diff --git a/addons/l10n_sg/__openerp__.py b/addons/l10n_sg/__openerp__.py
index f7063b2d475..db7ba824c96 100644
--- a/addons/l10n_sg/__openerp__.py
+++ b/addons/l10n_sg/__openerp__.py
@@ -31,7 +31,7 @@ After installing this module, the Configuration wizard for accounting is launche
'data': [
'l10n_sg_chart.xml',
'l10n_sg_chart_tax.xml',
- 'l10n_sg_wizard.xml',
+ 'account_chart_template.yml',
],
- 'installable': False,
+ 'installable': True,
}
diff --git a/addons/l10n_sg/account_chart_template.yml b/addons/l10n_sg/account_chart_template.yml
new file mode 100644
index 00000000000..e7bb9f5aed4
--- /dev/null
+++ b/addons/l10n_sg/account_chart_template.yml
@@ -0,0 +1,3 @@
+-
+ !python {model: account.chart.template, id: sg_chart_template}: |
+ self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_sg/l10n_sg_chart.xml b/addons/l10n_sg/l10n_sg_chart.xml
index 996237d20b7..a5ed4a06903 100644
--- a/addons/l10n_sg/l10n_sg_chart.xml
+++ b/addons/l10n_sg/l10n_sg_chart.xml
@@ -1,354 +1,311 @@
-
-
+
-
- Chart of Singapore
- 0
-
-
+
+ Transfer Accounts
+ 100301
+
+
-
- Balance Sheet
- 1
-
-
+
+ Singapore Chart of Accounts - Standard
+ 1001
+ 1002
+ 6
+
+
-
- Assets
- 10
-
-
-
-
-
- Cash and cash equivalents
- 100
-
-
-
-
-
- Cash on hand
- 100001
-
-
-
-
-
- Current
- 100002
-
-
-
-
-
- Money market
- 100003
-
-
-
-
-
- Rents held in trust
- 100004
-
-
-
-
-
- Savings
- 100005
-
-
-
-
-
- Client trust account
- 100006
-
-
-
-
-
- Current assets
- 101
-
-
+
+
Allowance for bad debts
101001
-
+
+
Development costs
101002
-
+
+
Employee cash advances
101003
-
+
+
Inventory
101004
-
+
+
Investments - other
101005
-
+
+
Loans to officers
101006
-
+
+
Loans to others
101007
-
+
+
Loans to shareholders
101008
-
+
+
Prepaid expenses
101009
-
+
+
Retainage
101010
-
+
+
Undeposited funds
101011
-
+
+
Other Current Assets
101012
-
-
-
-
-
- Property, plant and equipment
- 102
-
+
+
Accumulated amortisation
102001
-
+
+
Accumulated depreciation
102002
-
+
+
Accumulated depletion
102003
-
+
+
Buildings
102004
-
+
+
Depletable assets
102005
-
+
+
Furniture and fixtures
102006
-
+
+
Leasehold improvements
102007
-
+
+
Machinery and equipment
102008
-
+
+
Vehicles
102009
-
+
+
Other Assets
102010
-
-
-
-
-
- Non-current assets
- 103
-
+
+
Intangible Assets
103001
-
+
+
Accumulated amortization of non-current assets
103002
-
+
+
Available-for-sale financial assets
103003
-
+
+
Deferred tax
103004
-
+
+
Goodwill
103005
-
+
+
Investments
103006
-
+
+
Lease Buyout
103007
-
+
+
Licences
103008
-
+
+
Organisational costs
103009
-
+
+
Other intangible assets
103010
-
+
+
Other non-current assets
103011
-
+
+
Prepayments and accrued income
103012
-
+
+
Security Deposits
103013
-
+
+
Other non-current assets
103014
-
-
-
-
-
- Trade and other receivable
- 104
-
+
+
@@ -356,6 +313,7 @@
Trade Receivable Account
104001
+
@@ -363,111 +321,103 @@
Other Receivable Account
104002
+
-
- Purchase Tax Receivable
- 105
-
-
-
-
Purchase Tax Account 7% TX-N33
105001
-
+
+
Purchase Tax Account 7% TX-E33
105002
-
+
+
Purchase Tax Account 7% BL
105003
-
+
+
Purchase Tax Account 7% IM
105004
-
+
+
Purchase Tax Account 7% TX-RE
105005
-
+
+
Purchase Tax Account 0% ME
105006
-
+
+
Purchase Tax Account 0% NR
105007
-
+
+
Purchase Tax Account 0% ZP
105008
-
+
+
Purchase Tax Account 0% OP
105009
-
+
+
Purchase Tax Account 0% EP
105010
-
+
+
Purchase Tax Account MES
105011
-
+
+
Purchase Tax Account 7% TX7
105012
-
-
-
-
-
- Liabilities
- 20
-
-
-
-
-
- Current liabilities
- 200
-
+
+
@@ -475,6 +425,7 @@
Current portion of employee benefits obligations
200001
+
@@ -482,6 +433,7 @@
Current portion of obligations under finance leases
200002
+
@@ -489,6 +441,7 @@
Current Tax Liability
200003
+
@@ -496,6 +449,7 @@
Insurance Payable
200004
+
@@ -503,6 +457,7 @@
Interest payables
200005
+
@@ -510,6 +465,7 @@
Line of Credit
200006
+
@@ -517,6 +473,7 @@
Loan Payable
200007
+
@@ -524,6 +481,7 @@
Payroll Clearing
200008
+
@@ -531,6 +489,7 @@
Payroll liabilities
200009
+
@@ -538,6 +497,7 @@
Prepaid Expenses Payable
200010
+
@@ -545,6 +505,7 @@
Provision for warranty obligations
200011
+
@@ -552,6 +513,7 @@
Rents in trust - Liability
200012
+
@@ -559,6 +521,7 @@
GST Payable
200013
+
@@ -566,6 +529,7 @@
Short term borrowings
200014
+
@@ -573,13 +537,7 @@
Client Trust Accounts - Liabilities
200015
-
-
-
-
- Non-current liabilities
- 201
-
+
@@ -587,6 +545,7 @@
Accruals and Deferred Income
201001
+
@@ -594,6 +553,7 @@
Bank loans
201002
+
@@ -601,6 +561,7 @@
Obligations under finance leases
201003
+
@@ -608,6 +569,7 @@
Long term borrowings
201004
+
@@ -615,6 +577,7 @@
Long term employee benefit obligations
201005
+
@@ -622,6 +585,7 @@
Notes Payable
201006
+
@@ -629,6 +593,7 @@
Shareholder Notes Payable
201007
+
@@ -636,13 +601,7 @@
Other non-current liabilities
201008
-
-
-
-
- Trade and other payables
- 202
-
+
@@ -650,6 +609,7 @@
Trade Payable Account
202001
+
@@ -657,90 +617,87 @@
Other Payable Account
202002
+
-
- Equity
- 203
-
-
-
-
Partner's Equity
203001
-
+
+
Accumulated Adjustment
203002
-
+
+
Ordinary shares
203003
-
+
+
Opening Balance Equity
203004
-
+
+
Owner's Equity
203005
-
+
+
Paid-in capital or surplus
203006
-
+
+
Preferred shares
203007
-
+
+
Retained Earnings
203008
-
+
+
Share capital
203009
-
+
+
Treasury Shares
203010
-
-
-
-
-
- Sale Tax Payables
- 204
-
+
+
@@ -748,6 +705,7 @@
Sales Tax Account 0% ES33
204001
+
@@ -755,6 +713,7 @@
Sales Tax Account 7% DS
204002
+
@@ -762,6 +721,7 @@
Sales Tax Account 0% ESN33
204003
+
@@ -769,6 +729,7 @@
Sales Tax Account 0% OS
204004
+
@@ -776,6 +737,7 @@
Sales Tax Account 0% ZR
204005
+
@@ -783,27 +745,7 @@
Sales Tax Account 7% SR
204006
-
-
-
-
- Profit and Loss
- 2
-
-
-
-
-
- Income
- 30
-
-
-
-
-
- Revenue
- 300
-
+
@@ -811,6 +753,7 @@
Discounts/refunds given
300001
+
@@ -818,6 +761,7 @@
Non-profit revenue
300002
+
@@ -825,6 +769,7 @@
Other primary revenue
300003
+
@@ -832,6 +777,7 @@
Sales of product revenue
300004
+
@@ -839,6 +785,7 @@
Service/fee revenue
300005
+
@@ -846,13 +793,7 @@
Unapplied cash payment income
300006
-
-
-
-
- Other revenue
- 301
-
+
@@ -860,6 +801,7 @@
Dividend revenue
301001
+
@@ -867,6 +809,7 @@
Gain/loss on sale of fixed assets or investments
301002
+
@@ -874,6 +817,7 @@
Interest earned
301003
+
@@ -881,6 +825,7 @@
Other investment revenue
301004
+
@@ -888,6 +833,7 @@
Other miscellaneous revenue
301005
+
@@ -895,20 +841,7 @@
Tax-exempt interest
301006
-
-
-
-
- Cost of sales
- 40
-
-
-
-
-
- Cost of Good Sold
- 401
-
+
@@ -916,6 +849,7 @@
Cost of Labour - COS
401001
+
@@ -923,6 +857,7 @@
Equipment rental - COS
401002
+
@@ -930,6 +865,7 @@
Freight and delivery - COS
401003
+
@@ -937,6 +873,7 @@
Other costs of sales - COS
401004
+
@@ -944,20 +881,7 @@
Supplies and materials - COS
401005
-
-
-
-
- Indirect Expenses
- 50
-
-
-
-
-
- Expenses
- 501
-
+
@@ -965,6 +889,7 @@
Administrative expenses
501001
+
@@ -972,6 +897,7 @@
Advertising/promotional
501002
+
@@ -979,6 +905,7 @@
Auto
501003
+
@@ -986,6 +913,7 @@
Bad debts
501004
+
@@ -993,6 +921,7 @@
Bank charges
501005
+
@@ -1000,6 +929,7 @@
Charitable contributions
501006
+
@@ -1007,6 +937,7 @@
Cost of labour
501007
+
@@ -1014,6 +945,7 @@
Distribution costs
501008
+
@@ -1021,6 +953,7 @@
Dues and subscriptions
501009
+
@@ -1028,6 +961,7 @@
Entertainment
501010
+
@@ -1035,6 +969,7 @@
Meals and entertainment
501011
+
@@ -1042,6 +977,7 @@
Equipment rental
501012
+
@@ -1049,6 +985,7 @@
Finance costs
501013
+
@@ -1056,6 +993,7 @@
Insurance
501014
+
@@ -1063,6 +1001,7 @@
Interest paid
501015
+
@@ -1070,6 +1009,7 @@
Legal and professional fees
501016
+
@@ -1077,6 +1017,7 @@
Other miscellaneous service cost
501017
+
@@ -1084,6 +1025,7 @@
Payroll expenses
501018
+
@@ -1091,6 +1033,7 @@
Promotional meals
501019
+
@@ -1098,6 +1041,7 @@
Rent or lease of buildings
501020
+
@@ -1105,6 +1049,7 @@
Repair and maintenance
501021
+
@@ -1112,6 +1057,7 @@
Shipping, freight, and delivery
501022
+
@@ -1119,6 +1065,7 @@
Supplies
501023
+
@@ -1126,6 +1073,7 @@
Taxes paid
501024
+
@@ -1133,6 +1081,7 @@
Travel
501025
+
@@ -1140,6 +1089,7 @@
Travel meals
501026
+
@@ -1147,6 +1097,7 @@
Utilities
501027
+
@@ -1154,13 +1105,7 @@
Unapplied cash bill payment expense
501028
-
-
-
-
- Other Expenses
- 502
-
+
@@ -1168,6 +1113,7 @@
Amortisation
502001
+
@@ -1175,6 +1121,7 @@
Depreciation
502002
+
@@ -1182,6 +1129,7 @@
Exchange Gain or Loss
502003
+
@@ -1189,6 +1137,7 @@
Other Expense
502004
+
@@ -1196,20 +1145,17 @@
Penalties and settlements
502005
+
-
- Singapore Chart of Accounts - Standard
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
diff --git a/addons/l10n_sg/l10n_sg_chart_tax.xml b/addons/l10n_sg/l10n_sg_chart_tax.xml
index a42163fb6af..9c241de0e4c 100644
--- a/addons/l10n_sg/l10n_sg_chart_tax.xml
+++ b/addons/l10n_sg/l10n_sg_chart_tax.xml
@@ -1,85 +1,177 @@
-
+
+
+
+
+ Sales Tax 0% ES33
+ taxes
+
+
+
+ Sales Tax 7% DS
+ taxes
+
+
+
+ Sales Tax 0% ESN33
+ taxes
+
+
+
+ Sales Tax 0% OS
+ taxes
+
+
+
+ Sales Tax 0% ZR
+ taxes
+
+
+
+ Sales Tax 7% SR
+ taxes
+
+
+
+ Purchase Tax 7% TX-N33
+ taxes
+
+
+
+ Purchase Tax 7% TX-E33
+ taxes
+
+
+
+ Purchase Tax 7% BL
+ taxes
+
+
+
+ Purchase Tax 7% IM
+ taxes
+
+
+
+ Purchase Tax 7% TX-RE
+ taxes
+
+
+
+ Purchase Tax 0% ME
+ taxes
+
+
+
+ Purchase Tax 0% NR
+ taxes
+
+
+
+ Purchase Tax 0% ZP
+ taxes
+
+
+
+ Purchase Tax 0% OP
+ taxes
+
+
+
+ Purchase Tax 0% EP
+ taxes
+
+
+
+ Purchase Tax MES
+ taxes
+
+
+
+ Purchase Tax 7% TX7
+ taxes
+
+
Sales Tax 0% ES33
0% ES33
- 0.0
- percent
+ 0
+ percent
sale
-
-
-
+
+
+
Sales Tax 7% DS
7% DS
- 0.07
- percent
+ 7
+ percent
sale
-
-
-
+
+
+
Sales Tax 0% ESN33
0% ESN33
- 0.0
- percent
+ 0
+ percent
sale
-
-
-
+
+
+
Sales Tax 0% OS
0% OS
- 0.0
- percent
+ 0
+ percent
sale
-
-
-
+
+
+
Sales Tax 0% ZR
0% ZR
- 0.00
- percent
+ 0
+ percent
sale
-
-
-
+
+
+
Sales Tax 7% SR
7% SR
- 0.07
- percent
+ 7
+ percent
sale
-
-
-
+
+
+
@@ -87,158 +179,158 @@
Purchase Tax 7% TX-N33
7% TX-N33
-
-
+
+
- 0.07
- percent
+ 7
+ percent
purchase
-
+
Purchase Tax 7% TX-E33
7% TX-E33
-
-
+
+
- 0.07
- percent
+ 7
+ percent
purchase
-
+
Purchase Tax 7% BL
7% BL
-
-
+
+
- 0.07
- percent
+ 7
+ percent
purchase
-
+
Purchase Tax 7% IM
7% IM
-
-
+
+
- 0.07
- percent
+ 7
+ percent
purchase
-
+
Purchase Tax 7% TX-RE
7% TX-RE
-
-
+
+
- 0.07
- percent
+ 7
+ percent
purchase
-
+
Purchase Tax 0% ME
0% ME
-
-
+
+
- 0.0
- percent
+ 0
+ percent
purchase
-
+
Purchase Tax 0% NR
0% NR
-
-
+
+
- 0.0
- percent
+ 0
+ percent
purchase
-
+
Purchase Tax 0% ZP
0% ZP
-
-
+
+
- 0.0
- percent
+ 0
+ percent
purchase
-
+
Purchase Tax 0% OP
0% OP
-
-
+
+
- 0.0
- percent
+ 0
+ percent
purchase
-
+
Purchase Tax 0% EP
0% EP
-
-
+
+
- 0.0
- percent
+ 0
+ percent
purchase
-
+
Purchase Tax MES
0% MES
-
-
+
+
- 0.0
- percent
+ 0
+ percent
purchase
-
+
Purchase Tax 7% TX7
7% TX7
-
-
+
+
- 0.07
- percent
+ 7
+ percent
purchase
-
+
-
+
diff --git a/addons/l10n_sg/l10n_sg_wizard.xml b/addons/l10n_sg/l10n_sg_wizard.xml
deleted file mode 100644
index 19d27fb47c7..00000000000
--- a/addons/l10n_sg/l10n_sg_wizard.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- open
-
-
-
-