[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/gnue-config accounting/ar/classes/invoice....
From: |
Neil Tiffin |
Subject: |
gnue/gnue-config accounting/ar/classes/invoice.... |
Date: |
Thu, 05 Jul 2001 11:38:30 -0700 |
CVSROOT: /home/cvs
Module name: gnue
Changes by: Neil Tiffin <address@hidden> 01/07/05 11:38:30
Modified files:
gnue-config/accounting/ar/classes: invoice.gcd
gnue-config/accounting/gl/classes: gl_post.gcd
gnue-config/base/currency/classes: currency.gcd
gnue-config/base/language/classes: language.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
gnue-config/supply-chain/shipping/classes: shipping.gcd
Log message:
Fix syntax errors after yesterdays updates.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/accounting/ar/classes/invoice.gcd.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/accounting/gl/classes/gl_post.gcd.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/base/currency/classes/currency.gcd.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/base/language/classes/language.gcd.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/base/units/classes/units.gcd.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/sales/sales-order/classes/sales-order.gcd.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-config/supply-chain/shipping/classes/shipping.gcd.diff?cvsroot=OldCVS&tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnue/gnue-config/accounting/ar/classes/invoice.gcd
diff -u gnue/gnue-config/accounting/ar/classes/invoice.gcd:1.7
gnue/gnue-config/accounting/ar/classes/invoice.gcd:1.8
--- gnue/gnue-config/accounting/ar/classes/invoice.gcd:1.7 Wed Jul 4
11:04:13 2001
+++ gnue/gnue-config/accounting/ar/classes/invoice.gcd Thu Jul 5 11:38:29 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Id: invoice.gcd,v 1.7 2001/07/04 18:04:13 ntiffin Exp $
+# $Id: invoice.gcd,v 1.8 2001/07/05 18:38:29 ntiffin Exp $
#
include "../../../base/person/classes/person.gcd"
@@ -49,7 +49,7 @@
ar::invoice *invoice;
};
- class invoice : sales_order::header
+ class invoice : so::header
{
char id<10>; # invoice number
date date_invoiced;
@@ -57,7 +57,7 @@
char note<500>;
currency::money total;
- ar::payment [] payment;
+ ar::cash_receipt [] payment;
ar::adjustment [] adjustment;
char initial_setup(char force);
Index: gnue/gnue-config/accounting/gl/classes/gl_post.gcd
diff -u gnue/gnue-config/accounting/gl/classes/gl_post.gcd:1.5
gnue/gnue-config/accounting/gl/classes/gl_post.gcd:1.6
--- gnue/gnue-config/accounting/gl/classes/gl_post.gcd:1.5 Sun Jul 1
16:42:41 2001
+++ gnue/gnue-config/accounting/gl/classes/gl_post.gcd Thu Jul 5 11:38:29 2001
@@ -24,7 +24,7 @@
# Based on concepts and documents from Louis Charbonneau and
# Stanley A. Klein.
#
-# $Id: gl_post.gcd,v 1.5 2001/07/01 23:42:41 ntiffin Exp $
+# $Id: gl_post.gcd,v 1.6 2001/07/05 18:38:29 ntiffin Exp $
#
include "../../../base/currency/classes/currency.gcd"
@@ -155,7 +155,7 @@
# Explanation of the entry and/or
# references to support documents
- gl::entry_stage stage ; # Journal Entry Stage In progress, On
+ gl_post::entry_stage *stage; # Journal Entry Stage In progress, On
# approval, Posted to GL
};
@@ -180,14 +180,14 @@
currency::money frgn_amnt; # Transaction Foreign Amount
# Transaction Foreign Amount
- gl::gen_jour_det *detail; # pointer to detail if exists
+ gl_post::gen_jour_det *detail; # pointer to detail if exists
};
# only needed if detail transactions posting is selected
class gen_jour_det
{
- gl::gen_journal summary;
+ gl_post::gen_journal *summary;
int cust_id ; # Customer identification JE2.cust_id =
# CUSTOMER.cust_id
Index: gnue/gnue-config/base/currency/classes/currency.gcd
diff -u gnue/gnue-config/base/currency/classes/currency.gcd:1.13
gnue/gnue-config/base/currency/classes/currency.gcd:1.14
--- gnue/gnue-config/base/currency/classes/currency.gcd:1.13 Wed Jul 4
11:26:57 2001
+++ gnue/gnue-config/base/currency/classes/currency.gcd Thu Jul 5 11:38:29 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.13 $ $Date: 2001/07/04 18:26:57 $ $Author: ntiffin $
+# $Revision: 1.14 $ $Date: 2001/07/05 18:38:29 $ $Author: ntiffin $
#
# ===========================================================================
@@ -30,10 +30,8 @@
# ===========================================================================
module currency
{
- # type currency_code_type = char<3>;
-
# -------------------------------------------------------------------------
- # currency - definition of currencies.
+ # currency - definition of available currencies.
# -------------------------------------------------------------------------
class currency
{
@@ -45,19 +43,17 @@
};
# -------------------------------------------------------------------------
- # money - definition of money.
+ # money - TYPE definition of money.
# -------------------------------------------------------------------------
type money
- { # this definition allows us to abstract
- # qtys as needed.
- # todo amount should be 64 bit integer.
+ {
int64 amount = 0; # this integer has an implied decimal point
# for example if amount = 456192
- int16 num_decimals = 2; # and numDecimals = 3
+ int16 num_decimals = 2; # and num_decimals = 3
# then amount really has a value of 456.192
- char code<8>;
+ char currency<8>;
- REFERENCE currency_reference : currency::currency( code ) = this.code;
+ REFERENCE currency_reference : currency::currency( code ) = this.currency;
# select the system configured default currency
#INITIALISE code = currency_reference(code =
@@ -65,7 +61,6 @@
# read the number of decimals from the selected
# currency object
#INITIALISE num_decimals = code.default_decimals;
-
};
Index: gnue/gnue-config/base/language/classes/language.gcd
diff -u gnue/gnue-config/base/language/classes/language.gcd:1.12
gnue/gnue-config/base/language/classes/language.gcd:1.13
--- gnue/gnue-config/base/language/classes/language.gcd:1.12 Fri Jun 22
07:16:44 2001
+++ gnue/gnue-config/base/language/classes/language.gcd Thu Jul 5 11:38:29 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.12 $ $Date: 2001/06/22 14:16:44 $ $Author: ntiffin $
+# $Revision: 1.13 $ $Date: 2001/07/05 18:38:29 $ $Author: ntiffin $
#
# ===========================================================================
@@ -36,8 +36,8 @@
# -------------------------------------------------------------------------
class language
{
- char code<8>;
- char dialect<8>;
+ char code<8>; # en = ISO for english
+ char dialect<8>; # us = ISO for united states
char description<25>; # english description of language (required)
char description_1<25>; # other language description of language
char description_2<25>; # other language description of language
Index: gnue/gnue-config/base/units/classes/units.gcd
diff -u gnue/gnue-config/base/units/classes/units.gcd:1.18
gnue/gnue-config/base/units/classes/units.gcd:1.19
--- gnue/gnue-config/base/units/classes/units.gcd:1.18 Wed Jul 4 11:04:13 2001
+++ gnue/gnue-config/base/units/classes/units.gcd Thu Jul 5 11:38:29 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.18 $ $Date: 2001/07/04 18:04:13 $ $Author: ntiffin $
+# $Revision: 1.19 $ $Date: 2001/07/05 18:38:29 $ $Author: ntiffin $
#
module unit
@@ -73,7 +73,7 @@
unit::conversion_unit [] units;
# returns t or f if can or cannot do conversion
- char can_convert( text source_unit, text result_unit) );
+ char can_convert( text source_unit, text result_unit );
# returns resulting amount
text convert( text source_unit, text source_amount, text result_unit);
};
Index: gnue/gnue-config/sales/sales-order/classes/sales-order.gcd
diff -u gnue/gnue-config/sales/sales-order/classes/sales-order.gcd:1.5
gnue/gnue-config/sales/sales-order/classes/sales-order.gcd:1.6
--- gnue/gnue-config/sales/sales-order/classes/sales-order.gcd:1.5 Wed Jul
4 11:04:13 2001
+++ gnue/gnue-config/sales/sales-order/classes/sales-order.gcd Thu Jul 5
11:38:29 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Id: sales-order.gcd,v 1.5 2001/07/04 18:04:13 ntiffin Exp $
+# $Id: sales-order.gcd,v 1.6 2001/07/05 18:38:29 ntiffin Exp $
#
include "../../../base/currency/classes/currency.gcd"
@@ -62,21 +62,21 @@
boolean closed;
- sales_order::detail [] detail;
+ so::detail [] detail;
customer::customer * customer;
};
class detail
{
- sales_order::header *header;
+ so::header *header;
- int line_number;
- char description<25>;
- unit::quantity quantity;
- currency::money unit_price;
- so::line_type type; # freight, sales tax, item, tax service etc.
- so::line_status status; # open, deleted, etc.
- char notes<255>;
- int blank_after = 0; # print num blank lines after this line
+ int line_number;
+ char description<25>;
+ unit::quantity quantity;
+ currency::money unit_price;
+ so::line_type *type; # freight, sales tax, item, tax service etc.
+ so::line_status *status; # open, deleted, etc.
+ char notes<255>;
+ int blank_after = 0; # print num blank lines after this line
};
};
Index: gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd
diff -u gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd:1.9
gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd:1.10
--- gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd:1.9 Wed Jul
4 15:57:24 2001
+++ gnue/gnue-config/supply-chain/purchasing/classes/purchasing.gcd Thu Jul
5 11:38:30 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Revision: 1.9 $ $Date: 2001/07/04 22:57:24 $ $Author: ntiffin $
+# $Revision: 1.10 $ $Date: 2001/07/05 18:38:30 $ $Author: ntiffin $
#
include "../../../base/units/classes/units.gcd"
include "../../../supply-chain/vendor/classes/vendor.gcd"
@@ -50,7 +50,7 @@
text purch_text;
char purch_desc<100>;
- [] recommended vendor;
+ vendor::vendor [] recommended_vendor;
help en buyer_code "The buyer code is a reference to the buyer
responsible"
"for purchasing this product.";
Index: gnue/gnue-config/supply-chain/shipping/classes/shipping.gcd
diff -u gnue/gnue-config/supply-chain/shipping/classes/shipping.gcd:1.3
gnue/gnue-config/supply-chain/shipping/classes/shipping.gcd:1.4
--- gnue/gnue-config/supply-chain/shipping/classes/shipping.gcd:1.3 Wed Jul
4 16:28:45 2001
+++ gnue/gnue-config/supply-chain/shipping/classes/shipping.gcd Thu Jul 5
11:38:30 2001
@@ -22,7 +22,7 @@
#
# This file originally written by Neil Tiffin (address@hidden).
#
-# $Id: shipping.gcd,v 1.3 2001/07/04 23:28:45 ntiffin Exp $
+# $Id: shipping.gcd,v 1.4 2001/07/05 18:38:30 ntiffin Exp $
#
include "../../../base/currency/classes/currency.gcd"
@@ -42,9 +42,9 @@
char carrier<25>; # carrier name
char delivery_terms<25>; # overnight
pur::header *po_header;
- sales::header *so_header;
+ so::header *so_header;
pur::detail [] po_lines;
- sales::detail [] so_lines;
+ so::detail [] so_lines;
shipping::detail [] detail;
};