r152 - gnue-invoice/reports

[btami]

Author: btami
Date: 2004-12-02 10:36:55 -0600 (Thu, 02 Dec 2004)
New Revision: 152

Modified:
   gnue-invoice/reports/invoice.grd
Log:
gnue-invoice
added totals to invoice.grd

Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd    2004-12-02 14:36:52 UTC (rev 151)
+++ gnue-invoice/reports/invoice.grd    2004-12-02 16:36:55 UTC (rev 152)
@@ -20,51 +20,45 @@
      </eq>
     </condition>
   </datasource>
-  <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="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"/>
   </sources>
 
   <!--*****************************************************
                         Layout
   ******************************************************-->
-  <layout xmlns:out="GNUe:Reports:Char" suppressGNUeTags="Y">
+  <layout xmlns:out="GNUe:Reports:Char">
 
-  <out:report width="80" height="32">
+  <out:report width="80" height="36">
 
     <section name="head" source="dts">
-      <out:pageheader height="15">
-        <out:label x="40" y="9" width="20">dateIssued</out:label>
-        <out:label x="0"  y="9" width="20">dateDelivery</out:label>
-        <out:label x="20" y="9" width="20">dateDue</out:label>
-
+      <out:pageheader height="16">
+        <out:label x="60" y="1" width="11">Invoice No.</out:label>
         <out:label x="71" y="1" width="9"><field 
name="INV_number"/></out:label>
-        <out:label x="60" y="1" width="11">Invoice No.</out:label>
-
+        
         <out:label x="60" y="4" width="20"><field 
name="INV_buyer.PARTY_name"/></out:label>
         <out:label x="60" y="5" width="20"><field 
name="INV_buyer.PARTY_address.LOC_zip.LOC_city"/></out:label>
         <out:label x="60" y="6" width="20"><field 
name="INV_buyer.PARTY_address.LOC_street.LOC_name"/></out:label>
         <out:label x="60" y="7" width="20"><field 
name="INV_buyer.PARTY_address.LOC_number"/></out:label>
-
-        <out:label x="0"  y="10" width="10"><field 
name="INV_dateDelivery"/></out:label>
-        <out:label x="20" y="10" width="10"><field 
name="INV_dateDue"/></out:label>
-        <out:label x="40" y="10" width="10"><field 
name="INV_dateIssued"/></out:label>
-        
-        <out:label x="0"  y="13" width="20">Item Name</out:label>
-        <out:label x="20" y="13" width="10" align="right">Price</out:label>
-        <out:label x="30" y="13" width="10" align="right">Quantity</out:label>
-        <out:label x="40" y="13" width="5" align="right">Unit</out:label>
-        <out:label x="45" y="13" width="10" align="right">Net</out:label>
-        <out:label x="55" y="13" width="5"  align="right">VAT</out:label>
-        <out:label x="60" y="13" width="10" align="right">VAT</out:label>
-        <out:label x="70" y="13" width="10" align="right">Gross</out:label>
-        <out:label x="0" y="14" 
width="80">--------------------------------------------------------------------------------</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="INV_paymentMethod.INV_name"/></out:label>
+        <out:label x="20" y="10" width="10"><field 
name="INV_dateDelivery"/></out:label>
+        <out:label x="40" y="10" width="10"><field 
name="INV_dateDue"/></out:label>
+        <out:label x="60" y="10" width="10"><field 
name="INV_dateIssued"/></out:label>
+        <out:label x="0"  y="12" width="5">Note:</out:label>
+        <out:label x="6"  y="12" width="20"><field 
name="INV_note"/></out:label>
+        <out:label x="0"  y="14" width="20">Item name</out:label>
+        <out:label x="20" y="14" width="10" align="right">Price</out:label>
+        <out:label x="30" y="14" width="10" align="right">Quantity</out:label>
+        <out:label x="40" y="14" width="5"  align="right">Unit</out:label>
+        <out:label x="45" y="14" width="5"  align="right">VAT</out:label>
+        <out:label x="50" y="14" width="10" align="right">Net</out:label>
+        <out:label x="60" y="14" width="10" align="right">VAT</out:label>
+        <out:label x="70" y="14" width="10" align="right">Gross</out:label>
+        <out:label x="0"  y="15" 
width="80">--------------------------------------------------------------------------------</out:label>
       </out:pageheader>
 
       <out:pagefooter height="3">
@@ -77,12 +71,20 @@
           <out:label x="20" y="0" width="10" align="right"><field 
name="INV_product.ITEM_price"/></out:label>
           <out:label x="30" y="0" width="10" align="right"><field 
name="INV_quantity"/></out:label>
           <out:label x="40" y="0" width="5"  align="right"><field 
name="INV_product.ITEM_unit.ITEM_value"/></out:label>
-          <out:label x="45" y="0" width="10" align="right"><field 
name="INV_valueNet"/></out:label>
-          <out:label x="55" y="0" width="5"  align="right"> <field 
name="INV_product.ITEM_vat.TAX_name"/></out:label>
+          <out:label x="45" y="0" width="5"  align="right"> <field 
name="INV_product.ITEM_vat.TAX_name"/></out:label>
+          <out:label x="50" y="0" width="10" align="right"><field 
name="INV_valueNet"/></out:label>
           <out:label x="60" y="0" width="10" align="right"><field 
name="INV_valueVAT"/></out:label>
           <out:label x="70" y="0" width="10" align="right"><field 
name="INV_valueGross"/></out:label>
         </out:detail>
       </section>
+
+      <out:groupfooter height="10">
+        <out:label x="0" y="1" width="5">Total:</out:label>
+          <out:label x="50" y="1" width="10" align="right"><field 
name="INV_valueTotalNet"/></out:label>
+          <out:label x="60" y="1" width="10" align="right"><field 
name="INV_valueTotalVAT"/></out:label>
+          <out:label x="70" y="1" width="10" align="right"><field 
name="INV_valueTotalGross"/></out:label>
+      </out:groupfooter>
+
     </section>
 
   </out:report>