← Back to team overview

clearcorp team mailing list archive

[Merge] lp:~rr.clearcorp/openerp-ccorp-addons/6.1-rent into lp:openerp-ccorp-addons/6.1

 

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-rent into lp:openerp-ccorp-addons/6.1.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-rent/+merge/196033

[FIX] Fix account_invoice_line create when invoice_type='product'
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-rent/+merge/196033
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons/6.1.
=== modified file 'rent/rent.py'
--- rent/rent.py	2013-11-08 22:04:00 +0000
+++ rent/rent.py	2013-11-20 22:47:07 +0000
@@ -1745,7 +1745,8 @@
                 vals['invoice_rent_id'] = vals['invoice_rent_id']
             else:
                 vals['invoice_rent_id'] = vals['invoice_rent_id'][0]
-            
+        if 'invoice_type' in vals and vals['invoice_type'] == 'product' and 'invoice_rent_id' in vals and vals['invoice_rent_id']:
+            del vals['invoice_rent_id']
         
             #raise osv.except_osv('Wrong value!', 'The area for the estate has to bee greater than 0')
         return super(rent_invoice_line,self).create(cr,uid,vals,context)


Follow ups