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

[MERGE] delivery: clarified behavior when saving a delivery.carrier. We want to keep the behavior of writing normal_price and free_if_more_than delivery lines. However, we also want to keep user modifications. The module now differentiates if it uses advanced pricing per destination or not. It using it, the user is responsible of the delivery grid and lines. None will be overrided. If not using it, the default behavior is used, unlinking previous lines to set normal_price and free_if_more_than.

Browse Source 
lp bug: https://launchpad.net/bugs/927415 fixed

bzr revid: tde@openerp.com-20120214141618-w5c6ybouaqj87tqx
This commit is contained in:
Thibault Delavallée
2012-02-14 15:16:18 +01:00
parent 64d0bdfb4a 6ec72e3ad4
commit 90f2502429
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/delivery/delivery.py
+6 -1
View File
@@ -98,11 +98,16 @@ class delivery_carrier(osv.osv):
return False
def create_grid_lines(self, cr, uid, ids, vals, context=None):
if context == None:
if context is None:
context = {}
grid_line_pool = self.pool.get('delivery.grid.line')
grid_pool = self.pool.get('delivery.grid')
for record in self.browse(cr, uid, ids, context=context):
# if using advanced pricing per destination: do not change
if record.use_detailed_pricelist:
continue
# not using advanced pricing per destination: override grid
grid_id = grid_pool.search(cr, uid, [('carrier_id', '=', record.id)], context=context)
if grid_id and not (record.normal_price or record.free_if_more_than):
addons/delivery/delivery_view.xml
+2 -2
View File
@@ -28,9 +28,9 @@
<field name="active" select="1"/>
<separator string="Pricing Information" colspan="4"/>
<group colspan="4" col="4">
<field name="normal_price"/>
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<newline/>
<field name="free_if_more_than"/>
<field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
</group>
<newline/>