[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r169 - in gnue-invoice: forms reports schema
|
From: |
kilo |
|
Subject: |
r169 - in gnue-invoice: forms reports schema |
|
Date: |
Fri, 10 Dec 2004 02:19:28 -0600 (CST) |
Author: kilo
Date: 2004-12-10 02:19:26 -0600 (Fri, 10 Dec 2004)
New Revision: 169
Modified:
gnue-invoice/forms/ORG_Org.gfd
gnue-invoice/reports/invoice-hu.grd
gnue-invoice/reports/invoice.grd
gnue-invoice/schema/invoice-en.gsd
gnue-invoice/schema/invoice-hu.gsd
Log:
GNUe Invoice.
Follow changes in ORG module.
Modified: gnue-invoice/forms/ORG_Org.gfd
===================================================================
--- gnue-invoice/forms/ORG_Org.gfd 2004-12-09 23:33:16 UTC (rev 168)
+++ gnue-invoice/forms/ORG_Org.gfd 2004-12-10 08:19:26 UTC (rev 169)
@@ -30,9 +30,8 @@
<trigger name='OnActivation' type='On-Activation' src='startupSearch'/>
<datasource name="dts" connection="invoice" table="ORG_Org"/>
- <datasource name="dts_OrgAd" connection="invoice" table="ORG_OrgAd"/>
<datasource name="dts_Address" connection="invoice" table="LOC_Address"
- master="dts_OrgAd" masterlink="ORG_addr" detaillink="gnue_id"/>
+ prequery="Y"/>
<logic>
<block name="blk" datasource="dts">
@@ -40,36 +39,35 @@
<field name="fldOrgLongname" field="ORG_longName" maxLength="70"/>
<field name="fldOrgKeywords" field="ORG_keywords" maxLength="255"/>
<field name="fldOrgTaxid" field="TAX_taxID" maxLength="35"/>
+ <field name="fldOrgAddress" field="ORG_address" maxLength="32"
+ fk_source="dts_Address" fk_key="gnue_id"
+ fk_description="LOC_formatted"/>
</block>
-
- <block name="blkOrgAd" datasource="dts_OrgAd"/>
-
- <block name="blkAddress" datasource="dts_Address" rows="3">
- <field name="fldAddr" field="LOC_door" maxLength="35"/>
- </block>
</logic>
- <layout c:height="10" c:width="45">
+ <layout c:height="6" c:width="45">
<page>
- <label name="lblName:" c:height="1" c:width="5" c:x="1" c:y="1"
+ <label name="lblName" c:height="1" c:width="5" c:x="1" c:y="1"
text="Name:"/>
<entry name="entName" c:height="1" c:width="28" c:x="10" c:y="1"
block="blk" field="fldOrgShortname"/>
- <label name="lblLongname:" c:height="1" c:width="10" c:x="1" c:y="2"
+ <label name="lblLongname" c:height="1" c:width="10" c:x="1" c:y="2"
text="Long name:"/>
<entry name="entLongname" c:height="1" c:width="40" c:x="10" c:y="2"
block="blk" field="fldOrgLongname"/>
- <label name="lblKeywords:" c:height="1" c:width="10" c:x="1" c:y="3"
+ <label name="lblKeywords" c:height="1" c:width="10" c:x="1" c:y="3"
text="Keywords:"/>
<entry name="entKeywords" c:height="1" c:width="40" c:x="10" c:y="3"
block="blk" field="fldOrgKeywords"/>
- <label name="lblTaxid:" c:height="1" c:width="6" c:x="1" c:y="4"
+ <label name="lblTaxid" c:height="1" c:width="6" c:x="1" c:y="4"
text="Tax ID:"/>
<entry name="entTaxid" c:height="1" c:width="28" c:x="10" c:y="4"
block="blk" field="fldOrgTaxid"/>
- <entry name="entAddress" c:height="1" c:width="28" c:x="10" c:y="6"
- block="blkAddress" field="fldAddr"/>
-<!-- <button name="btnEditAddress" c:height="1" c:width="7" c:x="38"
c:y="3"
+ <label name="lblAddress" c:height="1" c:width="8" c:x="1" c:y="5"
+ text="Address:"/>
+ <entry name="entAddress" c:height="1" c:width="28" c:x="10" c:y="5"
+ block="blk" field="fldOrgAddress" style="dropdown"/>
+ <button name="btnEditAddress" c:height="1" c:width="7" c:x="38" c:y="5"
label="Edit...">
<trigger type="On-Action" name="btnEditAddressTrigger">
params = {'id': blk.fldOrgAddress.get() or ''}
@@ -77,7 +75,6 @@
blk.fldOrgAddress.resetForeignKey()
</trigger>
</button>
--->
</page>
</layout>
Modified: gnue-invoice/reports/invoice-hu.grd
===================================================================
--- gnue-invoice/reports/invoice-hu.grd 2004-12-09 23:33:16 UTC (rev 168)
+++ gnue-invoice/reports/invoice-hu.grd 2004-12-10 08:19:26 UTC (rev 169)
@@ -34,9 +34,9 @@
<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.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="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>
@@ -44,9 +44,9 @@
<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.ORG_shortName"/></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="60" y="3" width="20"><field
name="INV_buyer.ORG_address.LOC_zip.LOC_formatted"/></out:label>
+ <out:label x="60" y="4" width="20"><field
name="INV_buyer.ORG_address.LOC_street.LOC_formatted"/></out:label>
+ <out:label x="60" y="5" width="20"><field
name="INV_buyer.ORG_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>
Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd 2004-12-09 23:33:16 UTC (rev 168)
+++ gnue-invoice/reports/invoice.grd 2004-12-10 08:19:26 UTC (rev 169)
@@ -34,9 +34,9 @@
<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.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="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>
@@ -44,9 +44,9 @@
<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.ORG_shortName"/></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="60" y="3" width="20"><field
name="INV_buyer.ORG_address.LOC_zip.LOC_formatted"/></out:label>
+ <out:label x="60" y="4" width="20"><field
name="INV_buyer.ORG_address.LOC_street.LOC_formatted"/></out:label>
+ <out:label x="60" y="5" width="20"><field
name="INV_buyer.ORG_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>
Modified: gnue-invoice/schema/invoice-en.gsd
===================================================================
--- gnue-invoice/schema/invoice-en.gsd 2004-12-09 23:33:16 UTC (rev 168)
+++ gnue-invoice/schema/invoice-en.gsd 2004-12-10 08:19:26 UTC (rev 169)
@@ -525,45 +525,45 @@
</row>
</rows>
</tabledata>
- <tabledata name="PARTY_Party_dump" tablename="PARTY_Party">
+ <tabledata name="ORG_Org_dump" tablename="ORG_Org">
<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="PARTY_address" type="string(32)"/>
- <column field="PARTY_longName" type="string(70)"/>
- <column field="PARTY_name" type="string(35)"/>
- <column field="PARTY_taxID" type="string(35)"/>
+ <column field="ORG_address" type="string(32)"/>
+ <column field="ORG_longName" type="string(70)"/>
+ <column field="ORG_shortName" type="string(35)"/>
+ <column field="TAX_taxId" type="string(35)"/>
</definition>
<rows>
<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="PARTY_address">SELLERADDR0000000000000000000001</value>
- <value field="PARTY_longName">GNU Enterprise Blame Derek Ltd.</value>
- <value field="PARTY_name">GNU Enterprise</value>
- <value field="PARTY_taxID">123456</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="PARTY_address">97557955910901717001955556510247</value>
- <value field="PARTY_longName">Customer one</value>
- <value field="PARTY_name">Cust 1</value>
- <value field="PARTY_taxID">123321</value>
+ <value field="ORG_address">97557955910901717001955556510247</value>
+ <value field="ORG_longName">Customer one</value>
+ <value field="ORG_shortName">Cust 1</value>
+ <value field="TAX_taxId">123321</value>
</row>
<row>
<value field="gnue_createdate">2004-10-13 11:32:36.00</value>
<value field="gnue_createuser"></value>
<value field="gnue_id">75742249377561634390457549145613</value>
- <value field="PARTY_address">99955611994600712692304128528950</value>
- <value field="PARTY_longName">Customer two</value>
- <value field="PARTY_name">Cust 2</value>
- <value field="PARTY_taxID">222222</value>
+ <value field="ORG_address">99955611994600712692304128528950</value>
+ <value field="ORG_longName">Customer two</value>
+ <value field="ORG_shortName">Cust 2</value>
+ <value field="TAX_taxId">222222</value>
</row>
</rows>
</tabledata>
Modified: gnue-invoice/schema/invoice-hu.gsd
===================================================================
--- gnue-invoice/schema/invoice-hu.gsd 2004-12-09 23:33:16 UTC (rev 168)
+++ gnue-invoice/schema/invoice-hu.gsd 2004-12-10 08:19:26 UTC (rev 169)
@@ -488,45 +488,45 @@
</row>
</rows>
</tabledata>
- <tabledata name="PARTY_Party_dump" tablename="PARTY_Party">
+ <tabledata name="ORG_Org_dump" tablename="ORG_Org">
<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="PARTY_address" type="string(32)"/>
- <column field="PARTY_longName" type="string(70)"/>
- <column field="PARTY_name" type="string(35)"/>
- <column field="PARTY_taxID" type="string(35)"/>
+ <column field="ORG_address" type="string(32)"/>
+ <column field="ORG_longName" type="string(70)"/>
+ <column field="ORG_shortName" type="string(35)"/>
+ <column field="TAX_taxId" type="string(35)"/>
</definition>
<rows>
<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="PARTY_address">SELLERADDR0000000000000000000001</value>
- <value field="PARTY_longName">GNU Enterprise Blame Derek Ltd.</value>
- <value field="PARTY_name">GNU Enterprise</value>
- <value field="PARTY_taxID">12345678-2-06</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="PARTY_address">97557955910901717001955556510247</value>
- <value field="PARTY_longName">Elso vevo</value>
- <value field="PARTY_name">Vevo 1</value>
- <value field="PARTY_taxID">123321</value>
+ <value field="ORG_address">97557955910901717001955556510247</value>
+ <value field="ORG_longName">Elso vevo</value>
+ <value field="ORG_shortName">Vevo 1</value>
+ <value field="TAX_taxId">123321</value>
</row>
<row>
<value field="gnue_createdate">2004-10-13 11:32:36.00</value>
<value field="gnue_createuser"></value>
<value field="gnue_id">75742249377561634390457549145613</value>
- <value field="PARTY_address">99955611994600712692304128528950</value>
- <value field="PARTY_longName">Masodik vevo</value>
- <value field="PARTY_name">Vevo 2</value>
- <value field="PARTY_taxID">222222</value>
+ <value field="ORG_address">99955611994600712692304128528950</value>
+ <value field="ORG_longName">Masodik vevo</value>
+ <value field="ORG_shortName">Vevo 2</value>
+ <value field="TAX_taxId">222222</value>
</row>
</rows>
</tabledata>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r169 - in gnue-invoice: forms reports schema,
kilo <=