[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6100 - in trunk/gnue-packages: . base/comm base/item base/person financ
|
From: |
kilo |
|
Subject: |
r6100 - in trunk/gnue-packages: . base/comm base/item base/person finance/invoice finance/tax |
|
Date: |
Thu, 29 Jul 2004 03:38:46 -0500 (CDT) |
Author: kilo
Date: 2004-07-29 03:38:44 -0500 (Thu, 29 Jul 2004)
New Revision: 6100
Modified:
trunk/gnue-packages/README
trunk/gnue-packages/base/comm/comm.dia
trunk/gnue-packages/base/comm/comm.gcd
trunk/gnue-packages/base/comm/comm.png
trunk/gnue-packages/base/item/item.dia
trunk/gnue-packages/base/item/item.gcd
trunk/gnue-packages/base/item/item.png
trunk/gnue-packages/base/person/person.dia
trunk/gnue-packages/base/person/person.gcd
trunk/gnue-packages/base/person/person.gfd
trunk/gnue-packages/base/person/person.png
trunk/gnue-packages/finance/invoice/invoice.dia
trunk/gnue-packages/finance/invoice/invoice.gcd
trunk/gnue-packages/finance/invoice/invoice.png
trunk/gnue-packages/finance/tax/VAT.gfd
trunk/gnue-packages/finance/tax/tax.dia
trunk/gnue-packages/finance/tax/tax.gcd
trunk/gnue-packages/finance/tax/tax.png
Log:
Introduced CORE module with cross-module usable typedefs.
Modified existing modules to utilize new typedefs.
Modified: trunk/gnue-packages/README
===================================================================
--- trunk/gnue-packages/README 2004-07-28 23:21:06 UTC (rev 6099)
+++ trunk/gnue-packages/README 2004-07-29 08:38:44 UTC (rev 6100)
@@ -34,6 +34,6 @@
Each module-name folder contains the following objects:
-class (business object) definitions (.gcd)
-default values (.gsd)
- -the module documention files
+ -the module documention files (.dia, .png, .sxw, etc.)
-form definitions (.gfd)
-report definitions (.grd)
Modified: trunk/gnue-packages/base/comm/comm.dia
===================================================================
--- trunk/gnue-packages/base/comm/comm.dia 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/comm/comm.dia 2004-07-29 08:38:44 UTC (rev
6100)
@@ -98,16 +98,16 @@
<dia:point val="17.07,2.78"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="17.02,2.73;27.32,8.03"/>
+ <dia:rectangle val="17.02,2.73;24.72,7.23"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="17.07,2.78"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="10.2"/>
+ <dia:real val="7.6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="5.2"/>
+ <dia:real val="4.4"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Comm#</dia:string>
@@ -187,7 +187,7 @@
<dia:string>#access#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(100)#</dia:string>
+ <dia:string>#string(70)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -207,33 +207,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#commType#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#COMM_CommType#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="class_scope">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
<dia:string>#comment#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(50)#</dia:string>
+ <dia:string>#string(70)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -256,7 +233,7 @@
<dia:string>#formatted#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(100)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -283,16 +260,16 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O2">
<dia:attribute name="obj_pos">
- <dia:point val="29.07,4.78"/>
+ <dia:point val="29,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="29.02,4.73;35.97,10.03"/>
+ <dia:rectangle val="28.95,4.95;36.3,10.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="29.07,4.78"/>
+ <dia:point val="29,5"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.85"/>
+ <dia:real val="7.25"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="5.2"/>
@@ -398,7 +375,7 @@
<dia:string>#format#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(60)#</dia:string>
+ <dia:string>#string(70)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -421,7 +398,7 @@
<dia:string>#name#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(30)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -444,7 +421,7 @@
<dia:string>#formatted#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(30)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -471,16 +448,16 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O3">
<dia:attribute name="obj_pos">
- <dia:point val="27.27,5.48"/>
+ <dia:point val="24.67,3.48"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.27,5.43;29.92,7.08"/>
+ <dia:rectangle val="24.62,3.43;30.4,7.3"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="27.27,5.48"/>
- <dia:point val="27.27,5.48"/>
- <dia:point val="29.07,5.48"/>
- <dia:point val="29.07,5.48"/>
+ <dia:point val="24.67,3.48"/>
+ <dia:point val="26.835,3.48"/>
+ <dia:point val="26.835,5.7"/>
+ <dia:point val="29,5.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -488,7 +465,7 @@
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>##</dia:string>
+ <dia:string>#commType#</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="0"/>
@@ -524,7 +501,7 @@
</dia:composite>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O1" connection="11"/>
+ <dia:connection handle="0" to="O1" connection="4"/>
<dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
Modified: trunk/gnue-packages/base/comm/comm.gcd
===================================================================
--- trunk/gnue-packages/base/comm/comm.gcd 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/comm/comm.gcd 2004-07-29 08:38:44 UTC (rev
6100)
@@ -4,9 +4,9 @@
<module name="COMM" comment="Ways to reach someone/something">
<class name="CommType" comment="Defines a communication type and its format">
<property name="code" type="CDICT_Code" nullable="False"
comment="Phone/Fax/Email/Post, Code 001" />
- <property name="format" type="string(60)"
comment="For decoding" />
- <property name="name" type="string(30)" nullable="False"
comment="'Home phone' or 'Work email' etc" />
- <property name="formatted" type="string(30)"
comment="">
+ <property name="format" type="string(70)"
comment="For decoding" />
+ <property name="name" type="string(35)" nullable="False"
comment="'Home phone' or 'Work email' etc" />
+ <property name="formatted" type="string"
comment="">
<![CDATA[
return self.name
]]>
@@ -14,10 +14,10 @@
</class>
<class name="Comm" comment="">
- <property name="access" type="string(100)"
comment="a phone number, an email address, etc"/>
+ <property name="access" type="string(70)"
comment="a phone number, an email address, etc"/>
<property name="commType" type="COMM_CommType"
comment=""/>
- <property name="comment" type="string(50)"
comment=""/>
- <property name="formatted" type="string(100)"
comment="">
+ <property name="comment" type="string(70)"
comment=""/>
+ <property name="formatted" type="string"
comment="">
<![CDATA[
return self.access
]]>
Modified: trunk/gnue-packages/base/comm/comm.png
===================================================================
(Binary files differ)
Modified: trunk/gnue-packages/base/item/item.dia
===================================================================
--- trunk/gnue-packages/base/item/item.dia 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/item/item.dia 2004-07-29 08:38:44 UTC (rev
6100)
@@ -69,16 +69,16 @@
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.95,0.95;38.05,14.2"/>
+ <dia:rectangle val="15.95,0.95;40.05,13.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="22"/>
+ <dia:real val="24"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="12.15"/>
+ <dia:real val="11"/>
</dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
@@ -256,7 +256,7 @@
<dia:string>#keywords#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(250)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -283,28 +283,28 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O2">
<dia:attribute name="obj_pos">
- <dia:point val="28,5"/>
+ <dia:point val="29,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,4.95;37.4,13.45"/>
+ <dia:rectangle val="28.95,4.95;39.1,11.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="28,5"/>
+ <dia:point val="29,5"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.35"/>
+ <dia:real val="10.05"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="8.4"/>
+ <dia:real val="6.8"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#PricedItem#</dia:string>
+ <dia:string>#Price#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#Item with price#</dia:string>
+ <dia:string>#Item price information#</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -372,56 +372,10 @@
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#item#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#ITEM_Item#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="class_scope">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
- <dia:string>#qtyUnit#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#CDICT_Code#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Code 008#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="class_scope">
- <dia:boolean val="false"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
<dia:string>#minQuantity#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#number(8,3)#</dia:string>
+ <dia:string>#CORE_Quantity#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -444,7 +398,7 @@
<dia:string>#maxQuantity#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#number(8,3)#</dia:string>
+ <dia:string>#CORE_Quantity#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -467,7 +421,7 @@
<dia:string>#unitPrice#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -490,7 +444,7 @@
<dia:string>#minAmount#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -513,7 +467,7 @@
<dia:string>#maxAmount#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -566,21 +520,24 @@
<dia:point val="25.3,3.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="25.25,3.65;28.75,8.5"/>
+ <dia:rectangle val="25.25,3.65;30.4,7.3"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="25.3,3.7"/>
<dia:point val="26.65,3.7"/>
- <dia:point val="26.65,6.9"/>
- <dia:point val="28,6.9"/>
+ <dia:point val="26.65,5.7"/>
+ <dia:point val="29,5.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
<dia:enum val="1"/>
<dia:enum val="0"/>
</dia:attribute>
+ <dia:attribute name="autorouting">
+ <dia:boolean val="false"/>
+ </dia:attribute>
<dia:attribute name="name">
- <dia:string>##</dia:string>
+ <dia:string>#price#</dia:string>
</dia:attribute>
<dia:attribute name="direction">
<dia:enum val="0"/>
@@ -591,7 +548,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
+ <dia:string>#*#</dia:string>
</dia:attribute>
<dia:attribute name="arrow">
<dia:boolean val="false"/>
@@ -605,19 +562,19 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="multiplicity">
- <dia:string>##</dia:string>
+ <dia:string>#0..1#</dia:string>
</dia:attribute>
<dia:attribute name="arrow">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="aggregate">
- <dia:enum val="1"/>
+ <dia:enum val="0"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O1" connection="4"/>
- <dia:connection handle="1" to="O2" connection="8"/>
+ <dia:connection handle="1" to="O2" connection="3"/>
</dia:connections>
</dia:object>
</dia:group>
Modified: trunk/gnue-packages/base/item/item.gcd
===================================================================
--- trunk/gnue-packages/base/item/item.gcd 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/item/item.gcd 2004-07-29 08:38:44 UTC (rev
6100)
@@ -5,17 +5,17 @@
<property name="type" type="CDICT_Code" nullable="False"
comment="Code 007" />
<property name="shortName" type="string(35)"
comment="" />
<property name="longName" type="string(70)"
comment="" />
- <property name="keywords" type="string(250)"
comment="Free form keywords for lookup" />
+ <property name="keywords" type="string"
comment="Free form keywords for lookup" />
+
+ <property name="price" type="ITEM_Price"
comment="" />
</class>
- <class name="PricedItem" comment="Item with price">
- <property name="item" type="ITEM_Item" nullable="False"
comment="" />
- <property name="qtyUnit" type="CDICT_Code"
comment="Code 008" />
- <property name="minQuantity" type="number(8,3)"
comment="" />
- <property name="maxQuantity" type="number(8,3)"
comment="" />
- <property name="unitPrice" type="CUR_Money"
comment="" />
- <property name="minAmount" type="CUR_Money"
comment="" />
- <property name="maxAmount" type="CUR_Money"
comment="" />
+ <class name="Price" comment="Item price information">
+ <property name="minQuantity" type="CORE_Quantity"
comment="" />
+ <property name="maxQuantity" type="CORE_Quantity"
comment="" />
+ <property name="unitPrice" type="CORE_Amount"
comment="" />
+ <property name="minAmount" type="CORE_Amount"
comment="" />
+ <property name="maxAmount" type="CORE_Amount"
comment="" />
<property name="vat" type="TAX_Vat"
comment="" />
</class>
</module>
Modified: trunk/gnue-packages/base/item/item.png
===================================================================
(Binary files differ)
Modified: trunk/gnue-packages/base/person/person.dia
===================================================================
--- trunk/gnue-packages/base/person/person.dia 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/person/person.dia 2004-07-29 08:38:44 UTC (rev
6100)
@@ -210,7 +210,7 @@
<dia:string>#nameFirst#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(25)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -233,7 +233,7 @@
<dia:string>#nameMiddle#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(25)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -256,7 +256,7 @@
<dia:string>#nameLast#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(25)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -302,7 +302,7 @@
<dia:string>#nameNick#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(25)#</dia:string>
+ <dia:string>#ststring(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -325,7 +325,7 @@
<dia:string>#workTitle#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(25)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -348,7 +348,7 @@
<dia:string>#fullName#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(100)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -371,7 +371,7 @@
<dia:string>#politeName#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(51)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
Modified: trunk/gnue-packages/base/person/person.gcd
===================================================================
--- trunk/gnue-packages/base/person/person.gcd 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/person/person.gcd 2004-07-29 08:38:44 UTC (rev
6100)
@@ -3,13 +3,13 @@
<module name="PERSON" comment="A person with names, physical address(es) and
communication way(s)">
<class name="Person" comment="Typedef of a person">
<property name="namePrefix" type="CDICT_Code"
comment="Mr., Mrs., Dr., etc Code 004" />
- <property name="nameFirst" type="string(25)"
comment="" />
- <property name="nameMiddle" type="string(25)"
comment="" />
- <property name="nameLast" type="string(25)" nullable="False"
comment="" />
+ <property name="nameFirst" type="string(35)"
comment="" />
+ <property name="nameMiddle" type="string(35)"
comment="" />
+ <property name="nameLast" type="string(35)" nullable="False"
comment="" />
<property name="nameSuffix" type="CDICT_Code"
comment="Jr., Sr., III., etc Code 005" />
- <property name="nameNick" type="string(25)"
comment="" />
- <property name="workTitle" type="string(25)"
comment="" />
- <property name="fullName" type="string(100)"
comment="Full name per local requirements">
+ <property name="nameNick" type="string(35)"
comment="" />
+ <property name="workTitle" type="string(35)"
comment="" />
+ <property name="fullName" type="string"
comment="Full name per local requirements">
<![CDATA[
name = ''
if self.namePrefix : name += self.namePrefix + ' '
@@ -21,7 +21,7 @@
return name
]]>
</property>
- <property name="politeName" type="string(51)"
comment="Polite name per local requirements">
+ <property name="politeName" type="string"
comment="Polite name per local requirements">
<![CDATA[
name = ''
if self.namePrefix : name += self.namePrefix + ' '
Modified: trunk/gnue-packages/base/person/person.gfd
===================================================================
--- trunk/gnue-packages/base/person/person.gfd 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/base/person/person.gfd 2004-07-29 08:38:44 UTC (rev
6100)
@@ -11,16 +11,16 @@
<logic>
<block name="blkPERSON_Person" datasource="dtsperson_person">
<field name="fldGnueId" field="gnue_id" maxLength="32"/>
- <field name="fldPersonNamefirst" field="PERSON_nameFirst"
maxLength="25"/>
- <field name="fldPersonNamelast" field="PERSON_nameLast" maxLength="25"/>
+ <field name="fldPersonNamefirst" field="PERSON_nameFirst"
maxLength="35"/>
+ <field name="fldPersonNamelast" field="PERSON_nameLast" maxLength="35"/>
<field name="fldPersonNamemiddle" field="PERSON_nameMiddle"
- maxLength="25"/>
- <field name="fldPersonNamenick" field="PERSON_nameNick" maxLength="25"/>
+ maxLength="35"/>
+ <field name="fldPersonNamenick" field="PERSON_nameNick" maxLength="35"/>
<field name="fldPersonNameprefix" field="PERSON_namePrefix"
fk_description="CDICT_name" fk_key="gnue_id"
fk_source="dts_CDICT_Code_prefix" maxLength="32"/>
<field name="fldPersonNamesuffix" field="PERSON_nameSuffix"
fk_description="CDICT_name" fk_key="gnue_id"
fk_source="dts_CDICT_Code_suffix" maxLength="32"/>
- <field name="fldPersonWorktitle" field="PERSON_workTitle"
maxLength="25"/>
+ <field name="fldPersonWorktitle" field="PERSON_workTitle"
maxLength="35"/>
<field name="fldPersonFullname" field="PERSON_fullName" maxLength="40"/>
<field name="fldPersonPolitename" field="PERSON_politeName"
maxLength="40"/>
Modified: trunk/gnue-packages/base/person/person.png
===================================================================
(Binary files differ)
Modified: trunk/gnue-packages/finance/invoice/invoice.dia
===================================================================
--- trunk/gnue-packages/finance/invoice/invoice.dia 2004-07-28 23:21:06 UTC
(rev 6099)
+++ trunk/gnue-packages/finance/invoice/invoice.dia 2004-07-29 08:38:44 UTC
(rev 6100)
@@ -69,13 +69,13 @@
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.95,0.95;42.05,18.05"/>
+ <dia:rectangle val="15.95,0.95;47.05,18.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="26"/>
+ <dia:real val="31"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="16"/>
@@ -98,13 +98,13 @@
<dia:point val="17,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,12.95;23.65,17.45"/>
+ <dia:rectangle val="16.95,12.95;24.65,17.45"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="17,13"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.6"/>
+ <dia:real val="7.6"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="4.4"/>
@@ -260,16 +260,16 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O2">
<dia:attribute name="obj_pos">
- <dia:point val="32,5"/>
+ <dia:point val="35,5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="31.95,4.95;41.35,11.85"/>
+ <dia:rectangle val="34.95,4.95;46.15,11.85"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="32,5"/>
+ <dia:point val="35,5"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.3"/>
+ <dia:real val="11.1"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="6.8"/>
@@ -375,7 +375,7 @@
<dia:string>#quantity#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#number(12,4)#</dia:string>
+ <dia:string>#CORE_Quantity#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>#<>0#</dia:string>
@@ -398,7 +398,7 @@
<dia:string>#valueNet#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -421,7 +421,7 @@
<dia:string>#valueVAT#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -444,7 +444,7 @@
<dia:string>#valueGross#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -467,7 +467,7 @@
<dia:string>#note#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(250)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -497,13 +497,13 @@
<dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,2.95;29.35,12.25"/>
+ <dia:rectangle val="16.95,2.95;31.3,12.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="12.3"/>
+ <dia:real val="14.25"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="9.2"/>
@@ -724,7 +724,7 @@
<dia:string>#note#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(250)#</dia:string>
+ <dia:string>#string#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -770,7 +770,7 @@
<dia:string>#valueTotal#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -797,16 +797,16 @@
</dia:object>
<dia:object type="UML - Association" version="0" id="O4">
<dia:attribute name="obj_pos">
- <dia:point val="29.3,3.7"/>
+ <dia:point val="31.25,3.7"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="29.25,2.9;33.2,7.3"/>
+ <dia:rectangle val="31.2,3.65;36.4,7.3"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="29.3,3.7"/>
- <dia:point val="30.65,3.7"/>
- <dia:point val="30.65,5.7"/>
- <dia:point val="32,5.7"/>
+ <dia:point val="31.25,3.7"/>
+ <dia:point val="33,3.7"/>
+ <dia:point val="33,5.7"/>
+ <dia:point val="35,5.7"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -831,7 +831,7 @@
<dia:string>#1#</dia:string>
</dia:attribute>
<dia:attribute name="arrow">
- <dia:boolean val="true"/>
+ <dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="aggregate">
<dia:enum val="0"/>
Modified: trunk/gnue-packages/finance/invoice/invoice.gcd
===================================================================
--- trunk/gnue-packages/finance/invoice/invoice.gcd 2004-07-28 23:21:06 UTC
(rev 6099)
+++ trunk/gnue-packages/finance/invoice/invoice.gcd 2004-07-29 08:38:44 UTC
(rev 6100)
@@ -7,39 +7,39 @@
<property name="dueDays" type="number(3)"
nullable="False" comment="number of days before payment is due" />
</class>
- <class name="Item" comment="One item (line) on an invoice">
+ <class name="Item" comment="One item (line) on an invoice">
<property name="product" type="ITEM_Item"
nullable="False" comment="" />
- <property name="quantity" type="number(12,4)"
nullable="False" comment="" />
- <property name="valueNet" type="CUR_Money" >
+ <property name="quantity" type="CORE_Quantity"
nullable="False" comment="" />
+ <property name="valueNet" type="CORE_Amount" >
<![CDATA[
return self.quantity * self.product.ITEM_unitPrice
]]>
</property>
- <property name="valueVAT" type="CUR_Money" >
+ <property name="valueVAT" type="CORE_Amount" >
<![CDATA[
return self.product.ITEM_vat.TAX_getVATFromNet(self.valueNet)
]]>
</property>
- <property name="valueGross" type="CUR_Money" >
+ <property name="valueGross" type="CORE_Amount" >
<![CDATA[
return self.product.ITEM_vat.TAX_getGrossFromNet(self.valueNet)
]]>
</property>
- <property name="note" type="string(250)"
comment="" />
+ <property name="note" type="string"
comment="" />
</class>
- <class name="Head" comment="Invoice head">
+ <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="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" />
- <property name="note" type="string(250)"
comment="" />
+ <property name="note" type="string"
comment="" />
<property name="printed" type="number(3)"
comment="# of printed copies" />
- <property name="valueTotal" type="CUR_Money" >
+ <property name="valueTotal" type="CORE_Amount" >
<![CDATA[
pass
]]>
Modified: trunk/gnue-packages/finance/invoice/invoice.png
===================================================================
(Binary files differ)
Modified: trunk/gnue-packages/finance/tax/VAT.gfd
===================================================================
--- trunk/gnue-packages/finance/tax/VAT.gfd 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/finance/tax/VAT.gfd 2004-07-29 08:38:44 UTC (rev
6100)
@@ -6,7 +6,7 @@
<logic>
<block name="blkTAX_Vat" datasource="dtstax_vat">
<field name="fldGnueId" field="gnue_id" maxLength="32"/>
- <field name="fldTaxName" field="TAX_name" maxLength="40"/>
+ <field name="fldTaxName" field="TAX_name" maxLength="35"/>
<field name="fldTaxRate" field="TAX_rate" maxLength="6"
typecast="number"/>
<field name="fldTaxValidfrom" field="TAX_validFrom" maxLength="10"
Modified: trunk/gnue-packages/finance/tax/tax.dia
===================================================================
--- trunk/gnue-packages/finance/tax/tax.dia 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/finance/tax/tax.dia 2004-07-29 08:38:44 UTC (rev
6100)
@@ -69,13 +69,13 @@
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="15.95,0.95;35.05,13.05"/>
+ <dia:rectangle val="15.95,0.95;37.05,13.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="16,2"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="19"/>
+ <dia:real val="21"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="11"/>
@@ -98,13 +98,13 @@
<dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="16.95,2.95;34.05,12.05"/>
+ <dia:rectangle val="16.95,2.95;36.2,12.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="17,3"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="17"/>
+ <dia:real val="19.15"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="9"/>
@@ -210,7 +210,7 @@
<dia:string>#name#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(40)#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -307,7 +307,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -333,7 +333,7 @@
<dia:string>#inNet#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -355,7 +355,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -381,7 +381,7 @@
<dia:string>#inNet#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -403,7 +403,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -429,7 +429,7 @@
<dia:string>#inGross#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -451,7 +451,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -477,7 +477,7 @@
<dia:string>#inGross#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#CUR_Money#</dia:string>
+ <dia:string>#CORE_Amount#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
Modified: trunk/gnue-packages/finance/tax/tax.gcd
===================================================================
--- trunk/gnue-packages/finance/tax/tax.gcd 2004-07-28 23:21:06 UTC (rev
6099)
+++ trunk/gnue-packages/finance/tax/tax.gcd 2004-07-29 08:38:44 UTC (rev
6100)
@@ -12,31 +12,31 @@
]]>
</property>
- <procedure name="getVATFromNet" type="CUR_Money">
- <parameter name="inNet" type="CUR_Money" />
+ <procedure name="getVATFromNet" type="CORE_Amount">
+ <parameter name="inNet" type="CORE_Amount" />
<![CDATA[
- return inNet.CUR_asNumber * self.rate / 100
+ return inNet.CORE_value * self.rate / 100
]]>
</procedure>
- <procedure name="getGrossFromNet" type="CUR_Money">
- <parameter name="inNet" type="CUR_Money" />
+ <procedure name="getGrossFromNet" type="CORE_Amount">
+ <parameter name="inNet" type="CORE_Amount" />
<![CDATA[
- return inNet.CUR_asNumber * (100 + self.rate) / 100
+ return inNet.CORE_value * (100 + self.rate) / 100
]]>
</procedure>
- <procedure name="getVATFromGross" type="CUR_Money">
- <parameter name="inGross" type="CUR_Money" />
+ <procedure name="getVATFromGross" type="CORE_Amount">
+ <parameter name="inGross" type="CORE_Amount" />
<![CDATA[
- return inGross.CUR_asNumber * self.reciprocate / 100
+ return inGross.CORE_value * self.reciprocate / 100
]]>
</procedure>
- <procedure name="getNetFromGross" type="CUR_Money">
- <parameter name="inGross" type="CUR_Money" />
+ <procedure name="getNetFromGross" type="CORE_Amount">
+ <parameter name="inGross" type="CORE_Amount" />
<![CDATA[
- return inGross.CUR_asNumber * (100 - self.reciprocate) / 100
+ return inGross.CORE_value * (100 - self.reciprocate) / 100
]]>
</procedure>
</class>
Modified: trunk/gnue-packages/finance/tax/tax.png
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6100 - in trunk/gnue-packages: . base/comm base/item base/person finance/invoice finance/tax,
kilo <=