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

Some bugfixing in mrp_repair

Browse Source 
bzr revid: ruchakpatel@gmail.com-20081020065104-a2nwdexfilpbg42q
This commit is contained in:
Rucha Patel
2008-10-20 12:21:04 +05:30
parent 0f9f2aa587
commit 006798c5ef
2 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp_repair/mrp_repair.py
+21 -20
View File
@@ -200,31 +200,32 @@ class repair_operation(osv.osv):
def _get_price(self, cr, uid, ids, name, arg, context={}):
res = {}
for val in self.browse(cr, uid, ids):
current_date = time.strftime('%Y-%m-%d')
if current_date < val.repair_id.guarantee_limit:
res[val.id] = 0.0
if current_date >= val.repair_id.guarantee_limit:
price = 0.0
pricelist = val.repair_id.pricelist_id.id
if pricelist:
price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], val.product_id.id , 1.0, val.repair_id.partner_id.id)[pricelist]
if price is False:
warning={
'title':'No valid pricelist line found !',
'message':
"Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
}
else:
res[val.id] = price
if val.repair_id:
current_date = time.strftime('%Y-%m-%d')
if current_date < val.repair_id.guarantee_limit:
res[val.id] = 0.0
if current_date >= val.repair_id.guarantee_limit:
price = 0.0
pricelist = val.repair_id.pricelist_id.id
if pricelist:
price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], val.product_id.id , 1.0, val.repair_id.partner_id.id)[pricelist]
if price is False:
warning={
'title':'No valid pricelist line found !',
'message':
"Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
}
else:
res[val.id] = price
return res
_columns = {
'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True),
'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
'invoice': fields.boolean('Invoice'),
'price_unit': fields.function(_get_price, method=True, store= True, type='float', string='Price'),
'repair_price': fields.function(_get_price, method=True, store= True, type='float', string='Price'),
}
@@ -259,7 +260,7 @@ class repair_operation(osv.osv):
"You have to change either the product, the quantity or the pricelist."
}
else:
result.update({'price_unit': price})
result.update({'repair_price': price})
return {'value': result , 'domain' :domain, 'warning':warning}
addons/mrp_repair/mrp_repair_view.xml
+2 -2
View File
@@ -37,7 +37,7 @@
<field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_qty, parent.partner_id)"/>
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UoM"/>
<field name="price_unit"/>
<field name="repair_price"/>
<field name="prodlot_id"/>
<field name="location_id"/>
<field name="location_dest_id"/>
@@ -48,7 +48,7 @@
<field name="product_id"/>
<field name="product_qty" string="Qty"/>
<field name="product_uom" string="UoM"/>
<field name="price_unit"/>
<field name="repair_price"/>
<field name="prodlot_id"/>
<field name="location_id"/>
<field name="location_dest_id"/>