r8 - trunk/base

[reinhard]

Author: reinhard
Date: 2004-11-05 13:31:00 -0600 (Fri, 05 Nov 2004)
New Revision: 8

Modified:
   trunk/base/base-C.gld
   trunk/base/base-de.gld
   trunk/base/base.gcd
   trunk/base/currcalc.gfd
Log:
Some updates.


Modified: trunk/base/base-C.gld
===================================================================
--- trunk/base/base-C.gld       2004-10-25 16:29:07 UTC (rev 7)
+++ trunk/base/base-C.gld       2004-11-05 19:31:00 UTC (rev 8)
@@ -24,17 +24,17 @@
      $Id: base-C.gld 6262 2004-09-07 11:45:09Z reinhard $ -->
 
 <module name="base" language="C">
-  <class name="company">
-    <property name="code" pos="100" label="Company Code" search="100" />
-    <property name="name" pos="200" label="Company Name" search="200" />
+  <class name="company" label="Company">
+    <property name="code"     pos="100" label="Code"          search="100" />
+    <property name="name"     pos="200" label="Name"          search="200" />
+    <property name="currency" pos="300" label="Base currency" />
   </class>
 
-  <class name="currency">
+  <class name="currency" label="Currency">
     <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="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" />
+    <property name="name"      pos="200" label="Name"   search="200" />
+    <property name="roundunit" pos="300" label="Rounding Unit" />
+    <property name="convbase"  pos="400" label="Conversion amount in base 
currency" />
+    <property name="convthis"  pos="401" label="Conversion amount in this 
currency" />
   </class>
 </module>

Modified: trunk/base/base-de.gld
===================================================================
--- trunk/base/base-de.gld      2004-10-25 16:29:07 UTC (rev 7)
+++ trunk/base/base-de.gld      2004-11-05 19:31:00 UTC (rev 8)
@@ -24,17 +24,17 @@
      $Id: base-de.gld 6262 2004-09-07 11:45:09Z reinhard $ -->
 
 <module name="base" language="de">
-  <class name="company">
-    <property name="code" pos="100" label="Firmenk�rzel" search="100" />
-    <property name="name" pos="200" label="Firmenname"   search="200" />
+  <class name="company" label="Firma">
+    <property name="code"     pos="100" label="Code"         search="100" />
+    <property name="name"     pos="200" label="Name"         search="200" />
+    <property name="currency" pos="300" label="Basisw�hrung" />
   </class>
 
-  <class name="currency">
+  <class name="currency" label="W�hrung">
     <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="roundunit" pos="500" label="Rundungseinheit" />
-    <property name="convbase"  pos="600" label="Konvertierungsbetrag 
Basisw�hrung" />
-    <property name="convthis"  pos="601" label="Konvertierungsbetrag diese 
W�hrung" />
+    <property name="name"      pos="200" label="Name"   search="200" />
+    <property name="roundunit" pos="300" label="Rundungseinheit" />
+    <property name="convbase"  pos="400" label="Konvertierungsbetrag 
Basisw�hrung" />
+    <property name="convthis"  pos="401" label="Konvertierungsbetrag diese 
W�hrung" />
   </class>
 </module>

Modified: trunk/base/base.gcd
===================================================================
--- trunk/base/base.gcd 2004-10-25 16:29:07 UTC (rev 7)
+++ trunk/base/base.gcd 2004-11-05 19:31:00 UTC (rev 8)
@@ -25,14 +25,13 @@
 
 <module name="base" comment="Basic classes">
   <class name="company">
-    <property name="code" type="string(8)" />
-    <property name="name" type="string(35)" />
+    <property name="code"     type="string(8)" />
+    <property name="name"     type="string(35)" />
+    <property name="currency" type="base_currency" comment="base currency" />
   </class>
 
   <class name="currency" filter="base_company">
-    <!-- For the base currency, code is None -->
     <property name="code"      type="string(8)" />
-    <property name="symbol"    type="string(8)" />
     <property name="name"      type="string(35)" />
     <property name="roundunit" type="number(14,2)" />
     <!-- Conversion factors to base currency -->
@@ -60,14 +59,11 @@
         # Convert amount given in this currency to base currency
         cb = self.convbase or 1
         ct = self.convthis or 1
-        # baselist = find ('currency', {'code': None})
-        # if length (base) == 1:
-        #   for base in baselist:
-        #     break
-        #   return base.round (amount * cb / ct)
-        # else:
+        base = self.company.currency
+        if not base:
           # Emergency - Base currency not defined
-        return self.round (amount = amount * cb / ct)
+          base = self
+        return base.round (amount = amount * cb / ct)
       ]]>
     </procedure>
 

Modified: trunk/base/currcalc.gfd
===================================================================
--- trunk/base/currcalc.gfd     2004-10-25 16:29:07 UTC (rev 7)
+++ trunk/base/currcalc.gfd     2004-11-05 19:31:00 UTC (rev 8)
@@ -36,11 +36,11 @@
     prequery="Y" />
   <logic>
     <block name="blk">
-      <field name="fldFromSymbol" fk_source="dtsFromCurrency" fk_key="gnue_id"
-        fk_description="base_symbol" />
+      <field name="fldFromCode" fk_source="dtsFromCurrency" fk_key="gnue_id"
+        fk_description="base_code" />
       <field name="fldFromAmount" />
-      <field name="fldToSymbol" fk_source="dtsToCurrency" fk_key="gnue_id"
-        fk_description="base_symbol" />
+      <field name="fldToCode" fk_source="dtsToCurrency" fk_key="gnue_id"
+        fk_description="base_code" />
       <field name="fldToAmount" />
     </block>
     <block name="blkFromCurrency" datasource="dtsFromCurrency" />
@@ -48,17 +48,17 @@
   </logic>
   <layout xmlns:Char="GNUe:Layout:Char" Char:height="4" Char:width="37">
     <page name="page">
-      <entry name="entFromSymbol"
+      <entry name="entFromCode"
         Char:height="1" Char:width="8" Char:x="1" Char:y="1"
-        block="blk" field="fldFromSymbol" style="dropdown" />
+        block="blk" field="fldFromCode" style="dropdown" />
       <entry name="entFromAmount"
         Char:height="1" Char:width="8" Char:x="9" Char:y="1"
         block="blk" field="fldFromAmount" />
       <label text="="
         Char:height="1" Char:width="1" Char:x="18" Char:y="1" />
-      <entry name="entToSymbol"
+      <entry name="entToCode"
         Char:height="1" Char:width="8" Char:x="20" Char:y="1"
-        block="blk" field="fldToSymbol" style="dropdown" />
+        block="blk" field="fldToCode" style="dropdown" />
       <entry name="entToAmount"
         Char:height="1" Char:width="8" Char:x="28" Char:y="1"
         block="blk" field="fldToAmount"/>
@@ -67,12 +67,12 @@
         label="Calculate">
         <trigger name="trigger" type="ON-ACTION">
           # FIXME: should not have to manually navigate to current record...
-          dtsFromCurrency.createResultSet ({'gnue_id': 
blk.fldFromSymbol.get()})
-          dtsToCurrency.createResultSet ({'gnue_id': blk.fldToSymbol.get ()})
+          dtsFromCurrency.createResultSet ({'gnue_id': blk.fldFromCode.get()})
+          dtsToCurrency.createResultSet ({'gnue_id': blk.fldToCode.get ()})
 
           f = int (blk.fldFromAmount.get ())
-          b = dtsFromCurrency.call ('base_convfrom', {'amount': f})
-          t = dtsToCurrency.call ('base_convto', {'amount': b})
+          b = blkFromCurrency.call ('base_convfrom', {'amount': f})
+          t = blkToCurrency.call ('base_convto', {'amount': b})
           blk.fldToAmount.set (t)
         </trigger>
       </button>