[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r171 - in gnue-invoice: . forms reports schema
|
From: |
kilo |
|
Subject: |
r171 - in gnue-invoice: . forms reports schema |
|
Date: |
Fri, 10 Dec 2004 06:31:20 -0600 (CST) |
Author: kilo
Date: 2004-12-10 06:31:17 -0600 (Fri, 10 Dec 2004)
New Revision: 171
Added:
gnue-invoice/forms/INV_Company.gfd
Modified:
gnue-invoice/news
gnue-invoice/reports/invoice-hu.grd
gnue-invoice/reports/invoice.grd
gnue-invoice/schema/invoice-en.gsd
gnue-invoice/schema/invoice-hu.gsd
gnue-invoice/schema/invoice.gcd
gnue-invoice/todo
Log:
GNUe Invoice.
Store Seller info in separate class.
Added: gnue-invoice/forms/INV_Company.gfd
===================================================================
--- gnue-invoice/forms/INV_Company.gfd 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/forms/INV_Company.gfd 2004-12-10 12:31:17 UTC (rev 171)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Module
+
+ Copyright 2004 Free Software Foundation
+
+ This file is part of GNU Enterprise.
+
+ GNU Enterprise is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ GNU Enterprise is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU Enterprise; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+
+ $Id$-->
+
+<form title="Company">
+ <options/>
+
+ <datasource name="dts" connection="invoice" table="INV_Company"/>
+
+ <logic>
+ <block name="blk" datasource="dts">
+ <field name="fldCode" field="INV_code" maxLength="8"/>
+ <field name="fldName" field="INV_name" maxLength="35"/>
+ <field name="fldAddr1" field="INV_addr1" maxLength="35"/>
+ <field name="fldAddr2" field="INV_addr2" maxLength="35"/>
+ <field name="fldAddr3" field="INV_addr3" maxLength="35"/>
+ <field name="fldTaxid" field="INV_taxID" maxLength="35"/>
+ <field name="fldCurrency" field="INV_currency" maxLength="3"/>
+ <field name="fldNumprint" field="INV_numPrint" maxLength="2"
+ typecast="number"/>
+ </block>
+ </logic>
+
+ <layout xmlns:c="GNUe:Layout:Char" c:height="10" c:width="51">
+ <page>
+ <label name="lblCode" c:height="1" c:width="9" c:x="1" c:y="1"
+ text="Code:"/>
+ <entry name="entCode" c:height="1" c:width="8" c:x="15" c:y="1"
+ block="blk" field="fldCode"/>
+ <label name="lblName" c:height="1" c:width="9" c:x="1" c:y="2"
+ text="Name:"/>
+ <entry name="entName" c:height="1" c:width="35" c:x="15" c:y="2"
+ block="blk" field="fldName"/>
+ <label name="lblAddr1" c:height="1" c:width="10" c:x="1" c:y="3"
+ text="Addr1:"/>
+ <entry name="entAddr1" c:height="1" c:width="35" c:x="15" c:y="3"
+ block="blk" field="fldAddr1"/>
+ <label name="lblAddr2" c:height="1" c:width="10" c:x="1" c:y="4"
+ text="Addr2:"/>
+ <entry name="entAddr2" c:height="1" c:width="35" c:x="15" c:y="4"
+ block="blk" field="fldAddr2"/>
+ <label name="lblAddr3" c:height="1" c:width="10" c:x="1" c:y="5"
+ text="Addr3:"/>
+ <entry name="entAddr3" c:height="1" c:width="35" c:x="15" c:y="5"
+ block="blk" field="fldAddr3"/>
+ <label name="lblTaxid" c:height="1" c:width="10" c:x="1" c:y="6"
+ text="Taxid:"/>
+ <entry name="entTaxid" c:height="1" c:width="35" c:x="15" c:y="6"
+ block="blk" field="fldTaxid"/>
+ <label name="lblCurrency" c:height="1" c:width="13" c:x="1" c:y="7"
+ text="Currency:"/>
+ <entry name="entCurrency" c:height="1" c:width="3" c:x="15" c:y="7"
+ block="blk" field="fldCurrency"/>
+ <label name="lblNumprint" c:height="1" c:width="13" c:x="1" c:y="8"
+ text="Numprint:"/>
+ <entry name="entNumprint" c:height="1" c:width="2" c:x="15" c:y="8"
+ block="blk" field="fldNumprint"/>
+ </page>
+ </layout>
+
+</form>
Property changes on: gnue-invoice/forms/INV_Company.gfd
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: gnue-invoice/news
===================================================================
--- gnue-invoice/news 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/news 2004-12-10 12:31:17 UTC (rev 171)
@@ -4,6 +4,8 @@
*************************
New features / changes by 2004.12.10
* Can revert an invoice now.
+* Seller company info is stored in a separate class (INV_Company).
+ Maintenance is via INV_Company.gfd, not callable from within the system.
New features / changes by 2004.12.09
* Merged GCD files back to main GNUe Packages.
Modified: gnue-invoice/reports/invoice-hu.grd
===================================================================
--- gnue-invoice/reports/invoice-hu.grd 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/reports/invoice-hu.grd 2004-12-10 12:31:17 UTC (rev 171)
@@ -5,7 +5,7 @@
Parameters
******************************************************-->
<parameters>
- <parameter name="INV_number" type="char" description="Incoice Number"/>
+ <parameter name="INV_number" type="char" description="Invoice Number"/>
</parameters>
<sources>
@@ -33,11 +33,11 @@
<section name="head" source="dts">
<out:pageheader height="16">
- <out:label x="5" y="2" width="20"><field
name="INV_seller.ORG_shortName"/></out:label>
- <out:label x="5" y="3" width="20"><field
name="INV_seller.ORG_address.LOC_zip.LOC_formatted"/></out:label>
- <out:label x="5" y="4" width="20"><field
name="INV_seller.ORG_address.LOC_street.LOC_formatted"/></out:label>
- <out:label x="5" y="5" width="20"><field
name="INV_seller.ORG_address.LOC_number"/></out:label>
- <out:label x="5" y="6" width="20"><field
name="INV_seller.TAX_taxId"/></out:label>
+ <out:label x="5" y="2" width="20"><field
name="INV_seller.INV_name"/></out:label>
+ <out:label x="5" y="3" width="20"><field
name="INV_seller.INV_addr1"/></out:label>
+ <out:label x="5" y="4" width="20"><field
name="INV_seller.INV_addr2"/></out:label>
+ <out:label x="5" y="5" width="20"><field
name="INV_seller.INV_addr3"/></out:label>
+ <out:label x="5" y="6" width="20"><field
name="INV_seller.INV_taxID"/></out:label>
<out:label x="30" y="1" width="11">Invoice No.</out:label>
Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/reports/invoice.grd 2004-12-10 12:31:17 UTC (rev 171)
@@ -5,7 +5,7 @@
Parameters
******************************************************-->
<parameters>
- <parameter name="INV_number" type="char" description="Incoice Number"/>
+ <parameter name="INV_number" type="char" description="Invoice Number"/>
</parameters>
<sources>
@@ -33,11 +33,11 @@
<section name="head" source="dts">
<out:pageheader height="16">
- <out:label x="5" y="2" width="20"><field
name="INV_seller.ORG_shortName"/></out:label>
- <out:label x="5" y="3" width="20"><field
name="INV_seller.ORG_address.LOC_zip.LOC_formatted"/></out:label>
- <out:label x="5" y="4" width="20"><field
name="INV_seller.ORG_address.LOC_street.LOC_formatted"/></out:label>
- <out:label x="5" y="5" width="20"><field
name="INV_seller.ORG_address.LOC_number"/></out:label>
- <out:label x="5" y="6" width="20"><field
name="INV_seller.TAX_taxId"/></out:label>
+ <out:label x="5" y="2" width="20"><field
name="INV_seller.INV_name"/></out:label>
+ <out:label x="5" y="3" width="20"><field
name="INV_seller.INV_addr1"/></out:label>
+ <out:label x="5" y="4" width="20"><field
name="INV_seller.INV_addr2"/></out:label>
+ <out:label x="5" y="5" width="20"><field
name="INV_seller.INV_addr3"/></out:label>
+ <out:label x="5" y="6" width="20"><field
name="INV_seller.INV_taxID"/></out:label>
<out:label x="30" y="1" width="11">Invoice No.</out:label>
Modified: gnue-invoice/schema/invoice-en.gsd
===================================================================
--- gnue-invoice/schema/invoice-en.gsd 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/schema/invoice-en.gsd 2004-12-10 12:31:17 UTC (rev 171)
@@ -541,15 +541,6 @@
<row>
<value field="gnue_createdate">2004-10-13 11:32:36.00</value>
<value field="gnue_createuser"></value>
- <value field="gnue_id">SELLER66799149389110299288840100</value>
- <value field="ORG_address">SELLERADDR0000000000000000000001</value>
- <value field="ORG_longName">GNU Enterprise Blame Derek Ltd.</value>
- <value field="ORG_shortName">GNU Enterprise</value>
- <value field="TAX_taxId">123456</value>
- </row>
- <row>
- <value field="gnue_createdate">2004-10-13 11:32:36.00</value>
- <value field="gnue_createuser"></value>
<value field="gnue_id">85962366799149389110299288840100</value>
<value field="ORG_address">97557955910901717001955556510247</value>
<value field="ORG_longName">Customer one</value>
@@ -567,6 +558,40 @@
</row>
</rows>
</tabledata>
+ <tabledata name="INV_Company_dump" tablename="INV_Company">
+ <definition>
+ <column field="gnue_createdate" type="datetime"/>
+ <column field="gnue_createuser" type="string(8)"/>
+ <column field="gnue_id" key="Y" type="string(32)"/>
+ <column field="gnue_modifydate" type="datetime"/>
+ <column field="gnue_modifyuser" type="string(8)"/>
+ <column field="INV_addr1" type="string(35)"/>
+ <column field="INV_addr2" type="string(35)"/>
+ <column field="INV_addr3" type="string(35)"/>
+ <column field="INV_code" type="string(8)"/>
+ <column field="INV_currency" type="string(3)"/>
+ <column field="INV_name" type="string(35)"/>
+ <column field="INV_numPrint" type="number(2)"/>
+ <column field="INV_taxID" type="string(35)"/>
+ </definition>
+ <rows>
+ <row>
+ <value field="gnue_createdate">2004-12-10 13:04:19.00</value>
+ <value field="gnue_createuser"></value>
+ <value field="gnue_id">14888688109001455455880376865506</value>
+ <value field="gnue_modifydate">2004-12-10 13:05:42.00</value>
+ <value field="gnue_modifyuser"></value>
+ <value field="INV_addr1">1 Goat Avenue</value>
+ <value field="INV_addr2">Thwap City, GN, 12345</value>
+ <value field="INV_addr3">Universe</value>
+ <value field="INV_code">1</value>
+ <value field="INV_currency">USD</value>
+ <value field="INV_name">GNUe Blame Derek Ltd.</value>
+ <value field="INV_numPrint">2</value>
+ <value field="INV_taxID">12345678</value>
+ </row>
+ </rows>
+ </tabledata>
<tabledata name="INV_Head_dump" tablename="INV_Head">
<definition>
<column field="gnue_createdate" type="datetime"/>
Modified: gnue-invoice/schema/invoice-hu.gsd
===================================================================
--- gnue-invoice/schema/invoice-hu.gsd 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/schema/invoice-hu.gsd 2004-12-10 12:31:17 UTC (rev 171)
@@ -504,15 +504,6 @@
<row>
<value field="gnue_createdate">2004-10-13 11:32:36.00</value>
<value field="gnue_createuser"></value>
- <value field="gnue_id">SELLER66799149389110299288840100</value>
- <value field="ORG_address">SELLERADDR0000000000000000000001</value>
- <value field="ORG_longName">GNU Enterprise Blame Derek Ltd.</value>
- <value field="ORG_shortName">GNU Enterprise</value>
- <value field="TAX_taxId">12345678-2-06</value>
- </row>
- <row>
- <value field="gnue_createdate">2004-10-13 11:32:36.00</value>
- <value field="gnue_createuser"></value>
<value field="gnue_id">85962366799149389110299288840100</value>
<value field="ORG_address">97557955910901717001955556510247</value>
<value field="ORG_longName">Elso vevo</value>
@@ -530,6 +521,40 @@
</row>
</rows>
</tabledata>
+ <tabledata name="INV_Company_dump" tablename="INV_Company">
+ <definition>
+ <column field="gnue_createdate" type="datetime"/>
+ <column field="gnue_createuser" type="string(8)"/>
+ <column field="gnue_id" key="Y" type="string(32)"/>
+ <column field="gnue_modifydate" type="datetime"/>
+ <column field="gnue_modifyuser" type="string(8)"/>
+ <column field="INV_addr1" type="string(35)"/>
+ <column field="INV_addr2" type="string(35)"/>
+ <column field="INV_addr3" type="string(35)"/>
+ <column field="INV_code" type="string(8)"/>
+ <column field="INV_currency" type="string(3)"/>
+ <column field="INV_name" type="string(35)"/>
+ <column field="INV_numPrint" type="number(2)"/>
+ <column field="INV_taxID" type="string(35)"/>
+ </definition>
+ <rows>
+ <row>
+ <value field="gnue_createdate">2004-12-10 13:04:19.00</value>
+ <value field="gnue_createuser"></value>
+ <value field="gnue_id">14888688109001455455880376865506</value>
+ <value field="gnue_modifydate">2004-12-10 13:05:42.00</value>
+ <value field="gnue_modifyuser"></value>
+ <value field="INV_addr1">1 Goat Avenue</value>
+ <value field="INV_addr2">Thwap City, GN, 12345</value>
+ <value field="INV_addr3">Universe</value>
+ <value field="INV_code">1</value>
+ <value field="INV_currency">USD</value>
+ <value field="INV_name">GNUe Blame Derek Ltd.</value>
+ <value field="INV_numPrint">2</value>
+ <value field="INV_taxID">12345678</value>
+ </row>
+ </rows>
+ </tabledata>
<tabledata name="INV_Head_dump" tablename="INV_Head">
<definition>
<column field="gnue_createdate" type="datetime"/>
Modified: gnue-invoice/schema/invoice.gcd
===================================================================
--- gnue-invoice/schema/invoice.gcd 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/schema/invoice.gcd 2004-12-10 12:31:17 UTC (rev 171)
@@ -24,6 +24,18 @@
$Id$ -->
<module name="INV">
+
+ <class name="Company" comment="Seller company's data">
+ <property name="code" type="string(8)" nullable="False"
comment=""/>
+ <property name="name" type="string(35)"
comment=""/>
+ <property name="addr1" type="string(35)"
comment=""/>
+ <property name="addr2" type="string(35)"
comment=""/>
+ <property name="addr3" type="string(35)"
comment=""/>
+ <property name="taxID" type="string(35)"
comment=""/>
+ <property name="currency" type="string(3)"
comment="base currency"/>
+ <property name="numPrint" type="number(2)"
comment="number of invoices printed by default"/>
+ </class>
+
<!--**************************************************
Stores information about methods and terms of payment.
Also used for calculating the invoice's due date.
@@ -66,7 +78,7 @@
-->
<class name="Head" comment="Invoice head">
<property name="number" type="string(20)"
nullable="False" comment="invoice number" />
- <property name="seller" type="ORG_Org"
nullable="False" comment="who wants money..." />
+ <property name="seller" type="INV_Company"
nullable="False" comment="who wants money..." />
<property name="buyer" type="ORG_Org"
nullable="False" comment="who pays..." />
<property name="paymentMethod" type="INV_PaymentMethod"
nullable="False" comment="" />
<property name="dateDelivery" type="date"
nullable="False" comment="" />
@@ -243,10 +255,10 @@
#NULL does not behave well on the form, so better set it to '0'.
self.printed = 0
- sellerList = find('ORG_Org', {'ORG_shortName': 'GNU Enterprise'}, [], [])
+ sellerList = find('INV_Company', {'INV_code': '1'}, [], [])
if len(sellerList):
self.seller = sellerList[0]
- print 'INV_Head::OnInit - Seller is %s' % self.seller.ORG_shortName
+ print 'INV_Head::OnInit - Seller is %s' % self.seller.INV_name
self.reverted = False
</procedure>
Modified: gnue-invoice/todo
===================================================================
--- gnue-invoice/todo 2004-12-10 10:13:38 UTC (rev 170)
+++ gnue-invoice/todo 2004-12-10 12:31:17 UTC (rev 171)
@@ -4,6 +4,22 @@
*************************************
+MULTIPLE SELLERS
+================
+ Store seller as a special kind of PARTY_Party. By storing the seller
+ the software will be able to handle several firms' invoicing.
+ At startup the user should select the firm through AppServer filters.
+
+ Status: storing is OK. Choosing it at startup - not started.
+
+
+GENERATE REPORT
+===============
+ Ie generate and print the invoice.
+
+ Status: report OK, should call it whenever appropriate
+
+
PROPERLY INITIALIZE DATE DUE ENTRY
==================================
When producing several invoices continously, it is not cleared after
@@ -29,13 +45,6 @@
status: not started
-GENERATE REPORT
-===============
- Ie generate and print the invoice.
-
- Status: not started
-
-
DISPLAY INVOICE NUMBER
======================
During the fill up of the invoice, the presumed invoice number should be
@@ -44,19 +53,3 @@
Status: not started
-
-MULTIPLE SELLERS
-================
- Store seller as a special kind of PARTY_Party. By storing the seller
- the software will be able to handle several firms' invoicing.
- At startup the user should select the firm through AppServer filters.
-
- Status: not started
-
-
-USE IMPORTS TO CLEAN UP SOURCE CODE
-===================================
- Use import-trigger for form triggers that share the same code and store
- trigger code in a separate file.
-
- Status: not started, due to lack of documentation
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r171 - in gnue-invoice: . forms reports schema,
kilo <=