pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP]: Improved code for tax templates. Revoked view for plugins_xx.

Browse Source 
bzr revid: uco@tinyerp.com-20120229130234-99e485onvwj3q0lx
This commit is contained in:
Ujjvala Collins (OpenERP)
2012-02-29 18:32:34 +05:30
parent 909b86cfc3
commit 5d98b230ab
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/res_config.py
+6 -2
View File
@@ -63,9 +63,13 @@ class account_configuration(osv.osv_memory):
def set_tax_value(self, cr, uid, ids, vals, context=None):
chart_account_obj = self.pool.get('wizard.multi.charts.accounts')
acc_installer_obj = self.pool.get('account.installer')
chart_template_ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
chart_template_obj = self.pool.get('account.chart.template')
tax_template_obj = self.pool.get('account.tax.template')
chart_template_ids = chart_template_obj.search(cr, uid, [('visible', '=', True)], context=context)
if chart_template_ids:
taxes = tax_template_obj.search(cr, uid, [('chart_template_id', '=', chart_template_ids[0])], context=context)
result = {}
if not self._check_default_tax(cr, uid, context):
if not self._check_default_tax(cr, uid, context) and not taxes:
installer_id = acc_installer_obj.create(cr, uid, {}, context=context)
acc_installer_obj.execute(cr, uid, [installer_id], context=context)
if chart_template_ids:
addons/plugin_outlook/plugin_outlook.xml
+3 -3
View File
@@ -48,17 +48,17 @@
<field name="target">new</field>
</record>
<!--record id="view_config_outlook_installer" model="ir.ui.view">
<record id="view_config_outlook_installer" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_config_picking_policy"/>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
<field name="plugin_outlook" position="after">
<button name="%(action_outlook_installer)d" type="action" string="Configure Outlook Plug-In" icon="gtk-execute" colspan="2"/>
</field>
</field>
</record-->
</record>
<record id="action_outlook_wizard" model="ir.actions.act_window">
<field name="name">Install Outlook Plug-In</field>
addons/plugin_thunderbird/plugin_thunderbird.xml
+3 -3
View File
@@ -55,17 +55,17 @@
<field name="target">new</field>
</record>
<!--record id="view_config_thunderbird_installer" model="ir.ui.view">
<record id="view_config_thunderbird_installer" model="ir.ui.view">
<field name="name">Sales Application</field>
<field name="model">res.config</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_config_picking_policy"/>
<field name="inherit_id" ref="base.res_config_view_base"/>
<field name="arch" type="xml">
<field name="plugin_thunderbird" position="after">
<button name="%(action_thunderbird_installer)d" type="action" string="Configure Thunderbird Plug-In" icon="gtk-execute" colspan="2"/>
</field>
</field>
</record-->
</record>
<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config" sequence="10"/>
<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_installer" parent="base.menu_base_config_plugins" sequence="10"/>
addons/sale/res_config.py
+7 -5
View File
@@ -154,15 +154,17 @@ class sale_configuration(osv.osv_memory):
for k, v in vals.items():
if k == 'task_work':
MODULE_LIST += ['project_timesheet','project_mrp']
if k == 'timesheet':
MODULE_LIST += ['account_analytic_analysis']
if k in MODULE_LIST:
installed = self.get_default_installed_modules(cr, uid, [k], context)
if v == True and not installed.get(k):
module_id = module_obj.search(cr, uid, [('name','=',k)])[0]
module_obj.button_immediate_install(cr, uid, [module_id], context)
module_id = module_obj.search(cr, uid, [('name','=',k)])
module_obj.button_immediate_install(cr, uid, module_id, context)
elif v == False and installed.get(k):
module_id = module_obj.search(cr, uid, [('name','=',k)])[0]
module_obj.button_uninstall(self, cr, uid, [module_id], context=None)
module_obj.button_upgrade(self, cr, uid, [module_id], context=None)
module_id = module_obj.search(cr, uid, [('name','=',k)])
module_obj.button_uninstall(self, cr, uid, module_id, context=None)
module_obj.button_upgrade(self, cr, uid, module_id, context=None)
def set_sale_defaults(self, cr, uid, ids, vals, context=None):
ir_values_obj = self.pool.get('ir.values')