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

[FIX]: Fixed the problem of order_policy field and added tax field to get default tax value.

Browse Source 
bzr revid: uco@tinyerp.com-20120227133422-p0awgxjf56dhlx8d
This commit is contained in:
Ujjvala Collins (OpenERP)
2012-02-27 19:04:22 +05:30
parent 4f2e285f69
commit 9d4cc8413b
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_installer.xml
+7
View File
@@ -54,6 +54,13 @@
<field name="name">Accounting</field>
<field name="sequence">5</field>
</record>
<record id="account_configuration_installer_todo" model="ir.actions.todo">
<field name="action_id" ref="action_account_configuration_installer"/>
<field name="category_id" ref="category_accounting_configuration"/>
<field name="sequence">3</field>
<field name="type">automatic</field>
</record>
<record id="action_view_financial_accounts_installer" model="ir.actions.act_window">
<field name="name">Review your Financial Accounts</field>
addons/sale/sale.py
+13 -7
View File
@@ -1359,6 +1359,7 @@ class sale_configuration(osv.osv_memory):
'warning': fields.boolean("Alerts by products or customers",
help="Install warning module: Module to trigger warnings in OpenERP objects."),
'tax_value' : fields.float('Value'),
'tax_value_id': fields.many2one('account.tax.template'),
'tax_policy': fields.selection([
('no_tax', 'No Tax'),
('global_on_order', 'Global On Order'),
@@ -1372,6 +1373,7 @@ class sale_configuration(osv.osv_memory):
def default_get(self, cr, uid, fields_list, context=None):
ir_values_obj = self.pool.get('ir.values')
obj_tax_temp = self.pool.get('account.tax.template')
res = super(sale_configuration, self).default_get(
cr, uid, fields_list, context=context)
defaults = {}
@@ -1392,6 +1394,9 @@ class sale_configuration(osv.osv_memory):
defaults.update({'picking_policy': True})
if k == 'order_policy':
defaults.update({'order_policy': defaults.get('order_policy')})
if k == 'tax_policy' and defaults[k] == ['global_on_order','on_order_line']:
ref_tax_ids = obj_tax_temp.search(cr, uid, [('type_tax_use','in', ('sale','all'))], context=context, order="sequence, id desc", limit=1)
res.update({'tax_value_id': ref_tax_ids and ref_tax_ids[0] or False})
else:
res.update({k: False})
res.update(defaults)
@@ -1403,13 +1408,14 @@ class sale_configuration(osv.osv_memory):
'time_unit': lambda self, cr, uid, c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c) and self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=c)[0] or False,
}
def onchange_order(self, cr, uid, ids, sale, deli, context=None):
res = {}
if sale:
res.update({'order_policy': 'manual'})
elif deli:
res.update({'order_policy': 'picking'})
return {'value':res}
#TODO: Need to check
# def onchange_order(self, cr, uid, ids, sale, deli, context=None):
# res = {}
# if sale:
# res.update({'order_policy': 'manual'})
# elif deli:
# res.update({'order_policy': 'picking'})
# return {'value':res}
def apply_groups(self, cr, uid, ids, group_name, apply=True, context=None):
data_obj = self.pool.get('ir.model.data')
addons/sale/sale_view.xml
+4 -3
View File
@@ -515,9 +515,9 @@
<separator string="Picking and Invoice Policy" colspan="4"/>
<group colspan="4" col="8">
<group colspan="4" col="4">
<field name="sale_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
<field name="sale_orders"/>
<newline/>
<field name="deli_orders" on_change="onchange_order(sale_orders,deli_orders)"/>
<field name="deli_orders"/>
<newline/>
<field name="task_work"/>
<newline/>
@@ -543,7 +543,8 @@
<group colspan="4" col="4">
<separator string="Taxes" colspan="4"/>
<field name="tax_policy" nolabel="1"/>
<field name="tax_value" nolabel="1" attrs="{'invisible': [('tax_policy','=','no_tax')]}"/>
<field name="tax_value" nolabel="1" attrs="{'invisible': [('tax_policy','in',['no_tax','global_on_order'])]}"/>
<field name="tax_value_id" nolabel="1" attrs="{'invisible': [('tax_policy','in',['no_tax','on_order_line'])]}"/>
</group>
<newline/>
<field name="sale_margin"/>