[gnue-luca] r23 - trunk/modules/finance

[reinhard]

Author: reinhard
Date: 2005-09-01 10:18:02 -0500 (Thu, 01 Sep 2005)
New Revision: 23

Modified:
   trunk/modules/finance/acc-main.gfd
   trunk/modules/finance/gl.gcd
Log:
More work on transaction entry.


Modified: trunk/modules/finance/acc-main.gfd
===================================================================
--- trunk/modules/finance/acc-main.gfd  2005-09-01 13:56:01 UTC (rev 22)
+++ trunk/modules/finance/acc-main.gfd  2005-09-01 15:18:02 UTC (rev 23)
@@ -25,21 +25,47 @@
 
 <form title="GNUe Accounting">
   <datasource
+    name="dtsPeriodDropdown"
+    connection="appserver"
+    table="gl_period"
+    prequery="Y">
+    <condition>
+      <eq><cfield name="gl_active" /><cconst value="1" /></eq>
+    </condition>
+  </datasource>
+
+  <datasource
     name="dtsDoctypeDropdown"
     connection="appserver"
     table="gl_doctype"
     prequery="Y" />
 
   <datasource
-    name="dtsPeriodDropdown"
+    name="dtsCreditDropdown"
     connection="appserver"
-    table="gl_period"
+    table="gl_account"
     prequery="Y">
     <condition>
       <eq><cfield name="gl_active" /><cconst value="1" /></eq>
     </condition>
   </datasource>
 
+  <datasource
+    name="dtsDebitDropdown"
+    connection="appserver"
+    table="gl_account"
+    prequery="Y">
+    <condition>
+      <eq><cfield name="gl_active" /><cconst value="1" /></eq>
+    </condition>
+  </datasource>
+
+  <datasource
+    name="dtsCurrencyDropdown"
+    connection="appserver"
+    table="base_currency"
+    prequery="Y" />
+
   <datasource name="dtsPeriod" connection="appserver" table="gl_period" />
   <datasource name="dtsBatch" connection="appserver" table="gl_batch"
     master="dtsPeriod" masterlink="gnue_id" detaillink="gl_period">
@@ -68,7 +94,9 @@
               blkBatchitem.lastRecord ()
               if not blkBatchitem.isEmpty ():
                 blkBatchitem.newRecord ()
-              setFocus (blkBatchitem.fldDoctype)
+              # POST-CHANGE is also called on keypress in a dropdown, thus
+              # we may not change the focus
+              # setFocus (blkBatchitem.fldDoctype)
           ]]>
         </trigger>
       </field>
@@ -82,16 +110,35 @@
       <field name="fldSerial" field="gl_serial" />
     </block>
 
-    <block name="blkBatchitem" datasource="dtsBatchitem" rows="10"
+    <block name="blkBatchitem" datasource="dtsBatchitem"
+      rows="10" rowSpacer="1"
       autoCommit="True" autoNextRecord="True">
-      <field name="fldDoctype" fk_source="dtsDoctypeDropdown" fk_key="gnue_id"
-        fk_description="gl_code" />
+      <field name="fldDoctype" field="gl_doctype"
+        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" />
+      <field name="fldCreditNumber" field="gl_credit"
+        fk_source="dtsCreditDropdown"
+        fk_key="gnue_id" fk_description="gl_number" />
+      <field name="fldCreditName" field="gl_credit"
+        fk_source="dtsCreditDropdown"
+        fk_key="gnue_id" fk_description="gl_name" />
+      <field name="fldDebitNumber" field="gl_debit"
+        fk_source="dtsDebitDropdown"
+        fk_key="gnue_id" fk_description="gl_number" />
+      <field name="fldDebitName" field="gl_debit"
+        fk_source="dtsDebitDropdown"
+        fk_key="gnue_id" fk_description="gl_name" />
+      <field name="fldCurrency" field="gl_currency"
+        fk_source="dtsCurrencyDropdown"
+        fk_key="gnue_id" fk_description="base_code" />
+      <field name="fldAmountt" field="gl_amountt" typecast="number" />
+      <field name="fldComment" field="gl_comment" />
     </block>
   </logic>
 
-  <layout xmlns:Char="GNUe:Layout:Char" Char:height="20" Char:width="80">
+  <layout xmlns:Char="GNUe:Layout:Char" Char:height="25" Char:width="100">
     <page name="page">
       <label text="Period:"
         Char:height="1" Char:width="7" Char:x="1" Char:y="1" />
@@ -107,16 +154,42 @@
       <label text="Document:"
         Char:height="1" Char:width="9" Char:x="1" Char:y="3" />
       <label text="Date:"
-        Char:height="1" Char:width="5" Char:x="28" Char:y="3" />
+        Char:height="1" Char:width="5" Char:x="19" Char:y="3" />
+      <label text="Credit:"
+        Char:height="1" Char:width="7" Char:x="29" Char:y="3" />
+      <label text="Debit:"
+        Char:height="1" Char:width="6" Char:x="59" Char:y="3" />
+
       <entry name="entDoctype"
         Char:height="1" Char:width="8" Char:x="1" Char:y="4"
         block="blkBatchitem" field="fldDoctype" style="dropdown" />
       <entry name="entNumber"
-        Char:height="1" Char:width="17" Char:x="10" Char:y="4"
+        Char:height="1" Char:width="10" Char:x="9" Char:y="4"
         block="blkBatchitem" field="fldNumber" />
       <entry name="entDate"
-        Char:height="1" Char:width="10" Char:x="28" Char:y="4"
+        Char:height="1" Char:width="10" Char:x="19" Char:y="4"
         block="blkBatchitem" field="fldDate" displaymask="%x" inputmask="%x"/>
+      <entry name="entCreditNumber"
+        Char:height="1" Char:width="10" Char:x="29" Char:y="4"
+        block="blkBatchitem" field="fldCreditNumber" style="dropdown" />
+      <entry name="entCreditName"
+        Char:height="1" Char:width="15" Char:x="39" Char:y="4"
+        block="blkBatchitem" field="fldCreditName" style="dropdown" />
+      <entry name="entDebitNumber"
+        Char:height="1" Char:width="10" Char:x="54" Char:y="4"
+        block="blkBatchitem" field="fldDebitNumber" style="dropdown" />
+      <entry name="entDebitName"
+        Char:height="1" Char:width="15" Char:x="64" Char:y="4"
+        block="blkBatchitem" field="fldDebitName" style="dropdown" />
+      <entry name="entCurrency"
+        Char:height="1" Char:width="8" Char:x="79" Char:y="4"
+        block="blkBatchitem" field="fldCurrency" style="dropdown" />
+      <entry name="entAmountt"
+        Char:height="1" Char:width="12" Char:x="87" Char:y="4"
+        block="blkBatchitem" field="fldAmountt" />
+      <entry name="entComment"
+        Char:height="1" Char:width="70" Char:x="29" Char:y="5"
+        block="blkBatchitem" field="fldComment" />
     </page>
   </layout>
 </form>

Modified: trunk/modules/finance/gl.gcd
===================================================================
--- trunk/modules/finance/gl.gcd        2005-09-01 13:56:01 UTC (rev 22)
+++ trunk/modules/finance/gl.gcd        2005-09-01 15:18:02 UTC (rev 23)
@@ -284,7 +284,10 @@
     <property name="number"   type="string(17)"    comment="Document number" />
     <property name="date"     type="date"          comment="Document date" />
     <property name="currency" type="base_currency" nullable="False" />
-    <property name="last"     type="number(6)"     comment="Last entry serial" 
/>
+    <property name="credit"   type="gl_account"    />
+    <property name="debit"    type="gl_account"    />
+    <property name="amountt"  type="number(14,2)"  />
+    <property name="comment"  type="string(70)"    />
     <procedure name="OnInit">
       <![CDATA[
         self.currency = (find ('base_parameters') [0]).base_currency
@@ -295,7 +298,6 @@
         if not self.serial:
           self.batch.last += 1
           self.serial = self.batch.last
-        self.last = 0
       ]]>
     </procedure>
   </class>