diff --git a/addons/hr/report/attendance_errors.rml b/addons/hr/report/attendance_errors.rml index c81da90c57b..30199ce2f14 100644 --- a/addons/hr/report/attendance_errors.rml +++ b/addons/hr/report/attendance_errors.rml @@ -10,35 +10,44 @@ - + - - - + + + + + - + - - + + + + + + + + + + - + - - - - - - + + + + + - + - - - + + + @@ -46,6 +55,8 @@ + + @@ -53,98 +64,88 @@ + + + + + + + + + + + + - + [[ repeatIn(objects,'employee') ]] + Attendance Errors + [[ employee.name ]] + + + + - Report - From: [[ data['form']['init_date'] ]] - To: [[ data['form']['end_date'] ]] + Operation - Attendance Errors + Date Signed - Date Printed: - [[ time.strftime('%Y/%m/%d') ]] + Date Recorded + + + Delay + + + Min Delay - + + + + [[ repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]] + + + + [[ att['action'] ]] + + + [[ att['date'] ]] + + + [[ att['create_date'] ]] + + + [[ att['delay'] ]] + + + [[ att['delay2'] ]] + + + + + + + + + + Total period: + + + [[ total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay'])[0] ]] + + + [[ total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay'])[1] ]] + + + + -
- [[ repeatIn(objects, 'employee') ]] - - - - [[ employee.name ]] - - - - - - - Operation - - - Date Signed - - - Date Recorded - - - Delay - - - Avg Delay - - - - - [[repeatIn(lst(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay']), 'att') ]] [[att['action'] ]] - - - [[ att['date'] ]] - - - [[ att['create_date'] ]] - - - [[ att['delay'] ]] - - - [[ att['delay2'] ]] - - - - - - - Total period: - - - - [[total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay'])[0] ]] - - - - - [[total(employee.id,data['form']['init_date'], data['form']['end_date'], data['form']['max_delay'])[1] ]] - - - - - - - -
- - - - (*) A positive delay means that the employee worked less than recorded. - (*) A negative delay means that the employee worked more than encoded. + (*) A positive delay means that the employee worked less than recorded. + (*) A negative delay means that the employee worked more than encoded.
- diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index 96fda43bd8f..d169e3685ab 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -10,11 +10,11 @@
- + - + @@ -31,7 +31,7 @@ - + @@ -48,15 +48,15 @@ - + - - - - + + + + - + @@ -68,7 +68,6 @@ - @@ -98,7 +97,6 @@ - @@ -106,38 +104,35 @@ - [[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]] - + [[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]] + Invoiced to - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.name or '']] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.street or '']] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.zip or '']] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.city or '' ]] - [[ o.sale_id and o.sale_id.partner_invoice_id and o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name or '']] + [[ o.sale_id.partner_invoice_id.name ]] + [[ o.sale_id.partner_invoice_id.street ]] + [[ o.sale_id.partner_invoice_id.zip ]] + [[ o.sale_id.partner_invoice_id.city ]] + [[ o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name ]] Shipped to - [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.name or '']] - [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.street or '']] - [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.zip or '']] - [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.city or '']] - [[ o.sale_id and o.sale_id.partner_shipping_id and o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name or '']] + [[ o.sale_id.partner_shipping_id.name ]] + [[ o.sale_id.partner_shipping_id.street ]] + [[ o.sale_id.partner_shipping_id.zip ]] + [[ o.sale_id.partner_shipping_id.city ]] + [[ o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name ]] - Delivery order [[ o.sale_id and o.sale_id.name ]] + Delivery order [[ o.sale_id.name ]] - - - - + Order Ref. @@ -153,16 +148,16 @@ - + - [[ o.sale_id and o.sale_id.name ]] + [[ o.sale_id.name ]] - [[ o.sale_id and o.sale_id.date_order or '']] + [[ o.sale_id.date_order ]] - [[ o.min_date ]] + [[ o.date ]] [[ o.carrier_id and o.carrier_id.name or '' ]] @@ -172,7 +167,7 @@ - + Reference @@ -189,29 +184,46 @@
- [[ repeatIn(o.move_lines, 'line') ]] - + [[ repeatIn(o.move_lines, 'line') ]] + - [[line.product_id.code ]] + [[ line.product_id.code ]] - [[ line.product_id and line.product_id.name or '']] + [[ line.product_id.name ]] [[ line.product_qty ]] - [[ line.product_uom and line.product_uom.name ]] + [[ line.product_uom.name ]] + + + + + [[ line.product_id.ean13 ]] + + + Logistical unit : [[ line.product_packaging.qty ]] + [[ line.tracking_id and 'Packaging : %d package of %d P' % (1, line.product_packaging.qty) or '' ]] + [[ line.tracking_id and 'Pallets reference: %s' % line.tracking_id.name or '' ]] + Batch reference : [[ line.prodlot_id and line.prodlot_id.name or '/' ]] + + + [[ line.product_uos_qty ]] + + + [[ line.product_uos.name ]] - - - - +
+ + +