← Back to branch summary

~matjaz-6/openerpsl/openerpsl_01_25

« back to all changes in this revision

Viewing changes to mrp_procurement_qty/wizard/delivery_order_return.py

  • Committer: laznik
  • Date: 2014-01-30 17:21:32 UTC
  • mfrom: (320.1.2 openerpsl_01_25)
  • Revision ID: laznik@mentis.si-20140130172132-ux8g7b73hdihd202
[FIX] mrp_procurement_qty/wizard/mrp_procurement_qty.py (removed basket_delivery = 2 at wrong place)
[FIX] mrp_procurement_qty/report/delivery_order_return_report (unit price on four digits)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mrp_procurement_qty/wizard/delivery_order_return.py
81
81
                    #Dodamo ceno
82
82
                    if line.picking_id.partner_id.delivery_prices:
83
83
                        _price = line.sale_line_id.price_unit * (1 - (line.sale_line_id.discount or 0.0) / 100.0)
84
 
                        _price_tax = self.pool.get('account.tax').compute_all(cr, uid, line.sale_line_id.tax_id, _price, 1, line.sale_line_id.product_id, line.sale_line_id.order_id.partner_id)['total']
85
 
                        dict_temp['price'] = _price_tax
86
 
                        dict_temp['price_total'] = _price_tax * (line.basket_deliverd-line.product_qty_returned)
87
 
                        #sum_price = sum_price + _price_tax
88
 
                        sum_price_total = sum_price_total + (_price_tax * (line.basket_deliverd-line.product_qty_returned))
 
84
                        #_price_tax = self.pool.get('account.tax').compute_all(cr, uid, line.sale_line_id.tax_id, _price, 1, line.sale_line_id.product_id, line.sale_line_id.order_id.partner_id)['total']
 
85
                        dict_temp['price'] = _price
 
86
                        value = self.pool.get('account.tax').compute_all(cr, uid, line.sale_line_id.tax_id, _price, (line.basket_deliverd-line.product_qty_returned), line.sale_line_id.product_id, line.sale_line_id.order_id.partner_id)['total']
 
87
                        
 
88
                        dict_temp['price_total'] = value
 
89
                        sum_price_total = sum_price_total + value
89
90
                    else:
90
91
                        dict_temp['price'] = ''
91
92
                        dict_temp['price_total'] = ''
125
126
                        #Dodamo ceno
126
127
                        if sale_line.order_id.partner_id.delivery_prices:
127
128
                            _price = sale_line.price_unit * (1 - (sale_line.discount or 0.0) / 100.0)
128
 
                            _price_tax = self.pool.get('account.tax').compute_all(cr, uid, sale_line.tax_id, _price, 1, new_product_id[0], sale_line.order_id.partner_id)['total']
129
 
                            dict_temp['price'] = _price_tax
130
 
                            dict_temp['price_total'] = _price_tax * sale_line.product_qty_returned * (-1)
 
129
                            dict_temp['price'] = _price
 
130
                            value = self.pool.get('account.tax').compute_all(cr, uid, line.sale_line_id.tax_id, _price, (line.basket_deliverd-line.product_qty_returned), line.sale_line_id.product_id, line.sale_line_id.order_id.partner_id)['total']
 
131
                            dict_temp['price_total'] = value
131
132
                            #sum_price = sum_price + _price_tax
132
 
                            sum_price_total = sum_price_total - (_price_tax * sale_line.product_qty_returned)
 
133
                            sum_price_total = sum_price_total - value
133
134
                        else:
134
135
                            dict_temp['price'] = ''
135
136
                            dict_temp['price_total'] = ''