From ff4ee2c17ed8ca4fd311070009846b744a526639 Mon Sep 17 00:00:00 2001
From: Pierre Rousseau <pro@odoo.com>
Date: Thu, 4 Jan 2018 14:45:56 +0100
Subject: [PATCH] [IMP] l10n_sg: improved localisation

    Added Unique Entity Number (UEN) to company and partner to use them in the IRAS Audit File (l10n_sg_reports)
    Changed vat_label on Singapore
    Added new taxes (2019)
    Fixed the Chart of Account (account codes and types)
    Added 'Permit Number' and 'Permit Number Date' on invoices
---
 addons/l10n_sg/__init__.py                    |   2 +-
 addons/l10n_sg/__manifest__.py                |  26 +-
 addons/l10n_sg/data/account_tax_data.xml      |  78 ++-
 addons/l10n_sg/data/l10n_sg_chart_data.xml    | 452 +++++++++---------
 addons/l10n_sg/models/__init__.py             |   8 +
 addons/l10n_sg/models/account_invoice.py      |  11 +
 addons/l10n_sg/models/res_company.py          |   9 +
 addons/l10n_sg/models/res_partner.py          |   9 +
 addons/l10n_sg/views/account_invoice_view.xml |  16 +
 addons/l10n_sg/views/res_company_view.xml     |  18 +
 addons/l10n_sg/views/res_partner_view.xml     |  15 +
 odoo/addons/base/data/res_country_data.xml    |   1 +
 12 files changed, 405 insertions(+), 240 deletions(-)
 create mode 100644 addons/l10n_sg/models/__init__.py
 create mode 100644 addons/l10n_sg/models/account_invoice.py
 create mode 100644 addons/l10n_sg/models/res_company.py
 create mode 100644 addons/l10n_sg/models/res_partner.py
 create mode 100644 addons/l10n_sg/views/account_invoice_view.xml
 create mode 100644 addons/l10n_sg/views/res_company_view.xml
 create mode 100644 addons/l10n_sg/views/res_partner_view.xml

diff --git a/addons/l10n_sg/__init__.py b/addons/l10n_sg/__init__.py
index e2f7da260d0..db21f743bc4 100644
--- a/addons/l10n_sg/__init__.py
+++ b/addons/l10n_sg/__init__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 # Copyright (C) 2014 Tech Receptives (<http://techreceptives.com>).
-
+from . import models
 
 def _preserve_tag_on_taxes(cr, registry):
     from odoo.addons.account.models.chart_template import preserve_existing_tags_on_taxes
diff --git a/addons/l10n_sg/__manifest__.py b/addons/l10n_sg/__manifest__.py
index 3520aca1721..13064a9c618 100644
--- a/addons/l10n_sg/__manifest__.py
+++ b/addons/l10n_sg/__manifest__.py
@@ -13,25 +13,21 @@
 Singapore accounting chart and localization.
 =======================================================
 
-After installing this module, the Configuration wizard for accounting is launched.
-    * The Chart of Accounts consists of the list of all the general ledger accounts
-      required to maintain the transactions of Singapore.
-    * On that particular wizard, you will be asked to pass the name of the company,
-      the chart template to follow, the no. of digits to generate, the code for your
-      account and bank account, currency to create journals.
-
-    * The Chart of Taxes would display the different types/groups of taxes such as
-      Standard Rates, Zeroed, Exempted, MES and Out of Scope.
-    * The tax codes are specified considering the Tax Group and for easy accessibility of
-      submission of GST Tax Report.
+This module add, for accounting:
+ - The Chart of Accounts of Singapore
+ - Field UEN (Unique Entity Number) on company and partner
+ - Field PermitNo and PermitNoDate on invoice
 
     """,
     'depends': ['base', 'account'],
     'data': [
-             'data/l10n_sg_chart_data.xml',
-             'data/account_data.xml',
-             'data/account_tax_data.xml',
-             'data/account_chart_template_data.xml',
+        'data/l10n_sg_chart_data.xml',
+        'data/account_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.xml',
+        'views/account_invoice_view.xml',
+        'views/res_company_view.xml',
+        'views/res_partner_view.xml',
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml
index e37eef5c499..3ca0a064296 100644
--- a/addons/l10n_sg/data/account_tax_data.xml
+++ b/addons/l10n_sg/data/account_tax_data.xml
@@ -56,7 +56,7 @@
         <field name="applicability">taxes</field>
     </record>
     <record id="tag_sg_14" model="account.account.tag">
-        <field name="name">Tax Paid @ 0% ME</field>
+        <field name="name">Tax Paid @ 7% IGDS</field>
         <field name="applicability">taxes</field>
     </record>
     <record id="tag_sg_15" model="account.account.tag">
@@ -164,7 +164,7 @@
         <field name="applicability">taxes</field>
     </record>
     <record id="tag_sg_41" model="account.account.tag">
-        <field name="name">Purchase 0% Standard ME</field>
+        <field name="name">Purchase 7% Standard IGDS</field>
         <field name="applicability">taxes</field>
     </record>
     <record id="tag_sg_42" model="account.account.tag">
@@ -191,6 +191,30 @@
         <field name="name">Sales Out Of Scope</field>
         <field name="applicability">taxes</field>
     </record>
+    <record id="tag_sg_48" model="account.account.tag">
+        <field name="name">Tax Received SRCA-S</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_49" model="account.account.tag">
+        <field name="name">Tax Received @ 7% SRCA-C</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_50" model="account.account.tag">
+        <field name="name">Tax Paid @ 7% TXCA</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_51" model="account.account.tag">
+        <field name="name">Sales Standard SRCA-S</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_52" model="account.account.tag">
+        <field name="name">Sales 7% Standard SRCA-C</field>
+        <field name="applicability">taxes</field>
+    </record>
+    <record id="tag_sg_53" model="account.account.tag">
+        <field name="name">Purchase 7% Standard TXCA</field>
+        <field name="applicability">taxes</field>
+    </record>
 
     <!-- Sales Tax -->
 
@@ -278,6 +302,34 @@
         <field name="tax_group_id" ref="tax_group_7"/>
     </record>
 
+    <record id="sg_sale_tax_srca_s_na" model="account.tax.template">
+        <field name="name">Sales Tax SRCA-S</field>
+        <field name="description">SRCA-S</field>
+        <field name="price_include" eval="0"/>
+        <field name="amount">0</field>
+        <field name="amount_type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_id" ref="account_account_797"/>
+        <field name="refund_account_id" ref="account_account_797"/>
+        <field name="chart_template_id" ref="sg_chart_template"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_48'),ref('tag_sg_51')])]"/>
+        <field name="tax_group_id" ref="tax_group_0"/>
+    </record>
+
+    <record id="sg_sale_tax_srca_c_7" model="account.tax.template">
+        <field name="name">Sales Tax 7% SRCA-C</field>
+        <field name="description">7% SRCA-C</field>
+        <field name="price_include" eval="0"/>
+        <field name="amount">7</field>
+        <field name="amount_type">percent</field>
+        <field name="type_tax_use">sale</field>
+        <field name="account_id" ref="account_account_798"/>
+        <field name="refund_account_id" ref="account_account_798"/>
+        <field name="chart_template_id" ref="sg_chart_template"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_49'),ref('tag_sg_52')])]"/>
+        <field name="tax_group_id" ref="tax_group_7"/>
+    </record>
+
     <!-- Purchases Tax -->
 
     <record id="sg_purchase_tax_txn33_7" model="account.tax.template">
@@ -351,17 +403,17 @@
     </record>
 
     <record id="sg_purchase_tax_me_0" model="account.tax.template">
-        <field name="name">Purchase Tax 0% ME</field>
-        <field name="description">0% ME</field>
+        <field name="name">Purchase Tax 7% IGDS</field>
+        <field name="description">7% IGDS</field>
         <field name="account_id" ref="account_account_743"/>
         <field name="refund_account_id" ref="account_account_743"/>
         <field name="price_include" eval="0"/>
-        <field name="amount">0</field>
+        <field name="amount">7</field>
         <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="chart_template_id" ref="sg_chart_template"/>
         <field name="tag_ids" eval="[(6,0,[ref('tag_sg_14'),ref('tag_sg_41')])]"/>
-        <field name="tax_group_id" ref="tax_group_0"/>
+        <field name="tax_group_id" ref="tax_group_7"/>
     </record>
 
     <record id="sg_purchase_tax_nr_0" model="account.tax.template">
@@ -448,5 +500,19 @@
         <field name="tax_group_id" ref="tax_group_7"/>
     </record>
 
+    <record id="sg_purchase_tax_txca_7" model="account.tax.template">
+        <field name="name">Purchase Tax 7% TXCA</field>
+        <field name="description">7% TXCA</field>
+        <field name="account_id" ref="account_account_750"/>
+        <field name="refund_account_id" ref="account_account_750"/>
+        <field name="price_include" eval="0"/>
+        <field name="amount">7</field>
+        <field name="amount_type">percent</field>
+        <field name="type_tax_use">purchase</field>
+        <field name="chart_template_id" ref="sg_chart_template"/>
+        <field name="tag_ids" eval="[(6,0,[ref('tag_sg_50'),ref('tag_sg_53')])]"/>
+        <field name="tax_group_id" ref="tax_group_7"/>
+    </record>
+
     </data>
 </odoo>
diff --git a/addons/l10n_sg/data/l10n_sg_chart_data.xml b/addons/l10n_sg/data/l10n_sg_chart_data.xml
index 67e93ce24f8..12fd0eed68e 100644
--- a/addons/l10n_sg/data/l10n_sg_chart_data.xml
+++ b/addons/l10n_sg/data/l10n_sg_chart_data.xml
@@ -4,15 +4,15 @@
 
         <record id="transfer_account_id" model="account.account.template">
             <field name="name">Transfer Accounts</field>
-            <field name="code">100301</field>
+            <field name="code">101100</field>
             <field name="reconcile" eval="True"/>
             <field name="user_type_id" ref="account.data_account_type_current_assets"/>
         </record>
 
         <record id="sg_chart_template" model="account.chart.template">
             <field name="name">Singapore Chart of Accounts - Standard</field>
-            <field name="cash_account_code_prefix">1001</field>
-            <field name="bank_account_code_prefix">1002</field>
+            <field name="cash_account_code_prefix">10140</field>
+            <field name="bank_account_code_prefix">10141</field>
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.SGD" />
             <field name="transfer_account_id" ref="transfer_account_id"/>
@@ -23,24 +23,24 @@
         </record>
 
         <record model="account.account.template" id="account_account_696">
-            <field name="name">Allowance for bad debts</field>
-            <field name="code">101001</field>
+            <field name="name">Allowance for Bad Debts</field>
+            <field name="code">101110</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_697">
-            <field name="name">Development costs</field>
-            <field name="code">101002</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Development Costs</field>
+            <field name="code">104100</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_698">
-            <field name="name">Employee cash advances</field>
-            <field name="code">101003</field>
+            <field name="name">Employee Cash Advances</field>
+            <field name="code">101120</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -48,47 +48,47 @@
 
         <record model="account.account.template" id="account_account_699">
             <field name="name">Inventory</field>
-            <field name="code">101004</field>
+            <field name="code">101130</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_700">
-            <field name="name">Investments - other</field>
-            <field name="code">101005</field>
+            <field name="name">Investments - Other</field>
+            <field name="code">101140</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_701">
-            <field name="name">Loans to officers</field>
-            <field name="code">101006</field>
+            <field name="name">Loans to Officers</field>
+            <field name="code">101150</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_702">
-            <field name="name">Loans to others</field>
-            <field name="code">101007</field>
+            <field name="name">Loans to Others</field>
+            <field name="code">101160</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_703">
-            <field name="name">Loans to shareholders</field>
-            <field name="code">101008</field>
+            <field name="name">Loans to Shareholders</field>
+            <field name="code">101170</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_704">
-            <field name="name">Prepaid expenses</field>
-            <field name="code">101009</field>
+            <field name="name">Prepaid Expenses</field>
+            <field name="code">101180</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -96,15 +96,15 @@
 
         <record model="account.account.template" id="account_account_705">
             <field name="name">Retainage</field>
-            <field name="code">101010</field>
+            <field name="code">101190</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_706">
-            <field name="name">Undeposited funds</field>
-            <field name="code">101011</field>
+            <field name="name">Undeposited Funds</field>
+            <field name="code">101200</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -112,119 +112,119 @@
 
         <record model="account.account.template" id="account_account_707">
             <field name="name">Other Current Assets</field>
-            <field name="code">101012</field>
+            <field name="code">101210</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_709">
-            <field name="name">Accumulated amortisation</field>
-            <field name="code">102001</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Accumulated Amortisation</field>
+            <field name="code">103100</field>
+            <field name="user_type_id" ref="account.data_account_type_depreciation" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_710">
-            <field name="name">Accumulated depreciation</field>
-            <field name="code">102002</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Accumulated Depreciation</field>
+            <field name="code">103110</field>
+            <field name="user_type_id" ref="account.data_account_type_depreciation" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_711">
-            <field name="name">Accumulated depletion</field>
-            <field name="code">102003</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Accumulated Depletion</field>
+            <field name="code">103120</field>
+            <field name="user_type_id" ref="account.data_account_type_depreciation" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_712">
             <field name="name">Buildings</field>
-            <field name="code">102004</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">102100</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_713">
-            <field name="name">Depletable assets</field>
-            <field name="code">102005</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Depletable Assets</field>
+            <field name="code">102110</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_714">
-            <field name="name">Furniture and fixtures</field>
-            <field name="code">102006</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Furniture and Fixtures</field>
+            <field name="code">102120</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_715">
-            <field name="name">Leasehold improvements</field>
-            <field name="code">102007</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Leasehold Improvements</field>
+            <field name="code">102130</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_716">
-            <field name="name">Machinery and equipment</field>
-            <field name="code">102008</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Machinery and Equipment</field>
+            <field name="code">102140</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_717">
             <field name="name">Vehicles</field>
-            <field name="code">102009</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">102150</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_718">
             <field name="name">Other Assets</field>
-            <field name="code">102010</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">102160</field>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_720">
             <field name="name">Intangible Assets</field>
-            <field name="code">103001</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">104110</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_721">
-            <field name="name">Accumulated amortization of non-current assets</field>
-            <field name="code">103002</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Accumulated Amortization of Non-current Assets</field>
+            <field name="code">103130</field>
+            <field name="user_type_id" ref="account.data_account_type_depreciation" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_722">
-            <field name="name">Available-for-sale financial assets</field>
-            <field name="code">103003</field>
+            <field name="name">Available-for-sale Financial Assets</field>
+            <field name="code">101220</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_723">
-            <field name="name">Deferred tax</field>
-            <field name="code">103004</field>
+            <field name="name">Deferred Tax</field>
+            <field name="code">101230</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -232,63 +232,63 @@
 
         <record model="account.account.template" id="account_account_724">
             <field name="name">Goodwill</field>
-            <field name="code">103005</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">104120</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_725">
             <field name="name">Investments</field>
-            <field name="code">103006</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">104130</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_726">
             <field name="name">Lease Buyout</field>
-            <field name="code">103007</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">104140</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_727">
             <field name="name">Licences</field>
-            <field name="code">103008</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="code">104150</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_728">
-            <field name="name">Organisational costs</field>
-            <field name="code">103009</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Organisational Costs</field>
+            <field name="code">104160</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_729">
-            <field name="name">Other intangible assets</field>
-            <field name="code">103010</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Other Intangible Assets</field>
+            <field name="code">104170</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_730">
-            <field name="name">Other non-current assets</field>
-            <field name="code">103011</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="name">Other Non-current Assets</field>
+            <field name="code">104180</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_731">
-            <field name="name">Prepayments and accrued income</field>
-            <field name="code">103012</field>
+            <field name="name">Prepayments and Accrued Income</field>
+            <field name="code">101240</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -296,23 +296,15 @@
 
         <record model="account.account.template" id="account_account_732">
             <field name="name">Security Deposits</field>
-            <field name="code">103013</field>
+            <field name="code">101250</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
-
-        <record model="account.account.template" id="account_account_733">
-            <field name="name">Other non-current assets</field>
-            <field name="code">103014</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets" />
-            <field name="chart_template_id" ref="sg_chart_template"/>
-            <field name="reconcile" eval="False" />
-        </record>
-
+        
         <record model="account.account.template" id="account_account_735">
             <field name="name">Trade Receivable Account</field>
-            <field name="code">104001</field>
+            <field name="code">100010</field>
             <field name="user_type_id" ref="account.data_account_type_receivable" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="True" />
@@ -320,7 +312,7 @@
 
         <record model="account.account.template" id="account_account_736">
             <field name="name">Other Receivable Account</field>
-            <field name="code">104002</field>
+            <field name="code">100020</field>
             <field name="user_type_id" ref="account.data_account_type_receivable" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="True" />
@@ -328,7 +320,7 @@
 
         <record model="account.account.template" id="account_account_738">
             <field name="name">Purchase Tax Account 7% TX-N33</field>
-            <field name="code">105001</field>
+            <field name="code">101260</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -336,7 +328,7 @@
 
         <record model="account.account.template" id="account_account_739">
             <field name="name">Purchase Tax Account 7% TX-E33</field>
-            <field name="code">105002</field>
+            <field name="code">101270</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -344,7 +336,7 @@
 
         <record model="account.account.template" id="account_account_740">
             <field name="name">Purchase Tax Account 7% BL</field>
-            <field name="code">105003</field>
+            <field name="code">101280</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -352,7 +344,7 @@
 
         <record model="account.account.template" id="account_account_741">
             <field name="name">Purchase Tax Account 7% IM</field>
-            <field name="code">105004</field>
+            <field name="code">101290</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -360,15 +352,15 @@
 
         <record model="account.account.template" id="account_account_742">
             <field name="name">Purchase Tax Account 7% TX-RE</field>
-            <field name="code">105005</field>
+            <field name="code">101300</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_743">
-            <field name="name">Purchase Tax Account 0% ME</field>
-            <field name="code">105006</field>
+            <field name="name">Purchase Tax Account 7% IGDS</field>
+            <field name="code">101310</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -376,7 +368,7 @@
 
         <record model="account.account.template" id="account_account_744">
             <field name="name">Purchase Tax Account 0% NR</field>
-            <field name="code">105007</field>
+            <field name="code">101320</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -384,7 +376,7 @@
 
         <record model="account.account.template" id="account_account_745">
             <field name="name">Purchase Tax Account 0% ZP</field>
-            <field name="code">105008</field>
+            <field name="code">101330</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -392,7 +384,7 @@
 
         <record model="account.account.template" id="account_account_746">
             <field name="name">Purchase Tax Account 0% OP</field>
-            <field name="code">105009</field>
+            <field name="code">101340</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -400,7 +392,7 @@
 
         <record model="account.account.template" id="account_account_747">
             <field name="name">Purchase Tax Account 0% EP</field>
-            <field name="code">105010</field>
+            <field name="code">101350</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -408,7 +400,7 @@
 
         <record model="account.account.template" id="account_account_748">
             <field name="name">Purchase Tax Account MES</field>
-            <field name="code">105011</field>
+            <field name="code">101360</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -416,23 +408,31 @@
 
         <record model="account.account.template" id="account_account_749">
             <field name="name">Purchase Tax Account 7% TX7</field>
-            <field name="code">105012</field>
+            <field name="code">101370</field>
+            <field name="user_type_id" ref="account.data_account_type_current_assets" />
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="reconcile" eval="False" />
+        </record>
+
+        <record model="account.account.template" id="account_account_750">
+            <field name="name">Purchase Tax Account 7% TXCA</field>
+            <field name="code">101380</field>
             <field name="user_type_id" ref="account.data_account_type_current_assets" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_752">
-            <field name="name">Current portion of employee benefits obligations</field>
-            <field name="code">200001</field>
+            <field name="name">Current Portion of Employee Benefits Obligations</field>
+            <field name="code">201000</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_753">
-            <field name="name">Current portion of obligations under finance leases</field>
-            <field name="code">200002</field>
+            <field name="name">Current Portion of Obligations under Finance Leases</field>
+            <field name="code">201010</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -440,7 +440,7 @@
 
         <record model="account.account.template" id="account_account_754">
             <field name="name">Current Tax Liability</field>
-            <field name="code">200003</field>
+            <field name="code">201020</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -448,15 +448,15 @@
 
         <record model="account.account.template" id="account_account_755">
             <field name="name">Insurance Payable</field>
-            <field name="code">200004</field>
+            <field name="code">201030</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_756">
-            <field name="name">Interest payables</field>
-            <field name="code">200005</field>
+            <field name="name">Interest Payables</field>
+            <field name="code">201040</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -464,7 +464,7 @@
 
         <record model="account.account.template" id="account_account_757">
             <field name="name">Line of Credit</field>
-            <field name="code">200006</field>
+            <field name="code">201050</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -472,7 +472,7 @@
 
         <record model="account.account.template" id="account_account_758">
             <field name="name">Loan Payable</field>
-            <field name="code">200007</field>
+            <field name="code">201060</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -480,15 +480,15 @@
 
         <record model="account.account.template" id="account_account_759">
             <field name="name">Payroll Clearing</field>
-            <field name="code">200008</field>
+            <field name="code">201070</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_760">
-            <field name="name">Payroll liabilities</field>
-            <field name="code">200009</field>
+            <field name="name">Payroll Liabilities</field>
+            <field name="code">201080</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -496,23 +496,23 @@
 
         <record model="account.account.template" id="account_account_761">
             <field name="name">Prepaid Expenses Payable</field>
-            <field name="code">200010</field>
+            <field name="code">201090</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_762">
-            <field name="name">Provision for warranty obligations</field>
-            <field name="code">200011</field>
+            <field name="name">Provision for Warranty Obligations</field>
+            <field name="code">201100</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_763">
-            <field name="name">Rents in trust - Liability</field>
-            <field name="code">200012</field>
+            <field name="name">Rents in Trust - Liability</field>
+            <field name="code">201110</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -520,15 +520,15 @@
 
         <record model="account.account.template" id="account_account_764">
             <field name="name">GST Payable</field>
-            <field name="code">200013</field>
+            <field name="code">201120</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_765">
-            <field name="name">Short term borrowings</field>
-            <field name="code">200014</field>
+            <field name="name">Short Term Borrowings</field>
+            <field name="code">201130</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -536,7 +536,7 @@
 
         <record model="account.account.template" id="account_account_766">
             <field name="name">Client Trust Accounts - Liabilities</field>
-            <field name="code">200015</field>
+            <field name="code">201140</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -544,71 +544,71 @@
 
         <record model="account.account.template" id="account_account_768">
             <field name="name">Accruals and Deferred Income</field>
-            <field name="code">201001</field>
+            <field name="code">201150</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_769">
-            <field name="name">Bank loans</field>
-            <field name="code">201002</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="name">Bank Loans</field>
+            <field name="code">202000</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_770">
-            <field name="name">Obligations under finance leases</field>
-            <field name="code">201003</field>
+            <field name="name">Obligations under Finance Leases</field>
+            <field name="code">201160</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_771">
-            <field name="name">Long term borrowings</field>
-            <field name="code">201004</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="name">Long Term Borrowings</field>
+            <field name="code">202010</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_772">
-            <field name="name">Long term employee benefit obligations</field>
-            <field name="code">201005</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="name">Long Term Employee Benefit Obligations</field>
+            <field name="code">202020</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_773">
             <field name="name">Notes Payable</field>
-            <field name="code">201006</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="code">202030</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_774">
             <field name="name">Shareholder Notes Payable</field>
-            <field name="code">201007</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="code">202040</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_775">
-            <field name="name">Other non-current liabilities</field>
-            <field name="code">201008</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="name">Other Non-current Liabilities</field>
+            <field name="code">202050</field>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_777">
             <field name="name">Trade Payable Account</field>
-            <field name="code">202001</field>
+            <field name="code">200010</field>
             <field name="user_type_id" ref="account.data_account_type_payable" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="True" />
@@ -616,7 +616,7 @@
 
         <record model="account.account.template" id="account_account_778">
             <field name="name">Other Payable Account</field>
-            <field name="code">202002</field>
+            <field name="code">200020</field>
             <field name="user_type_id" ref="account.data_account_type_payable" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="True" />
@@ -624,7 +624,7 @@
 
         <record model="account.account.template" id="account_account_780">
             <field name="name">Partner's Equity</field>
-            <field name="code">203001</field>
+            <field name="code">203000</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -632,15 +632,15 @@
 
         <record model="account.account.template" id="account_account_781">
             <field name="name">Accumulated Adjustment</field>
-            <field name="code">203002</field>
+            <field name="code">203010</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_782">
-            <field name="name">Ordinary shares</field>
-            <field name="code">203003</field>
+            <field name="name">Ordinary Shares</field>
+            <field name="code">203020</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -648,7 +648,7 @@
 
         <record model="account.account.template" id="account_account_783">
             <field name="name">Opening Balance Equity</field>
-            <field name="code">203004</field>
+            <field name="code">203030</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -656,23 +656,23 @@
 
         <record model="account.account.template" id="account_account_784">
             <field name="name">Owner's Equity</field>
-            <field name="code">203005</field>
+            <field name="code">203040</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_785">
-            <field name="name">Paid-in capital or surplus</field>
-            <field name="code">203006</field>
+            <field name="name">Paid-in Capital or Surplus</field>
+            <field name="code">203050</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_786">
-            <field name="name">Preferred shares</field>
-            <field name="code">203007</field>
+            <field name="name">Preferred Shares</field>
+            <field name="code">203060</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -680,15 +680,15 @@
 
         <record model="account.account.template" id="account_account_787">
             <field name="name">Retained Earnings</field>
-            <field name="code">203008</field>
+            <field name="code">203070</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_788">
-            <field name="name">Share capital</field>
-            <field name="code">203009</field>
+            <field name="name">Share Capital</field>
+            <field name="code">203080</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -696,7 +696,7 @@
 
         <record model="account.account.template" id="account_account_789">
             <field name="name">Treasury Shares</field>
-            <field name="code">203010</field>
+            <field name="code">203090</field>
             <field name="user_type_id" ref="account.data_account_type_equity" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -704,7 +704,7 @@
 
         <record model="account.account.template" id="account_account_791">
             <field name="name"> Sales Tax Account 0% ES33</field>
-            <field name="code">204001</field>
+            <field name="code">201170</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -712,7 +712,7 @@
 
         <record model="account.account.template" id="account_account_792">
             <field name="name">Sales Tax Account 7% DS</field>
-            <field name="code">204002</field>
+            <field name="code">201180</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -720,7 +720,7 @@
 
         <record model="account.account.template" id="account_account_793">
             <field name="name">Sales Tax Account 0% ESN33</field>
-            <field name="code">204003</field>
+            <field name="code">201190</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -728,7 +728,7 @@
 
         <record model="account.account.template" id="account_account_794">
             <field name="name">Sales Tax Account 0% OS</field>
-            <field name="code">204004</field>
+            <field name="code">201200</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -736,7 +736,7 @@
 
         <record model="account.account.template" id="account_account_795">
             <field name="name">Sales Tax Account 0% ZR</field>
-            <field name="code">204005</field>
+            <field name="code">201210</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
@@ -744,14 +744,30 @@
 
         <record model="account.account.template" id="account_account_796">
             <field name="name">Sales Tax Account 7% SR</field>
-            <field name="code">204006</field>
+            <field name="code">201220</field>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="reconcile" eval="False" />
+        </record>
+
+        <record model="account.account.template" id="account_account_797">
+            <field name="name">Sales Tax Account SRCA-S</field>
+            <field name="code">201230</field>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
+            <field name="chart_template_id" ref="sg_chart_template"/>
+            <field name="reconcile" eval="False" />
+        </record>
+
+        <record model="account.account.template" id="account_account_798">
+            <field name="name">Sales Tax Account 7% SRCA-C</field>
+            <field name="code">201240</field>
             <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_800">
-            <field name="name">Discounts/refunds given</field>
+            <field name="name">Discounts/Refunds -Given</field>
             <field name="code">300001</field>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -759,7 +775,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_801">
-            <field name="name">Non-profit revenue</field>
+            <field name="name">Non-profit Revenue</field>
             <field name="code">300002</field>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -767,7 +783,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_802">
-            <field name="name">Other primary revenue</field>
+            <field name="name">Other Primary Revenue</field>
             <field name="code">300003</field>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -775,7 +791,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_803">
-            <field name="name">Sales of product revenue</field>
+            <field name="name">Sales of Product Revenue</field>
             <field name="code">300004</field>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -783,7 +799,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_804">
-            <field name="name">Service/fee revenue</field>
+            <field name="name">Service/Fee Revenue</field>
             <field name="code">300005</field>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -791,7 +807,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_805">
-            <field name="name">Unapplied cash payment income</field>
+            <field name="name">Unapplied Cash Payment Income</field>
             <field name="code">300006</field>
             <field name="user_type_id" ref="account.data_account_type_revenue" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -799,49 +815,49 @@
         </record>
 
         <record model="account.account.template" id="account_account_807">
-            <field name="name">Dividend revenue</field>
+            <field name="name">Dividend Revenue</field>
             <field name="code">301001</field>
-            <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="user_type_id" ref="account.data_account_type_other_income" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_808">
-            <field name="name">Gain/loss on sale of fixed assets or investments</field>
+            <field name="name">Gain/Loss on Sale of Fixed Assets or Investments</field>
             <field name="code">301002</field>
-            <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="user_type_id" ref="account.data_account_type_other_income" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_809">
-            <field name="name">Interest earned</field>
+            <field name="name">Interest Earned</field>
             <field name="code">301003</field>
-            <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="user_type_id" ref="account.data_account_type_other_income" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_810">
-            <field name="name">Other investment revenue</field>
+            <field name="name">Other Investment Revenue</field>
             <field name="code">301004</field>
-            <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="user_type_id" ref="account.data_account_type_other_income" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_811">
-            <field name="name">Other miscellaneous revenue</field>
+            <field name="name">Other Miscellaneous Revenue</field>
             <field name="code">301005</field>
-            <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="user_type_id" ref="account.data_account_type_other_income" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_812">
-            <field name="name">Tax-exempt interest</field>
+            <field name="name">Tax-exempt Interest</field>
             <field name="code">301006</field>
-            <field name="user_type_id" ref="account.data_account_type_revenue" />
+            <field name="user_type_id" ref="account.data_account_type_other_income" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
@@ -849,45 +865,45 @@
         <record model="account.account.template" id="account_account_815">
             <field name="name">Cost of Labour - COS</field>
             <field name="code">401001</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
+            <field name="user_type_id" ref="account.data_account_type_direct_costs" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_816">
-            <field name="name">Equipment rental - COS</field>
+            <field name="name">Equipment Rental - COS</field>
             <field name="code">401002</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
+            <field name="user_type_id" ref="account.data_account_type_direct_costs" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_817">
-            <field name="name">Freight and delivery - COS</field>
+            <field name="name">Freight and Delivery - COS</field>
             <field name="code">401003</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
+            <field name="user_type_id" ref="account.data_account_type_direct_costs" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_818">
-            <field name="name">Other costs of sales - COS</field>
+            <field name="name">Other Costs of Sales - COS</field>
             <field name="code">401004</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
+            <field name="user_type_id" ref="account.data_account_type_direct_costs" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_819">
-            <field name="name">Supplies and materials - COS</field>
+            <field name="name">Supplies and Materials - COS</field>
             <field name="code">401005</field>
-            <field name="user_type_id" ref="account.data_account_type_expenses" />
+            <field name="user_type_id" ref="account.data_account_type_direct_costs" />
             <field name="chart_template_id" ref="sg_chart_template"/>
             <field name="reconcile" eval="False" />
         </record>
 
         <record model="account.account.template" id="account_account_822">
-            <field name="name">Administrative expenses</field>
+            <field name="name">Administrative Expenses</field>
             <field name="code">501001</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -895,7 +911,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_823">
-            <field name="name">Advertising/promotional</field>
+            <field name="name">Advertising/Promotional</field>
             <field name="code">501002</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -911,7 +927,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_825">
-            <field name="name">Bad debts</field>
+            <field name="name">Bad Debts</field>
             <field name="code">501004</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -919,7 +935,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_826">
-            <field name="name">Bank charges</field>
+            <field name="name">Bank Charges</field>
             <field name="code">501005</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -927,7 +943,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_827">
-            <field name="name">Charitable contributions</field>
+            <field name="name">Charitable Contributions</field>
             <field name="code">501006</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -935,7 +951,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_828">
-            <field name="name">Cost of labour</field>
+            <field name="name">Cost of Labour</field>
             <field name="code">501007</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -943,7 +959,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_829">
-            <field name="name">Distribution costs</field>
+            <field name="name">Distribution Costs</field>
             <field name="code">501008</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -951,7 +967,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_830">
-            <field name="name">Dues and subscriptions</field>
+            <field name="name">Dues and Subscriptions</field>
             <field name="code">501009</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -967,7 +983,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_832">
-            <field name="name">Meals and entertainment</field>
+            <field name="name">Meals and Entertainment</field>
             <field name="code">501011</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -975,7 +991,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_833">
-            <field name="name">Equipment rental</field>
+            <field name="name">Equipment Rental</field>
             <field name="code">501012</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -983,7 +999,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_834">
-            <field name="name">Finance costs</field>
+            <field name="name">Finance Costs</field>
             <field name="code">501013</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -999,7 +1015,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_836">
-            <field name="name">Interest paid</field>
+            <field name="name">Interest Paid</field>
             <field name="code">501015</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1007,7 +1023,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_837">
-            <field name="name">Legal and professional fees</field>
+            <field name="name">Legal and Professional Fees</field>
             <field name="code">501016</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1015,7 +1031,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_838">
-            <field name="name">Other miscellaneous service cost</field>
+            <field name="name">Other Miscellaneous Service Cost</field>
             <field name="code">501017</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1023,7 +1039,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_839">
-            <field name="name">Payroll expenses</field>
+            <field name="name">Payroll Expenses</field>
             <field name="code">501018</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1031,7 +1047,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_840">
-            <field name="name">Promotional meals</field>
+            <field name="name">Promotional Meals</field>
             <field name="code">501019</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1039,7 +1055,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_841">
-            <field name="name">Rent or lease of buildings</field>
+            <field name="name">Rent or Lease of Buildings</field>
             <field name="code">501020</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1047,7 +1063,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_842">
-            <field name="name">Repair and maintenance</field>
+            <field name="name">Repair and Maintenance</field>
             <field name="code">501021</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1055,7 +1071,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_843">
-            <field name="name">Shipping, freight, and delivery</field>
+            <field name="name">Shipping, Freight, and Delivery</field>
             <field name="code">501022</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1071,7 +1087,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_845">
-            <field name="name">Taxes paid</field>
+            <field name="name">Taxes Paid</field>
             <field name="code">501024</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1087,7 +1103,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_847">
-            <field name="name">Travel meals</field>
+            <field name="name">Travel Meals</field>
             <field name="code">501026</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1103,7 +1119,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_849">
-            <field name="name">Unapplied cash bill payment expense</field>
+            <field name="name">Unapplied Cash Bill Payment Expense</field>
             <field name="code">501028</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
@@ -1143,7 +1159,7 @@
         </record>
 
         <record model="account.account.template" id="account_account_855">
-            <field name="name">Penalties and settlements</field>
+            <field name="name">Penalties and Settlements</field>
             <field name="code">502005</field>
             <field name="user_type_id" ref="account.data_account_type_expenses" />
             <field name="chart_template_id" ref="sg_chart_template"/>
diff --git a/addons/l10n_sg/models/__init__.py b/addons/l10n_sg/models/__init__.py
new file mode 100644
index 00000000000..a4f534641a6
--- /dev/null
+++ b/addons/l10n_sg/models/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (C) 2014 Tech Receptives (<http://techreceptives.com>).
+
+from . import account_invoice
+from . import res_company
+from . import res_partner
diff --git a/addons/l10n_sg/models/account_invoice.py b/addons/l10n_sg/models/account_invoice.py
new file mode 100644
index 00000000000..3821eb7c69e
--- /dev/null
+++ b/addons/l10n_sg/models/account_invoice.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+class AccountInvoice(models.Model):
+    _name = 'account.invoice'
+    _inherit = 'account.invoice'
+
+    l10n_sg_permit_number = fields.Char(string="Permit No.")
+
+    l10n_sg_permit_number_date = fields.Date(string="Date of permit number")
diff --git a/addons/l10n_sg/models/res_company.py b/addons/l10n_sg/models/res_company.py
new file mode 100644
index 00000000000..c894cf1a1a9
--- /dev/null
+++ b/addons/l10n_sg/models/res_company.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+class ResCompany(models.Model):
+    _name = 'res.company'
+    _inherit = 'res.company'
+
+    l10n_sg_unique_entity_number = fields.Char(string='UEN', related="partner_id.l10n_sg_unique_entity_number")
diff --git a/addons/l10n_sg/models/res_partner.py b/addons/l10n_sg/models/res_partner.py
new file mode 100644
index 00000000000..1bf9802a9a5
--- /dev/null
+++ b/addons/l10n_sg/models/res_partner.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+class ResPartner(models.Model):
+    _name = 'res.partner'
+    _inherit = 'res.partner'
+
+    l10n_sg_unique_entity_number = fields.Char(string='UEN')
diff --git a/addons/l10n_sg/views/account_invoice_view.xml b/addons/l10n_sg/views/account_invoice_view.xml
new file mode 100644
index 00000000000..5987650a7a9
--- /dev/null
+++ b/addons/l10n_sg/views/account_invoice_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="view_invoice_form_l10n_sg" model="ir.ui.view">
+            <field name="name">l10n_sg.invoice.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_supplier_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='fiscal_position_id']" position="after">
+                    <field name="l10n_sg_permit_number"/>
+                    <field name="l10n_sg_permit_number_date"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/l10n_sg/views/res_company_view.xml b/addons/l10n_sg/views/res_company_view.xml
new file mode 100644
index 00000000000..0d012bd4621
--- /dev/null
+++ b/addons/l10n_sg/views/res_company_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="view_company_form_l10n_sg" model="ir.ui.view">
+            <field name="name">l10n_sg.company.form</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='email']" position="after">
+                  <field name="l10n_sg_unique_entity_number"/>
+                </xpath>
+                <xpath expr="//field[@name='vat']" position="attributes">
+                  <attribute name="string" >GST No.</attribute>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/l10n_sg/views/res_partner_view.xml b/addons/l10n_sg/views/res_partner_view.xml
new file mode 100644
index 00000000000..c1c7ac47f79
--- /dev/null
+++ b/addons/l10n_sg/views/res_partner_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <record id="view_partner_form_l10n_sg" model="ir.ui.view">
+            <field name="name">l10n_sg.partner.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='vat']" position="before">
+                  <field name="l10n_sg_unique_entity_number"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/odoo/addons/base/data/res_country_data.xml b/odoo/addons/base/data/res_country_data.xml
index 031af455c5b..bdc333b8610 100644
--- a/odoo/addons/base/data/res_country_data.xml
+++ b/odoo/addons/base/data/res_country_data.xml
@@ -1415,6 +1415,7 @@
             <field file="base/static/img/country_flags/sg.png" name="image" type="base64" />
             <field name="currency_id" ref="SGD" />
             <field eval="65" name="phone_code" />
+            <field name="vat_label">GST No.</field>
         </record>
         <record id="sh" model="res.country">
             <field name="name">Saint Helena, Ascension and Tristan da Cunha</field>