[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7311 - trunk/gnue-packages/supply-chain/billing
|
From: |
kilo |
|
Subject: |
[gnue] r7311 - trunk/gnue-packages/supply-chain/billing |
|
Date: |
Thu, 7 Apr 2005 07:05:06 -0500 (CDT) |
Author: kilo
Date: 2005-04-07 07:05:05 -0500 (Thu, 07 Apr 2005)
New Revision: 7311
Modified:
trunk/gnue-packages/supply-chain/billing/billing.dia
trunk/gnue-packages/supply-chain/billing/billing.gcd
trunk/gnue-packages/supply-chain/billing/billing.png
Log:
Updated Billing so that each and every value is stored
in the bill head and lines.
No references are used to store and print the bill.
Modified: trunk/gnue-packages/supply-chain/billing/billing.dia
===================================================================
--- trunk/gnue-packages/supply-chain/billing/billing.dia 2005-04-07
12:00:21 UTC (rev 7310)
+++ trunk/gnue-packages/supply-chain/billing/billing.dia 2005-04-07
12:05:05 UTC (rev 7311)
@@ -13,16 +13,16 @@
<dia:string>#A4#</dia:string>
</dia:attribute>
<dia:attribute name="tmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="bmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="lmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="rmargin">
- <dia:real val="2.8222000598907471"/>
+ <dia:real val="2.8222"/>
</dia:attribute>
<dia:attribute name="is_portrait">
<dia:boolean val="true"/>
@@ -69,16 +69,16 @@
<dia:point val="7,-22"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.95,-23.05;47.05,-0.95"/>
+ <dia:rectangle val="6.95,-23.05;43.05,4.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="7,-22"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="40"/>
+ <dia:real val="36"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="21"/>
+ <dia:real val="26"/>
</dia:attribute>
<dia:attribute name="line_colour">
<dia:color val="#000000"/>
@@ -98,16 +98,16 @@
<dia:point val="8,-21"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.95,-21.05;26.05,-2.35"/>
+ <dia:rectangle val="7.95,-21.05;28.95,3.25"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="8,-21"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="18"/>
+ <dia:real val="20.9"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="18.600000000000001"/>
+ <dia:real val="24.2"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Head#</dia:string>
@@ -136,12 +136,6 @@
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
- </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -170,13 +164,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -213,10 +207,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#seller#</dia:string>
+ <dia:string>#sellerName#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#BILLING_Company#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -236,16 +230,16 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#buyer#</dia:string>
+ <dia:string>#sellerAddr1#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#ORG_Org#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#who pays...#</dia:string>
+ <dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@@ -259,10 +253,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#paymentMethod#</dia:string>
+ <dia:string>#sellerAddr2#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#BILLING_PaymentMethod#</dia:string>
+ <dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -282,6 +276,190 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
+ <dia:string>#sellerAddr3#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#sellerTaxID#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#buyerName#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#buyerAddr1#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#buyerAddr2#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#buyerAddr3#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#paymMethodName#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#string(35)#</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>#paymMethodDays#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#number(3)#</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>#dateDelivery#</dia:string>
</dia:attribute>
<dia:attribute name="type">
@@ -489,29 +667,6 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#buyerName#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Calculated: returns the buyer's name or emptry
string#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="3"/>
- </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>#revertedString#</dia:string>
</dia:attribute>
<dia:attribute name="type">
@@ -776,19 +931,19 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O2">
<dia:attribute name="obj_pos">
- <dia:point val="36,-21"/>
+ <dia:point val="33,-21"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="35.95,-21.05;44.15,-14.15"/>
+ <dia:rectangle val="32.95,-21.05;42.4,-10.35"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="36,-21"/>
+ <dia:point val="33,-21"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="8.0999999999999996"/>
+ <dia:real val="9.35"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="6.8000000000000007"/>
+ <dia:real val="10.6"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#Item#</dia:string>
@@ -817,12 +972,6 @@
<dia:attribute name="visible_comments">
<dia:boolean val="false"/>
</dia:attribute>
- <dia:attribute name="wrap_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
- </dia:attribute>
<dia:attribute name="line_color">
<dia:color val="#000000"/>
</dia:attribute>
@@ -851,13 +1000,13 @@
<dia:font family="sans" style="8" name="Helvetica"/>
</dia:attribute>
<dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
+ <dia:real val="0.8"/>
</dia:attribute>
<dia:attribute name="classname_font_height">
<dia:real val="1"/>
@@ -871,29 +1020,6 @@
<dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#product#</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>#quantity#</dia:string>
</dia:attribute>
<dia:attribute name="type">
@@ -940,180 +1066,9 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#valueNet#</dia:string>
+ <dia:string>#prodName#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#number(10,2)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Calculated:#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="3"/>
- </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>#valueVAT#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#number(10,2)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Calculated:#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="3"/>
- </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>#valueGross#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#number(10,2)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Calculated:#</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility">
- <dia:enum val="3"/>
- </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:attribute>
- <dia:attribute name="operations"/>
- <dia:attribute name="template">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="templates"/>
- </dia:object>
- <dia:object type="UML - Class" version="0" id="O3">
- <dia:attribute name="obj_pos">
- <dia:point val="28,-7"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="27.95,-7.05;34.65,-2.55"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="28,-7"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="6.5999999999999996"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="4.4000000000000004"/>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>#PaymentMethod#</dia:string>
- </dia:attribute>
- <dia:attribute name="stereotype">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#terms of payment#</dia:string>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="suppress_attributes">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="suppress_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="visible_attributes">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="visible_operations">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="visible_comments">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
- </dia:attribute>
- <dia:attribute name="text_color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="comment_font">
- <dia:font family="sans" style="8" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="classname_font_height">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="abstract_classname_font_height">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="comment_font_height">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="attributes">
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
- <dia:string>#name#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
@@ -1134,40 +1089,17 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#channel#</dia:string>
+ <dia:string>#prodDesc#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
+ <dia:string>#string(70)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>#cash, transfer, etc.#</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>#dueDays#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#number(3)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#number of days before payment is due#</dia:string>
- </dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
@@ -1178,114 +1110,12 @@
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
- </dia:attribute>
- <dia:attribute name="operations"/>
- <dia:attribute name="template">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="templates"/>
- </dia:object>
- <dia:object type="UML - Class" version="0" id="O4">
- <dia:attribute name="obj_pos">
- <dia:point val="36,-13"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="35.95,-13.05;44.15,-2.15"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="36,-13"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="8.0999999999999996"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="10.800000000000001"/>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>#Company#</dia:string>
- </dia:attribute>
- <dia:attribute name="stereotype">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#Seller company's data#</dia:string>
- </dia:attribute>
- <dia:attribute name="abstract">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="suppress_attributes">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="suppress_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="visible_attributes">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="visible_operations">
- <dia:boolean val="true"/>
- </dia:attribute>
- <dia:attribute name="visible_comments">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_operations">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="wrap_after_char">
- <dia:int val="40"/>
- </dia:attribute>
- <dia:attribute name="line_color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_color">
- <dia:color val="#ffffff"/>
- </dia:attribute>
- <dia:attribute name="text_color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="normal_font">
- <dia:font family="monospace" style="0" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="abstract_font">
- <dia:font family="monospace" style="88" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="polymorphic_font">
- <dia:font family="monospace" style="8" name="Courier"/>
- </dia:attribute>
- <dia:attribute name="classname_font">
- <dia:font family="sans" style="80" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="abstract_classname_font">
- <dia:font family="sans" style="88" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="comment_font">
- <dia:font family="sans" style="8" name="Helvetica"/>
- </dia:attribute>
- <dia:attribute name="font_height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="polymorphic_font_height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="abstract_font_height">
- <dia:real val="0.80000000000000004"/>
- </dia:attribute>
- <dia:attribute name="classname_font_height">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="abstract_classname_font_height">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="comment_font_height">
- <dia:real val="1"/>
- </dia:attribute>
- <dia:attribute name="attributes">
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#code#</dia:string>
+ <dia:string>#prodPrice#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(8)#</dia:string>
+ <dia:string>#number(10,2)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -1305,10 +1135,10 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#name#</dia:string>
+ <dia:string>#prodVAT#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
+ <dia:string>#number(6,3)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@@ -1328,7 +1158,7 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#addr1#</dia:string>
+ <dia:string>#prodUnit#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#string(35)#</dia:string>
@@ -1351,19 +1181,19 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#addr2#</dia:string>
+ <dia:string>#valueNet#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
+ <dia:string>#number(10,2)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>##</dia:string>
+ <dia:string>#Calculated:#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="0"/>
+ <dia:enum val="3"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -1374,19 +1204,19 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#addr3#</dia:string>
+ <dia:string>#valueVAT#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
+ <dia:string>#number(10,2)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>##</dia:string>
+ <dia:string>#Calculated:#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="0"/>
+ <dia:enum val="3"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -1397,19 +1227,19 @@
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
- <dia:string>#phone#</dia:string>
+ <dia:string>#valueGross#</dia:string>
</dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
+ <dia:string>#number(10,2)#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
- <dia:string>##</dia:string>
+ <dia:string>#Calculated:#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="0"/>
+ <dia:enum val="3"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
@@ -1418,140 +1248,56 @@
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
- <dia:composite type="umlattribute">
+ </dia:attribute>
+ <dia:attribute name="operations">
+ <dia:composite type="umloperation">
<dia:attribute name="name">
- <dia:string>#taxID#</dia:string>
+ <dia:string>#onValidate#</dia:string>
</dia:attribute>
- <dia:attribute name="type">
- <dia:string>#string(35)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
+ <dia:attribute name="stereotype">
<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>#currency#</dia:string>
- </dia:attribute>
<dia:attribute name="type">
- <dia:string>#string(3)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#base currency#</dia:string>
- </dia:attribute>
<dia:attribute name="visibility">
- <dia:enum val="0"/>
+ <dia:enum val="1"/>
</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>#Name of bank#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#string(35)#</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 name="inheritance_type">
+ <dia:enum val="2"/>
</dia:attribute>
- </dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
- <dia:string>#accNum#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#string(35)#</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:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
+ <dia:attribute name="parameters"/>
</dia:composite>
- <dia:composite type="umlattribute">
- <dia:attribute name="name">
- <dia:string>#numPrint#</dia:string>
- </dia:attribute>
- <dia:attribute name="type">
- <dia:string>#string(2)#</dia:string>
- </dia:attribute>
- <dia:attribute name="value">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="comment">
- <dia:string>#number of invoices printed by default#</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:attribute>
- <dia:attribute name="operations"/>
<dia:attribute name="template">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O5">
+ <dia:object type="UML - Association" version="0" id="O3">
<dia:attribute name="obj_pos">
- <dia:point val="26,-19.1"/>
+ <dia:point val="33,-20.3"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="25.95,-19.8;36.3,-11.4"/>
+ <dia:rectangle val="28.8293,-20.35;34.4,-18.7"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="26,-19.1"/>
- <dia:point val="31,-19.1"/>
- <dia:point val="31,-12.3"/>
- <dia:point val="36,-12.3"/>
+ <dia:point val="33,-20.3"/>
+ <dia:point val="33,-20.3"/>
+ <dia:point val="28.9,-20.3"/>
+ <dia:point val="28.9,-20.3"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@@ -1559,65 +1305,6 @@
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="name">
- <dia:string>#seller#</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..*#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O1" connection="9"/>
- <dia:connection handle="1" to="O4" connection="3"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="0" id="O6">
- <dia:attribute name="obj_pos">
- <dia:point val="36,-20.3"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="25.9293,-21;37.2,-19.4"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="36,-20.3"/>
- <dia:point val="36,-20.3"/>
- <dia:point val="26,-20.3"/>
- <dia:point val="26,-20.3"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="direction">
@@ -1658,240 +1345,6 @@
<dia:connection handle="1" to="O1" connection="4"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="0" id="O7">
- <dia:attribute name="obj_pos">
- <dia:point val="26,-16.7"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="25.95,-17.4;31,-5.4"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="26,-16.7"/>
- <dia:point val="27,-16.7"/>
- <dia:point val="27,-6.3"/>
- <dia:point val="28,-6.3"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>#paymentMethod#</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..*#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O1" connection="15"/>
- <dia:connection handle="1" to="O3" connection="3"/>
- </dia:connections>
- <dia:childnode parent="O0"/>
- </dia:object>
</dia:group>
- <dia:object type="UML - Association" version="0" id="O8">
- <dia:attribute name="obj_pos">
- <dia:point val="8,-17.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="3.95,-18.2;9.2,-13.4"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="8,-17.5"/>
- <dia:point val="4,-17.5"/>
- <dia:point val="4,-15"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>#buyer#</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#0..*#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O1" connection="12"/>
- <dia:connection handle="1" to="O10" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - Association" version="0" id="O9">
- <dia:attribute name="obj_pos">
- <dia:point val="44.1,-19.1"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="44.05,-19.8;48.3,-17.1"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="44.1,-19.1"/>
- <dia:point val="46.05,-19.1"/>
- <dia:point val="46.05,-18"/>
- <dia:point val="48,-18"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="0"/>
- </dia:attribute>
- <dia:attribute name="ends">
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>#product#</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- <dia:composite>
- <dia:attribute name="role">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multiplicity">
- <dia:string>#1#</dia:string>
- </dia:attribute>
- <dia:attribute name="arrow">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="aggregate">
- <dia:enum val="0"/>
- </dia:attribute>
- </dia:composite>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O2" connection="9"/>
- <dia:connection handle="1" to="O11" connection="0"/>
- </dia:connections>
- </dia:object>
- <dia:object type="UML - LargePackage" version="0" id="O10">
- <dia:attribute name="obj_pos">
- <dia:point val="2,-15"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="1.95,-16.05;6.05,-10.95"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="2,-15"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="4"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="4"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffffff"/>
- </dia:attribute>
- <dia:attribute name="stereotype">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>#ORG#</dia:string>
- </dia:attribute>
- </dia:object>
- <dia:object type="UML - LargePackage" version="0" id="O11">
- <dia:attribute name="obj_pos">
- <dia:point val="48,-18"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="47.95,-19.05;52.05,-13.95"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="48,-18"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="4"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="4"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="fill_colour">
- <dia:color val="#ffffff"/>
- </dia:attribute>
- <dia:attribute name="stereotype">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="name">
- <dia:string>#ITEM#</dia:string>
- </dia:attribute>
- </dia:object>
</dia:layer>
</dia:diagram>
Modified: trunk/gnue-packages/supply-chain/billing/billing.gcd
===================================================================
--- trunk/gnue-packages/supply-chain/billing/billing.gcd 2005-04-07
12:00:21 UTC (rev 7310)
+++ trunk/gnue-packages/supply-chain/billing/billing.gcd 2005-04-07
12:05:05 UTC (rev 7311)
@@ -35,7 +35,7 @@
<property name="taxID" type="string(35)"
comment=""/>
<property name="currency" type="string(3)"
comment="base currency"/>
<property name="accBank" type="string(35)"
comment="Name of bank"/>
- <property name="accNum" type="string(35)"
comment=""/>
+ <property name="accNum" type="string(35)"
comment="Account number"/>
<property name="numPrint" type="number(2)"
comment="number of invoices printed by default"/>
</class>
@@ -55,21 +55,37 @@
************************************************-->
<class name="Item" comment="One item (line) on an invoice">
<property name="head" type="BILLING_Head" nullable="False"
comment="link with invoice head" />
- <property name="product" type="ITEM_Item" nullable="False"
comment="" />
<property name="quantity" type="number(10,2)" nullable="False"
comment="" />
<property name="note" type="string"
comment="" />
+
+ <property name="product" type="ITEM_Item"
comment="HACK" />
+ <property name="prodName" type="string(35)" nullable="False"
comment="" />
+ <property name="prodDesc" type="string(70)"
comment="" />
+ <property name="prodPrice" type="number(10,2)" nullable="False"
comment="Product net unit price" />
+ <property name="prodVAT" type="number(6,3)" nullable="False"
comment="VAT rate" />
+ <property name="prodUnit" type="string(35)" nullable="False"
comment="Unit" />
<property name="valueNet" type="number(10,2)" >
- return self.product and (self.quantity * self.product.SALES_price) or 0
+ return self.quantity and self.prodPrice and (self.quantity *
self.prodPrice) or 0
</property>
<property name="valueVAT" type="number(10,2)" >
- return self.product and
self.product.SALES_vat.TAX_vatFromNet(inNet=self.valueNet) or 0
+ return self.prodPrice and self.prodVAT and (self.prodPrice *
self.prodVAT / 100) or 0
</property>
<property name="valueGross" type="number(10,2)" >
- return self.product and
self.product.SALES_vat.TAX_grossFromNet(inNet=self.valueNet) or 0
+ return self.prodPrice and self.prodVAT and (self.prodPrice * (100 +
self.prodVAT) / 100) or 0
</property>
+
+ <procedure name="OnValidate">
+ if self.product:
+ self.prodName = self.product.ITEM_shortName
+ self.prodDesc = self.product.ITEM_longName
+ self.prodPrice = self.product.SALES_price
+ self.prodVAT = self.product.SALES_vat.TAX_rate
+ self.prodUnit = self.product.ITEM_unit.ITEM_value
+ self.product = None
+ </procedure>
</class>
@@ -81,9 +97,24 @@
-->
<class name="Head" comment="Invoice head">
<property name="number" type="string(20)"
nullable="False" comment="invoice number" />
- <property name="seller" type="BILLING_Company"
nullable="False" comment="who wants money..." />
- <property name="buyer" type="ORG_Org"
nullable="False" comment="who pays..." />
- <property name="paymentMethod" type="BILLING_PaymentMethod"
nullable="False" comment="" />
+ <!-- Who wants money... -->
+ <property name="seller" type="BILLING_Company"
comment="HACK" />
+ <property name="sellerName" type="string(35)"
nullable="False" comment="" />
+ <property name="sellerAddr1" type="string(35)"
nullable="False" comment="" />
+ <property name="sellerAddr2" type="string(35)"
comment="" />
+ <property name="sellerAddr3" type="string(35)"
comment="" />
+ <property name="sellerTaxID" type="string(35)"
nullable="False" comment="" />
+ <!-- Who pays -->
+ <property name="buyer" type="ORG_Org"
comment="HACK" />
+ <property name="buyerName" type="string(35)"
nullable="False" comment="" />
+ <property name="buyerAddr1" type="string(35)"
nullable="False" comment="" />
+ <property name="buyerAddr2" type="string(35)"
comment="" />
+ <property name="buyerAddr3" type="string(35)"
comment="" />
+ <!-- Payment method -->
+ <property name="paymentMethod" type="BILLING_PaymentMethod"
comment="HACK" />
+ <property name="paymMethodName" type="string(35)"
nullable="False" comment="" />
+ <property name="paymMethodDays" type="number(3)"
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="dateDue" type="date"
nullable="False" comment="Date the payment is due" />
@@ -106,14 +137,6 @@
return sum([i.BILLING_valueGross for i in items])
</property>
- <!--******************************************************
- Return a string (holding the name or only an empty string)
- each time so that grid form works OK.
- *******************************************************-->
- <property name="buyerName" type="string(35)" >
- return self.buyer and self.buyer.ORG_shortName or ''
- </property>
-
<!--******************************************************************
Return a string ('REVERTED' or empty) for the invoice report to print.
This way the same report can print both normal and reverted invoices.
@@ -137,7 +160,7 @@
try:
items = find('BILLING_Item', \
- {'BILLING_head':self.gnue_id,
'BILLING_product.SALES_vat.TAX_rate':rate}, \
+ {'BILLING_head':self.gnue_id, 'BILLING_prodVAT':rate), \
[], \
[SumTypes[type]])
@@ -158,9 +181,20 @@
invOrig.BILLING_reverted = True #cannot make >1 reverted invoices
invNew = new('BILLING_Head')
- invNew.BILLING_seller = invOrig.BILLING_seller
- invNew.BILLING_buyer = invOrig.BILLING_buyer
- invNew.BILLING_paymentMethod = invOrig.BILLING_paymentMethod
+ invNew.BILLING_sellerName = invOrig.BILLING_sellerName
+ invNew.BILLING_sellerAddr1 = invOrig.BILLING_sellerAddr1
+ invNew.BILLING_sellerAddr2 = invOrig.BILLING_sellerAddr2
+ invNew.BILLING_sellerAddr3 = invOrig.BILLING_sellerAddr3
+ invNew.BILLING_sellerTaxID = invOrig.BILLING_sellerTaxID
+
+ invNew.BILLING_buyerName = invOrig.BILLING_buyerName
+ invNew.BILLING_buyerAddr1 = invOrig.BILLING_buyerAddr1
+ invNew.BILLING_buyerAddr2 = invOrig.BILLING_buyerAddr2
+ invNew.BILLING_buyerAddr3 = invOrig.BILLING_buyerAddr3
+
+ invNew.BILLING_paymMethodName = invNew.BILLING_paymMethodName
+ invNew.BILLING_paymMethodDays = invNew.BILLING_paymMethodDays
+
invNew.BILLING_dateDelivery = invOrig.BILLING_dateDelivery
invNew.BILLING_dateIssued = invOrig.BILLING_dateIssued
invNew.BILLING_dateDue = invOrig.BILLING_dateDue
@@ -172,9 +206,13 @@
for item in invItems:
itemNew = new('BILLING_Item')
itemNew.BILLING_head = invNew.gnue_id
- itemNew.BILLING_product = item.BILLING_product
itemNew.BILLING_quantity = -1 * item.BILLING_quantity
itemNew.BILLING_note = item.BILLING_note
+
+ itemNew.BILLING_product = item.BILLING_product
+ itemNew.BILLING_prodName = item.BILLING_prodName
+ itemNew.BILLING_prodDesc = item.BILLING_prodDesc
+
session.commit()
return invNew.BILLING_number
@@ -190,10 +228,9 @@
*******************************************************-->
<procedure name="calcDateDue" type="date" >
import mx.DateTime
- method = self.paymentMethod
issued = self.dateIssued
- if (method is not None) and (issued is not None):
- dateDue = issued +
mx.DateTime.RelativeDate(days=method.BILLING_dueDays)
+ if (self.paymMethodDays is not None) and (issued is not None):
+ dateDue = issued + mx.DateTime.RelativeDate(days=self.paymMethodDays)
self.dateDue = dateDue.date
return dateDue.date
else:
@@ -242,6 +279,20 @@
if self.dateDelivery is None:
self.dateDelivery = mx.DateTime.today().date
print 'BILLING_Head::OnValidate - dateDelivery set to %s' %
self.dateDelivery
+
+
+ if self.buyer:
+ self.buyerName = self.buyer.ORG_shortName
+ self.buyerAddr1 = self.buyer.ORG_address.LOC_street.LOC_formatted
+ self.buyerAddr1 += ' ' + self.buyer.ORG_address.LOC_number
+ self.buyerAddr2 = self.buyer.ORG_address.LOC_zip.LOC_formatted
+ self.buyerAddr3 =
self.buyer.ORG_address.LOC_zip.LOC_region.LOC_country.LOC_formatted
+ self.buyer = None
+
+ if self.paymentMethod:
+ self.paymMethodName = self.paymentMethod.BILLING_name
+ self.paymMethodDays = self.paymentMethod.BILLING_dueDays
+ self.paymentMethod = None
</procedure>
<!--******************
@@ -259,8 +310,11 @@
sellerList = find('BILLING_Company', {'BILLING_code': '1'}, [], [])
if sellerList:
- self.seller = sellerList[0]
- print 'BILLING_Head::OnInit - Seller is %s' % self.seller.BILLING_name
+ self.sellerName = sellerList[0].BILLING_name
+ self.sellerAddr1 = sellerList[0].BILLING_addr1
+ self.sellerAddr2 = sellerList[0].BILLING_addr2
+ self.sellerAddr3 = sellerList[0].BILLING_addr3
+ self.sellerTaxID = sellerList[0].BILLING_taxID
</procedure>
</class>
Property changes on: trunk/gnue-packages/supply-chain/billing/billing.gcd
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: trunk/gnue-packages/supply-chain/billing/billing.png
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7311 - trunk/gnue-packages/supply-chain/billing,
kilo <=