r6 - trunk/finance

[reinhard]

Author: reinhard
Date: 2004-10-25 11:14:06 -0500 (Mon, 25 Oct 2004)
New Revision: 6

Added:
   trunk/finance/gl-C.gld
Modified:
   trunk/finance/gl.gcd
Log:
Restructured using gl_year as filter.


Added: trunk/finance/gl-C.gld
===================================================================
--- trunk/finance/gl-C.gld      2004-10-25 15:47:16 UTC (rev 5)
+++ trunk/finance/gl-C.gld      2004-10-25 16:14:06 UTC (rev 6)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- General Ledger Module
+
+     Copyright 2004 Free Software Foundation
+
+     This file is part of GNU Enterprise.
+
+     GNU Enterprise is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of
+     the License, or (at your option) any later version.
+
+     GNU Enterprise is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNU Enterprise; see the file COPYING.  If not, write to
+     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+     $Id: gl.gcd 6208 2004-08-25 16:49:04Z reinhard $ -->
+
+<module name="gl" language="C">
+  <class name="year">
+    <property name="name"     pos="100" label="Fiscal year" search="100" />
+    <property name="start"    pos="200" label="Start date" />
+    <property name="end"      pos="300" label="End date" />
+    <property name="previous" pos="400" label="Previous year" />
+    <property name="active"   pos="500" label="Active" />
+    <property name="last"     pos="600" label="Last journal number" />
+  </class>
+
+  <class name="account">
+    <property name="number"   pos="100" label="Account number" search="100" />
+    <property name="name"     pos="200" label="Name" />
+    <property name="active"   pos="300" label="Active" />
+    <property name="currency" pos="400" label="Currency" />
+  </class>
+
+  <class name="doctype">
+    <property name="code"    pos="100" label="Code" />
+    <property name="name"    pos="200" label="Name" />
+    <property name="account" pos="300" label="Account" />
+  </class>
+</module>

Modified: trunk/finance/gl.gcd
===================================================================
--- trunk/finance/gl.gcd        2004-10-25 15:47:16 UTC (rev 5)
+++ trunk/finance/gl.gcd        2004-10-25 16:14:06 UTC (rev 6)
@@ -24,7 +24,7 @@
      $Id: gl.gcd 6208 2004-08-25 16:49:04Z reinhard $ -->
 
 <module name="gl" comment="General Ledger">
-  <class name="year" comment="Fiscal year">
+  <class name="year" filter="base_company" comment="Fiscal year">
     <property name="name"     type="string(17)" nullable="False" />
     <property name="start"    type="date"       nullable="False" />
     <property name="end"      type="date"       nullable="False" />
@@ -50,8 +50,7 @@
     </procedure>
   </class>
 
-  <class name="period" comment="Accouning period">
-    <property name="year"   type="gl_year"    nullable="False" />
+  <class name="period" filter="gl_year" comment="Accouning period">
     <property name="name"   type="string(17)" nullable="False" />
     <property name="start"  type="date"       nullable="False" />
     <property name="end"    type="date"       nullable="False" />
@@ -73,8 +72,7 @@
     </procedure>
   </class>
 
-  <class name="account" comment="General Ledger Account">
-    <property name="year"     type="gl_year"       nullable="False" />
+  <class name="account" filter="gl_year" comment="General Ledger Account">
     <property name="number"   type="string(17)"    nullable="False" />
     <property name="name"     type="string(35)"    />
     <property name="active"   type="boolean"       nullable="False" />
@@ -86,16 +84,14 @@
     </procedure>
   </class>
 
-  <class name="doctype" comment="Document type">
+  <class name="doctype" filter="gl_year" comment="Document type">
     <property name="code"    type="string(8)"  nullable="False" />
     <property name="name"    type="string(35)" />
     <!-- This account will be used automatically, e.g. bank account -->
-    <!-- Problem: the accounts are per year, this class is general... -->
-    <!-- Maybe have this class per year, too? -->
     <property name="account" type="gl_account" />
   </class>
 
-  <class name="journal" comment="General Ledger Journal">
+  <class name="journal" filter="gl_year" comment="General Ledger Journal">
     <property name="period"   type="gl_period" nullable="False" />
     <property name="serial"   type="number(6)" nullable="False" />
     <property name="last"     type="number(6)" comment="Last transact serial" 
/>
@@ -131,7 +127,7 @@
     </procedure>
   </class>
 
-  <class name="trans" comment="General Ledger Transaction">
+  <class name="trans" filter="gl_year" comment="General Ledger Transaction">
     <property name="journal"  type="gl_journal"    nullable="False" />
     <property name="serial"   type="number(6)"     comment="Pos. in journal" />
     <property name="source"   type="gl_doctype"    comment="Document type" />
@@ -165,7 +161,7 @@
     </procedure>
   </class>
 
-  <class name="entry" comment="General Ledger Entry">
+  <class name="entry" filter="gl_year" 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" />