[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r168 - in gnue-invoice: forms reports schema scripts
|
From: |
kilo |
|
Subject: |
r168 - in gnue-invoice: forms reports schema scripts |
|
Date: |
Thu, 9 Dec 2004 17:33:17 -0600 (CST) |
Author: kilo
Date: 2004-12-09 17:33:16 -0600 (Thu, 09 Dec 2004)
New Revision: 168
Added:
gnue-invoice/forms/ORG_Org.gfd
Removed:
gnue-invoice/forms/PARTY_Party.gfd
Modified:
gnue-invoice/forms/INV_Head.gfd
gnue-invoice/reports/invoice-hu.grd
gnue-invoice/reports/invoice.grd
gnue-invoice/schema/invoice.gcd
gnue-invoice/scripts/setup-db-hu.sh
gnue-invoice/scripts/setup-db.sh
Log:
GNUe Invoice.
Changes due to modifications in ORG package.
Modified: gnue-invoice/forms/INV_Head.gfd
===================================================================
--- gnue-invoice/forms/INV_Head.gfd 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/forms/INV_Head.gfd 2004-12-09 23:33:16 UTC (rev 168)
@@ -38,8 +38,8 @@
Datasources
******************************************************-->
<datasource name="dts" connection="invoice" table="INV_Head"/>
- <datasource name="dts_PARTY_PartyBuyer" connection="invoice" prequery="Y"
- table="PARTY_Party"/>
+ <datasource name="dts_ORG_OrgBuyer" connection="invoice" prequery="Y"
+ table="ORG_Org"/>
<datasource name="dts_INV_PaymentMethod" connection="invoice" prequery="Y"
table="INV_PaymentMethod"/>
<datasource name="dtsINV_Item" connection="invoice" detaillink="INV_Head"
@@ -56,8 +56,8 @@
<block name="blkINV_Head" datasource="dts">
<field name="fldInvNumber" field="INV_number" maxLength="20"
readonly="Y"/>
- <field name="fldInvBuyer" field="INV_buyer" fk_description="PARTY_name"
- fk_key="gnue_id" fk_source="dts_PARTY_PartyBuyer" maxLength="32"/>
+ <field name="fldInvBuyer" field="INV_buyer"
fk_description="ORG_shortName"
+ fk_key="gnue_id" fk_source="dts_ORG_OrgBuyer" maxLength="32"/>
<field name="fldInvPaymentmethod" field="INV_paymentMethod"
fk_description="INV_name" fk_key="gnue_id"
fk_source="dts_INV_PaymentMethod" maxLength="32">
@@ -143,7 +143,7 @@
label="Edit...">
<trigger type="ON-ACTION" name="btnEditBuyerTrigger">
params = {'id': blkINV_Head.fldInvBuyer.get() or ''}
- form.runForm('PARTY_Party.gfd', params)
+ form.runForm('ORG_Org.gfd', params)
blkINV_Head.fldInvBuyer.resetForeignKey()
</trigger>
</button>
Copied: gnue-invoice/forms/ORG_Org.gfd (from rev 167,
gnue-invoice/forms/PARTY_Party.gfd)
===================================================================
--- gnue-invoice/forms/PARTY_Party.gfd 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/forms/ORG_Org.gfd 2004-12-09 23:33:16 UTC (rev 168)
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="iso8859-1"?>
+
+<!-- Organization Form
+
+ 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 style="dialog" xmlns:c="GNUe:Layout:Char" title="Organization">
+ <options/>
+
+ <import-trigger name='startupSearch' library='util.gfd'/>
+ <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"/>
+
+ <logic>
+ <block name="blk" datasource="dts">
+ <field name="fldOrgShortname" field="ORG_shortName" maxLength="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"/>
+ </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">
+ <page>
+ <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"
+ 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"
+ 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"
+ 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="Edit...">
+ <trigger type="On-Action" name="btnEditAddressTrigger">
+ params = {'id': blk.fldOrgAddress.get() or ''}
+ form.runForm('LOC_Address.gfd', params)
+ blk.fldOrgAddress.resetForeignKey()
+ </trigger>
+ </button>
+-->
+ </page>
+ </layout>
+
+</form>
Deleted: gnue-invoice/forms/PARTY_Party.gfd
===================================================================
--- gnue-invoice/forms/PARTY_Party.gfd 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/forms/PARTY_Party.gfd 2004-12-09 23:33:16 UTC (rev 168)
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="iso8859-1"?>
-
-<!-- Party Form
-
- 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 style="dialog" xmlns:c="GNUe:Layout:Char" title="Party">
- <options/>
-
- <import-trigger name='startupSearch' library='util.gfd'/>
- <trigger name='OnActivation' type='On-Activation' src='startupSearch'/>
-
- <datasource name="dts" connection="invoice" table="PARTY_Party"/>
- <datasource name="dts_LOC_Address" connection="invoice" prequery="Y"
- table="LOC_Address"/>
-
- <logic>
- <block name="blk" datasource="dts">
- <field name="fldPartyName" field="PARTY_name" maxLength="35"/>
- <field name="fldPartyLongname" field="PARTY_longName" maxLength="70"/>
- <field name="fldPartyAddress" field="PARTY_address"
- fk_description="LOC_door" fk_key="gnue_id"
fk_source="dts_LOC_Address" maxLength="32"/>
- <field name="fldPartyTaxid" field="PARTY_taxID" maxLength="35"/>
- </block>
- </logic>
-
- <layout c:height="5" c:width="45">
- <page>
- <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="fldPartyName" label=""/>
- <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="fldPartyLongname" label=""/>
- <label name="lblAddress:" c:height="1" c:width="8" c:x="1" c:y="3"
- text="Address:"/>
- <entry name="entAddress" c:height="1" c:width="28" c:x="10" c:y="3"
- block="blk" field="fldPartyAddress" label="" style="dropdown"/>
- <button name="btnEditAddress" c:height="1" c:width="7" c:x="38" c:y="3"
- label="Edit...">
- <trigger type="On-Action" name="btnEditAddressTrigger">
- params = {'id': blk.fldPartyAddress.get() or ''}
- form.runForm('LOC_Address.gfd', params)
- blk.fldPartyAddress.resetForeignKey()
- </trigger>
- </button>
- <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="fldPartyTaxid" label=""/>
- </page>
- </layout>
-
-</form>
Modified: gnue-invoice/reports/invoice-hu.grd
===================================================================
--- gnue-invoice/reports/invoice-hu.grd 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/reports/invoice-hu.grd 2004-12-09 23:33:16 UTC (rev 168)
@@ -33,17 +33,17 @@
<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="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="6" width="20"><field
name="INV_seller.PARTY_taxID"/></out:label>
+ <out:label x="5" y="6" width="20"><field
name="INV_seller.TAX_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="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>
@@ -75,10 +75,10 @@
<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="20" y="0" width="10" align="right"><field
name="INV_product.SALES_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="45" y="0" width="5" align="right"> <field
name="INV_product.SALES_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>
Modified: gnue-invoice/reports/invoice.grd
===================================================================
--- gnue-invoice/reports/invoice.grd 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/reports/invoice.grd 2004-12-09 23:33:16 UTC (rev 168)
@@ -33,17 +33,17 @@
<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="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="6" width="20"><field
name="INV_seller.PARTY_taxID"/></out:label>
+ <out:label x="5" y="6" width="20"><field
name="INV_seller.TAX_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="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>
@@ -75,10 +75,10 @@
<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="20" y="0" width="10" align="right"><field
name="INV_product.SALES_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="45" y="0" width="5" align="right"> <field
name="INV_product.SALES_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>
Modified: gnue-invoice/schema/invoice.gcd
===================================================================
--- gnue-invoice/schema/invoice.gcd 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/schema/invoice.gcd 2004-12-09 23:33:16 UTC (rev 168)
@@ -66,8 +66,8 @@
-->
<class name="Head" comment="Invoice head">
<property name="number" type="string(20)"
nullable="False" comment="invoice number" />
- <property name="seller" type="PARTY_Party"
nullable="False" comment="who wants money..." />
- <property name="buyer" type="PARTY_Party"
nullable="False" comment="who pays..." />
+ <property name="seller" type="ORG_Org"
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="" />
<property name="dateIssued" type="date"
nullable="False" comment="Date when invoice was generated" />
@@ -104,7 +104,7 @@
each time so that grid form works OK.
*******************************************************-->
<property name="buyerName" type="string(35)" >
- return self.buyer and self.buyer.PARTY_name or ''
+ return self.buyer and self.buyer.ORG_shortName or ''
</property>
<!--************************************
@@ -204,10 +204,10 @@
#NULL does not behave well on the form, so better set it to '0'.
self.printed = 0
- sellerList = find('PARTY_Party', {'PARTY_name': 'GNU Enterprise'}, [],
[])
+ sellerList = find('ORG_Org', {'ORG_shortName': 'GNU Enterprise'}, [], [])
if len(sellerList):
self.seller = sellerList[0]
- print 'INV_Head::OnInit - Seller is %s' % self.seller.PARTY_name
+ print 'INV_Head::OnInit - Seller is %s' % self.seller.ORG_shortName
</procedure>
</class>
Modified: gnue-invoice/scripts/setup-db-hu.sh
===================================================================
--- gnue-invoice/scripts/setup-db-hu.sh 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/scripts/setup-db-hu.sh 2004-12-09 23:33:16 UTC (rev 168)
@@ -1,13 +1,17 @@
#!/bin/sh
+GNUEDIR="/home/gabor/SVN/gnue"
+PACKAGEDIR="$GNUEDIR/gnue-packages"
+
gsscvs --connection=invoice-backend --createdb gnue.gsd
-gcdcvs --connection=invoice-backend ../schema/filter.gcd
-gldcvs --connection=invoice-backend ../schema/filter.gld
-gcdcvs --connection=invoice-backend ../schema/loc.gcd
-gcdcvs --connection=invoice-backend ../schema/tax.gcd
-gcdcvs --connection=invoice-backend ../schema/party.gcd
-gcdcvs --connection=invoice-backend ../schema/item.gcd
+#prerequisits
+gcdcvs --connection=invoice-backend "$PACKAGEDIR/base/location/loc.gcd" \
+
"$PACKAGEDIR/base/org/org.gcd" \
+
"$PACKAGEDIR/base/item/item.gcd" \
+
"$PACKAGEDIR/sales/sales.gcd" \
+
"$PACKAGEDIR/finance/tax/tax.gcd"
+
gcdcvs --connection=invoice-backend ../schema/invoice.gcd
gcdcvs --connection=invoice-backend ../schema/invoice-hu.gcd
Modified: gnue-invoice/scripts/setup-db.sh
===================================================================
--- gnue-invoice/scripts/setup-db.sh 2004-12-09 12:53:21 UTC (rev 167)
+++ gnue-invoice/scripts/setup-db.sh 2004-12-09 23:33:16 UTC (rev 168)
@@ -7,11 +7,11 @@
#prerequisits
gcdcvs --connection=invoice-backend "$PACKAGEDIR/base/location/loc.gcd" \
-
"$PACKAGEDIR/base/party/party.gcd" \
+
"$PACKAGEDIR/base/org/org.gcd" \
"$PACKAGEDIR/base/item/item.gcd" \
"$PACKAGEDIR/sales/sales.gcd" \
"$PACKAGEDIR/finance/tax/tax.gcd"
-
+
gcdcvs --connection=invoice-backend ../schema/invoice.gcd
#standard data
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r168 - in gnue-invoice: forms reports schema scripts,
kilo <=