[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r158 - gnue-invoice/schema
|
From: |
kilo |
|
Subject: |
r158 - gnue-invoice/schema |
|
Date: |
Mon, 6 Dec 2004 04:56:36 -0600 (CST) |
Author: kilo
Date: 2004-12-06 04:56:35 -0600 (Mon, 06 Dec 2004)
New Revision: 158
Modified:
gnue-invoice/schema/item.gcd
gnue-invoice/schema/loc.gcd
gnue-invoice/schema/party.gcd
gnue-invoice/schema/tax.gcd
Log:
GNUe Invoice.
Some simplification and formatting things.
Modified: gnue-invoice/schema/item.gcd
===================================================================
--- gnue-invoice/schema/item.gcd 2004-12-06 10:48:59 UTC (rev 157)
+++ gnue-invoice/schema/item.gcd 2004-12-06 10:56:35 UTC (rev 158)
@@ -25,21 +25,21 @@
<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="" />
+ <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="" />
+ <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="" />
+ <property name="code" type="string(35)" comment="" />
+ <property name="value" type="string(70)" comment="" />
</class>
</module>
Modified: gnue-invoice/schema/loc.gcd
===================================================================
--- gnue-invoice/schema/loc.gcd 2004-12-06 10:48:59 UTC (rev 157)
+++ gnue-invoice/schema/loc.gcd 2004-12-06 10:56:35 UTC (rev 158)
@@ -30,9 +30,7 @@
<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">
- <![CDATA[
- return self.name
- ]]>
+ return self.LOC_name
</property>
</class>
@@ -41,9 +39,7 @@
<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">
- <![CDATA[
- return self.code
- ]]>
+ return self.LOC_code
</property>
</class>
@@ -52,9 +48,7 @@
<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">
- <![CDATA[
- return self.city + ', ' + self.region.formatted + ', ' + self.code
- ]]>
+ return self.LOC_city + ', ' + self.LOC_region.LOC_formatted + ', ' +
self.LOC_code
</property>
</class>
@@ -62,9 +56,7 @@
<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">
- <![CDATA[
return self.name + ' ' + self.type
- ]]>
</property>
</class>
@@ -78,7 +70,6 @@
<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">
- <![CDATA[
addr = ''
if self.street: addr += self.street.formatted
@@ -87,7 +78,6 @@
if self.country: addr += self.country.formatted
return addr
- ]]>
</property>
</class>
</module>
Modified: gnue-invoice/schema/party.gcd
===================================================================
--- gnue-invoice/schema/party.gcd 2004-12-06 10:48:59 UTC (rev 157)
+++ gnue-invoice/schema/party.gcd 2004-12-06 10:56:35 UTC (rev 158)
@@ -25,9 +25,9 @@
<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=""/>
+ <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>
Modified: gnue-invoice/schema/tax.gcd
===================================================================
--- gnue-invoice/schema/tax.gcd 2004-12-06 10:48:59 UTC (rev 157)
+++ gnue-invoice/schema/tax.gcd 2004-12-06 10:56:35 UTC (rev 158)
@@ -25,32 +25,22 @@
<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">
- if self.rate is not None:
- return self.rate / (100 + self.rate)
- else:
- return None
+ <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)" />
- if self.rate is not None:
- return inNet * self.rate / 100
- else:
- return None
+ <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)" />
- #if self.rate is not None:
- #return inNet * (100 + self.rate) / 100
- #else:
- #return None
- return inNet * 1.25
+ <parameter name="inNet" type="number(10,2)" />
+ return self.rate and (inNet * (100 + self.rate) / 100) or None
</procedure>
</class>
</module>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r158 - gnue-invoice/schema,
kilo <=