[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnue-config accounting/acct/classes/acct.g...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue/gnue-config accounting/acct/classes/acct.g... |
|
Date: |
Sun, 16 Sep 2001 05:27:43 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Reinhard Mueller <address@hidden> 01/09/16 05:27:42
Modified files:
gnue-config/accounting/acct/classes: acct.gcd
gnue-config/accounting/ar/classes: invoice.gcd
gnue-config/accounting/gl/classes: gl.gcd gl_post.gcd
gnue-config/base/currency/classes: currency.gcd
gnue-config/base/org/classes: org.gcd
gnue-config/base/parameter/classes: parameter.gcd
gnue-config/base/units/classes: units.gcd
gnue-config/sales/sales-order/classes: sales-order.gcd
gnue-config/supply-chain/purchasing/classes: purchasing.gcd
Log message:
Changed the order of class definitions, and removed some redundant
backward pointers
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/accounting/acct/classes/acct.gcd.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/accounting/ar/classes/invoice.gcd.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/accounting/gl/classes/gl.gcd.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/accounting/gl/classes/gl_post.gcd.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/base/currency/classes/currency.gcd.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/base/org/classes/org.gcd.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/base/parameter/classes/parameter.gcd.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/base/units/classes/units.gcd.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/sales/sales-order/classes/sales-order.gcd.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: gnue/gnue-config/accounting/acct/classes/acct.gcd
diff -u gnue/gnue-config/accounting/acct/classes/acct.gcd:1.3
gnue/gnue-config/accounting/acct/classes/acct.gcd:1.4
--- gnue/gnue-config/accounting/acct/classes/acct.gcd:1.3 Sun Sep 2
18:29:04 2001
+++ gnue/gnue-config/accounting/acct/classes/acct.gcd Sun Sep 16 05:27:42 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Id: acct.gcd,v 1.3 2001/09/02 22:29:04 ntiffin Exp $
+# $Id: acct.gcd,v 1.4 2001/09/16 09:27:42 reinhard Exp $
#
module acct
@@ -38,7 +38,7 @@
char name<64> not null; # name of the parameter
char value<255> not null; # value of the paramter
- unique index (module, class, name);
+ unique index (mod_name, clas_name, name);
};
};
Index: gnue/gnue-config/accounting/ar/classes/invoice.gcd
diff -u gnue/gnue-config/accounting/ar/classes/invoice.gcd:1.13
gnue/gnue-config/accounting/ar/classes/invoice.gcd:1.14
--- gnue/gnue-config/accounting/ar/classes/invoice.gcd:1.13 Sun Aug 26
23:02:24 2001
+++ gnue/gnue-config/accounting/ar/classes/invoice.gcd Sun Sep 16 05:27:42 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Id: invoice.gcd,v 1.13 2001/08/27 03:02:24 ntiffin Exp $
+# $Id: invoice.gcd,v 1.14 2001/09/16 09:27:42 reinhard Exp $
#
include "../../../base/person/classes/person.gcd"
@@ -31,7 +31,15 @@
module ar
{
-
+ # -------------------------------------------------------------------------
+ # the invoice detail
+ # -------------------------------------------------------------------------
+ class detail
+ {
+ org::detail det;
+ # ar::header *header; # redundant
+ };
+
# -------------------------------------------------------------------------
# document the receipt of cash
# -------------------------------------------------------------------------
@@ -41,7 +49,7 @@
date effective_date; # date for calculating terms
currency::money amount; # amount received
char note<250>;
- ar::header *invoice;
+ # ar::header *invoice; # redundant
char document_number<15>; # reference to customer
# document used for payment
char who<15>; # who processed the receipt
@@ -55,7 +63,7 @@
date date not null;
currency::money amount not null;
char note<250> not null; # reason for adjustment
- ar::header *invoice;
+ # ar::header *invoice; # redundant
char who<15>; # who processed the adjustment
};
@@ -77,15 +85,6 @@
ar::adjustment [] adjustment;
char initial_setup(char force);
- };
-
- # -------------------------------------------------------------------------
- # the invoice detail
- # -------------------------------------------------------------------------
- class detail
- {
- org::detail det;
- ar::header *header;
};
# -------------------------------------------------------------------------
Index: gnue/gnue-config/accounting/gl/classes/gl.gcd
diff -u gnue/gnue-config/accounting/gl/classes/gl.gcd:1.7
gnue/gnue-config/accounting/gl/classes/gl.gcd:1.8
--- gnue/gnue-config/accounting/gl/classes/gl.gcd:1.7 Fri Sep 14 18:20:57 2001
+++ gnue/gnue-config/accounting/gl/classes/gl.gcd Sun Sep 16 05:27:42 2001
@@ -22,11 +22,21 @@
#
# This file is for discussion only.
#
-# $Id: gl.gcd,v 1.7 2001/09/14 22:20:57 ntiffin Exp $
+# $Id: gl.gcd,v 1.8 2001/09/16 09:27:42 reinhard Exp $
module gl
{
# -----------------------------------------------------------
+ # Accounting period
+ # -----------------------------------------------------------
+ class period
+ {
+ date start; # start date of this period
+ date end; # end date of this period
+ boolean open; # if true then can post
+ };
+
+ # -----------------------------------------------------------
# Fiscal year
# -----------------------------------------------------------
class year
@@ -40,16 +50,6 @@
};
# -----------------------------------------------------------
- # Accounting period
- # -----------------------------------------------------------
- class period
- {
- date start; # start date of this period
- date end; # end date of this period
- boolean open; # if true then can post
- };
-
- # -----------------------------------------------------------
# General Ledger Account
# -----------------------------------------------------------
class account
@@ -66,17 +66,20 @@
};
# -----------------------------------------------------------
- # Journal - a set of transactions that can be posted at once
- # and not be changed after posting
+ # Entry - a single line of a transaction
# -----------------------------------------------------------
- class journal
+ class entry
{
- gl::trans []transactions; # transactions in this journal
- gl::year *year; # financial year
- char user<20>; # posted by user
- date created; # creation date
- date posted; # posted date
- # void post(); # method to post the journal
+ int serial; # serial number within the
+ # transaction
+ gl::account *account; # g/l account
+ currency::money trans; # amount / transaction currency
+ currency::money acc; # amount / account currency
+ currency::money base; # amount / base currency
+ char text<70>; # note
+ int sum; # 0 = there is no sum
+ # 1 = this is the detail
+ # 2 = this is the sum
};
# -----------------------------------------------------------
@@ -104,19 +107,16 @@
};
# -----------------------------------------------------------
- # Entry - a single line of a transaction
+ # Journal - a set of transactions that can be posted at once
+ # and not be changed after posting
# -----------------------------------------------------------
- class entry
+ class journal
{
- int serial; # serial number within the
- # transaction
- gl::account *account; # g/l account
- currency::money trans; # amount / transaction currency
- currency::money acc; # amount / account currency
- currency::money base; # amount / base currency
- char text<70>; # note
- int sum; # 0 = there is no sum
- # 1 = this is the detail
- # 2 = this is the sum
+ gl::trans []transactions; # transactions in this journal
+ gl::year *year; # financial year
+ char user<20>; # posted by user
+ date created; # creation date
+ date posted; # posted date
+ # void post(); # method to post the journal
};
};
Index: gnue/gnue-config/accounting/gl/classes/gl_post.gcd
diff -u gnue/gnue-config/accounting/gl/classes/gl_post.gcd:1.8
gnue/gnue-config/accounting/gl/classes/gl_post.gcd:1.9
--- gnue/gnue-config/accounting/gl/classes/gl_post.gcd:1.8 Fri Sep 14
18:20:57 2001
+++ gnue/gnue-config/accounting/gl/classes/gl_post.gcd Sun Sep 16 05:27:42 2001
@@ -24,7 +24,7 @@
# Based on concepts and documents from Louis Charbonneau and
# Stanley A. Klein.
#
-# $Id: gl_post.gcd,v 1.8 2001/09/14 22:20:57 ntiffin Exp $
+# $Id: gl_post.gcd,v 1.9 2001/09/16 09:27:42 reinhard Exp $
#
include "../../../base/currency/classes/currency.gcd"
@@ -178,7 +178,8 @@
currency::money frgn_amnt; # Transaction Foreign Amount
# Transaction Foreign Amount
- gl_post::gen_jour_det *detail; # pointer to detail if exists
+ # gl_post::gen_jour_det *detail; # pointer to detail if exists
+ # TODO: must be resolved
};
Index: gnue/gnue-config/base/currency/classes/currency.gcd
diff -u gnue/gnue-config/base/currency/classes/currency.gcd:1.17
gnue/gnue-config/base/currency/classes/currency.gcd:1.18
--- gnue/gnue-config/base/currency/classes/currency.gcd:1.17 Sun Aug 26
23:02:24 2001
+++ gnue/gnue-config/base/currency/classes/currency.gcd Sun Sep 16 05:27:42 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.17 $ $Date: 2001/08/27 03:02:24 $ $Author: ntiffin $
+# $Revision: 1.18 $ $Date: 2001/09/16 09:27:42 $ $Author: reinhard $
#
# ===========================================================================
@@ -51,9 +51,9 @@
# for example if amount = 456192
int16 num_decimals = 2; # and num_decimals = 3
# then amount really has a value of 456.192
- char currency<8>;
-
- REFERENCE currency_reference : currency::currency( code ) = this.currency;
+ currency::currency *currency;
+# char currency<8>;
+# REFERENCE currency_reference : currency::currency( code ) = this.currency;
# select the system configured default currency
#INITIALISE code = currency_reference(code =
Index: gnue/gnue-config/base/org/classes/org.gcd
diff -u gnue/gnue-config/base/org/classes/org.gcd:1.9
gnue/gnue-config/base/org/classes/org.gcd:1.10
--- gnue/gnue-config/base/org/classes/org.gcd:1.9 Fri Sep 14 18:20:58 2001
+++ gnue/gnue-config/base/org/classes/org.gcd Sun Sep 16 05:27:42 2001
@@ -22,19 +22,19 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.9 $ $Date: 2001/09/14 22:20:58 $ $Author: ntiffin $
+# $Revision: 1.10 $ $Date: 2001/09/16 09:27:42 $ $Author: reinhard $
#
include "../../../base/person/classes/person.gcd"
include "../../../base/location/classes/address.gcd"
include "../../../base/units/classes/units.gcd"
include "../../../base/currency/classes/currency.gcd"
-module org
+public module org
{
# -------------------------------------------------------------------------
# base class for instantiating person as a contact and defining a type.
# -------------------------------------------------------------------------
- class contact
+ public class contact
{
person::person name;
char code<8>; # type of contact
Index: gnue/gnue-config/base/parameter/classes/parameter.gcd
diff -u gnue/gnue-config/base/parameter/classes/parameter.gcd:1.5
gnue/gnue-config/base/parameter/classes/parameter.gcd:1.6
--- gnue/gnue-config/base/parameter/classes/parameter.gcd:1.5 Thu Aug 23
09:44:08 2001
+++ gnue/gnue-config/base/parameter/classes/parameter.gcd Sun Sep 16
05:27:42 2001
@@ -23,7 +23,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.5 $ $Date: 2001/08/23 13:44:08 $ $Author: ntiffin $
+# $Revision: 1.6 $ $Date: 2001/09/16 09:27:42 $ $Author: reinhard $
#
module base
@@ -42,6 +42,6 @@
date modified;
char modified_by<64>; # user name that modified parameter
- unique index (module, class, name);
+ unique index (mod_name, clas_name, name);
};
};
Index: gnue/gnue-config/base/units/classes/units.gcd
diff -u gnue/gnue-config/base/units/classes/units.gcd:1.20
gnue/gnue-config/base/units/classes/units.gcd:1.21
--- gnue/gnue-config/base/units/classes/units.gcd:1.20 Fri Sep 14 18:20:58 2001
+++ gnue/gnue-config/base/units/classes/units.gcd Sun Sep 16 05:27:42 2001
@@ -22,15 +22,15 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.20 $ $Date: 2001/09/14 22:20:58 $ $Author: ntiffin $
+# $Revision: 1.21 $ $Date: 2001/09/16 09:27:42 $ $Author: reinhard $
#
-module unit
+public module unit
{
# -------------------------------------------------------------------------
# unit - unit of measure
# -------------------------------------------------------------------------
- class unit
+ public class unit
{ # keeps track of the different units
char code<8>; # of measure
char descr<35>; # used in GNUe.
@@ -68,7 +68,7 @@
# -------------------------------------------------------------------------
# conversion - convert between different units.
# -------------------------------------------------------------------------
- class conversion
+ public class conversion
{
unit::conversion_unit [] units;
Index: gnue/gnue-config/sales/sales-order/classes/sales-order.gcd
diff -u gnue/gnue-config/sales/sales-order/classes/sales-order.gcd:1.7
gnue/gnue-config/sales/sales-order/classes/sales-order.gcd:1.8
--- gnue/gnue-config/sales/sales-order/classes/sales-order.gcd:1.7 Fri Aug
24 15:13:33 2001
+++ gnue/gnue-config/sales/sales-order/classes/sales-order.gcd Sun Sep 16
05:27:42 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Id: sales-order.gcd,v 1.7 2001/08/24 19:13:33 ntiffin Exp $
+# $Id: sales-order.gcd,v 1.8 2001/09/16 09:27:42 reinhard Exp $
#
include "../../../base/org/classes/org.gcd"
@@ -31,6 +31,15 @@
module so
{
# -------------------------------------------------------------------------
+ # Sales order detail.
+ # -------------------------------------------------------------------------
+ class detail
+ {
+ org::detail det;
+ # so::header *header; # redundant
+ };
+
+ # -------------------------------------------------------------------------
# Sales order header.
# -------------------------------------------------------------------------
class header
@@ -38,14 +47,5 @@
org::header head;
customer::customer * customer;
so::detail [] detail;
- };
-
- # -------------------------------------------------------------------------
- # Sales order detail.
- # -------------------------------------------------------------------------
- class detail
- {
- org::detail det;
- so::header *header;
};
};
Index: gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd
diff -u gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd:1.12
gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd:1.13
--- gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd:1.12
Fri Aug 24 15:36:50 2001
+++ gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd Sun Sep
16 05:27:42 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.12 $ $Date: 2001/08/24 19:36:50 $ $Author: ntiffin $
+# $Revision: 1.13 $ $Date: 2001/09/16 09:27:42 $ $Author: reinhard $
#
include "../../../base/units/classes/units.gcd"
include "../../../supply-chain/vendor/classes/vendor.gcd"
@@ -108,7 +108,7 @@
person::employee *employee;
boolean approved = false;
boolean not_approved = false;
- pur::header *what; # what was approved
+ # pur::header *what; # what was approved (redundant)
};
# -------------------------------------------------------------------------
@@ -126,7 +126,7 @@
# -------------------------------------------------------------------------
class detail
{
- pur::header *header;
+ # pur::header *header; # redundant
int line_number; # the line on the po
char item_number<25>; # the item ordered