r104 - in gnue-invoice: forms schema

[kilo]

Author: kilo
Date: 2004-10-28 05:26:15 -0500 (Thu, 28 Oct 2004)
New Revision: 104

Modified:
   gnue-invoice/forms/INV_Head.gfd
   gnue-invoice/schema/invoice.gcd
Log:
GNUe Invoice
Re-enabled some automatic stuff, now working.

Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd     2004-10-27 11:58:30 UTC (rev 103)
+++ gnue-invoice/forms/INV_Head.gfd     2004-10-28 10:26:15 UTC (rev 104)
@@ -76,7 +76,7 @@
              fk_description="INV_name" fk_key="gnue_id"
              fk_source="dts_INV_PaymentMethod" maxLength="32">
 <!--
-             <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
+      <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
 This causes infinite loop when autocommitting items!!!
 -->
       </field>
@@ -146,15 +146,11 @@
       <field name="fldInvProduct" field="INV_product"
              fk_description="ITEM_shortName" fk_key="gnue_id"
              fk_source="dts_ITEM_Item" maxLength="32">
-<!--         <trigger type="POST-CHANGE" name="postchange" src="getItemPrice" 
/>
-This causes items to not autocommit!!!
--->
+        <trigger type="POST-CHANGE" name="postchange" src="getItemPrice" />
       </field>
       <field name="fldInvQuantity" field="INV_quantity" maxLength="10"
              typecast="number">
-<!--         <trigger type="POST-CHANGE" name="postchange" 
src="calcItemPriceTotal" />
-This causes items to not autocommit!!!
--->
+        <trigger type="POST-CHANGE" name="postchange" src="calcItemPriceTotal" 
/>
       </field>
 
       <!--Count totals -->
@@ -276,7 +272,7 @@
              Char:y="12" block="blkFreeItem" field="itemPrice" style="label" />
       <entry name="entInvQuantity" Char:height="1" Char:width="5" Char:x="38"
              Char:y="12" block="blkINV_Item" field="fldInvQuantity"/>
-      <entry name="entItemPriceTotal" Char:height="1" Char:width="10" 
Char:x="343"
+      <entry name="entItemPriceTotal" Char:height="1" Char:width="10" 
Char:x="44"
              Char:y="12" block="blkFreeItem" field="itemPriceTotal" 
style="label" />
     </page>
   </layout>

Modified: gnue-invoice/schema/invoice.gcd
===================================================================
--- gnue-invoice/schema/invoice.gcd     2004-10-27 11:58:30 UTC (rev 103)
+++ gnue-invoice/schema/invoice.gcd     2004-10-28 10:26:15 UTC (rev 104)
@@ -39,14 +39,9 @@
   Represents an invoice item, ie a line on an invoice
   ************************************************-->
   <class name="Item"            comment="One item (line) on an invoice">
-<!--
     <property name="head"           type="INV_Head"         nullable="False"   
 comment="link with invoice head" />
     <property name="product"        type="ITEM_Item"        nullable="False"   
 comment="" />
     <property name="quantity"       type="number(10,2)"     nullable="False"   
 comment="" />
- -->
-    <property name="head"           type="INV_Head"         comment="link with 
invoice head" />
-    <property name="product"        type="ITEM_Item"        comment="" />
-    <property name="quantity"       type="number(10,2)"     comment="" />
     <property name="note"           type="string"           comment="" />
     <property name="valueNet"       type="number(10,2)" >
       net = self.quantity * self.product.ITEM_price
@@ -101,6 +96,7 @@
     <property name="paymentMethod"  type="INV_PaymentMethod"    
nullable="False"    comment="" />
     <property name="dateDelivery"   type="date"                 
nullable="False"    comment="" />
     <property name="dateIssued"     type="date"                 
nullable="False"    comment="Date when invoice was generated" />
+    <property name="dateDue"        type="date"                 
nullable="False"    comment="Date the payment is due" />
     -->
     <property name="number"         type="string(20)"           
comment="invoice number" />
     <property name="buyer"          type="PARTY_Party"          comment="who 
pays..." />
@@ -119,7 +115,7 @@
         for a in items:
           total += a.INV_valueNet
 
-      print 'INV_Head::valueTotalNet %d %f' % (len(items),total)
+      print 'INV_Head::valueTotalNet #item:%d total:%f' % (len(items),total)
       return total
     </property>
 
@@ -132,7 +128,7 @@
         for a in items:
           total += a.INV_valueVAT
 
-      print 'INV_Head::valueTotalVAT %d %f' % (len(items),total)
+      print 'INV_Head::valueTotalVAT #item:%d total:%f' % (len(items),total)
       return total
     </property>
 
@@ -145,7 +141,7 @@
           total += a.INV_valueGross
 
         #total = sum(items)
-      print 'INV_Head::valueTotalGross %d %f' % (len(items),total)
+      print 'INV_Head::valueTotalGross #item:%d total:%f' % (len(items),total)
       return total
     </property>