r160 - in gnue-invoice: . reports

[btami]

Author: btami
Date: 2004-12-07 03:45:01 -0600 (Tue, 07 Dec 2004)
New Revision: 160

Added:
   gnue-invoice/reports/invoice-hu.grd
Modified:
   gnue-invoice/news
   gnue-invoice/reports/invoice.grd
Log:
GNUe-Invoice.
new hungarian invoice
added TAX summary to .grd


Modified: gnue-invoice/news
===================================================================
--- gnue-invoice/news   2004-12-07 09:27:11 UTC (rev 159)
+++ gnue-invoice/news   2004-12-07 09:45:01 UTC (rev 160)
@@ -4,6 +4,7 @@
 *************************
 New features / changes by 2004.12.07
 * Added summing support for Hungarian invoices.
+* New invoice-hu.grd
 
 New features / changes by 2004.12.06
 * Added 'seller' field to the invoice. Report also contains this.

Added: gnue-invoice/reports/invoice-hu.grd
===================================================================
--- gnue-invoice/reports/invoice-hu.grd 2004-12-07 09:27:11 UTC (rev 159)
+++ gnue-invoice/reports/invoice-hu.grd 2004-12-07 09:45:01 UTC (rev 160)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<report title="GNUe Invoice">
+  <!--*****************************************************
+                        Parameters
+  ******************************************************-->
+  <parameters>
+    <parameter name="INV_number" type="char" description="Incoice Number"/>
+  </parameters>
+  
+  <sources>
+  <!--*****************************************************
+                        Datasources
+  ******************************************************-->
+  <datasource name="dts" connection="invoice" table="INV_Head">
+    <condition>
+     <eq>
+       <cfield name="INV_number"/>
+       <cparam name="INV_number"/>
+     </eq>
+    </condition>
+  </datasource>
+  <datasource name="dtsINV_Item" connection="invoice" detaillink="INV_Head"
+              master="dts" masterlink="gnue_id" table="INV_Item"/>
+  </sources>
+
+  <!--*****************************************************
+                        Layout
+  ******************************************************-->
+  <layout xmlns:out="GNUe:Reports:Char">
+
+  <out:report width="80" height="66">
+
+    <section name="head" source="dts">
+      <out:pageheader height="16">
+        <out:label x="5" y="2" width="20"><field 
name="INV_seller.PARTY_name"/></out:label>
+        <out:label x="5" y="3" width="20"><field 
name="INV_seller.PARTY_address.LOC_zip.LOC_formatted"/></out:label>
+        <out:label x="5" y="4" width="20"><field 
name="INV_seller.PARTY_address.LOC_street.LOC_formatted"/></out:label>
+        <out:label x="5" y="5" width="20"><field 
name="INV_seller.PARTY_address.LOC_number"/></out:label>
+        <out:label x="5" y="6" width="20"><field 
name="INV_seller.PARTY_taxID"/></out:label>
+
+
+        <out:label x="30" y="1" width="11">Invoice No.</out:label>
+        <out:label x="41" y="1" width="9"><field 
name="INV_number"/></out:label>
+        
+        <out:label x="60" y="2" width="20"><field 
name="INV_buyer.PARTY_name"/></out:label>
+        <out:label x="60" y="3" width="20"><field 
name="INV_buyer.PARTY_address.LOC_zip.LOC_formatted"/></out:label>
+        <out:label x="60" y="4" width="20"><field 
name="INV_buyer.PARTY_address.LOC_street.LOC_formatted"/></out:label>
+        <out:label x="60" y="5" width="20"><field 
name="INV_buyer.PARTY_address.LOC_number"/></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">
+        <out:label x="0" y="1" width="80">GNU Enterprise</out:label>
+      </out:pagefooter>
+
+      <section name="detail" source="dtsINV_Item">
+        <out:detail height="2">
+          <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="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="0" 
width="80">--------------------------------------------------------------------------------</out:label>
+        <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:label x="0"  y="3" width="20">TAX summary:</out:label>
+        <out:label x="50" y="3" width="10" align="right"><field 
name="INVHU_totalNet5"/></out:label>
+        <out:label x="60" y="3" width="10" align="right"><field 
name="INVHU_totalVAT5"/></out:label>
+        <out:label x="70" y="3" width="10" align="right"><field 
name="INVHU_totalGross5"/></out:label>
+        
+        <out:label x="50" y="4" width="10" align="right"><field 
name="INVHU_totalNet15"/></out:label>
+        <out:label x="60" y="4" width="10" align="right"><field 
name="INVHU_totalVAT15"/></out:label>
+        <out:label x="70" y="4" width="10" align="right"><field 
name="INVHU_totalGross15"/></out:label>
+
+        <out:label x="50" y="5" width="10" align="right"><field 
name="INVHU_totalNet25"/></out:label>
+        <out:label x="60" y="5" width="10" align="right"><field 
name="INVHU_totalVAT25"/></out:label>
+        <out:label x="70" y="5" width="10" align="right"><field 
name="INVHU_totalGross25"/></out:label>
+      </out:groupfooter>
+
+    </section>
+
+  </out:report>
+  </layout>
+</report>

Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd    2004-12-07 09:27:11 UTC (rev 159)
+++ gnue-invoice/reports/invoice.grd    2004-12-07 09:45:01 UTC (rev 160)
@@ -29,7 +29,7 @@
   ******************************************************-->
   <layout xmlns:out="GNUe:Reports:Char">
 
-  <out:report width="80" height="36">
+  <out:report width="80" height="66">
 
     <section name="head" source="dts">
       <out:pageheader height="16">