commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

r110 - gnue-invoice/forms


From: kilo
Subject: r110 - gnue-invoice/forms
Date: Thu, 11 Nov 2004 17:13:08 -0600 (CST)

Author: kilo
Date: 2004-11-11 17:13:07 -0600 (Thu, 11 Nov 2004)
New Revision: 110

Modified:
   gnue-invoice/forms/INV_Head.gfd
   gnue-invoice/forms/INV_PaymentMethod.gfd
   gnue-invoice/forms/ITEM_Item.gfd
   gnue-invoice/forms/ITEM_ItemType.gfd
   gnue-invoice/forms/ITEM_UnitType.gfd
   gnue-invoice/forms/PARTY_Party.gfd
   gnue-invoice/forms/TAX_Vat.gfd
Log:
GNUe Invoice.
Converted more forms to dialogs.

Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd     2004-11-11 12:42:18 UTC (rev 109)
+++ gnue-invoice/forms/INV_Head.gfd     2004-11-11 23:13:07 UTC (rev 110)
@@ -23,19 +23,19 @@
 
      $Id$ -->
 
-<form title="Invoice">
+<form xmlns:c="GNUe:Layout:Char" title="Invoice">
   <options/>
 
   <!--*****************************************************
                         Datasources
   ******************************************************-->
-  <datasource name="dtsINV_Head" connection="invoice" table="INV_Head"/>
+  <datasource name="dts" connection="invoice" table="INV_Head"/>
   <datasource name="dts_PARTY_PartyBuyer" connection="invoice" prequery="Y"
               table="PARTY_Party"/>
   <datasource name="dts_INV_PaymentMethod" connection="invoice" prequery="Y"
               table="INV_PaymentMethod"/>
   <datasource name="dtsINV_Item" connection="invoice" detaillink="INV_Head"
-              master="dtsINV_Head" masterlink="gnue_id" table="INV_Item"/>
+              master="dts" masterlink="gnue_id" table="INV_Item"/>
   <datasource name="dts_ITEM_Item" connection="invoice" prequery="Y"
               table="ITEM_Item"/>
   <datasource name="dtsITEM_Item" connection="invoice" table="ITEM_Item"/>
@@ -67,7 +67,7 @@
     <!--***************************************************
                         Invoice head
     ****************************************************-->
-    <block name="blkINV_Head" datasource="dtsinv_head">
+    <block name="blkINV_Head" datasource="dts">
       <field name="fldInvNumber" field="INV_number" maxLength="20"
              readonly="Y"/>
       <field name="fldInvBuyer" field="INV_buyer" fk_description="PARTY_name"
@@ -182,98 +182,77 @@
   <!--*****************************************************
                           Form layout
   ******************************************************-->
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="18" Char:width="49">
-    <page name="Page1">
-      <label name="lblInv Number:" Char:height="1" Char:width="7" Char:x="1"
-             Char:y="1" text="Number:"/>
-      <entry name="entInvNumber" Char:height="1" Char:width="20" Char:x="16"
-             Char:y="1" block="blkFreeHead" field="number" style="label"/>
-      <label name="lblInv Buyer:" Char:height="1" Char:width="6" Char:x="1"
-             Char:y="2" text="Buyer:"/>
-      <entry name="entInvBuyer" Char:height="1" Char:width="28" Char:x="16"
-             Char:y="2" block="blkINV_Head" field="fldInvBuyer" 
style="dropdown"/>
-      <button name="btnEditBuyer" Char:height="1" Char:width="6" Char:x="44"
-              Char:y="2" label="Edit...">
+  <layout c:height="18" c:width="49">
+    <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"/>
+      <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"
+          block="blkINV_Head" field="fldInvBuyer" style="dropdown"/>
+      <button name="btnEditBuyer" c:height="1" c:width="6" c:x="44" c:y="2"
+          label="Edit...">
         <trigger type="ON-ACTION" name="btnEditBuyerTrigger">
-          location = "PARTY_Party.gfd"
-          form.runForm(location)
-        </trigger>
-      </button>
-      <button name="btnRefreshBuyer" Char:height="1" Char:width="3"
-              Char:x="50" Char:y="2" label="@">
-        <trigger type="ON-ACTION" name="btnRefreshBuyerTrigger">
+          form.runForm('PARTY_Party.gfd')
           blkINV_Head.fldInvBuyer.resetForeignKey()
         </trigger>
       </button>
-      <label name="lblInv Paymentmethod:" Char:height="1" Char:width="15"
-             Char:x="1" Char:y="3" text="Payment method:"/>
-      <entry name="entInvPaymentmethod" Char:height="1" Char:width="28"
-             Char:x="16" Char:y="3" block="blkINV_Head" 
field="fldInvPaymentmethod"
-             style="dropdown"/>
-      <button name="btnEditPaymentMethod" Char:height="1" Char:width="6"
-              Char:x="44" Char:y="3" label="Edit...">
+      <label name="lblPaymentmethod:" c:height="1" c:width="15" c:x="1" c:y="3"
+          text="Payment method:"/>
+      <entry name="entInvPaymentmethod" c:height="1" c:width="28" c:x="16" 
c:y="3"
+          block="blkINV_Head" field="fldInvPaymentmethod" style="dropdown"/>
+      <button name="btnEditPaymMeth" c:height="1" c:width="6" c:x="44" c:y="3"
+          label="Edit...">
         <trigger type="ON-ACTION" name="btnEditPaymentMethodTrigger">
-          location = "INV_PaymentMethod.gfd"
-          form.runForm(location)
-        </trigger>
-      </button>
-      <button name="btnRefreshPaymentMethod" Char:height="1" Char:width="3"
-              Char:x="50" Char:y="3" label="@">
-        <trigger type="ON-ACTION" name="btnRefreshPaymentMethodTrigger">
+          form.runForm('INV_PaymentMethod.gfd')
           blkINV_Head.fldInvPaymentmethod.resetForeignKey()
         </trigger>
       </button>
-      <label name="lblInv Dateissued:" Char:height="1" Char:width="12"
-             Char:x="1" Char:y="4" text="Date issued:"/>
-      <entry name="entInvDateIssued" Char:height="1" Char:width="10"
-             Char:x="16" Char:y="4" block="blkFreeHead" field="dateIssued" />
-      <label name="lblInv Datedue:" Char:height="1" Char:width="14"
-             Char:x="1" Char:y="5" text="Due date:"/>
-      <entry name="entInvDatedue" Char:height="1" Char:width="10"
-             Char:x="16" Char:y="5" block="blkFreeHead" field="dateDue" />
-      <label name="lblInv Datedelivery:" Char:height="1" Char:width="14"
-             Char:x="1" Char:y="6" text="Delivery date:"/>
-      <entry name="entInvDatedelivery" Char:height="1" Char:width="10"
-             Char:x="16" Char:y="6" block="blkINV_Head" 
field="fldInvDatedelivery" />
-      <label name="lblInv Note:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="7" text="Note:"/>
-      <entry name="entInvNote" Char:height="1" Char:width="28" Char:x="16"
-             Char:y="7" block="blkINV_Head" field="fldInvNote" />
-      <label name="lblInv Printed:" Char:height="1" Char:width="8" Char:x="1"
-             Char:y="8" text="Printed:"/>
-      <entry name="entInvPrinted" Char:height="1" Char:width="3" Char:x="16"
-             Char:y="8" block="blkINV_Head" field="fldInvPrinted" 
style="label"/>
-      <label name="lblInv ValuetotalGross:" Char:height="1" Char:width="12"
-             Char:x="1" Char:y="9" text="Value total:"/>
-      <entry name="entInvValuetotalGross" Char:height="1" Char:width="10"
-             Char:x="16" Char:y="9" block="blkFreeHead" field="valueTotalGross"
-             style="label"/>
+      <label name="lblDateissued:" c:height="1" c:width="12" c:x="1" c:y="4"
+          text="Date issued:"/>
+      <entry name="entInvDateIssued" c:height="1" c:width="10" c:x="16" c:y="4"
+          block="blkFreeHead" field="dateIssued" />
+      <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"
+          block="blkFreeHead" field="dateDue" />
+      <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"
+          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"
+          block="blkINV_Head" field="fldInvNote" />
+      <label name="lblPrinted:" c:height="1" c:width="8" c:x="1" c:y="8"
+          text="Printed:"/>
+      <entry name="entInvPrinted" c:height="1" c:width="3" c:x="16" c:y="8"
+          block="blkINV_Head" field="fldInvPrinted" style="label"/>
+      <label name="lblValuetotalGross:" c:height="1" c:width="12" c:x="1" 
c:y="9"
+          text="Value total:"/>
+      <entry name="entInvValuetotalGross" c:height="1" c:width="10" c:x="16" 
c:y="9"
+          block="blkFreeHead" field="valueTotalGross" style="label"/>
 
-      <box name="BoxItem" Char:height="8" Char:width="50" Char:x="1"
-           Char:y="10" label="Items"/>
-      <button name="btnEditItem" Char:height="1" Char:width="6" Char:x="14"
-              Char:y="11" label="Edit...">
+      <box name="BoxItem" c:height="8" c:width="50" c:x="1" c:y="10"
+          label="Items"/>
+      <button name="btnEditItem" c:height="1" c:width="6" c:x="14" c:y="11"
+          label="Edit...">
         <trigger type="ON-ACTION" name="btnEditItemTrigger">
-          location = "ITEM_Item.gfd"
-          form.runForm(location)
-        </trigger>
-      </button>
-      <button name="btnRefreshItem" Char:height="1" Char:width="3" Char:x="20"
-              Char:y="11" label="@">
-        <trigger type="ON-ACTION" name="btnRefreshItemTrigger">
+          form.runForm('ITEM_Item.gfd')
           blkINV_Item.fldInvProduct.resetForeignKey()
         </trigger>
       </button>
 
-      <entry name="entInvProduct" Char:height="1" Char:width="28" Char:x="2"
-             Char:y="12" block="blkINV_Item" field="fldInvProduct"
-             style="dropdown" />
-      <entry name="entItemPrice" Char:height="1" Char:width="6" Char:x="31"
-             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="44"
-             Char:y="12" block="blkFreeItem" field="itemPriceTotal" 
style="label" />
+      <entry name="entInvProduct" c:height="1" c:width="28" c:x="2" c:y="12"
+          block="blkINV_Item" field="fldInvProduct" style="dropdown" />
+      <entry name="entItemPrice" c:height="1" c:width="6" c:x="31" c:y="12"
+          block="blkFreeItem" field="itemPrice" style="label" />
+      <entry name="entInvQuantity" c:height="1" c:width="5" c:x="38" c:y="12"
+          block="blkINV_Item" field="fldInvQuantity"/>
+      <entry name="entItemPriceTotal" c:height="1" c:width="10" c:x="44" 
c:y="12"
+          block="blkFreeItem" field="itemPriceTotal" style="label" />
     </page>
   </layout>
+
 </form>

Modified: gnue-invoice/forms/INV_PaymentMethod.gfd
===================================================================
--- gnue-invoice/forms/INV_PaymentMethod.gfd    2004-11-11 12:42:18 UTC (rev 
109)
+++ gnue-invoice/forms/INV_PaymentMethod.gfd    2004-11-11 23:13:07 UTC (rev 
110)
@@ -23,32 +23,35 @@
 
      $Id$ -->
 
-<form title="Payment Method">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="Payment Method">
   <options/>
-  <datasource name="dtsINV_PaymentMethod" connection="invoice"
-              table="INV_PaymentMethod"/>
+
+  <datasource name="dts" connection="invoice" table="INV_PaymentMethod"/>
+
   <logic>
-    <block name="blkINV_PaymentMethod" datasource="dtsinv_paymentmethod">
+    <block name="blk" datasource="dts">
       <field name="fldInvName" field="INV_name" maxLength="35"/>
       <field name="fldInvChannel" field="INV_channel" maxLength="35"/>
       <field name="fldInvDuedays" field="INV_dueDays" maxLength="3"
              typecast="number"/>
     </block>
   </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="4" Char:width="46">
-    <page name="Page1">
-      <label name="lblInv Name:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Name:"/>
-      <entry name="entInvName" Char:height="1" Char:width="35" Char:x="10"
-             Char:y="1" block="blkINV_PaymentMethod" field="fldInvName" 
label=""/>
-      <label name="lblInv Channel:" Char:height="1" Char:width="8" Char:x="1"
-             Char:y="2" text="Channel:"/>
-      <entry name="entInvChannel" Char:height="1" Char:width="35" Char:x="10"
-             Char:y="2" block="blkINV_PaymentMethod" field="fldInvChannel" 
label=""/>
-      <label name="lblInv Duedays:" Char:height="1" Char:width="9" Char:x="1"
-             Char:y="3" text="Due days:"/>
-      <entry name="entInvDuedays" Char:height="1" Char:width="3" Char:x="10"
-             Char:y="3" block="blkINV_PaymentMethod" field="fldInvDuedays" 
label=""/>
+
+  <layout c:height="4" c:width="46">
+    <page>
+      <label name="lblInv Name:" c:height="1" c:width="5" c:x="1" c:y="1"
+          text="Name:"/>
+      <entry name="entInvName" c:height="1" c:width="35" c:x="10" c:y="1"
+          block="blk" field="fldInvName" label=""/>
+      <label name="lblInv Channel:" c:height="1" c:width="8" c:x="1" c:y="2"
+          text="Channel:"/>
+      <entry name="entInvChannel" c:height="1" c:width="35" c:x="10" c:y="2"
+          block="blk" field="fldInvChannel" label=""/>
+      <label name="lblInv Duedays:" c:height="1" c:width="9" c:x="1" c:y="3"
+          text="Due days:"/>
+      <entry name="entInvDuedays" c:height="1" c:width="3" c:x="10" c:y="3"
+          block="blk" field="fldInvDuedays" label=""/>
     </page>
   </layout>
+
 </form>

Modified: gnue-invoice/forms/ITEM_Item.gfd
===================================================================
--- gnue-invoice/forms/ITEM_Item.gfd    2004-11-11 12:42:18 UTC (rev 109)
+++ gnue-invoice/forms/ITEM_Item.gfd    2004-11-11 23:13:07 UTC (rev 110)
@@ -23,17 +23,19 @@
 
      $Id$ -->
 
-<form xmlns:c="GNUe:Layout:Char" title="Item">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="Item">
   <options/>
-  <datasource name="dtsITEM_Item" connection="invoice" table="ITEM_Item"/>
+
+  <datasource name="dts" connection="invoice" table="ITEM_Item"/>
   <datasource name="dts_ITEM_ItemType" connection="invoice" prequery="Y"
               table="ITEM_ItemType"/>
   <datasource name="dts_ITEM_UnitType" connection="invoice" prequery="Y"
               table="ITEM_UnitType"/>
   <datasource name="dts_TAX_Vat" connection="invoice" prequery="Y"
               table="TAX_Vat"/>
+
   <logic>
-    <block name="blkITEM_Item" datasource="dtsitem_item">
+    <block name="blk" datasource="dts">
       <field name="fldItemType" field="ITEM_type" fk_description="ITEM_value"
              fk_key="gnue_id" fk_source="dts_ITEM_ItemType" maxLength="32"/>
       <field name="fldItemShortname" field="ITEM_shortName" maxLength="35"/>
@@ -47,52 +49,53 @@
     </block>
   </logic>
   <layout c:height="7" c:width="55">
-    <page name="Page1">
-      <label name="lblItem Type:" c:height="1" c:width="5" c:x="1" c:y="1"
+    <page>
+      <label name="lblType:" c:height="1" c:width="5" c:x="1" c:y="1"
           text="Type:"/>
-      <entry name="entItemType" c:height="1" c:width="28" c:x="13" c:y="1"
-          block="blkITEM_Item" field="fldItemType" label="" style="dropdown"/>
-      <button name="btnEditItemType" c:height="1" c:width="6" c:x="41" c:y="1"
+      <entry name="entType" c:height="1" c:width="28" c:x="13" c:y="1"
+          block="blk" field="fldItemType" label="" style="dropdown"/>
+      <button name="btnEditType" c:height="1" c:width="6" c:x="41" c:y="1"
           label="Edit...">
-        <trigger type="On-Action" name="btnEditItemTypeTrigger">
+        <trigger type="On-Action" name="btnEditTypeTrigger">
           form.runForm('ITEM_ItemType.gfd')
-          blkITEM_Item.fldItemType.resetForeignKey()
+          blk.fldItemType.resetForeignKey()
         </trigger>
       </button>
-      <label name="lblItem Shortname:" c:height="1" c:width="11" c:x="1" 
c:y="2"
+      <label name="lblShortname:" c:height="1" c:width="11" c:x="1" c:y="2"
           text="Short name:"/>
-      <entry name="entItemShortname" c:height="1" c:width="35" c:x="13" c:y="2"
-          block="blkITEM_Item" field="fldItemShortname" label=""/>
-      <label name="lblItem Longname:" c:height="1" c:width="10" c:x="1" c:y="3"
+      <entry name="entShortname" c:height="1" c:width="35" c:x="13" c:y="2"
+          block="blk" field="fldItemShortname" label=""/>
+      <label name="lblLongname:" c:height="1" c:width="10" c:x="1" c:y="3"
           text="Long name:"/>
-      <entry name="entItemLongname" c:height="1" c:width="35" c:x="13" c:y="3"
-          block="blkITEM_Item" field="fldItemLongname" label=""/>
-      <label name="lblItem Price:" c:height="1" c:width="6" c:x="1" c:y="4"
+      <entry name="entLongname" c:height="1" c:width="35" c:x="13" c:y="3"
+          block="blk" field="fldItemLongname" label=""/>
+      <label name="lblPrice:" c:height="1" c:width="6" c:x="1" c:y="4"
           text="Price:"/>
-      <entry name="entItemPrice" c:height="1" c:width="10" c:x="13" c:y="4"
-          block="blkITEM_Item" field="fldItemPrice" label=""/>
-      <label name="lblItem Unit:" c:height="1" c:width="5" c:x="1" c:y="5"
+      <entry name="entPrice" c:height="1" c:width="10" c:x="13" c:y="4"
+          block="blk" field="fldItemPrice" label=""/>
+      <label name="lblUnit:" c:height="1" c:width="5" c:x="1" c:y="5"
           text="Unit:"/>
-      <entry name="entItemUnit" c:height="1" c:width="28" c:x="13" c:y="5"
-          block="blkITEM_Item" field="fldItemUnit" label="" style="dropdown"/>
-      <button name="btnEditItemUnit" c:height="1" c:width="6" c:x="41" c:y="5"
+      <entry name="entUnit" c:height="1" c:width="28" c:x="13" c:y="5"
+          block="blk" field="fldItemUnit" label="" style="dropdown"/>
+      <button name="btnEditUnit" c:height="1" c:width="6" c:x="41" c:y="5"
           label="Edit...">
-        <trigger type="On-Action" name="btnEditItemUnitTrigger">
+        <trigger type="On-Action" name="btnEditUnitTrigger">
           form.runForm('ITEM_UnitType.gfd')
-          blkITEM_Item.fldItemUnit.resetForeignKey()
+          blk.fldItemUnit.resetForeignKey()
         </trigger>
       </button>
-      <label name="lblItem Vat:" c:height="1" c:width="9" c:x="1" c:y="6"
+      <label name="lblVat:" c:height="1" c:width="9" c:x="1" c:y="6"
           text="Item Vat:"/>
-      <entry name="entItemVat" c:height="1" c:width="28" c:x="13" c:y="6"
-          block="blkITEM_Item" field="fldItemVat" label="" style="dropdown"/>
+      <entry name="entVat" c:height="1" c:width="28" c:x="13" c:y="6"
+          block="blk" field="fldItemVat" label="" style="dropdown"/>
       <button name="btnEditVat" c:height="1" c:width="6" c:x="41" c:y="6"
           label="Edit...">
         <trigger type="On-Action" name="btnEditVatTrigger">
           form.runForm('TAX_Vat.gfd')
-          blkITEM_Item.fldItemVat.resetForeignKey()
+          blk.fldItemVat.resetForeignKey()
         </trigger>
       </button>
     </page>
   </layout>
+
 </form>

Modified: gnue-invoice/forms/ITEM_ItemType.gfd
===================================================================
--- gnue-invoice/forms/ITEM_ItemType.gfd        2004-11-11 12:42:18 UTC (rev 
109)
+++ gnue-invoice/forms/ITEM_ItemType.gfd        2004-11-11 23:13:07 UTC (rev 
110)
@@ -25,28 +25,27 @@
 
 <form style="dialog" xmlns:c="GNUe:Layout:Char" title="Item type">
   <options/>
-  
-  <datasource name="dtsITEM_ItemType" connection="invoice"
-              table="ITEM_ItemType"/>
-              
+
+  <datasource name="dts" connection="invoice" table="ITEM_ItemType"/>
+
   <logic>
-    <block name="blkITEM_ItemType" datasource="dtsITEM_ItemType">
+    <block name="blk" datasource="dts">
       <field name="fldItemCode" field="ITEM_code" maxLength="35"/>
       <field name="fldItemValue" field="ITEM_value" maxLength="35"/>
     </block>
   </logic>
-  
+
   <layout c:height="3" c:width="30">
     <page>
-      <label name="lblItem Code:" c:height="1" c:width="5" c:x="1" c:y="1"
+      <label name="lblCode:" c:height="1" c:width="5" c:x="1" c:y="1"
           text="Code:"/>
-      <entry name="entItemCode" c:height="1" c:width="20" c:x="8" c:y="1"
-          block="blkITEM_ItemType" field="fldItemCode" label=""/>
-      <label name="lblItem Value:" c:height="1" c:width="6" c:x="1" c:y="2"
+      <entry name="entCode" c:height="1" c:width="20" c:x="8" c:y="1"
+          block="blk" field="fldItemCode" label=""/>
+      <label name="lblValue:" c:height="1" c:width="6" c:x="1" c:y="2"
           text="Value:"/>
-      <entry name="entItemValue" c:height="1" c:width="20" c:x="8" c:y="2"
-          block="blkITEM_ItemType" field="fldItemValue" label=""/>
+      <entry name="entValue" c:height="1" c:width="20" c:x="8" c:y="2"
+          block="blk" field="fldItemValue" label=""/>
     </page>
   </layout>
-  
+
 </form>

Modified: gnue-invoice/forms/ITEM_UnitType.gfd
===================================================================
--- gnue-invoice/forms/ITEM_UnitType.gfd        2004-11-11 12:42:18 UTC (rev 
109)
+++ gnue-invoice/forms/ITEM_UnitType.gfd        2004-11-11 23:13:07 UTC (rev 
110)
@@ -25,28 +25,27 @@
 
 <form style="dialog" xmlns:c="GNUe:Layout:Char" title="UnitType">
   <options/>
-  
-  <datasource name="dtsITEM_UnitType" connection="invoice"
-              table="ITEM_UnitType"/>
-              
+
+  <datasource name="dts" connection="invoice" table="ITEM_UnitType"/>
+
   <logic>
-    <block name="blkITEM_UnitType" datasource="dtsITEM_UnitType">
+    <block name="blk" datasource="dts">
       <field name="fldItemCode" field="ITEM_code" maxLength="35"/>
       <field name="fldItemValue" field="ITEM_value" maxLength="35"/>
     </block>
   </logic>
-  
+
   <layout c:height="3" c:width="30">
     <page>
-      <label name="lblItem Code:" c:height="1" c:width="5" c:x="1" c:y="1"
+      <label name="lblCode:" c:height="1" c:width="5" c:x="1" c:y="1"
           text="Code:"/>
-      <entry name="entItemCode" c:height="1" c:width="20" c:x="8" c:y="1"
-          block="blkITEM_UnitType" field="fldItemCode" label=""/>
-      <label name="lblItem Value:" c:height="1" c:width="6" c:x="1" c:y="2"
+      <entry name="entCode" c:height="1" c:width="20" c:x="8" c:y="1"
+          block="blk" field="fldItemCode" label=""/>
+      <label name="lblValue:" c:height="1" c:width="6" c:x="1" c:y="2"
           text="Value:"/>
-      <entry name="entItemValue" c:height="1" c:width="20" c:x="8" c:y="2"
-          block="blkITEM_UnitType" field="fldItemValue" label=""/>
+      <entry name="entValue" c:height="1" c:width="20" c:x="8" c:y="2"
+          block="blk" field="fldItemValue" label=""/>
     </page>
   </layout>
-  
+
 </form>

Modified: gnue-invoice/forms/PARTY_Party.gfd
===================================================================
--- gnue-invoice/forms/PARTY_Party.gfd  2004-11-11 12:42:18 UTC (rev 109)
+++ gnue-invoice/forms/PARTY_Party.gfd  2004-11-11 23:13:07 UTC (rev 110)
@@ -23,13 +23,15 @@
 
      $Id$ -->
 
-<form title="Party">
+<form style="dialog" xmlns:c="GNUe:Layout:Char" title="Party">
   <options/>
-  <datasource name="dtsPARTY_Party" connection="invoice" table="PARTY_Party"/>
+
+  <datasource name="dts" connection="invoice" table="PARTY_Party"/>
   <datasource name="dts_LOC_Address" connection="invoice" prequery="Y"
               table="LOC_Address"/>
+
   <logic>
-    <block name="blkPARTY_Party" datasource="dtsparty_party">
+    <block name="blk" datasource="dts">
       <field name="fldPartyName" field="PARTY_name" maxLength="35"/>
       <field name="fldPartyLongname" field="PARTY_longName" maxLength="70"/>
       <field name="fldPartyAddress" field="PARTY_address"
@@ -37,41 +39,41 @@
       <field name="fldPartyTaxid" field="PARTY_taxID" maxLength="35"/>
     </block>
   </logic>
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="5" Char:width="54">
-    <page name="Page1">
-      <label name="lblParty Name:" Char:height="1" Char:width="5" Char:x="1"
-             Char:y="1" text="Name:"/>
-      <entry name="entPartyName" Char:height="1" Char:width="28" Char:x="13"
-             Char:y="1" block="blkPARTY_Party" field="fldPartyName" label=""/>
-      <label name="lblParty Longname:" Char:height="1" Char:width="10"
-             Char:x="1" Char:y="2" text="Long name:"/>
-      <entry name="entPartyLongname" Char:height="1" Char:width="40"
-             Char:x="13" Char:y="2" block="blkPARTY_Party" 
field="fldPartyLongname"
-             label=""/>
-      <label name="lblParty Address:" Char:height="1" Char:width="8"
-             Char:x="1" Char:y="3" text="Address:"/>
-      <entry name="entPartyAddress" Char:height="1" Char:width="28"
-             Char:x="13" Char:y="3" block="blkPARTY_Party" 
field="fldPartyAddress"
-             label="" style="dropdown"/>
-      <button name="btnEditAddress" Char:height="1" Char:width="6" Char:x="41"
-              Char:y="3" label="Edit...">
+
+  <layout c:height="5" c:width="54">
+    <page>
+      <label name="lblName:" c:height="1" c:width="5" c:x="1" c:y="1"
+          text="Name:"/>
+      <entry name="entName" c:height="1" c:width="28" c:x="13" c:y="1"
+          block="blk" field="fldPartyName" label=""/>
+      <label name="lblLongname:" c:height="1" c:width="10" c:x="1" c:y="2"
+          text="Long name:"/>
+      <entry name="entLongname" c:height="1" c:width="40" c:x="13" c:y="2"
+          block="blk" field="fldPartyLongname" label=""/>
+      <label name="lblAddress:" c:height="1" c:width="8" c:x="1" c:y="3"
+          text="Address:"/>
+      <entry name="entAddress" c:height="1" c:width="28" c:x="13" c:y="3"
+          block="blk" field="fldPartyAddress" label="" style="dropdown"/>
+      <button name="btnEditAddress" c:height="1" c:width="6" c:x="41" c:y="3"
+          label="Edit...">
         <trigger type="On-Action" name="btnEditAddressTrigger"><![CDATA[##
           location = "LOC_Address.gfd"
           form.runForm(location)
         ]]>
         </trigger>
       </button>
-      <button name="btnRefreshAddress" Char:height="1" Char:width="3"
-              Char:x="47" Char:y="3" label="@">
+      <button name="btnRefreshAddress" c:height="1" c:width="3" c:x="47" 
c:y="3"
+          label="@">
         <trigger type="On-Action" name="btnRefreshAddressTrigger"><![CDATA[##
-          blkPARTY_Party.fldPartyAddress.resetForeignKey()
+          blk.fldPartyAddress.resetForeignKey()
         ]]>
         </trigger>
       </button>
-      <label name="lblParty Taxid:" Char:height="1" Char:width="6" Char:x="1"
-             Char:y="4" text="Taxid:"/>
-      <entry name="entPartyTaxid" Char:height="1" Char:width="28" Char:x="13"
-             Char:y="4" block="blkPARTY_Party" field="fldPartyTaxid" label=""/>
+      <label name="lblTaxid:" c:height="1" c:width="6" c:x="1" c:y="4"
+          text="Taxid:"/>
+      <entry name="entTaxid" c:height="1" c:width="28" c:x="13" c:y="4"
+          block="blk" field="fldPartyTaxid" label=""/>
     </page>
   </layout>
+
 </form>

Modified: gnue-invoice/forms/TAX_Vat.gfd
===================================================================
--- gnue-invoice/forms/TAX_Vat.gfd      2004-11-11 12:42:18 UTC (rev 109)
+++ gnue-invoice/forms/TAX_Vat.gfd      2004-11-11 23:13:07 UTC (rev 110)
@@ -25,11 +25,11 @@
 
 <form style="dialog" xmlns:c="GNUe:Layout:Char" title="VAT">
   <options/>
-  
-  <datasource name="dtsTAX_Vat" connection="invoice" table="TAX_Vat"/>
-  
+
+  <datasource name="dts" connection="invoice" table="TAX_Vat"/>
+
   <logic>
-    <block name="blkTAX_Vat" datasource="dtstax_vat">
+    <block name="blk" datasource="dts">
       <field name="fldTaxName" field="TAX_name" maxLength="40"/>
       <field name="fldTaxRate" field="TAX_rate" maxLength="6"
              typecast="number"/>
@@ -41,26 +41,26 @@
              typecast="number"/>
     </block>
   </logic>
-  
+
   <layout c:height="5" c:width="55">
     <page>
-      <label name="lblTax Name:" c:height="1" c:width="11" c:x="1" c:y="1"
+      <label name="lblName:" c:height="1" c:width="11" c:x="1" c:y="1"
           text="VAT name:"/>
-      <entry name="entTaxName" c:height="1" c:width="40" c:x="14" c:y="1"
-          block="blkTAX_Vat" field="fldTaxName" label=""/>
-      <label name="lblTax Rate:" c:height="1" c:width="9" c:x="1" c:y="2"
+      <entry name="entName" c:height="1" c:width="40" c:x="14" c:y="1"
+          block="blk" field="fldTaxName" label=""/>
+      <label name="lblRate:" c:height="1" c:width="9" c:x="1" c:y="2"
           text="Rate:"/>
-      <entry name="entTaxRate" c:height="1" c:width="6" c:x="14" c:y="2"
-          block="blkTAX_Vat" field="fldTaxRate" label=""/>
-      <label name="lblTax Validfrom:" c:height="1" c:width="13" c:x="1" c:y="3"
+      <entry name="entRate" c:height="1" c:width="6" c:x="14" c:y="2"
+          block="blk" field="fldTaxRate" label=""/>
+      <label name="lblValidfrom:" c:height="1" c:width="13" c:x="1" c:y="3"
           text="Valid from:"/>
-      <entry name="entTaxValidfrom" c:height="1" c:width="10" c:x="14" c:y="3"
-          block="blkTAX_Vat" field="fldTaxValidfrom" label=""/>
-      <label name="lblTax Validuntil:" c:height="1" c:width="10" c:x="1" 
c:y="4"
+      <entry name="entValidfrom" c:height="1" c:width="10" c:x="14" c:y="3"
+          block="blk" field="fldTaxValidfrom" label=""/>
+      <label name="lblValiduntil:" c:height="1" c:width="10" c:x="1" c:y="4"
           text="Valid until:"/>
-      <entry name="entTaxValiduntil" c:height="1" c:width="10" c:x="14" c:y="4"
-          block="blkTAX_Vat" field="fldTaxValiduntil" label=""/>
+      <entry name="entValiduntil" c:height="1" c:width="10" c:x="14" c:y="4"
+          block="blk" field="fldTaxValiduntil" label=""/>
     </page>
   </layout>
-  
+
 </form>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]