Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_report_process_withot_uom_dev_luis into lp:addons-vauxoo/6.1

  1. addons-vauxoo-6.1_report_process_withot_uom_dev_luis
  2. Merge into 6.1
Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 544
Proposed branch: lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_report_process_withot_uom_dev_luis
Merge into: lp:addons-vauxoo/6.1
Diff against target: 27 lines (+2/-2)
2 files modified
report_process_production/report/process_production_report.rml (+1/-1)
report_process_production/report/process_production_report_rml.patch (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_report_process_withot_uom_dev_luis
Reviewer Review Type Date Requested Status
Isaac López Zúñiga Pending
Moisés López - http://www.vauxoo.com Pending
Rodolfo Lopez Pending
Review via email: mp+131291@code.launchpad.net

Description of the change

Se elimino del reporte de produce la etiqueta Unidad de Medida,
nota: Solo fue la etiqueta, no la unidad de medida

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_process_production/report/process_production_report.rml'
2--- report_process_production/report/process_production_report.rml 2012-10-18 23:24:09 +0000
3+++ report_process_production/report/process_production_report.rml 2012-10-24 23:11:20 +0000
4@@ -174,7 +174,7 @@
5 </section>
6 <section>
7 <para style="P8">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
8- <para style="P3">Producción: [[ o.name ]] , Producto: [[o.product_id.name ]], Codigo: [[o.product_id.default_code ]] , Cantidad: [[ o.product_qty ]], Unidad Medida: [[o.product_uom.name ]] , Fecha Planificada: [[o.date_planned or '']] , Lista De Materiales: [[ o.bom_id and o.bom_id.name or '' ]]</para>
9+ <para style="P3">Producción: [[ o.name ]] , Producto: [[o.product_id.name ]], Codigo: [[o.product_id.default_code ]] , Cantidad: [[ o.product_qty ]] [[o.product_uom.name ]] , Fecha Planificada: [[o.date_planned or '']] , Lista De Materiales: [[ o.bom_id and o.bom_id.name or '' ]]</para>
10 <blockTable colWidths="242.0,61.0,66.0,121.0,62.0" style="Table1">
11 <tr>
12 <td>
13
14=== modified file 'report_process_production/report/process_production_report.sxw'
15Binary files report_process_production/report/process_production_report.sxw 2012-10-18 23:08:12 +0000 and report_process_production/report/process_production_report.sxw 2012-10-24 23:11:20 +0000 differ
16=== modified file 'report_process_production/report/process_production_report_rml.patch'
17--- report_process_production/report/process_production_report_rml.patch 2012-10-18 23:24:09 +0000
18+++ report_process_production/report/process_production_report_rml.patch 2012-10-24 23:11:20 +0000
19@@ -167,7 +167,7 @@
20 <section>
21 - <para style="P9">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
22 + <para style="P8">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
23- <para style="P3">Producción: [[ o.name ]] , Producto: [[o.product_id.name ]], Codigo: [[o.product_id.default_code ]] , Cantidad: [[ o.product_qty ]], Unidad Medida: [[o.product_uom.name ]] , Fecha Planificada: [[o.date_planned or '']] , Lista De Materiales: [[ o.bom_id and o.bom_id.name or '' ]]</para>
24+ <para style="P3">Producción: [[ o.name ]] , Producto: [[o.product_id.name ]], Codigo: [[o.product_id.default_code ]] , Cantidad: [[ o.product_qty ]] [[o.product_uom.name ]] , Fecha Planificada: [[o.date_planned or '']] , Lista De Materiales: [[ o.bom_id and o.bom_id.name or '' ]]</para>
25 <blockTable colWidths="242.0,61.0,66.0,121.0,62.0" style="Table1">
26 <tr>
27 <td>