diff --git a/addons/account/account.py b/addons/account/account.py index 3f436373ef1..9a1b796ef5e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1939,6 +1939,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): self.pool._init = True children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id])]) + children_acc_template.sort() for account_template in obj_acc_template.browse(cr, uid, children_acc_template): tax_ids = [] for tax in account_template.tax_ids: diff --git a/addons/account_report/wizard/wizard_print_indicators.py b/addons/account_report/wizard/wizard_print_indicators.py index b781073ddf4..17252e8b3c8 100644 --- a/addons/account_report/wizard/wizard_print_indicators.py +++ b/addons/account_report/wizard/wizard_print_indicators.py @@ -61,6 +61,11 @@ def _load_base(self, cr, uid, data, context): next_fields['base_selection']['relation']='account.period' return data['form'] +def _check_len(self, cr, uid, data, context): + if len(data['form']['base_selection'][0][2])>12: + raise wizard.except_wizard('User Error!',"Please select maximum 12 records to fit the page-width.") + return data['form'] + class wizard_print_indicators(wizard.interface): states = { 'init': { @@ -72,7 +77,7 @@ class wizard_print_indicators(wizard.interface): 'result': {'type':'form', 'arch':next_form, 'fields':next_fields, 'state':[('end','Cancel'),('print','Print')]} }, 'print': { - 'actions':[], + 'actions':[_check_len], 'result' :{'type':'print','report':'print.indicators', 'state':'end'} } } diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml index 0cc7032602d..edcb92038d5 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -72,4 +72,4 @@ - \ No newline at end of file + diff --git a/addons/l10n_fr/__terp__.py b/addons/l10n_fr/__terp__.py index 0eeb3ba5eee..2e5fc8bd3bd 100644 --- a/addons/l10n_fr/__terp__.py +++ b/addons/l10n_fr/__terp__.py @@ -40,6 +40,18 @@ "category" : "Localisation/Account Charts", "website": "http://erp-libre.info", "depends" : ["base", "account", "account_chart", 'base_vat'], + "description": """ + This is the base module to manage the accounting chart for France in Tiny ERP. + + After Installing this module,The Configuration wizard for accounting is launched. + * We have the account templates which can be helpful to generate Charts of Accounts. + * 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. + 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. + + * This module installs : + The Tax Code chart and taxes for French Accounting. + """, "init_xml" : [], "update_xml" : ["types.xml", "plan-99-03_societe.xml", "taxes.xml","fr_wizard.xml"], "demo_xml" : [], diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py index 49761b3fdb5..7e0d9e89dbf 100644 --- a/addons/l10n_lu/__terp__.py +++ b/addons/l10n_lu/__terp__.py @@ -4,8 +4,8 @@ "author" : "Tiny", "website" : "http://openerp.com", "category" : "Localisation/Account Charts", - "description": """ -This module install: + "description": """ +This module installs: *the KLUWER Chart of Accounts, *the Tax Code Chart for Luxembourg @@ -21,4 +21,4 @@ This module install: "l10n_lu_report.xml", ], "installable": True -} +}