diff --git a/addons/account/account.py b/addons/account/account.py
index 5908fa737e0..5fd45977905 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1994,9 +1994,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
#create the account_account
dig = obj_multi.code_digits
- code_main = len(account_template.code)
- code_acc = account_template.code
- if code_main<=dig and account_template.type != 'view':
+ code_main = account_template.code and len(account_template.code) or 0
+ code_acc = account_template.code or ''
+ if code_main>0 and code_main<=dig and account_template.type != 'view':
code_acc=str(code_acc) + (str('0'*(dig-code_main)))
vals={
'name': (obj_acc_root.id == account_template.id) and obj_multi.company_id.name or account_template.name,
diff --git a/addons/l10n_chart_uk_minimal/__terp__.py b/addons/l10n_chart_uk_minimal/__terp__.py
index fc998f167cf..94da21b59ac 100644
--- a/addons/l10n_chart_uk_minimal/__terp__.py
+++ b/addons/l10n_chart_uk_minimal/__terp__.py
@@ -66,8 +66,8 @@
"depends" : ["base", "account", "base_iban", "base_vat", "account_chart"],
"init_xml" : [],
"demo_xml" : [],
- "update_xml" : ["account_chart.xml",
- "account_tax.xml"],
+ "update_xml" : ["account_types.xml","account_chart.xml",
+ "account_tax.xml","l10n_uk_wizard.xml"],
"installable": True
}
diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml
index 683252462f3..507c836c7e2 100755
--- a/addons/l10n_chart_uk_minimal/account_chart.xml
+++ b/addons/l10n_chart_uk_minimal/account_chart.xml
@@ -1,345 +1,186 @@
-
-
-
-
-
-
-
-
-
-
+
+
0
-
Account Chart UK
-
-
view
-
-
+
-
-
-
-
-
-
+
Balance Sheet
-
-
view
-
-
+
-
-
-
-
+
Fixed Assets
-
-
view
-
-
+
-
-
-
-
+
Fixed Asset Account
-
-
- asset
-
-
+ other
+
-
-
-
-
+
Net Current Assets
-
-
view
-
-
+
-
-
-
-
+
Current Assets
-
-
view
-
-
+
-
-
-
-
+
-
Purchased Stocks
-
-
- asset
-
-
+ other
+
-
-
-
-
+
-
Debtors
-
-
receivable
-
-
-
+
-
-
+
-
-
-
-
-
-
+
Output VAT
-
-
- tax
-
-
+ other
+
-
-
-
-
+
Bank Current Account
-
-
- cash
-
-
+ other
+
-
-
-
-
+
-
Cash
-
-
- cash
-
-
+ other
+
-
-
-
-
+
Current Liabilities
-
-
view
-
-
+
-
-
-
-
+
-
Creditors
-
-
payable
-
-
-
+
-
-
+
-
-
-
-
-
-
+
Input VAT
-
-
- tax
-
-
+ other
+
-
-
-
-
-
-
+
Profit and Loss
-
-
view
-
-
+
-
-
-
-
+
Revenue
-
-
view
-
-
+
-
-
-
-
+
-
Product Sales
-
-
- income
-
-
+ other
+
-
-
+
-
-
-
-
-
-
+
Cost of Sales
-
-
view
-
-
+
-
-
-
-
+
-
Cost of Goods Sold
-
-
- expense
-
-
+ other
+
-
-
-
-
+
Overheads
-
-
view
-
-
+
-
-
-
-
+
-
Expenses
-
-
- expense
-
-
+ other
+
-
-
-
+
+
+
-
-
-
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index c1b254865c7..f9064116d96 100755
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -1,444 +1,249 @@
-
-
-
-
-
-
-
-
-
-
-
-
- VAT balance to pay
-
+
+ Plan Fees UK
+
+ VAT Balance to Pay
+
+
-
-
-
+
Input VAT
-
-
-
-
-
-
- Input VAT rate S (17.5%)
-
+
+ Input VAT Rate S (17.5%)
-
-
-
-
-
- Input VAT rate R (5%)
-
+
+ Input VAT Rate R (5%)
-
-
-
-
-
-
-
+
Output VAT
-
-
-
-
-
-
- Output VAT rate S (17.5%)
-
+
+ Output VAT Rate S (17.5%)
-
-
-
-
-
- Output VAT rate R (5%)
-
+
+ Output VAT Rate R (5%)
-
-
-
-
-
-
-
-
-
- Tax bases
-
+
+ Tax Bases
+
-
-
-
-
- Taxable purchases base
-
+
+ Taxable Purchases Base
-
-
-
-
-
- Taxable purchases rated S (17.5%)
-
+
+ Taxable Purchases Rated S (17.5%)
-
-
-
-
-
- Taxable purchases rated R (5%)
-
+
+ Taxable Purchases Rated R (5%)
-
-
-
-
-
- Taxable purchases rated Z (0%)
-
+
+ Taxable Purchases Rated Z (0%)
-
-
-
-
-
- Taxable purchases type X (Exempt)
-
+
+ Taxable Purchases Type X (Exempt)
-
-
-
-
-
- Taxable purchases type O (Out of scope)
-
+
+ Taxable Purchases Type O (Out of scope)
-
-
-
-
-
-
-
- Base of taxable sales
-
+
+ Base of Taxable Sales
-
-
-
-
-
- Taxable sales rated S (17.5%)
-
+
+ Taxable Sales Rated S (17.5%)
-
-
-
-
-
- Taxable sales rated R (5%)
-
+
+ Taxable Sales Rated R (5%)
-
-
-
-
-
- Taxable sales rated Z (0%)
-
+
+ Taxable Sales Rated Z (0%)
-
-
-
-
-
- Taxable sales type X (Exempt)
-
+
+ Taxable Sales Type X (Exempt)
-
-
-
-
-
- Taxable sales type O (Out of scope)
-
+
+ Taxable Sales Type O (Out of scope)
-
+
-
-
+
+ UK Account Chart Template
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
IVAT S
-
-
percent
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
IVAT R
-
-
percent
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
IVAT Z
-
-
percent
-
-
-
-
-
-
-
+
+
IVAT X
-
-
percent
-
-
-
-
-
-
-
+
+
IVAT O
-
-
percent
-
-
-
-
-
-
+
-
-
-
-
+
+
OVAT S
-
-
percent
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
OVAT R
-
-
percent
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
OVAT Z
-
-
percent
-
-
-
-
-
-
-
+
+
OVAT X
-
-
percent
-
-
-
-
-
-
-
+
+
OVAT O
-
-
percent
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/account_types.xml
new file mode 100644
index 00000000000..51040cadbbd
--- /dev/null
+++ b/addons/l10n_chart_uk_minimal/account_types.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+ Receivable
+ receivable
+ unreconciled
+
+
+
+ Payable
+ payable
+ unreconciled
+
+
+
+ View
+ view
+ none
+
+
+
+ Income
+ income
+ none
+
+
+
+ Expense
+ expense
+ none
+
+
+
+ Tax
+ tax
+ unreconciled
+
+
+
+ Cash
+ cash
+ balance
+
+
+
+ Asset
+ asset
+ balance
+
+
+
+ Equity
+ equity
+ balance
+
+
+
+
diff --git a/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml b/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
new file mode 100644
index 00000000000..633209ae612
--- /dev/null
+++ b/addons/l10n_chart_uk_minimal/l10n_uk_wizard.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+ Generate Chart of Accounts from a Chart Template
+ Generate Chart of Accounts from a Chart Template. 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 accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
+This is the same wizard that runs from Financial Managament/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
+
+ open
+
+
+
+
\ No newline at end of file