r130 - gnue-invoice/forms

[kilo]

Author: kilo
Date: 2004-11-23 07:34:56 -0600 (Tue, 23 Nov 2004)
New Revision: 130

Modified:
   gnue-invoice/forms/INV_Head.gfd
Log:
GNUe Invoice.
Added note field to invoice lines.
Redesigned form.

Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd     2004-11-23 13:30:52 UTC (rev 129)
+++ gnue-invoice/forms/INV_Head.gfd     2004-11-23 13:34:56 UTC (rev 130)
@@ -118,9 +118,10 @@
              fk_source="dts_ITEM_Item" readonly="Y" />
       <field name="fldInvQuantity" field="INV_quantity" maxLength="10"
              typecast="number" >
-        <!--Count item value -->
+        <!--Count invoice total -->
         <trigger type="POST-CHANGE" name="onchange">
           #Calling a calculated property will cause it to refresh
+          blkINV_Item.call("INV_getvalueGross", {})
           blkINV_Head.call("INV_getvalueTotalGross", {})
         </trigger>
       </field>
@@ -129,6 +130,7 @@
              fk_source="dts_ITEM_Item" readonly="Y" />
       <field name="fldInvValueGross" field="INV_valueGross"
              typecast="number" readonly="Y"/>
+      <field name="fldInvNote" field="INV_note" />
     </block>
 
   </logic>
@@ -137,14 +139,12 @@
   <!--*****************************************************
                           Form layout
   ******************************************************-->
-  <layout c:height="20" c:width="51">
+  <layout c:height="18" c:width="70">
     <page>
       <label name="lblNumber:" c:height="1" c:width="7" c:x="1" c:y="1"
           text="Number:"/>
-<!--
       <entry name="entInvNumber" c:height="1" c:width="20" c:x="16" c:y="1"
-          block="blkFreeHead" field="number" style="label"/>
--->
+          block="blkINV_Head" field="fldInvNumber" style="label"/>
       <label name="lblBuyer:" c:height="1" c:width="6" c:x="1" c:y="2"
           text="Buyer:"/>
       <entry name="entInvBuyer" c:height="1" c:width="28" c:x="16" c:y="2"
@@ -173,29 +173,29 @@
           text="Date issued:"/>
       <entry name="entInvDateIssued" c:height="1" c:width="10" c:x="16" c:y="4"
           block="blkINV_Head" field="fldInvDateissued" />
-      <label name="lblDatedue:" c:height="1" c:width="14" c:x="1" c:y="5"
-          text="Due date:"/>
-      <entry name="entInvDatedue" c:height="1" c:width="10" c:x="16" c:y="5"
+      <label name="lblDatedue:" c:height="1" c:width="7" c:x="27" c:y="4"
+          text="Due by:"/>
+      <entry name="entInvDatedue" c:height="1" c:width="10" c:x="35" c:y="4"
           block="blkINV_Head" field="fldInvDatedue" />
-      <label name="lblDatedelivery:" c:height="1" c:width="14" c:x="1" c:y="6"
-          text="Delivery date:"/>
-      <entry name="entInvDatedelivery" c:height="1" c:width="10" c:x="16" 
c:y="6"
+      <label name="lblDatedelivery:" c:height="1" c:width="14" c:x="46" c:y="4"
+          text="Delivery by:"/>
+      <entry name="entInvDatedelivery" c:height="1" c:width="10" c:x="59" 
c:y="4"
           block="blkINV_Head" field="fldInvDatedelivery" />
-      <label name="lblNote:" c:height="1" c:width="5" c:x="1" c:y="7" 
text="Note:"/>
-      <entry name="entInvNote" c:height="1" c:width="28" c:x="16" c:y="7"
+      <label name="lblNote:" c:height="1" c:width="5" c:x="1" c:y="5" 
text="Note:"/>
+      <entry name="entInvNote" c:height="1" c:width="53" c:x="16" c:y="5"
           block="blkINV_Head" field="fldInvNote" />
-      <label name="lblPrinted:" c:height="1" c:width="8" c:x="1" c:y="8"
+      <label name="lblPrinted:" c:height="1" c:width="8" c:x="1" c:y="6"
           text="Printed:"/>
-      <entry name="entInvPrinted" c:height="1" c:width="3" c:x="16" c:y="8"
+      <entry name="entInvPrinted" c:height="1" c:width="3" c:x="16" c:y="6"
           block="blkINV_Head" field="fldInvPrinted" style="label"/>
-      <label name="lblValuetotalGross:" c:height="1" c:width="12" c:x="1" 
c:y="9"
+      <label name="lblValuetotalGross:" c:height="1" c:width="12" c:x="1" 
c:y="7"
           text="Value total:"/>
-      <entry name="entInvValuetotalGross" c:height="1" c:width="10" c:x="16" 
c:y="9"
+      <entry name="entInvValuetotalGross" c:height="1" c:width="10" c:x="16" 
c:y="7"
           block="blkINV_Head" field="fldInvValuetotalGross" style="label"/>
           
-      <box name="BoxItem" c:height="8" c:width="50" c:x="1" c:y="10"
+      <box name="BoxItem" c:height="8" c:width="69" c:x="1" c:y="8"
           label="Items"/>
-      <button name="btnEditItem" c:height="1" c:width="7" c:x="14" c:y="11"
+      <button name="btnEditItem" c:height="1" c:width="7" c:x="14" c:y="9"
           label="Edit...">
         <trigger type="ON-ACTION" name="btnEditItemTrigger">
           params = {'id': blkINV_Item.fldInvProduct.get() or ''}
@@ -204,31 +204,35 @@
         </trigger>
       </button>
 
-      <label name="lblInvProduct:" c:height="1" c:width="20" c:x="2" c:y="11"
+      <label name="lblInvProduct:" c:height="1" c:width="20" c:x="2" c:y="9"
           text="Product"/>
-      <label name="lblItemPrice:" c:height="1" c:width="6" c:x="23" c:y="11"
+      <label name="lblItemPrice:" c:height="1" c:width="6" c:x="23" c:y="9"
           text="Price"/>
-      <label name="lblInvQuantity:" c:height="1" c:width="5" c:x="30" c:y="11"
+      <label name="lblInvQuantity:" c:height="1" c:width="5" c:x="30" c:y="9"
           text="Qty."/>
-      <label name="lblItemUnit:" c:height="1" c:width="5" c:x="36" c:y="11"
+      <label name="lblItemUnit:" c:height="1" c:width="5" c:x="36" c:y="9"
           text="Unit"/>
-      <label name="lblItemPriceTotal:" c:height="1" c:width="10" c:x="44" 
c:y="11"
+      <label name="lblItemPriceTotal:" c:height="1" c:width="10" c:x="44" 
c:y="9"
           text="Value"/>
-      <entry name="entInvProduct" c:height="1" c:width="20" c:x="2" c:y="12"
+      <label name="lblItemPriceTotal:" c:height="1" c:width="10" c:x="55" 
c:y="9"
+          text="Note"/>
+      <entry name="entInvProduct" c:height="1" c:width="20" c:x="2" c:y="10"
           block="blkINV_Item" field="fldInvProduct" style="dropdown" />
-      <entry name="entItemPrice" c:height="1" c:width="6" c:x="23" c:y="12"
+      <entry name="entItemPrice" c:height="1" c:width="6" c:x="23" c:y="10"
           block="blkINV_Item" field="fldInvProductPrice" style="label" />
-      <entry name="entInvQuantity" c:height="1" c:width="5" c:x="30" c:y="12"
+      <entry name="entInvQuantity" c:height="1" c:width="5" c:x="30" c:y="10"
           block="blkINV_Item" field="fldInvQuantity"/>
-      <entry name="entItemUnit" c:height="1" c:width="5" c:x="36" c:y="12"
+      <entry name="entItemUnit" c:height="1" c:width="5" c:x="36" c:y="10"
           block="blkINV_Item" field="fldInvUnit" style="label" />
-      <entry name="entItemPriceTotal" c:height="1" c:width="10" c:x="44" 
c:y="12"
+      <entry name="entItemPriceTotal" c:height="1" c:width="10" c:x="44" 
c:y="10"
           block="blkINV_Item" field="fldInvValueGross" style="label" />
+      <entry name="entItemNote" c:height="1" c:width="14" c:x="55" c:y="10"
+          block="blkINV_Item" field="fldInvNote" />
           
-      <button c:x="1" c:y="19" c:width="10" c:height="1" label="Ok">
+      <button c:x="1" c:y="17" c:width="10" c:height="1" label="Ok">
         <trigger type="ON-ACTION" src="saveAll" />
       </button>
-      <button c:x="12" c:y="19" c:width="10" c:height="1" label="Cancel">
+      <button c:x="12" c:y="17" c:width="10" c:height="1" label="Cancel">
         <trigger type="ON-ACTION" src="revertAll" />
       </button>