r148 - gnue-invoice/reports

[btami]

Author: btami
Date: 2004-12-01 05:55:18 -0600 (Wed, 01 Dec 2004)
New Revision: 148

Modified:
   gnue-invoice/reports/invoice.grd
Log:
gnue-invoice.
work on invoice.grd

Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd    2004-12-01 10:36:49 UTC (rev 147)
+++ gnue-invoice/reports/invoice.grd    2004-12-01 11:55:18 UTC (rev 148)
@@ -40,19 +40,29 @@
 
     <section name="head" source="dts">
       <out:pageheader height="15">
-        <out:label x="60" y="1" width="20">Invoice No.</out:label>
-        <out:label x="0" y="9" width="12">dateDelivery</out:label>
-        <out:label x="20" y="9" width="5">dateDue</out:label>
-        <out:label x="40" y="10" width="4">dateIssued</out:label>
+        <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="30" y="4" width="20"><field 
name="INV_buyer.PARTY_name"/></out:label>
-        <out:label x="30" y="5" width="20"><field 
name="INV_buyer.PARTY_address.LOC_zip.LOC_city"/></out:label>
-        <out:label x="30" y="6" width="20"><field 
name="INV_buyer.PARTY_address.LOC_street.LOC_name"/></out:label>
-        <out:label x="30" y="7" width="20"><field 
name="INV_buyer.PARTY_address.LOC_number"/></out:label>
-        <out:label x="60" y="2" width="20"><field 
name="INV_number"/></out:label>
-        <out:label x="0" y="10" width="12"><field 
name="INV_dateDelivery"/></out:label>
-        <out:label x="25" y="10" width="5"><field 
name="INV_dateDue"/></out:label>
-        <out:label x="50" y="10" width="4"><field 
name="INV_dateIssued"/></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="9" width="20">dateDelivery</out:label>
+        <out:label x="20" y="9" width="20">dateDue</out:label>
+        <out:label x="40" y="9" width="20">dateIssued</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:pageheader>
 
       <out:pagefooter height="3">
@@ -61,8 +71,14 @@
 
       <section name="detail" source="dtsINV_Item">
         <out:detail height="2">
-          <out:label x="20" y="0" width="15"><field 
name="INV_quantity"/></out:label>
-          <out:label x="40" y="0" width="25"><field 
name="INV_valueNet"/></out:label>
+          <out:label x="0"  y="0" width="20"><field 
name="INV_product.ITEM_longName"/></out:label>
+          <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="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>
     </section>