diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 5474646c004..8890ed533d7 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -69,10 +69,10 @@ class report_custom(report_rml): xml += "" + prod_name + '' xml += "" + main_sp_name + sellers + '' - xml += "" + str(prod_qtty) + '' - xml += "" + product_uom.name + '' - xml += "" + main_strd_price + '' - xml += "" + main_sp_price + sellers_price + '' + xml += "" + str(prod_qtty) + '' + xml += "" + product_uom.name + '' + xml += "" + main_strd_price + '' + xml += "" + main_sp_price + sellers_price + '' xml += '' @@ -87,9 +87,9 @@ class report_custom(report_rml): xml += "" + workcenter.name + '' xml += "" xml += "" - xml += "" + str(cost_cycle) + '' - xml += "" + str(cost_hour) + '' - xml += "" + str(cost_hour + cost_cycle) + '' + xml += "" + str(cost_cycle) + '' + xml += "" + str(cost_hour) + '' + xml += "" + str(cost_hour + cost_cycle) + '' xml += '' return xml, total @@ -102,7 +102,7 @@ class report_custom(report_rml): 210.00mm,297.00mm 595.27 841.88 - 60.00mm,60.00mm, 20.00mm, 20.00mm, 20.00mm, 20.00mm + 55.00mm,55.00mm, 20.00mm, 22.00mm, 22.00mm, 25.00mm """ config_stop = """ Generated by OpenERP @@ -114,30 +114,30 @@ class report_custom(report_rml): %s - - %s - %s - %s + + %s + %s + %s """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost')) prod_header = """ - %s - %s - %s - %s - %s - %s + %s + %s + %s + %s + %s + %s - """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Unit Price per Uom'), _('Supplier Unit Price per Uom')) + """ % (_('Componet'), _('Componet suppliers'), _('Quantity'), _('Uom'), _('Cost Price per Uom'), _('Supplier Price per Uom')) company_currency = user_pool.browse(cr, uid, uid).company_id.currency_id.id for product in product_pool.browse(cr, uid, ids, context=context): bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id) title = "%s" %(_("Cost Structure")) title += "%s" %product.name - xml += "" + title + prod_header + "" + xml += "" + title + prod_header + "" if not bom_id: total_strd = number * product.standard_price total = number * product_pool.price_get(cr, uid, [product.id], 'standard_price')[product.id] @@ -153,9 +153,9 @@ class report_custom(report_rml): %s %s %s %s : - - %s - %s + + %s + %s '"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total)) else: bom = bom_pool.browse(cr, uid, bom_id, context=context) @@ -164,9 +164,9 @@ class report_custom(report_rml): total = 0 total_strd = 0 parent_bom = { - 'product_qty': bom.product_qty, - 'name': bom.product_id.name, - 'product_uom': bom.product_uom.id, + 'product_qty': bom.product_qty, + 'name': bom.product_id.name, + 'product_uom': bom.product_uom.id, 'product_id': bom.product_id.id } xml_tmp = '' @@ -175,15 +175,15 @@ class report_custom(report_rml): xml_tmp += txt total += sum total_strd += sum_strd - + xml += "" + xml_tmp + '' xml += """ %s %s %s %s : - - %s - %s + + %s + %s '"""%(_('Cost'), _('of'), str(number), product.uom_id.name, str(total_strd), str(total)) total2 = 0 @@ -201,18 +201,19 @@ class report_custom(report_rml): - %s + %s '"""%(_('Work Cost'), _('of'), str(number), product.uom_id.name, str(total2)) xml += """ %s %s %s %s : - - %s - %s + + %s + %s '"""%(_('Total Cost'), _('of'), str(number), product.uom_id.name, str(total_strd+total2), str(total+total2)) xml = '' + config_start + config_stop + xml + '' + return xml report_custom('report.product.price', 'product.product', '', 'addons/mrp/report/price.xsl') diff --git a/addons/mrp/report/price.xsl b/addons/mrp/report/price.xsl index 10e088629e0..dc43c3d6f7d 100644 --- a/addons/mrp/report/price.xsl +++ b/addons/mrp/report/price.xsl @@ -3,7 +3,7 @@ - + @@ -12,35 +12,37 @@ - + + + + + - - + - + - - + - + - + @@ -66,7 +68,7 @@ - + @@ -75,22 +77,28 @@ + + + + + + @@ -105,22 +113,32 @@ - + - + - - + + - + + + + + + + + + + +