r6792 - in trunk/gnue-packages: base/location base/party finance/tax

[kilo]

Author: kilo
Date: 2004-12-09 06:06:30 -0600 (Thu, 09 Dec 2004)
New Revision: 6792

Modified:
   trunk/gnue-packages/base/location/loc.gcd
   trunk/gnue-packages/base/party/party.gcd
   trunk/gnue-packages/finance/tax/tax.gcd
Log:
Packages.
Merge back changes from pilot project GNUe Invoice.

Modified: trunk/gnue-packages/base/location/loc.gcd
===================================================================
--- trunk/gnue-packages/base/location/loc.gcd   2004-12-09 10:04:47 UTC (rev 
6791)
+++ trunk/gnue-packages/base/location/loc.gcd   2004-12-09 12:06:30 UTC (rev 
6792)
@@ -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
-      ]]>
     </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
-      ]]>
     </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
-      ]]>
     </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>


Property changes on: trunk/gnue-packages/base/location/loc.gcd
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-packages/base/party/party.gcd
===================================================================
--- trunk/gnue-packages/base/party/party.gcd    2004-12-09 10:04:47 UTC (rev 
6791)
+++ trunk/gnue-packages/base/party/party.gcd    2004-12-09 12:06:30 UTC (rev 
6792)
@@ -1,15 +1,36 @@
 <?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="TAX_Id"                              
 comment=""/>
+    <property name="taxID"          type="string(35)"                          
 comment=""/>
     <property name="buyerParty"     type="PARTY_BuyerParty"                    
 comment=""/>
     <property name="sellerParty"    type="PARTY_SellerParty"                   
 comment=""/>
-
-    <!--property name="contacts"    type="list_PERSON_Person"                  
 comment=""/>-->
   </class>
 
   <class name="BuyerParty"  comment="Defines buyer-specific datae">


Property changes on: trunk/gnue-packages/base/party/party.gcd
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-packages/finance/tax/tax.gcd
===================================================================
--- trunk/gnue-packages/finance/tax/tax.gcd     2004-12-09 10:04:47 UTC (rev 
6791)
+++ trunk/gnue-packages/finance/tax/tax.gcd     2004-12-09 12:06:30 UTC (rev 
6792)
@@ -1,49 +1,57 @@
 <?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">
-      <![CDATA[
-      return self.rate / (100 + self.rate)
-      ]]>
+    <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="getVATFromNet" type="CORE_Amount">
-      <parameter name="inNet"       type="CORE_Amount" />
-      <![CDATA[
-      return inNet.CORE_value * self.rate / 100
-      ]]>
+    <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="getGrossFromNet"   type="CORE_Amount">
-      <parameter name="inNet"           type="CORE_Amount" />
-      <![CDATA[
-      return inNet.CORE_value * (100 + self.rate) / 100
-      ]]>
+    <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>
 
-    <procedure name="getVATFromGross"   type="CORE_Amount">
-      <parameter name="inGross"         type="CORE_Amount" />
-      <![CDATA[
-      return inGross.CORE_value * self.reciprocate / 100
-      ]]>
+    <procedure name="vatFromGross"  type="number(10,2)">
+      <parameter name="inGross" type="number(10,2)" />
+      return self.rate and (inGross.CORE_value * self.reciprocate / 100) or 
None
     </procedure>
 
-    <procedure name="getNetFromGross"   type="CORE_Amount">
-      <parameter name="inGross"         type="CORE_Amount" />
-      <![CDATA[
-      return inGross.CORE_value * (100 - self.reciprocate) / 100
-      ]]>
+    <procedure name="netFromGross"  type="number(10,2)">
+      <parameter name="inGross" type="number(10,2)" />
+      return self.rate and (inGross.CORE_value * (100 - self.reciprocate) / 
100) or None
     </procedure>
   </class>
 
-  <class name="Id"  comment="Defines a tax ID">
-    <property name="id"     type="string(11)"       comment="Tax 
identification number" />
-    <property name="number" type="string(10)"       comment="Tax number" />
-    <property name="euId"   type="string(12)"       comment="EU tax 
identification number" />
-  </class>
 </module>