Merge lp:~unifield-team/unifield-server/us-2309 into lp:unifield-server

[Quentin THEURET @Amaris]

[Jeff Allen (jr.allen)]

Don't know if this comment is helpful or not...

=== modified file 'bin/addons/analytic_distribution_supply/account_commitment.py'
--- bin/addons/analytic_distribution_supply/account_commitment.py	2014-03-07 14:09:26 +0000
+++ bin/addons/analytic_distribution_supply/account_commitment.py	2017-02-15 09:48:45 +0000
@@ -90,7 +90,12 @@
                     if not total_amount:
                         continue
                     # compute percentage
-                    percentage = (total_amount / line.amount) * 100 or 0.0
+                    if line.amount:
+                        percentage = (total_amount / line.amount) * 100 or 0.0
+                    elif not total_amount:
+                        percentage = 100
+                    else:
+                        percentage = 0
                     vals.update({'percentage': percentage})
                     # create cost_center_line
                     self.pool.get('cost.center.distribution.line').create(cr, uid, vals, context=context)
 
=== modified file 'bin/addons/analytic_distribution_supply/purchase.py'
--- bin/addons/analytic_distribution_supply/purchase.py	2016-12-05 13:25:10 +0000
+++ bin/addons/analytic_distribution_supply/purchase.py	2017-02-15 09:48:45 +0000
@@ -220,8 +220,9 @@
                 # Create commitment lines
                 line_id = self.pool.get('account.commitment.line').create(cr, uid, {
                     'commit_id': commit_id,
-                    'amount': total_amount,
-                    'initial_amount': total_amount, 'account_id': account_id,
+                    'amount': total_amount < 0.00001 and 0.00001 or total_amount,
+                    'initial_amount': total_amount < 0.00001 and 0.00001 or total_amount,
+                    'account_id': account_id,
                     'purchase_order_line_ids': [(6,0,[x.id for x in po_lines[account_id]])]
                 }, context=context)
                 created_commitment_lines.append(line_id)
 
=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2016-11-17 10:50:45 +0000
+++ bin/addons/procurement_request/procurement_request.py	2017-02-15 09:48:45 +0000
@@ -658,6 +658,8 @@
             if line.order_id.procurement_request:
                 subtotal = line.cost_price * line.product_uom_qty
                 res[line.id] = cur_obj.round(cr, uid, curr_browse.rounding, subtotal)
+                if line.cost_price > 0 and res[line.id] < 0.01:
+                    res[line.id] = 0.01
             else:
                 new_ids.append(line.id)
 
@@ -730,7 +732,7 @@
         return res
 
     _columns = {
-        'cost_price': fields.float(string='Cost price'),
+        'cost_price': fields.float(string='Cost price', digits_compute=dp.get_precision('Sale Price Computation')),
         'procurement_request': fields.boolean(string='Internal Request', readonly=True),
         'latest': fields.char(size=64, string='Latest documents', readonly=True),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute=dp.get_precision('Sale Price')),
 
=== modified file 'bin/addons/purchase/purchase.py'
--- bin/addons/purchase/purchase.py	2016-10-21 09:57:27 +0000
+++ bin/addons/purchase/purchase.py	2017-02-15 09:48:45 +0000
@@ -675,6 +675,8 @@
             taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur.rounding, taxes['total'])
+            if line.price_unit > 0 and res[line.id] < 0.01:
+                res[line.id] = 0.01
         return res
 
     _columns = {
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2017-02-06 10:46:50 +0000
+++ bin/addons/purchase_override/purchase.py	2017-02-15 09:48:45 +0000
@@ -1223,7 +1223,7 @@
         for po in self.browse(cr, uid, ids, context=context):
             line_error = []
             if po.order_type == 'regular':
-                cr.execute('SELECT line_number FROM purchase_order_line WHERE (price_unit*product_qty < 0.01 OR price_unit = 0.00) AND order_id = %s', (po.id,))
+                cr.execute('SELECT line_number FROM purchase_order_line WHERE (price_unit*product_qty < 0.00001 OR price_unit = 0.00) AND order_id = %s', (po.id,))
                 line_errors = cr.dictfetchall()
                 for l_id in line_errors:
                     if l_id not in line_error:
@@ -1315,7 +1315,7 @@
                 raise osv.except_osv(_('Error'), _('Delivery Confirmed Date is a mandatory field.'))
             # for all lines, if the confirmed date is not filled, we copy the header value
             if is_regular:
-                cr.execute('SELECT line_number FROM purchase_order_line WHERE (price_unit*product_qty < 0.01 OR price_unit = 0.00) AND order_id = %s', (po['id'],))
+                cr.execute('SELECT line_number FROM purchase_order_line WHERE (price_unit*product_qty < 0.00001 OR price_unit = 0.00) AND order_id = %s', (po['id'],))
                 line_errors = cr.dictfetchall()
                 for l_id in line_errors:
                     if l_id not in line_error:
@@ -1619,8 +1619,8 @@
                                                                                  sol.currency_id.id, line.price_unit or 0.0,
                                                                                  round=False, context=date_context)
 
-                    if so.order_type == 'regular' and price_unit_converted < 0.01:
-                        price_unit_converted = 0.01
+                    if so.order_type == 'regular' and price_unit_converted < 0.00001:
+                        price_unit_converted = 0.00001
 
                     line_qty = line.product_qty
                     if line.procurement_id:
 
=== modified file 'bin/addons/sale/sale.py'
--- bin/addons/sale/sale.py	2016-11-09 16:19:23 +0000
+++ bin/addons/sale/sale.py	2017-02-15 09:48:45 +0000
@@ -987,6 +987,8 @@
             taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur.rounding, taxes['total'])
+            if price > 0 and res[line.id] < 0.01:
+                res[line.id] = 0.01
         return res
 
     def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
 
=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2017-01-23 16:14:11 +0000
+++ bin/addons/sale_override/sale.py	2017-02-15 09:48:45 +0000
@@ -1301,7 +1301,7 @@
                     reset_soq.append(line.id)
             no_price_lines = []
             if order.order_type == 'regular':
-                cr.execute('SELECT line_number FROM sale_order_line WHERE (price_unit*product_uom_qty < 0.01 OR price_unit = 0.00) AND order_id = %s', (order.id,))
+                cr.execute('SELECT line_number FROM sale_order_line WHERE (price_unit*product_uom_qty < 0.00001 OR price_unit = 0.00) AND order_id = %s', (order.id,))
                 line_errors = cr.dictfetchall()
                 for l_id in line_errors:
                     if l_id not in no_price_lines:
 
=== modified file 'bin/addons/sourcing/sale_order_line.py'
--- bin/addons/sourcing/sale_order_line.py	2016-12-13 08:05:51 +0000
+++ bin/addons/sourcing/sale_order_line.py	2017-02-15 09:48:45 +0000
@@ -1363,7 +1363,7 @@
             if line['order_id'][0] not in order_to_check:
                 order_to_check.update({line['order_id'][0]: state_to_use})
 
-            if order_type == 'regular' and not order_proc and line['price_unit'] * line['product_uom_qty'] < 0.01:
+            if order_type == 'regular' and not order_proc and line['price_unit'] * line['product_uom_qty'] < 0.00001:
                 raise osv.except_osv(
                     _('Warning'),
                     _('You cannot confirm the sourcing of a line with a subtotal of zero.'),