[gnue-luca] r18 - trunk/finance

[reinhard]

Author: reinhard
Date: 2005-02-09 12:34:12 -0600 (Wed, 09 Feb 2005)
New Revision: 18

Modified:
   trunk/finance/acc-main.gfd
   trunk/finance/gl.gcd
Log:
Adapted to new releases of forms and appserver


Modified: trunk/finance/acc-main.gfd
===================================================================
--- trunk/finance/acc-main.gfd  2005-01-06 17:55:34 UTC (rev 17)
+++ trunk/finance/acc-main.gfd  2005-02-09 18:34:12 UTC (rev 18)
@@ -25,17 +25,18 @@
 
 <form title="GNUe Accounting">
   <datasource
-    name="dtsDoctype"
+    name="dtsDoctypeDropdown"
     connection="appserver"
     table="gl_doctype"
     prequery="Y" />
 
   <datasource
-    name="dtsPeriod"
+    name="dtsPeriodDropdown"
     connection="appserver"
     table="gl_period"
     prequery="Y" />
 
+  <datasource name="dtsPeriod" connection="appserver" table="gl_period" />
   <datasource name="dtsJournal" connection="appserver" table="gl_journal"
     master="dtsPeriod" masterlink="gnue_id" detaillink="gl_period">
     <condition>
@@ -44,25 +45,34 @@
   </datasource>
 
   <datasource name="dtsTrans" connection="appserver" table="gl_trans"
-    order_by="gl_serial"
-    master="dtsJournal" masterlink="gnue_id" detaillink="gl_journal" />
+    master="dtsJournal" masterlink="gnue_id" detaillink="gl_journal">
+    <sortorder>
+      <sortfield name="gl_serial" />
+    </sortorder>
+  </datasource>
 
   <datasource name="dtsEntry" connection="appserver" table="gl_entry"
-    order_by="gl_serial"
-    master="dtsTrans" masterlink="gnue_id" detaillink="gl_trans" />
+    master="dtsTrans" masterlink="gnue_id" detaillink="gl_trans">
+    <sortorder>
+      <sortfield name="gl_serial" />
+    </sortorder>
+  </datasource>
 
   <logic>
     <block name="blk">
-      <field name="fldPeriod" fk_source="dtsPeriod" fk_key="gnue_id"
+      <field name="fldPeriod" fk_source="dtsPeriodDropdown" fk_key="gnue_id"
         fk_description="gl_name">
         <trigger type="POST-CHANGE">
           <![CDATA[
-            # FIXME: This should not be necessary.
+            # FIXME: This is necessary because a dropdown-source (without
+            # block) cannot be a master.
             dtsPeriod.createResultSet ({'gnue_id': blk.fldPeriod.get()})
+            print blkPeriod.isEmpty ()
             # Most of the time, the user will want to continue to enter
             # transactions at the end of the journal
             blkTrans.lastRecord ()
-            blkTrans.newRecord ()
+            if not blkTrans.isEmpty ():
+              blkTrans.newRecord ()
           ]]>
         </trigger>
       </field>
@@ -75,8 +85,8 @@
     </block>
 
     <block name="blkTrans" datasource="dtsTrans" rows="10"
-      autoNextRecord="True">
-      <field name="fldDoctype" fk_source="dtsDoctype" fk_key="gnue_id"
+      autoCommit="True" autoNextRecord="True">
+      <field name="fldDoctype" fk_source="dtsDoctypeDropdown" fk_key="gnue_id"
         fk_description="gl_code" />
       <field name="fldNumber" field="gl_number" typecast="number" />
       <field name="fldDate" field="gl_date" typecast="date" />

Modified: trunk/finance/gl.gcd
===================================================================
--- trunk/finance/gl.gcd        2005-01-06 17:55:34 UTC (rev 17)
+++ trunk/finance/gl.gcd        2005-02-09 18:34:12 UTC (rev 18)
@@ -150,14 +150,18 @@
         self.posted = mx.DateTime.now () # Should probably be a parameter
       ]]>
     </procedure>
+    <procedure name="OnInit">
+      <![CDATA[
+        self.last = 0
+      ]]>
+    </procedure>
     <procedure name="OnValidate">
       <![CDATA[
         if not self.period.active:
-          abort (message (periodInactive))
+          abort (message ('periodInactive'))
         if not self.serial:
           self.period.year.last += 1
           self.serial = self.period.year.last
-        self.last = 0
       ]]>
     </procedure>
   </class>
@@ -185,7 +189,7 @@
     </property>
     <procedure name="OnInit">
       <![CDATA[
-        self.currency = self.gl_year.base_company.base_currency
+        self.currency = (find ('base_parameters') [0]).base_currency
       ]]>
     </procedure>
     <procedure name="OnValidate">