diff --git a/addons/account/account.py b/addons/account/account.py index 52bee770bef..8b7d286cb6b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2342,6 +2342,7 @@ class account_chart_template(osv.osv): 'property_account_income_categ': fields.many2one('account.account.template','Income Category Account'), 'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'), 'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'), + 'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Surplus Account', domain=[('type', '=', 'payable')] , help='This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report'), } account_chart_template() @@ -2725,7 +2726,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): ('property_account_expense_categ','product.category','account.account'), ('property_account_income_categ','product.category','account.account'), ('property_account_expense','product.template','account.account'), - ('property_account_income','product.template','account.account') + ('property_account_income','product.template','account.account'), + ('property_reserve_and_surplus_account','res.company','account.account') ] for record in todo_list: r = [] @@ -2738,6 +2740,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'fields_id': field[0], 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False, } + if r: #the property exist: modify it property_obj.write(cr, uid, r, vals) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 31d4b39e5b1..ae458a0aac4 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2080,6 +2080,7 @@ + diff --git a/addons/account/company.py b/addons/account/company.py index 613c702a46e..ec106616c0d 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -25,6 +25,15 @@ class res_company(osv.osv): _inherit = "res.company" _columns = { 'overdue_msg' : fields.text('Overdue Payments Message', translate=True), + 'property_reserve_and_surplus_account': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Reserve and Surplus Account", + method=True, + view_load=True, + domain="[('type', '=', 'payable')]", + help="This Account is used for trasfering Profit/Loss(If It is Profit : Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"), } _defaults = { diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml index 7892fceee91..a3a1ec0080a 100644 --- a/addons/account/company_view.xml +++ b/addons/account/company_view.xml @@ -15,5 +15,21 @@ + + + res.company.form.inherit + + res.company + form + + + + + + + + + + diff --git a/addons/account/configurable_account_chart.xml b/addons/account/configurable_account_chart.xml index b9e063dc509..053b8429c0f 100644 --- a/addons/account/configurable_account_chart.xml +++ b/addons/account/configurable_account_chart.xml @@ -2,16 +2,18 @@ - - + + Receivable receivable + income unreconciled Payable payable + expense unreconciled @@ -21,50 +23,86 @@ none + + Income View + view + income + + + Expense View + expense + expense + + + Asset View + asset + asset + + + Liability View + liability + liability + + Income income + income none Expense expense + expense none Tax tax + expense unreconciled Cash cash + asset balance + + Liability + liability + liability + balance + + Asset asset + asset balance Equity equity + asset balance Bank bank + asset balance Check check + asset balance @@ -79,183 +117,193 @@ - + - - 1 - Balance Sheet - - view - - - - - 10 - Fixed Assets - - view - - - - - 100 - Fixed Asset Account - - other - - - - - 11 - Net Current Assets - - view - - - - - 110 - Current Assets - - view - - - - - 1101 - Purchased Stocks - - other - - - - - 1102 - Debtors - - receivable - - - - - - - - 1103 - Output VAT - - other - - - - - 1104 - Bank Current Account - - view - - - - - 1105 - Cash - - view - - - - - 111 - Current Liabilities - - view - - - - - 1111 - Creditors - - payable - - - - - - - - 1112 - Input VAT - - other - - - - - - - 2 - Profit and Loss - - view - - - - - 20 - Revenue - - view - - - - - 200 - Product Sales - - other - - - - - - - 21 - Cost of Sales - - view - - - - - 210 - Cost of Goods Sold - - other - - - - - 22 - Overheads - - view - - - - - 220 - Expenses - - other - - + + 1 + Balance Sheet + + view + + + + + 10 + Fixed Assets + + view + + + + + 100 + Fixed Asset Account + + other + + + + + 11 + Net Current Assets + + view + + + + + 110 + Current Assets + + view + + + + + 1101 + Purchased Stocks + + other + + + + + 1102 + Debtors + + receivable + + + + + + + + 1103 + Output VAT + + other + + + + + 1104 + Bank Current Account + + view + + + + + + + + + + + + + 111 + Current Liabilities + + view + + + + + 1111 + Creditors + + payable + + + + + + + + 1112 + Input VAT + + other + + + + + 1113 + Reserve and Surplus Account + + payable + + + + + + + + + 2 + Profit and Loss + + view + + + + + 20 + Revenue + + view + + + + + 200 + Product Sales + + other + + + + + + + 21 + Cost of Sales + + view + + + + + 210 + Cost of Goods Sold + + other + + + + + 22 + Overheads + + view + + + + + 220 + Expenses + + other + + - - Plan Fees - - VAT Balance to Pay - - + + VAT Balance to Pay + + - - Input VAT - - - + + + Input VAT + + + - - Input VAT Rate S (15%) - - + + Input VAT Rate S (15%) + + + + + Input VAT Rate R (5%) + + - - Input VAT Rate R (5%) - - + + + + Output VAT + + - + + Output VAT Rate S (15%) + + + + + Output VAT Rate R (5%) + + - - Output VAT - - - - Output VAT Rate S (15%) - - + + + + + + Tax Bases + + - - Output VAT Rate R (5%) - - + + Taxable Purchases Base + + - + + Taxable Purchases Rated S (15%) + + + + + Taxable Purchases Rated R (5%) + + + + + Taxable Purchases Rated Z (0%) + + - + + Taxable Purchases Type X (Exempt) + + + + + Taxable Purchases Type O (Out of scope) + + - - Tax Bases - - + + + + Base of Taxable Sales + + - - Taxable Purchases Base - - + + Taxable Sales Rated S (15%) + + + + + Taxable Sales Rated R (5%) + + + + + Taxable Sales Rated Z (0%) + + - - Taxable Purchases Rated S (15%) - - - - - Taxable Purchases Rated R (5%) - - - - - Taxable Purchases Rated Z (0%) - - - - - Taxable Purchases Type X (Exempt) - - - - - Taxable Purchases Type O (Out of scope) - - - - - - - Base of Taxable Sales - - - - - Taxable Sales Rated S (15%) - - - - - Taxable Sales Rated R (5%) - - - - - Taxable Sales Rated Z (0%) - - - - - Taxable Sales Type X (Exempt) - - - - - Taxable Sales Type O (Out of scope) - - + + Taxable Sales Type X (Exempt) + + + + + Taxable Sales Type O (Out of scope) + + Configurable Account Chart Template - + + - + - + IVAT S percent @@ -410,7 +459,7 @@ - + IVAT R percent diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index d7a85753ab1..df43c81b3b7 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -4,6 +4,7 @@ + View view @@ -70,225 +71,234 @@ - + + + + X1 + Balance Sheet - (test) + + view + + + + + Assets - (test) + X10 + view + + + + - - X1 - Balance Sheet - (test) - - view - - + + X100 + Fixed Assets - (test) + + view + + + + + X1000 + Fixed Asset Account - (test) + + other + + + + + X101 + Net Current Assets - (test) + + view + + + + + X1100 + Current Assets - (test) + + view + + + + + X11001 + Purchased Stocks - (test) + + other + + + + + X11002 + Debtors - (test) + + receivable + + + + + + X11003 + Output VAT - (test) + + other + + + + + X11004 + Bank Current Account - (test) + + other + + + + + X11005 + Cash - (test) + + other + + + + + Liabilities - (test) + X11 + view + + + + + + + X110 + Current Liabilities - (test) + + view + + + + + X1111 + Creditors - (test) + + payable + + + + + + X1112 + Input VAT - (test) + + other + + + + + X1113 + Reserve and Surplus - (test) + + payable + + + + + + + X2 + Profit and Loss - (test) + + view + + + + + Income - (test) + X20 + view + + + + + + + Foreign Exchange Gain - (test) + X201 + other + + + + - - Assets - (test) - X10 - view - - - - + + X200 + Revenue - (test) + + view + + + + + X2001 + Product Sales - (test) + + other + + - - Liabilities - (test) - X11 - view - - - - - - - X100 - Fixed Assets - (test) - - view - - - - - X1000 - Fixed Asset Account - (test) - - other - - - - - X101 - Net Current Assets - (test) - - view - - - - - X1100 - Current Assets - (test) - - view - - - - - X11001 - Purchased Stocks - (test) - - other - - - - - X11002 - Debtors - (test) - - receivable - - - - - - X11003 - Output VAT - (test) - - other - - - - - X11004 - Bank Current Account - (test) - - other - - - - - X11005 - Cash - (test) - - other - - - - - X110 - Current Liabilities - (test) - - view - - - - - X1111 - Creditors - (test) - - payable - - - - - - X1112 - Input VAT - (test) - - other - - - - - - - X2 - Profit and Loss - (test) - - view - - - - - Income - (test) - X20 - view - - - - - - - Foreign Exchange Gain - (test) - X201 - other - - - - - - - Expense - (test) - X21 - view - - - - - - - X200 - Revenue - (test) - - view - - - - - X2001 - Product Sales - (test) - - other - - - - - X210 - Cost of Sales - (test) - - view - - - - - X2100 - Cost of Goods Sold - (test) - - other - - - - - X211 - Overheads - (test) - - view - - - - - X2110 - Expenses - (test) - - other - - - - - Foreign Exchange Loss - (test) - X2111 - other - - - - + + Expense - (test) + X21 + view + + + + + + + + X210 + Cost of Sales - (test) + + view + + + + + X2100 + Cost of Goods Sold - (test) + + other + + + + + X211 + Overheads - (test) + + view + + + + + X2110 + Expenses - (test) + + other + + + + + Foreign Exchange Loss - (test) + X2111 + other + + + + @@ -310,6 +320,13 @@ + + property_account_receivable + + + + + + diff --git a/addons/l10n_chart_uk_minimal/account_chart.xml b/addons/l10n_chart_uk_minimal/account_chart.xml index 17eae399ef8..2dba2a46acb 100644 --- a/addons/l10n_chart_uk_minimal/account_chart.xml +++ b/addons/l10n_chart_uk_minimal/account_chart.xml @@ -11,241 +11,249 @@ - + + + + 1 + Balance Sheet + + view + + - - 1 - Balance Sheet - - view - - - - - Assets - 10 - view - - - - - - - Liabilities - 11 - view - - - - + + Liabilities + 11 + view + + + + + + + 110 + Current Liabilities + + view + + + + + 1111 + Creditors + + payable + + + + + + 1112 + Input VAT + + other + + + + + 1113 + Reserve and Surplus Account + + payable + + + + + + + Assets + 10 + view + + + + - - 100 - Fixed Assets - - view - - + + 100 + Fixed Assets + + view + + - - 1000 - Fixed Asset Account - - other - - + + 1000 + Fixed Asset Account + + other + + + + + 101 + Net Current Assets + + view + + - - 101 - Net Current Assets - - view - - + + 1100 + Current Assets + + view + + - - 1100 - Current Assets - - view - - + + 11001 + Purchased Stocks + + other + + - - 11001 - Purchased Stocks - - other - - + + 11002 + Debtors + + receivable + + + - - 11002 - Debtors - - receivable - - - + - + + 11003 + Output VAT + + other + + - - 11003 - Output VAT - - other - - + + 11004 + Bank Current Account + + other + + - - 11004 - Bank Current Account - - other - - + + 11005 + Cash + + other + + - - 11005 - Cash - - other - - - - 110 - Current Liabilities - - view - - - - - 1111 - Creditors - - payable - - - - - - - - 1112 - Input VAT - - other - - - - - - - 2 - Profit and Loss - - view - - + + + + 2 + Profit and Loss + + view + + - - Income - 20 - view - - - - + + Income + 20 + view + + + + - - Foreign Exchange Gain - X201 - other - - - - - - - Expense - 21 - view - - - - + + Foreign Exchange Gain + X201 + other + + + + + + + 200 + Revenue + + view + + + + + 2001 + Product Sales + + other + + + + + Expense + 21 + view + + + + - - 200 - Revenue - - view - - + + + + 210 + Cost of Sales + + view + + - - 2001 - Product Sales - - other - - + + 2100 + Cost of Goods Sold + + other + + - + + 211 + Overheads + + view + + - - 210 - Cost of Sales - - view - - - - - 2100 - Cost of Goods Sold - - other - - - - - 211 - Overheads - - view - - - - - 2110 - Expenses - - other - - - - - Foreign Exchange Loss - (test) - X2111 - other - - - - - - + + 2110 + Expenses + + other + + + + Foreign Exchange Loss - (test) + X2111 + other + + + + + + diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml index 502cea9b0d2..64375db5302 100644 --- a/addons/l10n_chart_uk_minimal/account_tax.xml +++ b/addons/l10n_chart_uk_minimal/account_tax.xml @@ -132,6 +132,7 @@ + diff --git a/addons/l10n_chart_uk_minimal/account_types.xml b/addons/l10n_chart_uk_minimal/account_types.xml index 180cf3a9b4a..d9bfb5344ad 100644 --- a/addons/l10n_chart_uk_minimal/account_types.xml +++ b/addons/l10n_chart_uk_minimal/account_types.xml @@ -5,14 +5,14 @@ Receivable receivable - asset + income unreconciled Payable payable - liability + expense unreconciled @@ -22,26 +22,30 @@ none - - Income View - view - income - - - Expense View - expense - expense - - - Asset View - asset - asset - - - Liability View - liability - liability - + + Income View + view + income + + + + Expense View + expense + expense + + + + Asset View + asset + asset + + + + Liability View + liability + liability + + Income income @@ -59,6 +63,7 @@ Tax tax + liability unreconciled @@ -69,6 +74,13 @@ balance + + Liability + liability + balance + liability + + Asset asset diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/account_chart.xml index 5bdc5df3c50..98817045dc4 100644 --- a/addons/l10n_in/account_chart.xml +++ b/addons/l10n_in/account_chart.xml @@ -580,6 +580,7 @@ +