[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6208 - in trunk/gnue-packages: base finance
From: |
reinhard |
Subject: |
r6208 - in trunk/gnue-packages: base finance |
Date: |
Wed, 25 Aug 2004 11:49:05 -0500 (CDT) |
Author: reinhard
Date: 2004-08-25 11:49:04 -0500 (Wed, 25 Aug 2004)
New Revision: 6208
Modified:
trunk/gnue-packages/base/base-C.gld
trunk/gnue-packages/base/base-de.gld
trunk/gnue-packages/base/base.gcd
trunk/gnue-packages/finance/gl.gcd
Log:
After thinking it over again, forget about the currency dependent format
string.
Modified: trunk/gnue-packages/base/base-C.gld
===================================================================
--- trunk/gnue-packages/base/base-C.gld 2004-08-25 14:13:44 UTC (rev 6207)
+++ trunk/gnue-packages/base/base-C.gld 2004-08-25 16:49:04 UTC (rev 6208)
@@ -28,7 +28,6 @@
<property name="code" pos="100" label="Code" search="100" />
<property name="symbol" pos="200" label="Symbol" search="200" />
<property name="name" pos="300" label="Name" search="300" />
- <property name="formatstr" pos="400" label="Format String" />
<property name="roundunit" pos="500" label="Rounding Unit" />
<property name="convbase" pos="600" label="Conversion amount in base
currency" />
<property name="convthis" pos="601" label="Conversion amount in this
currency" />
Modified: trunk/gnue-packages/base/base-de.gld
===================================================================
--- trunk/gnue-packages/base/base-de.gld 2004-08-25 14:13:44 UTC (rev
6207)
+++ trunk/gnue-packages/base/base-de.gld 2004-08-25 16:49:04 UTC (rev
6208)
@@ -28,7 +28,6 @@
<property name="code" pos="100" label="Code" search="100" />
<property name="symbol" pos="200" label="Symbol" search="200" />
<property name="name" pos="300" label="Name" search="300" />
- <property name="formatstr" pos="400" label="Format" />
<property name="roundunit" pos="500" label="Rundungseinheit" />
<property name="convbase" pos="600" label="Konvertierungsbetrag
Basisw�hrung" />
<property name="convthis" pos="601" label="Konvertierungsbetrag diese
W�hrung" />
Modified: trunk/gnue-packages/base/base.gcd
===================================================================
--- trunk/gnue-packages/base/base.gcd 2004-08-25 14:13:44 UTC (rev 6207)
+++ trunk/gnue-packages/base/base.gcd 2004-08-25 16:49:04 UTC (rev 6208)
@@ -29,20 +29,18 @@
<property name="code" type="string(8)" />
<property name="symbol" type="string(8)" />
<property name="name" type="string(35)" />
- <!-- Format string - currently not in use because forms can't handle it -->
- <property name="formatstr" type="string(35)" />
- <property name="roundunit" type="number(15)" />
+ <property name="roundunit" type="number(14,2)" />
<!-- Conversion factors to base currency -->
- <!-- Example: convbase = 100, convthis = 1376 means 100 units of base
- currency are 1376 units of this currency -->
- <property name="convbase" type="number(15)" />
- <property name="convthis" type="number(15)" />
+ <!-- Example: convbase = 100, convthis = 1376.03 means 100 units of base
+ currency are 1376.03 units of this currency -->
+ <property name="convbase" type="number(14,2)" />
+ <property name="convthis" type="number(14,2)" />
- <procedure name="round" type="number(15)">
- <parameter name="amount" type="number(15)" />
+ <procedure name="round" type="number(14,2)">
+ <parameter name="amount" type="number(14,2)" />
<![CDATA[
# Round given amount
- ru = self.roundunit or 1
+ ru = self.roundunit or 0.01
if amount < 0:
x = amount - ru / 2
else:
@@ -51,8 +49,8 @@
]]>
</procedure>
- <procedure name="convfrom" type="number(15)">
- <parameter name="amount" type="number(15)" />
+ <procedure name="convfrom" type="number(14,2)">
+ <parameter name="amount" type="number(14,2)" />
<![CDATA[
# Convert amount given in this currency to base currency
cb = self.convbase or 1
@@ -68,8 +66,8 @@
]]>
</procedure>
- <procedure name="convto" type="number(15)">
- <parameter name="amount" type="number(15)" />
+ <procedure name="convto" type="number(14,2)">
+ <parameter name="amount" type="number(14,2)" />
<![CDATA[
# Convert amount given in base currency to this currency
cb = self.convbase or 1
Modified: trunk/gnue-packages/finance/gl.gcd
===================================================================
--- trunk/gnue-packages/finance/gl.gcd 2004-08-25 14:13:44 UTC (rev 6207)
+++ trunk/gnue-packages/finance/gl.gcd 2004-08-25 16:49:04 UTC (rev 6208)
@@ -166,14 +166,14 @@
</class>
<class name="entry" comment="General Ledger Entry">
- <property name="trans" type="gl_trans" nullable="False" />
- <property name="serial" type="number(6)" comment="Pos. in transaction" />
- <property name="account" type="gl_account" nullable="False" />
- <property name="credit" type="boolean" nullable="False" />
- <property name="amountt" type="number(15)" comment="in transact currency"
/>
- <property name="amounta" type="number(15)" comment="in account currency" />
- <property name="amountb" type="number(15)" comment="in base currency" />
- <property name="comment" type="string(70)" />
+ <property name="trans" type="gl_trans" nullable="False" />
+ <property name="serial" type="number(6)" comment="Pos. in transaction"
/>
+ <property name="account" type="gl_account" nullable="False" />
+ <property name="credit" type="boolean" nullable="False" />
+ <property name="amountt" type="number(14,2)" comment="in transact
currency" />
+ <property name="amounta" type="number(14,2)" comment="in account currency"
/>
+ <property name="amountb" type="number(14,2)" comment="in base currency" />
+ <property name="comment" type="string(70)" />
<procedure name="OnValidate">
<![CDATA[
# Find out whether the entry is valid
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6208 - in trunk/gnue-packages: base finance,
reinhard <=