diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index 6805496a5e8..223bcd38fbe 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -10,7 +10,7 @@ - + @@ -48,19 +48,28 @@ - + - - + + + + + + + + + + + + + + + - - - - @@ -68,81 +77,58 @@ - - - - - - - - - - - + - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + @@ -180,271 +166,234 @@ - [[ repeatIn(objects,'o') ]] - + [[ repeatIn(objects,'o') ]] + - Shipping address : - [[ o.partner_id.name ]] - [[ o.address_id.title or '' ]] [[ o.address_id.name ]] - [[ o.address_id.street ]] - [[ o.address_id.street2 or '' ]] - [[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]] - [[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]] - + Shipping address : + [[ o.partner_id.name ]] + [[ o.address_id.title or '' ]] [[ o.address_id.name ]] + [[ o.address_id.street ]] + [[ o.address_id.street2 or '' ]] + [[ o.address_id.city or '' ]] [[ o.address_id.zip or '' ]] + [[ o.address_id.state_id and o.address_id.state_id.name or '' ]] [[ o.address_id.country_id and o.address_id.country_id.name or '' ]] + - Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name and removeParentNode('para')]] - [[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]] - [[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] + Invoice address :[[ o.partner_id and o.partner_id.property_payment_term.name ]] + [[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]] + [[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] - + - [[ o.partner_id.name ]] - [[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]] - [[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]] - [[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]] [[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]] - [[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]] + [[ o.partner_id.name ]] + [[ o.partner_id and adr_get(o.partner_id, 'default')['name'] ]] + [[ o.partner_id and adr_get(o.partner_id, 'default')['street'] ]] + [[ o.partner_id and adr_get(o.partner_id, 'default')['zip'] ]][[ o.partner_id and adr_get(o.partner_id, 'default')['city'] ]] + [[ o.partner_id and adr_get(o.partner_id, 'default')['country_id'] and adr_get(o.partner_id, 'default')['country_id'][1] ]] + + + + + + + + + + + + + + + - + [[ o.state<>'draft' and removeParentNode('para') ]]Repair Quotation N° : [[ o.name ]] + [[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]] + - [[ o.state<>'draft' and removeParentNode('para') ]]Repair Quotation N° : [[ o.name ]] - [[ o.state=='draft' and removeParentNode('para') ]]Repair Order N° : [[ o.name ]] - - - - + - Product to Repair + Product to Repair - Lot Number + Lot Number - Guarantee Limit + Guarantee Limit - Printing Date + Printing Date - [[ o.product_id.name or '' ]] + [[ o.product_id.name or '' ]] - [[ o.prodlot_id.name or '' ]] + [[ o.prodlot_id.name or ' ' ]] - [[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]] + [[ time.strftime('%d/%m/%Y', time.strptime(o.guarantee_limit, '%Y-%m-%d')) ]] - [[ time.strftime('%d/%m/%Y') ]] + [[ time.strftime('%d/%m/%Y')]] - + - + - + - - Description + Description - VAT + VAT - Quantity + Quantity - Unit Price + Unit Price - Price + Price
- - - - Operation Line(s) - + + Operation Line(s) + - [[ repeatIn(o.operations,'line') ]] - - - - - [[ line.name ]] - - - [[ ', '.join(map(lambda x: x.name, line.tax_id)) or '0.00' ]] - - - [[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] - - - [[ line.price_unit ]] - - - [[ line.price_subtotal ]] - - - - - - + [[ repeatIn(o.operations,'line') ]] Add [[ ((line.type == 'add') or removeParentNode('para')) and '' ]] + Remove [[ ((line.type == 'remove') or removeParentNode('para')) and '' ]] + + + [[ line.name ]] + + + [[ ','.join(map( lambda x: x.name, line.tax_id)) or '0.00' ]] + + + [[ line.product_uom_qty or '0.00' ]] [[ line.product_uom.name ]] + + + [[ line.price_unit ]] + + + [[ line.price_subtotal ]] - - -
- Fees Line(s) - - - - [[ repeatIn(o.fees_lines,'fees') ]] - - - - - [[ fees.name ]] - - - [[ ', '.join(map(lambda x: x.name, fees.tax_id)) or '0.00' ]] - - - [[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] - - - [[ fees.price_unit ]] - - - [[ fees.price_subtotal ]] - - - - - - - - - - - - + Fees Line(s) - - - - - - - - - Net Total : - - - [[ o.amount_untaxed or '0.00' ]] - - - [[ o.pricelist_id.currency_id.name ]] - - + - - - + [[ repeatIn(o.fees_lines,'fees') ]] - Taxes : + [[ fees.name ]] - [[ o.amount_tax or '0.00' ]] + [[ ','.join(map( lambda x: x.name, fees.tax_id)) or '0.00' ]] - [[ o.pricelist_id.currency_id.name ]] + [[ fees.product_uom_qty or '0.00' ]] [[ fees.product_uom.name ]] + + + [[ fees.price_unit ]] + + + [[ fees.price_subtotal ]] - + + + + + + + + - - - + Net Total : - Total : + [[ o.amount_untaxed or '0.00' ]] - [[ total(o) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] + + - - - + Taxes: - - - + [[ o.amount_tax or '0.00']] - - - + [[ o.pricelist_id.currency_id.name ]] + + + + + + + Total : - - - + [[ total(o) ]] + + + [[ o.pricelist_id.currency_id.name ]] - + + + + - [[ format(o.quotation_notes or '') ]] + [[ format(o.quotation_notes or '') ]] - + - + \ No newline at end of file