[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r165 - in gnue-invoice: . schema scripts
|
From: |
kilo |
|
Subject: |
r165 - in gnue-invoice: . schema scripts |
|
Date: |
Thu, 9 Dec 2004 06:14:54 -0600 (CST) |
Author: kilo
Date: 2004-12-09 06:14:53 -0600 (Thu, 09 Dec 2004)
New Revision: 165
Removed:
gnue-invoice/schema/item.gcd
gnue-invoice/schema/loc.gcd
gnue-invoice/schema/party.gcd
gnue-invoice/schema/tax.gcd
Modified:
gnue-invoice/news
gnue-invoice/schema/invoice.gcd
gnue-invoice/scripts/setup-db.sh
Log:
GNUe Invoice.
Merged GCD files back to main GNUe Packages.
Modified: gnue-invoice/news
===================================================================
--- gnue-invoice/news 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/news 2004-12-09 12:14:53 UTC (rev 165)
@@ -2,6 +2,9 @@
*************************
GNUe Invoice - Project CV
*************************
+New features / changes by 2004.12.09
+* Merged GCD files back to main GNUe Packages.
+
New features / changes by 2004.12.07
* Added summing support for Hungarian invoices.
* New invoice-hu.grd
Modified: gnue-invoice/schema/invoice.gcd
===================================================================
--- gnue-invoice/schema/invoice.gcd 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/schema/invoice.gcd 2004-12-09 12:14:53 UTC (rev 165)
@@ -40,20 +40,20 @@
************************************************-->
<class name="Item" comment="One item (line) on an invoice">
<property name="head" type="INV_Head" nullable="False"
comment="link with invoice head" />
- <property name="product" type="ITEM_Item" nullable="False"
comment="" />
+ <property name="product" type="SALES_Item" nullable="False"
comment="" />
<property name="quantity" type="number(10,2)" nullable="False"
comment="" />
<property name="note" type="string"
comment="" />
<property name="valueNet" type="number(10,2)" >
- return self.product and (self.quantity * self.product.ITEM_price) or 0
+ return self.product and (self.quantity * self.product.SALES_price) or 0
</property>
<property name="valueVAT" type="number(10,2)" >
- return self.product and
self.product.ITEM_vat.TAX_vatFromNet(inNet=self.valueNet) or 0
+ return self.product and
self.product.SALES_vat.TAX_vatFromNet(inNet=self.valueNet) or 0
</property>
<property name="valueGross" type="number(10,2)" >
- return self.product and
self.product.ITEM_vat.TAX_grossFromNet(inNet=self.valueNet) or 0
+ return self.product and
self.product.SALES_vat.TAX_grossFromNet(inNet=self.valueNet) or 0
</property>
</class>
@@ -122,7 +122,7 @@
try:
items = find('INV_Item', \
- {'INV_head':self.gnue_id, 'INV_product.ITEM_vat.TAX_rate':rate}, \
+ {'INV_head':self.gnue_id, 'INV_product.SALES_vat.TAX_rate':rate}, \
[], \
[SumTypes[type]])
Deleted: gnue-invoice/schema/item.gcd
===================================================================
--- gnue-invoice/schema/item.gcd 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/schema/item.gcd 2004-12-09 12:14:53 UTC (rev 165)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ITEM 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$ -->
-
-<module name="ITEM">
- <class name="Item" comment="Atomic item info">
- <property name="type" type="ITEM_ItemType" comment="" />
- <property name="shortName" type="string(35)" comment="" />
- <property name="longName" type="string(70)" comment="" />
- <property name="price" type="number(10,2)" comment="" />
- <property name="unit" type="ITEM_UnitType" comment="" />
- <property name="vat" type="TAX_Vat" comment="" />
- </class>
-
- <class name="ItemType">
- <property name="code" type="string(35)" comment="" />
- <property name="value" type="string(70)" comment="" />
- </class>
-
- <class name="UnitType">
- <property name="code" type="string(35)" comment="" />
- <property name="value" type="string(70)" comment="" />
- </class>
-</module>
Deleted: gnue-invoice/schema/loc.gcd
===================================================================
--- gnue-invoice/schema/loc.gcd 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/schema/loc.gcd 2004-12-09 12:14:53 UTC (rev 165)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- LOC 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$ -->
-
-<!-- Implements a business logic object representing a physical address. -->
-<module name="LOC" comment="Address management">
- <class name="Country" comment="">
- <property name="code" type="string(3)" nullable="False"
comment="ISO 3166-1 country code" />
- <property name="name" type="string(70)"
comment="ISO 3166-1 country name" />
- <property name="phone" type="string(4)"
comment="Country phone prefix" />
- <property name="formatted" type="string"
comment="Formatted per local requirements">
- return self.LOC_name
- </property>
- </class>
-
- <class name="Region">
- <property name="code" type="string(8)" nullable="False"
comment="Region/state abbreviation" />
- <property name="name" type="string(70)"
comment="Full name of region/state" />
- <property name="country" type="LOC_Country"
comment="Country the region resides in" />
- <property name="formatted" type="string"
comment="Formatted per local requirements">
- return self.LOC_code
- </property>
- </class>
-
- <class name="Zip" comment="">
- <property name="code" type="string(8)" nullable="False"
comment="zip code" />
- <property name="city" type="string(70)"
comment="Full name of city" />
- <property name="region" type="LOC_Region"
comment="Region zip code is in" />
- <property name="formatted" type="string"
comment="Formatted per local requirements">
- return self.LOC_city + ', ' + self.LOC_region.LOC_formatted + ', ' +
self.LOC_code
- </property>
- </class>
-
- <class name="Street" comment="">
- <property name="name" type="string(35)" nullable="False"
comment="GNUe, Abbey, Appia..." />
- <property name="type" type="string(35)"
comment="street/avenue/boulevard/etc." />
- <property name="formatted" type="string"
comment="Formatted per local requirements">
- return self.name + ' ' + self.type
- </property>
- </class>
-
- <class name="Address" comment="">
- <property name="country" type="LOC_Country"
comment="" />
- <property name="zip" type="LOC_Zip"
comment="Also designates city" />
- <property name="street" type="LOC_Street"
comment="Name and type of street" />
- <property name="number" type="string(11)"
comment="" />
- <property name="building" type="string(4)"
comment="" />
- <property name="staircase" type="string(4)"
comment="" />
- <property name="floor" type="string(2)"
comment="" />
- <property name="door" type="string(4)"
comment="" />
- <property name="formatted" type="string"
comment="Full address per local requirements">
- addr = ''
-
- if self.street: addr += self.street.formatted
- if self.number: addr += self.number + '\n'
- if self.zip: addr += self.zip.formatted + '\n'
- if self.country: addr += self.country.formatted
-
- return addr
- </property>
- </class>
-</module>
Deleted: gnue-invoice/schema/party.gcd
===================================================================
--- gnue-invoice/schema/party.gcd 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/schema/party.gcd 2004-12-09 12:14:53 UTC (rev 165)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- PARTY 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$ -->
-
-<module name="PARTY">
- <class name="Party" comment="Defines a business partner, either a seller
or buyer">
- <property name="name" type="string(35)" nullable="False"
comment=""/>
- <property name="longName" type="string(70)"
comment=""/>
- <property name="address" type="LOC_Address"
comment=""/>
- <property name="taxID" type="string(35)"
comment=""/>
- </class>
-</module>
Deleted: gnue-invoice/schema/tax.gcd
===================================================================
--- gnue-invoice/schema/tax.gcd 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/schema/tax.gcd 2004-12-09 12:14:53 UTC (rev 165)
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- TAX 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$ -->
-
-<module name="TAX">
- <class name="Vat" comment="Value Added Tax">
- <property name="rate" type="number(6,3)" nullable="False"
comment="Multiplicator in %"/>
- <property name="name" type="string(35)"
comment=""/>
- <property name="validFrom" type="date" nullable="False"
comment=""/>
- <property name="validUntil" type="date"
comment=""/>
- <property name="reciprocate" type="number(6,3)"
comment="To compute net value from gross value">
- return self.rate and (self.rate / (100 + self.rate)) or None
- </property>
-
- <procedure name="vatFromNet" type="number(10,2)">
- <parameter name="inNet" type="number(10,2)" />
- return self.rate and (inNet * self.rate / 100) or None
- </procedure>
-
- <procedure name="grossFromNet" type="number(10,2)">
- <parameter name="inNet" type="number(10,2)" />
- return self.rate and (inNet * (100 + self.rate) / 100) or None
- </procedure>
- </class>
-</module>
Modified: gnue-invoice/scripts/setup-db.sh
===================================================================
--- gnue-invoice/scripts/setup-db.sh 2004-12-08 09:50:19 UTC (rev 164)
+++ gnue-invoice/scripts/setup-db.sh 2004-12-09 12:14:53 UTC (rev 165)
@@ -1,14 +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
+gcdcvs --connection=invoice-backend "$PACKAGEDIR/base/location/loc.gcd" \
+
"$PACKAGEDIR/base/party/party.gcd" \
+
"$PACKAGEDIR/base/item/item.gcd" \
+
"$PACKAGEDIR/sales/sales.gcd" \
+
"$PACKAGEDIR/finance/tax/tax.gcd"
+
gcdcvs --connection=invoice-backend ../schema/invoice.gcd
#standard data
-gsscvs --connection=invoice-backend ../schema/invoice-en.gsd
+#gsscvs --connection=invoice-backend ../schema/invoice-en.gsd
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r165 - in gnue-invoice: . schema scripts,
kilo <=