[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[4435] trunk
- Subject: SF.net SVN: ledger-smb:[4435] trunk
- From: ..hidden..
- Date: Sat, 10 Mar 2012 11:28:30 +0000
Revision: 4435
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4435&view=rev
Author: einhverfr
Date: 2012-03-10 11:28:29 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
merging from branches/1.3
Modified Paths:
--------------
trunk/sql/coa/at/chart/General.sql
trunk/sql/coa/au/chart/General-0000.sql
trunk/sql/coa/au/chart/General-00000.sql
trunk/sql/coa/be/chart/General.sql
trunk/sql/coa/br/chart/General.sql
trunk/sql/coa/ca/chart/English_General.sql
trunk/sql/coa/ca/chart/French-Quebec_General.sql
trunk/sql/coa/ch/chart/German.sql
trunk/sql/coa/cn/chart/General.sql
trunk/sql/coa/de/chart/DATEV-SKR03.sql
trunk/sql/coa/de/chart/General.sql
trunk/sql/coa/de/chart/SKR03.sql
trunk/sql/coa/dk/chart/General.sql
trunk/sql/coa/eg/chart/General.sql
trunk/sql/coa/id/chart/General.sql
trunk/sql/coa/it/chart/General.sql
trunk/sql/coa/it/chart/cc2424.sql
trunk/sql/coa/nl/chart/General.sql
trunk/sql/coa/nl/chart/Simple.sql
trunk/sql/coa/se/chart/Agriculture.sql
trunk/sql/coa/se/chart/Church_Society.sql
trunk/sql/coa/se/chart/General.sql
trunk/sql/coa/tw/chart/General.sql
trunk/sql/coa/uk/chart/General.sql
trunk/sql/coa/us/chart/General.sql
trunk/sql/coa/us/chart/Manufacturing.sql
trunk/sql/coa/us/chart/Service.sql
trunk/sql/coa/us/chart/UCOA-Form990.sql
trunk/sql/coa/us/chart/UCOA-Form990EZ.sql
trunk/sql/coa/ve/chart/General.sql
Property Changed:
----------------
trunk/
trunk/LedgerSMB/Scripts/account.pm
trunk/LedgerSMB/Scripts/admin.pm
trunk/LedgerSMB/Scripts/customer.pm
trunk/LedgerSMB/Scripts/employee.pm
trunk/LedgerSMB/Scripts/file.pm
trunk/LedgerSMB/Scripts/journal.pm
trunk/LedgerSMB/Scripts/login.pm
trunk/LedgerSMB/Scripts/menu.pm
trunk/LedgerSMB/Scripts/payment.pm
trunk/LedgerSMB/Scripts/recon.pm
trunk/LedgerSMB/Scripts/setup.pm
trunk/LedgerSMB/Scripts/taxform.pm
trunk/LedgerSMB/Scripts/vendor.pm
trunk/sql/upgrade/1.2-1.3-manual.sql
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3:3711-4428
+ /branches/1.3:3711-4434
Property changes on: trunk/LedgerSMB/Scripts/account.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4428
/branches/1.3/scripts/account.pl:3711-4368
+ /branches/1.3/LedgerSMB/Scripts/account.pm:4369-4434
/branches/1.3/scripts/account.pl:3711-4368
Property changes on: trunk/LedgerSMB/Scripts/admin.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4428
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/admin.pm:3901-4434
/branches/1.3/scripts/admin.pl:3711-3903,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/customer.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4428
/branches/1.3/scripts/customer.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/customer.pm:4288-4434
/branches/1.3/scripts/customer.pl:4273-4287
Property changes on: trunk/LedgerSMB/Scripts/employee.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4428
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
+ /branches/1.3/LedgerSMB/Scripts/employee.pm:3712-4434
/branches/1.3/scripts/employee.pl:3842-3843,4273-4287,4289-4310
Property changes on: trunk/LedgerSMB/Scripts/file.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4428
/branches/1.3/scripts/file.pl:3711-4138
+ /branches/1.3/LedgerSMB/Scripts/file.pm:3711-4434
/branches/1.3/scripts/file.pl:3711-4138
Property changes on: trunk/LedgerSMB/Scripts/journal.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4428
/branches/1.3/scripts/journal.pl:3711-4328
+ /branches/1.3/LedgerSMB/Scripts/journal.pm:4288-4434
/branches/1.3/scripts/journal.pl:3711-4328
Property changes on: trunk/LedgerSMB/Scripts/login.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4428
/branches/1.3/scripts/login.pl:3711-4192
+ /branches/1.3/LedgerSMB/Scripts/login.pm:4193-4434
/branches/1.3/scripts/login.pl:3711-4192
Property changes on: trunk/LedgerSMB/Scripts/menu.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4428
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/menu.pm:4155-4434
/branches/1.3/scripts/menu.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/payment.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4428
/branches/1.3/scripts/payment.pl:3711-4310
+ /branches/1.3/LedgerSMB/Scripts/payment.pm:4010-4434
/branches/1.3/scripts/payment.pl:3711-4310
Property changes on: trunk/LedgerSMB/Scripts/recon.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4428
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/recon.pm:3711-4434
/branches/1.3/scripts/recon.pl:4194-4271,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/setup.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4428
/branches/1.3/scripts/setup.pl:3711-4391
+ /branches/1.3/LedgerSMB/Scripts/setup.pm:3937-4434
/branches/1.3/scripts/setup.pl:3711-4391
Property changes on: trunk/LedgerSMB/Scripts/taxform.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4428
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
+ /branches/1.3/LedgerSMB/Scripts/taxform.pm:4193-4434
/branches/1.3/scripts/taxform.pl:3711-4192,4273-4287
Property changes on: trunk/LedgerSMB/Scripts/vendor.pm
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4428
/branches/1.3/scripts/vendor.pl:4273-4287
+ /branches/1.3/LedgerSMB/Scripts/vendor.pm:4288-4434
/branches/1.3/scripts/vendor.pl:4273-4287
Modified: trunk/sql/coa/at/chart/General.sql
===================================================================
--- trunk/sql/coa/at/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/at/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -161,3 +161,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '2810';
+
Modified: trunk/sql/coa/au/chart/General-0000.sql
===================================================================
--- trunk/sql/coa/au/chart/General-0000.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/au/chart/General-0000.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -18,6 +18,10 @@
INSERT INTO chart (accno, description, charttype, category, link, gifi_accno, contra) VALUES ('1845', 'Less: Accumulated Depreciation', 'A', 'A', '', '1800', '1');
SELECT account_heading_save(NULL, '1800', 'CAPITAL ASSETS', NULL);
SELECT account_save(NULL,'1060','Cheque Account','A','1000', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '1060';
+
SELECT account_save(NULL,'1205','Less: Provision Doubtful Debts','A','1000', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1210','Trade Debtors / Australia - with GST','A','1000', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1220','Trade Debtors / Exports - GST free','A','1000', NULL, false, false, string_to_array('AR', ':'));
Modified: trunk/sql/coa/au/chart/General-00000.sql
===================================================================
--- trunk/sql/coa/au/chart/General-00000.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/au/chart/General-00000.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -5,6 +5,9 @@
SELECT account_heading_save(NULL, '10000', 'BANK AND CASH ACCOUNTS', NULL);
SELECT account_save(NULL,'10001','Bank Account','A','100', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'10010','Petty Cash','A','100', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('10001', '10010');
+
SELECT account_heading_save(NULL, '11000', 'CUSTOMERS AND SETTLEMENT ACCOUNTS', NULL);
SELECT account_save(NULL,'11001','Accounts Receivables','A','110', NULL, false, false, string_to_array('AR', ':'));
SELECT account_heading_save(NULL, '12000', 'OTHER CURRENT ASSETS', NULL);
Modified: trunk/sql/coa/be/chart/General.sql
===================================================================
--- trunk/sql/coa/be/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/be/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -454,3 +454,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '55';
+
Modified: trunk/sql/coa/br/chart/General.sql
===================================================================
--- trunk/sql/coa/br/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/br/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -4,6 +4,9 @@
SELECT account_heading_save(NULL, '1000', 'RECURSOS ATUAIS', NULL);
SELECT account_save(NULL,'1060','Checando Cliente','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Caixa Baixo','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Contas a Receber','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','ProvisÃo para devedors duvidosos','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL, '1500', 'INVENTÃRIO DE CLIENTES', NULL);
Modified: trunk/sql/coa/ca/chart/English_General.sql
===================================================================
--- trunk/sql/coa/ca/chart/English_General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/ca/chart/English_General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -4,6 +4,9 @@
SELECT account_heading_save(NULL, '1000', 'CURRENT ASSETS', NULL);
SELECT account_save(NULL,'1060','Chequing Account','A','1002', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Petty Cash','A','1001', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Accounts Receivables','A','1060', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','Allowance for doubtful accounts','A','1063', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL, '1500', 'INVENTORY ASSETS', NULL);
Modified: trunk/sql/coa/ca/chart/French-Quebec_General.sql
===================================================================
--- trunk/sql/coa/ca/chart/French-Quebec_General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/ca/chart/French-Quebec_General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -12,6 +12,9 @@
SELECT account_heading_save(NULL, '1000', 'ACTIF COURANT', NULL);
SELECT account_save(NULL,'1060','Compte chÃque','A','1002', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Petite caisse','A','1001', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Comptes clients','A','1060', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','Provisions pour crÃances douteuses','A','1063', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL, '1500', 'INVENTAIRE', NULL);
Modified: trunk/sql/coa/ch/chart/German.sql
===================================================================
--- trunk/sql/coa/ch/chart/German.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/ch/chart/German.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -179,3 +179,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '11102';
+
Modified: trunk/sql/coa/cn/chart/General.sql
===================================================================
--- trunk/sql/coa/cn/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/cn/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -66,6 +66,9 @@
SELECT account_save(NULL,'4320','èè','I','', NULL, false, false, string_to_array('AR_amount:IC_income', ':'));
SELECT account_save(NULL,'1200','åæåæ','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1061','æçæå','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1061', '1065');
+
SELECT account_save(NULL,'2310','ååæåç','L','', NULL, false, false, string_to_array('AR_tax:AP_tax:IC_taxpart:IC_taxservice', ':'));
--
-- exchange rate
Modified: trunk/sql/coa/de/chart/DATEV-SKR03.sql
===================================================================
--- trunk/sql/coa/de/chart/DATEV-SKR03.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/de/chart/DATEV-SKR03.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -247,3 +247,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '0120000';
+
Modified: trunk/sql/coa/de/chart/General.sql
===================================================================
--- trunk/sql/coa/de/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/de/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -235,3 +235,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno BETWEEN '1700' AND '1820';
+
Modified: trunk/sql/coa/de/chart/SKR03.sql
===================================================================
--- trunk/sql/coa/de/chart/SKR03.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/de/chart/SKR03.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -284,3 +284,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '1200';
+
Modified: trunk/sql/coa/dk/chart/General.sql
===================================================================
--- trunk/sql/coa/dk/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/dk/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -4,6 +4,9 @@
SELECT account_heading_save(NULL,'1000','KORTFRISTEDE AKTIVER', NULL);
SELECT account_save(NULL,'1061','Bank','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Kasse','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1061', '1065');
+
SELECT account_save(NULL,'1200','Indbetalinger','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','HensÃttelser til formodet gÃld','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1210','Moms indgÃende','A','', NULL, false, false, string_to_array('AR_tax:AP_tax:IC_taxpart:IC_taxservice', ':'));
Modified: trunk/sql/coa/eg/chart/General.sql
===================================================================
--- trunk/sql/coa/eg/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/eg/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -16,6 +16,9 @@
SELECT account_save(NULL,'5650','Capital Cost Allowance Expense','E','', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1060','ÙÙØÙØ ØØÙØÙÙ','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','ÙÙØÙØØØÙØÙØÙÙ','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1520','ÙØØÙÙ - ÙØØ ØÙØØ ÙÙØÙÙØØ','A','', NULL, false, false, string_to_array('IC', ':'));
SELECT account_save(NULL,'1530','ÙØØÙÙ - ØØØÙØ','A','', NULL, false, false, string_to_array('IC', ':'));
SELECT account_save(NULL,'1540','ÙØØÙÙ - ÙØØ ØØØÙ','A','', NULL, false, false, string_to_array('IC', ':'));
Modified: trunk/sql/coa/id/chart/General.sql
===================================================================
--- trunk/sql/coa/id/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/id/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -4,6 +4,9 @@
SELECT account_heading_save(NULL,'1000','AKTIVA LANCAR', NULL);
SELECT account_save(NULL,'1060','Bank','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Kas Kecil','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Piutang','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_heading_save(NULL,'1500','INVENTORY', NULL);
SELECT account_save(NULL,'1520','Inventory / Umum','A','', NULL, false, false, string_to_array('IC', ':'));
Modified: trunk/sql/coa/it/chart/General.sql
===================================================================
--- trunk/sql/coa/it/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/it/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -198,3 +198,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '4480105';
+
Modified: trunk/sql/coa/it/chart/cc2424.sql
===================================================================
--- trunk/sql/coa/it/chart/cc2424.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/it/chart/cc2424.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -277,3 +277,8 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '114001';
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '114003';
+
Modified: trunk/sql/coa/nl/chart/General.sql
===================================================================
--- trunk/sql/coa/nl/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/nl/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -252,3 +252,6 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno BETWEEN '1100' AND '1180';
+
Modified: trunk/sql/coa/nl/chart/Simple.sql
===================================================================
--- trunk/sql/coa/nl/chart/Simple.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/nl/chart/Simple.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -99,3 +99,5 @@
FROM account_link
WHERE description LIKE '%_tax');
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno = '1061';
Modified: trunk/sql/coa/se/chart/Agriculture.sql
===================================================================
--- trunk/sql/coa/se/chart/Agriculture.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/se/chart/Agriculture.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -226,6 +226,11 @@
SELECT account_save(NULL,'1920','Plusgiro ','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1930','CheckrÃkningskonto','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1940','Bank och Ãvr bankkon','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+
+
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1900', '1910', '1920', '1930', '1940');
+
SELECT account_save(NULL,'1950','Bankcertifikat ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1960','Koncernkont moderbol','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1970','SÃrskilda bankkonton','A','200', NULL, false, false, string_to_array('', ':'));
Modified: trunk/sql/coa/se/chart/Church_Society.sql
===================================================================
--- trunk/sql/coa/se/chart/Church_Society.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/se/chart/Church_Society.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -44,6 +44,9 @@
SELECT account_save(NULL,'1940','Ãvriga bankkonto','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1941','Nordea vÃrdepappersfond','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1942','Nordea girokapitalkonto','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1910', '1920', '1930', '1940', '1941', '1942');
+
SELECT account_heading_save(NULL,'2','Eget kapital och skulder', NULL);
SELECT account_heading_save(NULL,'20','Eget kapital', NULL);
SELECT account_save(NULL,'2000','Eget kapital EFS Ãsele','Q','', NULL, false, false, string_to_array('', ':'));
Modified: trunk/sql/coa/se/chart/General.sql
===================================================================
--- trunk/sql/coa/se/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/se/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -212,17 +212,12 @@
SELECT account_save(NULL,'1900','Obsevationskonto ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1910','Kassa ','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1911','Huvudkassa ','A','200', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'1912','Kassa 2 ','A','200', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'1913','Kassa 3 ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1920','Postgiro ','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
-SELECT account_save(NULL,'1921','Postgiro 1 ','A','200', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'1922','Postgiro 2 ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1930','CheckrÃkningskonto ','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
-SELECT account_save(NULL,'1931','CheckrÃkningskonto 1 ','A','200', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'1932','CheckrÃkningskonto 2 ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1940','Bank och Ãvriga bankkonton ','A','200', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
-SELECT account_save(NULL,'1941','Bankkonto 1 ','A','200', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'1942','Bankkonto 2 ','A','200', NULL, false, false, string_to_array('', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1910', '1920', '1930', '1940');
+
SELECT account_save(NULL,'1950','Bankcertifikat ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1960','Koncernkonto moderbolag ','A','200', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1970','SÃrskilda bankkonton ','A','200', NULL, false, false, string_to_array('', ':'));
@@ -311,12 +306,6 @@
SELECT account_save(NULL,'2310','Obligations- och fÃrlagslÃn ','L','329', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2320','Konvertibla lÃn ','L','329', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2330','CheckrÃkningskredit ','L','329', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2331','CheckrÃkningskredit 1 ','L','329', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2332','CheckrÃkningskredit 2 ','L','329', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2333','Utnyttjad checkrÃkningskredit 1 ','L','329', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2334','Utnyttjad checkrÃkningskredit 2 ','L','329', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2335','Beviljad checkrÃkningskredit 1 ','L','329', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2336','Beviljad checkrÃkningskredit 2 ','L','329', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2340','Byggnadskreditiv ','L','329', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2350','Andra skulder till kreditinstitut ','L','329', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2351','FastighetslÃn ','L','329', NULL, false, false, string_to_array('', ':'));
@@ -440,7 +429,6 @@
SELECT account_save(NULL,'2911','LÃneskulder ','L','305', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2912','AckordsÃverskott ','L','305', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2920','Upplupna semesterlÃner ','L','305', NULL, false, false, string_to_array('', ':'));
-SELECT account_save(NULL,'2921','Upplupna semesterlÃner ','L','305', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2928','Betalda semesterlÃner ','L','305', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2930','Upplupna pensionskostnader ','L','305', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'2931','Upplupna pensionsutbetalningar ','L','305', NULL, false, false, string_to_array('', ':'));
Modified: trunk/sql/coa/tw/chart/General.sql
===================================================================
--- trunk/sql/coa/tw/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/tw/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -66,6 +66,9 @@
SELECT account_save(NULL,'4320','èè','I','', NULL, false, false, string_to_array('AR_amount:IC_income', ':'));
SELECT account_save(NULL,'1200','ææåæ','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1061','æçæé','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1061', '1065');
+
SELECT account_save(NULL,'2310','ååæåç','L','', NULL, false, false, string_to_array('AR_tax:AP_tax:IC_taxpart:IC_taxservice', ':'));
--
-- exchange rate
Modified: trunk/sql/coa/uk/chart/General.sql
===================================================================
--- trunk/sql/coa/uk/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/uk/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -23,6 +23,9 @@
SELECT account_save(NULL,'1220','Building Society Account','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1230','Petty Cash','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1240','Company Credit Card','L','', NULL, false, false, string_to_array('', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1200', '1210', '1220', '1230', '1240');
+
SELECT account_save(NULL,'2100','Creditors Control Account','L','', NULL, false, false, string_to_array('AP', ':'));
SELECT account_save(NULL,'2102','Other Creditors','L','', NULL, false, false, string_to_array('AP', ':'));
SELECT account_save(NULL,'2109','Accruals','L','', NULL, false, false, string_to_array('', ':'));
Modified: trunk/sql/coa/us/chart/General.sql
===================================================================
--- trunk/sql/coa/us/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/us/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -5,6 +5,9 @@
SELECT account_heading_save(NULL,'1000','CURRENT ASSETS', NULL);
SELECT account_save(NULL,'1060','Checking Account','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Petty Cash','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Accounts Receivables','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','Allowance for doubtful accounts','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL,'1500','INVENTORY ASSETS', NULL);
Modified: trunk/sql/coa/us/chart/Manufacturing.sql
===================================================================
--- trunk/sql/coa/us/chart/Manufacturing.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/us/chart/Manufacturing.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -5,6 +5,9 @@
SELECT account_heading_save(NULL,'1000','CURRENT ASSETS', NULL);
SELECT account_save(NULL,'1060','Checking Account','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Petty Cash','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Accounts Receivables','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','Allowance for doubtful accounts','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL,'1500','INVENTORY ASSETS', NULL);
Modified: trunk/sql/coa/us/chart/Service.sql
===================================================================
--- trunk/sql/coa/us/chart/Service.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/us/chart/Service.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -5,6 +5,9 @@
SELECT account_heading_save(NULL,'1000','CURRENT ASSETS', NULL);
SELECT account_save(NULL,'1060','Checking Account','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1065','Petty Cash','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1060', '1065');
+
SELECT account_save(NULL,'1200','Accounts Receivables','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','Allowance for doubtful accounts','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL,'1500','INVENTORY ASSETS', NULL);
Modified: trunk/sql/coa/us/chart/UCOA-Form990.sql
===================================================================
--- trunk/sql/coa/us/chart/UCOA-Form990.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/us/chart/UCOA-Form990.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -6,6 +6,9 @@
SELECT account_save(NULL,'1020','Cash in bank-payroll','A','45', NULL, false, false, string_to_array('AP_paid', ':'));
SELECT account_save(NULL,'1040','Petty cash','A','45', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1070','Savings & short-term investments','A','46', NULL, false, false, string_to_array('', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1010', '1020', '1040', '1070');
+
SELECT account_heading_save(NULL,'1100','Accounts receivable', NULL);
SELECT account_save(NULL,'1110','Accounts receivable','A','47a', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1115','Doubtful accounts allowance','A','47b', NULL, true, false, string_to_array('AR_paid', ':'));
Modified: trunk/sql/coa/us/chart/UCOA-Form990EZ.sql
===================================================================
--- trunk/sql/coa/us/chart/UCOA-Form990EZ.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/us/chart/UCOA-Form990EZ.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -6,6 +6,9 @@
SELECT account_save(NULL,'1020','Cash in bank-payroll','A','22', NULL, false, false, string_to_array('AP_paid', ':'));
SELECT account_save(NULL,'1040','Petty cash','A','22', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1070','Savings & short-term investments','A','22', NULL, false, false, string_to_array('', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1010', '1020', '1040', '1070');
+
SELECT account_heading_save(NULL,'1100','Accounts receivable', NULL);
SELECT account_save(NULL,'1110','Accounts receivable','A','24', NULL, false, false, string_to_array('', ':'));
SELECT account_save(NULL,'1115','Doubtful accounts allowance','A','24', NULL, true, false, string_to_array('AR_paid', ':'));
Modified: trunk/sql/coa/ve/chart/General.sql
===================================================================
--- trunk/sql/coa/ve/chart/General.sql 2012-03-10 11:15:58 UTC (rev 4434)
+++ trunk/sql/coa/ve/chart/General.sql 2012-03-10 11:28:29 UTC (rev 4435)
@@ -10,6 +10,9 @@
SELECT account_save(NULL,'1110','Provincial','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1120','Venezuela','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
SELECT account_save(NULL,'1130','Banesco JD','A','', NULL, false, false, string_to_array('AR_paid:AP_paid', ':'));
+SELECT cr_coa_to_account_save(accno, accno || '--' || description)
+FROM account WHERE accno in ('1050', '1100', '1110', '1120', '1130');
+
SELECT account_save(NULL,'1200','Cuentas por Cobrar','A','', NULL, false, false, string_to_array('AR', ':'));
SELECT account_save(NULL,'1205','ProvisiÃn Cuentas Incobrables','A','', NULL, false, false, string_to_array('', ':'));
SELECT account_heading_save(NULL,'1500','INVENTARIO', NULL);
Property changes on: trunk/sql/upgrade/1.2-1.3-manual.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4428
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
+ /branches/1.3/sql/upgrade/1.2-1.3-manual.sql:3712-4434
/branches/1.3/sql/upgrade/1.2-1.3.sql:3711-3851
/trunk/sql/upgrade/1.2-1.3.sql:858-3710
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.