Merge lp:~matjaz-6/openerpsl/openerpsl_01_25 into lp:openerpsl/7.0

[Matjaz Kalic]

[FIX] mrp_procurement_qty/stock.py (group invoice lines with 0.0001 diff; right price for sale lines without product_id)

[lp:~matjaz-6/openerpsl/openerpsl_01_25]

323. By Dušan Laznik (Mentis) on 2014-02-05

[FIX] mrp_procurement_qty/stock.py (group invoice lines with 0.0001 diff; right price for sale lines without product_id)

=== modified file 'mrp_procurement_qty/stock.py'
--- mrp_procurement_qty/stock.py	2014-01-28 15:31:45 +0000
+++ mrp_procurement_qty/stock.py	2014-02-03 15:29:48 +0000
@@ -157,10 +157,14 @@
     def _merge_invoice_lines(self, cr, uid, vals, context=None):
         invoice_line_obj = self.pool.get('account.invoice.line')
         
+        price_lo = vals['price_unit'] - 0.0001
+        price_hi = vals['price_unit'] + 0.0001
+        
         invoice_line_ids = invoice_line_obj.search(cr, uid, [
                                                              ('invoice_id', '=', vals['invoice_id']),
                                                              ('product_id', '=', vals['product_id']),
-                                                             ('price_unit', '=', vals['price_unit']),
+                                                             ('price_unit', '>=', price_lo),
+                                                             ('price_unit', '<=', price_hi),
                                                              ('discount', '=', vals['discount'])
                                                              ])
         
@@ -275,6 +279,13 @@
             'invoice_state': 'invoiced',
             }, context=context)
         return res
+    
+    def _get_price_unit_invoice(self, cursor, user, move_line, type):
+        #Ce obstaja product_id na movu in obstaja povezava na sale line in tam ne obstaja product_id -> vracilo
+        if move_line.sale_line_id and not move_line.sale_line_id.product_id.id and move_line.product_id.id:
+            return move_line.sale_line_id.price_unit
+        return super(stock_picking, self)._get_price_unit_invoice(cursor, user, move_line, type)
+        
 
 stock_picking()
 

=== modified file 'mrp_procurement_qty/wizard/delivery_order_return.py'
--- mrp_procurement_qty/wizard/delivery_order_return.py	2014-01-31 13:02:06 +0000
+++ mrp_procurement_qty/wizard/delivery_order_return.py	2014-02-03 15:29:48 +0000
@@ -131,7 +131,7 @@
                             value = self.pool.get('account.tax').compute_all(cr, uid, sale_line.tax_id, _price, (0 - sale_line.product_qty_returned), new_product_id[0], sale_line.order_id.partner_id)['total']
                             dict_temp['price_total'] = value
                             #sum_price = sum_price + _price_tax
-                            sum_price_total = sum_price_total - value
+                            sum_price_total = sum_price_total + value #ker je value vedno negativen
                         else:
                             dict_temp['price'] = ''
                             dict_temp['price_total'] = ''