diff options
| author | Ujjvala Collins (OpenERP) <uco@tinyerp.com> | 2012-02-29 19:05:09 +0530 |
|---|---|---|
| committer | Ujjvala Collins (OpenERP) <uco@tinyerp.com> | 2012-02-29 19:05:09 +0530 |
| commit | 27fe954a1b1d7e7776510bd2f7f61fc7dfe322cd (patch) | |
| tree | 685ebd9623c37bf09185aa308b0bdec70c4af559 | |
| parent | c09dd872c6771daf45614b2b9c262340a6b00d84 (diff) | |
[IMP] sale: Improved code for getting default settings of sale.
bzr revid: uco@tinyerp.com-20120229133509-yomie0d9o1k73veq
| -rw-r--r-- | addons/account/res_config.py | 2 | ||||
| -rw-r--r-- | addons/sale/res_config.py | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 353f711ea17..0af0a9dcbae 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -50,7 +50,7 @@ class account_configuration(osv.osv_memory): res.update({'tax_value': 15.0}) tax_id = self._check_default_tax(cr, uid, context) if tax_id: - res.update({'tax_value': tax_id and tax_id[0]}) + res.update({'tax_value': tax_id and tax_id[0]}) return res def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 367aa5ef3e9..ce6312ecfce 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -106,7 +106,18 @@ class sale_configuration(osv.osv_memory): def get_default_sale_configs(self, cr, uid, ids, context=None): ir_values_obj = self.pool.get('ir.values') + data_obj = self.pool.get('ir.model.data') + menu_obj = self.pool.get('ir.ui.menu') result = {} + invoicing_groups_id = [gid.id for gid in data_obj.get_object(cr, uid, 'sale', 'menu_invoicing_sales_order_lines').groups_id] + picking_groups_id = [gid.id for gid in data_obj.get_object(cr, uid, 'sale', 'menu_action_picking_list_to_invoice').groups_id] + group_id = data_obj.get_object(cr, uid, 'base', 'group_sale_salesman').id + for menu in ir_values_obj.get(cr, uid, 'default', False, ['ir.ui.menu']): + if menu[1] == 'groups_id' and group_id in menu[2][0]: + if group_id in invoicing_groups_id: + result['sale_orders'] = True + if group_id in picking_groups_id: + result['deli_orders'] = True for res in ir_values_obj.get(cr, uid, 'default', False, ['sale.order']): result[res[1]] = res[2] return result |