[gnue-contrib] r215 - in gnue-invoice: forms reports

[kilo]

Author: kilo
Date: 2005-04-07 07:22:37 -0500 (Thu, 07 Apr 2005)
New Revision: 215

Modified:
   gnue-invoice/forms/Head.gfd
   gnue-invoice/forms/grid.gfd
   gnue-invoice/reports/invoice.grd
Log:
Adopted to modified package.

Modified: gnue-invoice/forms/Head.gfd
===================================================================
--- gnue-invoice/forms/Head.gfd 2005-03-15 13:55:33 UTC (rev 214)
+++ gnue-invoice/forms/Head.gfd 2005-04-07 12:22:37 UTC (rev 215)
@@ -61,13 +61,9 @@
       <field name="fldBuyer"        field="BILLING_buyer"           
maxLength="32"
           fk_source="dts_ORG_OrgBuyer"  fk_key="gnue_id"
           fk_description="ORG_shortName"/>
-      <field name="fldPaymentmeth"  field="BILLING_paymentMethod"   
maxLength="32"
-             fk_source="dts_BILLING_PaymentMethod"  fk_key="gnue_id"
-             fk_description="BILLING_name">
-<!--
-        <trigger type="POST-CHANGE" name="postchange" src="calcDueDate"/>
--->
-      </field>
+      <field name="fldPaymentMethod"    field="BILLING_paymentMethod"   
maxLength="32"
+          fk_source="dts_BILLING_PaymentMethod" fk_key="gnue_id"
+          fk_description="BILLING_name"/>
       <field name="fldDatedelivery" field="BILLING_dateDelivery"    
maxLength="10"
           typecast="date"/>
       <field name="fldDateissued"   field="BILLING_dateIssued"      
maxLength="10"
@@ -78,7 +74,7 @@
       </field>
       <field name="fldDatedue"      field="BILLING_dateDue"         
maxLength="10"
           typecast="date"/>
-      <field name="fldNote"         field="BILLING_note"           
maxLength="255"/>
+      <field name="fldNote"         field="BILLING_note"            
maxLength="255"/>
       <field name="fldPrinted"      field="BILLING_printed"         
maxLength="3"
           readonly="Y"  typecast="number"/>
       <field name="fldTotalGross"   field="BILLING_totalGross" maxLength="10"
@@ -118,10 +114,19 @@
     </block>
 
     <block name="blkSeller" datasource="dtsSeller">
-      <field name="fldNumPrint"     field="BILLING_numPrint"        
maxLength="10"
-          readonly="Y"  typecast="number"/>
+      <field name="fldNumPrint"     field="BILLING_numPrint"    readonly="Y"  
typecast="number"/>
     </block>
 
+<!--     <block name="blkPaymentMethod" datasource="dts_BILLING_PaymentMethod">
+      <field name="fldMethodName"   field="BILLING_name"    readonly="Y">
+        <trigger type="POST-CHANGE" name="asdasdasd">
+          blkHead.fldPaymMethodName.set(blkPaymentMethod.fldMethodName.get())
+          blkHead.fldPaymMethodName.set(blkPaymentMethod.fldMethodName.get())
+        </trigger>
+      </field>
+      <field name="fldMethodDays"   field="BILLING_dueDays" readonly="Y"    
typecast="number"/>
+    </block>
+ -->
     <!--***************************************************
             Block used for displaying wee luvly goat
     ****************************************************-->
@@ -155,10 +160,10 @@
           blkHead.fldBuyer.resetForeignKey()
         </trigger>
       </button>
-      <label name="lblPaymentmethod:" c:height="1" c:width="15" c:x="1" c:y="3"
+      <label name="lblPaymentMethod:" c:height="1" c:width="15" c:x="1" c:y="3"
           text="Payment method:"/>
-      <entry name="entPaymentmeth" c:height="1" c:width="28" c:x="16" c:y="3"
-          block="blkHead" field="fldPaymentmeth" style="dropdown"/>
+      <entry name="entPaymMethodName" c:height="1" c:width="28" c:x="16" 
c:y="3"
+          block="blkHead" field="fldPaymentMethod" style="dropdown"/>
       <button name="btnEditPaymMeth" c:height="1" c:width="7" c:x="44" c:y="3"
           label="Edit...">
         <trigger type="ON-ACTION" name="btnEditPaymentMethodTrigger">

Modified: gnue-invoice/forms/grid.gfd
===================================================================
--- gnue-invoice/forms/grid.gfd 2005-03-15 13:55:33 UTC (rev 214)
+++ gnue-invoice/forms/grid.gfd 2005-04-07 12:22:37 UTC (rev 215)
@@ -41,8 +41,6 @@
     <block name="blk"   datasource="dts"    rows="8">
       <field name="fldGnueid"       field="gnue_id"             maxLength="32"
           readonly="Y"/>
-      <!--<field name="fldBuyerName"    field="BILLING_buyer.ORG_shortName"
-          maxLength="35"  readonly="Y"/>-->
       <field name="fldBuyerName"    field="BILLING_buyerName"       
maxLength="35"
           readonly="Y"/>
       <field name="fldDatedelivery" field="BILLING_dateDelivery"    
maxLength="10"
@@ -51,7 +49,7 @@
           readonly="Y"  typecast="date"/>
       <field name="fldNumber"       field="BILLING_number"          
maxLength="20"
           readonly="Y"/>
-      <field name="fldPaymentmeth"  field="BILLING_paymentMethod"   
maxLength="32"
+      <field name="fldPaymentmeth"  field="BILLING_paymMethodName"  
maxLength="35"
           readonly="Y"/>
       <field name="fldTotalgross"   field="BILLING_totalGross"      
maxLength="10"
           readonly="Y"  typecast="number"/>

Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd    2005-03-15 13:55:33 UTC (rev 214)
+++ gnue-invoice/reports/invoice.grd    2005-04-07 12:22:37 UTC (rev 215)
@@ -56,11 +56,11 @@
 
     <section name="head" source="dts">
       <out:pageheader height="16">
-        <out:label x="5" y="2" width="20"><field 
name="BILLING_seller.BILLING_name"/></out:label>
-        <out:label x="5" y="3" width="20"><field 
name="BILLING_seller.BILLING_addr1"/></out:label>
-        <out:label x="5" y="4" width="20"><field 
name="BILLING_seller.BILLING_addr2"/></out:label>
-        <out:label x="5" y="5" width="20"><field 
name="BILLING_seller.BILLING_addr3"/></out:label>
-        <out:label x="5" y="6" width="20"><field 
name="BILLING_seller.BILLING_taxID"/></out:label>
+        <out:label x="5" y="2" width="20"><field 
name="BILLING_sellerName"/></out:label>
+        <out:label x="5" y="3" width="20"><field 
name="BILLING_sellerAddr1"/></out:label>
+        <out:label x="5" y="4" width="20"><field 
name="BILLING_sellerAddr2"/></out:label>
+        <out:label x="5" y="5" width="20"><field 
name="BILLING_sellerAddr3"/></out:label>
+        <out:label x="5" y="6" width="20"><field 
name="BILLING_sellerTaxID"/></out:label>
 
 
         <out:label x="30" y="1" width="11">Invoice No.</out:label>
@@ -68,15 +68,15 @@
         <out:label x="51" y="1" width="9"><field 
name="BILLING_revertedString"/></out:label>
         <out:label x="75" y="1" width="4" align="right"><field 
name="BILLING_printed"/></out:label>
 
-        <out:label x="60" y="2" width="20"><field 
name="BILLING_buyer.ORG_shortName"/></out:label>
-        <out:label x="60" y="3" width="20"><field 
name="BILLING_buyer.ORG_address.LOC_zip.LOC_formatted"/></out:label>
-        <out:label x="60" y="4" width="20"><field 
name="BILLING_buyer.ORG_address.LOC_street.LOC_formatted"/></out:label>
-        <out:label x="60" y="5" width="20"><field 
name="BILLING_buyer.ORG_address.LOC_number"/></out:label>
+        <out:label x="60" y="2" width="20"><field 
name="BILLING_buyerName"/></out:label>
+        <out:label x="60" y="3" width="20"><field 
name="BILLING_buyerAddr1"/></out:label>
+        <out:label x="60" y="4" width="20"><field 
name="BILLING_buyerAddr2"/></out:label>
+        <out:label x="60" y="5" width="20"><field 
name="BILLING_buyerAddr3"/></out:label>
         <out:label x="0"  y="9" width="20">Payment method</out:label>
         <out:label x="20" y="9" width="20">Date delivery</out:label>
         <out:label x="40" y="9" width="20">Date due</out:label>
         <out:label x="60" y="9" width="20">Date issued</out:label>
-        <out:label x="0"  y="10" width="10"><field 
name="BILLING_paymentMethod.BILLING_name"/></out:label>
+        <out:label x="0"  y="10" width="10"><field 
name="BILLING_paymMethodName"/></out:label>
         <out:label x="20" y="10" width="10"><field 
name="BILLING_dateDelivery"/></out:label>
         <out:label x="40" y="10" width="10"><field 
name="BILLING_dateDue"/></out:label>
         <out:label x="60" y="10" width="10"><field 
name="BILLING_dateIssued"/></out:label>
@@ -99,11 +99,11 @@
 
       <section name="detail" source="dtsBILLING_Item">
         <out:detail height="2">
-          <out:label x="0"  y="0" width="20"><field 
name="BILLING_product.ITEM_longName"/></out:label>
-          <out:label x="20" y="0" width="10" align="right"><field 
name="BILLING_product.SALES_price"/></out:label>
+          <out:label x="0"  y="0" width="20"><field 
name="BILLING_prodName"/></out:label>
+          <out:label x="20" y="0" width="10" align="right"><field 
name="BILLING_prodPrice"/></out:label>
           <out:label x="30" y="0" width="10" align="right"><field 
name="BILLING_quantity"/></out:label>
-          <out:label x="40" y="0" width="5"  align="right"><field 
name="BILLING_product.ITEM_unit.ITEM_value"/></out:label>
-          <out:label x="45" y="0" width="5"  align="right"> <field 
name="BILLING_product.SALES_vat.TAX_name"/></out:label>
+          <out:label x="40" y="0" width="5"  align="right"><field 
name="BILLING_prodUnit"/></out:label>
+          <out:label x="45" y="0" width="5"  align="right"> <field 
name="BILLING_prodVat"/></out:label>
           <out:label x="50" y="0" width="10" align="right"><field 
name="BILLING_valueNet"/></out:label>
           <out:label x="60" y="0" width="10" align="right"><field 
name="BILLING_valueVAT"/></out:label>
           <out:label x="70" y="0" width="10" align="right"><field 
name="BILLING_valueGross"/></out:label>