Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp-account-improvements-bde
into lp:~openerp-dev/openobject-addons/trunk-application_setting_cleanup-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp-account-improvements-bde/+merge/109347
Hello Sir,
I have added following points in Accounting Configuration:
1) Added Separator.
2) Added Tooltip on Default Sale Tax and Default Purchase Tax fields.
3) Added group on company_id field.
4) Applied on change methods to set "Analytic Accounting for Sales"
and "Analytic Accounting for Purchase" fields True when
"Several Analytic Accounts on Sales" and
"Several Analytic Accounts on Purchases" are True.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp-account-improvements-bde/+merge/109347
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp-account-improvements-bde
into lp:~openerp-dev/openobject-addons/trunk-application_setting_cleanup-atp.
=== modified file 'account/res_config.py'
--- account/res_config.py 2012-05-30 13:46:13 +0000
+++ account/res_config.py 2012-06-08 12:35:37 +0000
@@ -111,10 +111,17 @@
'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
implied_group='account.group_proforma_invoices',
help="Allows you to put invoices in pro-forma state."),
+<<<<<<< TREE
'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax'),
'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax'),
'decimal_precision': fields.integer('Decimal Precision on Journal Entries',
help="""As an example, a decimal precision of 2 will allow journal entries like: 9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: 0.0231 EUR."""),
+=======
+ 'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax', help="Selected tax will be applied by default to Product's Sale Tax, while creating a new product."),
+ 'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax', help="Selected tax will be applied by default to Product's Purchase Tax, while creating a new product."),
+ 'decimal_precision': fields.integer('Decimal Precision',
+ help="""Set the decimal precision for rounding results in accounting."""),
+>>>>>>> MERGE-SOURCE
}
def _default_company(self, cr, uid, context=None):
=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml 2012-06-05 09:32:51 +0000
+++ account/res_config_view.xml 2012-06-08 12:35:37 +0000
@@ -21,9 +21,10 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
- <field name="has_default_company" invisible="1" />
+ <separator string="Accounting Details of Company" colspan="4"/>
+ <field name="has_default_company" invisible="1"/>
<field name="has_chart_of_accounts" invisible="1"/>
- <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
+ <field name="company_id" groups="base.group_multi_company" widget="selection" on_change="onchange_company_id(company_id)"
attrs="{'invisible': [('has_default_company', '=', True)]}"/>
<field name="expects_chart_of_accounts"/>
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-05-30 13:46:13 +0000
+++ purchase/res_config.py 2012-06-08 12:35:37 +0000
@@ -89,5 +89,13 @@
implied_group='purchase.group_analytic_accounting',
help="Allows you to specify an analytic account on purchase orders."),
}
+
+ def onchange_purchase_analytic_plans(self, cr, uid, ids, module_purchase_analytic_plans, context=None):
+ res = {}
+ if module_purchase_analytic_plans:
+ res['value'] = {'group_analytic_account_for_purchases': True}
+ else:
+ res['value'] = {'group_analytic_account_for_purchases': False}
+ return res
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'purchase/res_config_view.xml'
--- purchase/res_config_view.xml 2012-06-05 09:32:51 +0000
+++ purchase/res_config_view.xml 2012-06-08 12:35:37 +0000
@@ -54,7 +54,7 @@
</group>
<group name="analytic_accounting" position="inside">
<field name="group_analytic_account_for_purchases"/>
- <field name="module_purchase_analytic_plans"/>
+ <field name="module_purchase_analytic_plans" on_change="onchange_purchase_analytic_plans(module_purchase_analytic_plans)"/>
</group>
</field>
</record>
=== modified file 'sale/res_config.py'
--- sale/res_config.py 2012-05-30 13:46:13 +0000
+++ sale/res_config.py 2012-06-08 12:35:37 +0000
@@ -190,5 +190,13 @@
implied_group='sale.group_analytic_accounting',
help="Allows you to specify an analytic account on sale orders."),
}
+
+ def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None):
+ res = {}
+ if module_sale_analytic_plans:
+ res['value'] = {'group_analytic_account_for_sales': True}
+ else:
+ res['value'] = {'group_analytic_account_for_sales': False}
+ return res
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'sale/res_config_view.xml'
--- sale/res_config_view.xml 2012-05-14 12:09:56 +0000
+++ sale/res_config_view.xml 2012-06-08 12:35:37 +0000
@@ -60,7 +60,7 @@
</group>
<group name="analytic_accounting" position="inside">
<field name="group_analytic_account_for_sales"/>
- <field name="module_sale_analytic_plans"/>
+ <field name="module_sale_analytic_plans" on_change="onchange_sale_analytic_plans(module_sale_analytic_plans)"/>
</group>
</field>
</record>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
