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

[IMP]: Improved field names and method names.

Browse Source 
bzr revid: uco@tinyerp.com-20120229102827-z4zku1yj3b6ho9eg
This commit is contained in:
Ujjvala Collins (OpenERP)
2012-02-29 15:58:27 +05:30
parent adc65d5cfa
commit 8f5c6d0b30
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale/res_config.py
+13 -7
View File
@@ -43,7 +43,7 @@ class sale_configuration(osv.osv_memory):
('manual', 'Invoice Based on Sales Orders'),
('picking', 'Invoice Based on Deliveries'),
], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."),
'charge_delivery': fields.boolean('Do you charge the delivery?'),
'delivery': fields.boolean('Do you charge the delivery?'),
'time_unit': fields.many2one('product.uom','Working Time Unit'),
'picking_policy' : fields.boolean("Deliver all products at once?"),
'group_sale_delivery_address':fields.boolean("Multiple Address",help="Group To Allow delivery address different from invoice address"),
@@ -107,13 +107,15 @@ 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')
result = {}
defaults = ir_values_obj.get(cr, uid, 'default', False, ['sale.order'])
for res in ir_values_obj.get(cr, uid, 'default', False, ['sale.order']):
result[res[1]] = res[2]
return result
def get_default_groups(self, cr, uid, ids, context=None):
ir_values_obj = self.pool.get('ir.values')
result = {}
defaults = ir_values_obj.get(cr, uid, 'default', False, ['res.users'])
for res in ir_values_obj.get(cr, uid, 'default', False, ['res.users']):
result[res[1]] = res[2]
return result
def default_get(self, cr, uid, fields_list, context=None):
@@ -141,13 +143,17 @@ class sale_configuration(osv.osv_memory):
def execute(self, cr, uid, ids, vals, context=None):
#TODO: TO BE IMPLEMENTED
for method in dir(self):
if method.startswith('set_'):
if method.startswith('_set'):
getattr(self, method)(cr, uid, ids, vals, context)
return True
def set_modules(self, cr, uid, ids, vals, context=None):
def _set_modules(self, cr, uid, ids, vals, context=None):
module_obj = self.pool.get('ir.module.module')
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:
@@ -161,7 +167,7 @@ class sale_configuration(osv.osv_memory):
cr.commit()
pooler.restart_pool(cr.dbname, update_module=True)[1]
def set_sale_defaults(self, cr, uid, ids, vals, context=None):
def _set_sale_defaults(self, cr, uid, ids, vals, 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')
@@ -195,7 +201,7 @@ class sale_configuration(osv.osv_memory):
return res
def set_groups(self, cr, uid, ids, vals, context=None):
def _set_groups(self, cr, uid, ids, vals, context=None):
data_obj = self.pool.get('ir.model.data')
users_obj = self.pool.get('res.users')
groups_obj = self.pool.get('res.groups')
addons/sale/res_config_view.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<group colspan="4" col="4">
<field name="order_policy" attrs="{'invisible':['|',('sale_orders','=',False),('deli_orders','=',False)]}"/>
<newline/>
<field name="charge_delivery" attrs="{'invisible':[('sale_orders','=',False), ('deli_orders','=',False)]}"/>
<field name="delivery" attrs="{'invisible':[('sale_orders','=',False), ('deli_orders','=',False)]}"/>
<newline/>
<field name="picking_policy" attrs="{'invisible':[('deli_orders','=',False)]}"/>
<newline/>