Vauxoo Addons

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

  1. addons-vauxoo-6.1_report_process_bom_patch_dev_luis
  2. Merge into 6.1
Proposed by Luis Torres - http://www.vauxoo.com
Status: Needs review
Proposed branch: lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_report_process_bom_patch_dev_luis
Merge into: lp:addons-vauxoo/6.1
Diff against target: 642 lines (+77/-388)
2 files modified
report_process_production/report/process_production_report.rml (+77/-78)
report_process_production/report/process_production_report_rml.patch (+0/-310)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1_report_process_bom_patch_dev_luis
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+130635@code.launchpad.net

Description of the change

Se corrigio el parche que se habia generado.

To post a comment you must log in.

Unmerged revisions

524. By Luis Torres - http://www.vauxoo.com

[FIX]Change rml format, and generate you .patch

523. By Luis Torres - http://www.vauxoo.com

[DEL]Delete patch

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-19 21:05:23 +0000
4@@ -118,18 +118,17 @@
5 <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
6 <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
7 <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
8- <paraStyle name="P4" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
9- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
10- <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
11- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
12- <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
13+ <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
14+ <paraStyle name="P5" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
15+ <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
16+ <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
17+ <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
18 <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
19- <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
20- <paraStyle name="P11" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
21- <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
22- <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
23- <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
24- <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
25+ <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
26+ <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
27+ <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
28+ <paraStyle name="P13" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
29+ <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
30 <paraStyle name="Standard" fontName="Helvetica"/>
31 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
32 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
33@@ -144,123 +143,123 @@
34 </stylesheet>
35 <story>
36 <section>
37- <para style="P13">[[ repeatIn(get_sin(data['form']), 's') ]]</para>
38- <para style="P12">Reporte de proceso de producción</para>
39+ <para style="P4">[[ repeatIn(get_sin(data['form']), 's') ]]</para>
40+ <para style="P14">Reporte de proceso de producción</para>
41 <blockTable colWidths="242.0,61.0,66.0,122.0,62.0" style="Table2">
42 <tr>
43 <td>
44- <para style="P7">[[ s['name'] ]]</para>
45- </td>
46- <td>
47- <para style="P7">[[ s['qty'] ]]</para>
48- </td>
49- <td>
50- <para style="P7">[[ s['uom'] ]]</para>
51- </td>
52- <td>
53- <para style="P7">[[ s['categ'] ]]</para>
54- </td>
55- <td>
56- <para style="P7">[[ s['real'] ]]</para>
57+ <para style="P8">[[ s['name'] ]]</para>
58+ </td>
59+ <td>
60+ <para style="P8">[[ s['qty'] ]]</para>
61+ </td>
62+ <td>
63+ <para style="P8">[[ s['uom'] ]]</para>
64+ </td>
65+ <td>
66+ <para style="P8">[[ s['categ'] ]]</para>
67+ </td>
68+ <td>
69+ <para style="P8">[[ s['real'] ]]</para>
70 </td>
71 </tr>
72 </blockTable>
73 <para style="P1">
74 <font color="white"> </font>
75 </para>
76- <para style="P5">
77+ <para style="P6">
78 <font color="white"> </font>
79 </para>
80 </section>
81 <section>
82- <para style="P8">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
83+ <para style="P9">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
84 <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>
85 <blockTable colWidths="242.0,61.0,66.0,121.0,62.0" style="Table1">
86 <tr>
87 <td>
88- <para style="P9">[[ repeatIn(get_production(data['form'], o.id ), 'p' ) ]]</para>
89- <para style="P9">[[ p.product_id.default_code]]:: [[ p.product_id.name ]]</para>
90- </td>
91- <td>
92- <para style="P10">[[ formatLang(p.product_qty) ]]</para>
93- </td>
94- <td>
95- <para style="P9">[[ p.product_uom.name ]]</para>
96- </td>
97- <td>
98- <para style="P9">[[ p.product_id.categ_id.name ]]</para>
99- </td>
100- <td>
101- <para style="P6">
102+ <para style="P10">[[ repeatIn(get_production(data['form'], o.id ), 'p' ) ]]</para>
103+ <para style="P10">[[ p.product_id.default_code]]:: [[ p.product_id.name ]]</para>
104+ </td>
105+ <td>
106+ <para style="P11">[[ formatLang(p.product_qty) ]]</para>
107+ </td>
108+ <td>
109+ <para style="P10">[[ p.product_uom.name ]]</para>
110+ </td>
111+ <td>
112+ <para style="P10">[[ p.product_id.categ_id.name ]]</para>
113+ </td>
114+ <td>
115+ <para style="P7">
116 <font color="white"> </font>
117 </para>
118 </td>
119 </tr>
120 </blockTable>
121- <para style="P4">
122+ <para style="P5">
123 <font color="white"> </font>
124 </para>
125 </section>
126- <para style="P4">
127+ <para style="P5">
128 <font color="white"> </font>
129 </para>
130- <para style="P11">______________________________________________________________________________________________________________________________________________________________________</para>
131- <para style="P11">
132+ <para style="P13">______________________________________________________________________________________________________________________________________________________________________</para>
133+ <para style="P13">
134 <font color="white"> </font>
135 </para>
136 <section>
137- <para style="P14">[[ repeatIn(get_group(data['form']), 'g') ]]</para>
138- <para style="P12">Reporte de proceso de producción agrupado</para>
139+ <para style="P12">[[ repeatIn(get_group(data['form']), 'g') ]]</para>
140+ <para style="P14">Reporte de proceso de producción agrupado</para>
141 <para style="P2">
142 <font color="white"> </font>
143 </para>
144 <blockTable colWidths="241.0,63.0,66.0,121.0,61.0" style="Table3">
145 <tr>
146 <td>
147- <para style="P7">Nombre</para>
148- </td>
149- <td>
150- <para style="P7">Cantidad</para>
151- </td>
152- <td>
153- <para style="P7">UOM</para>
154- </td>
155- <td>
156- <para style="P7">Categoria</para>
157- </td>
158- <td>
159- <para style="P7">Real</para>
160+ <para style="P8">Nombre</para>
161+ </td>
162+ <td>
163+ <para style="P8">Cantidad</para>
164+ </td>
165+ <td>
166+ <para style="P8">UOM</para>
167+ </td>
168+ <td>
169+ <para style="P8">Categoria</para>
170+ </td>
171+ <td>
172+ <para style="P8">Real</para>
173 </td>
174 </tr>
175 <tr>
176 <td>
177- <para style="P9">[[ repeatIn(get_production_group(data['form'] ), 'p' ) ]]</para>
178- <para style="P9">[[ p['code'] ]]::[[ p['name'] ]]</para>
179- </td>
180- <td>
181- <para style="P10">[[ formatLang(p['product_qty']) ]]</para>
182- </td>
183- <td>
184- <para style="P9">[[ p['product_uom'] ]]</para>
185- </td>
186- <td>
187- <para style="P9">[[ p['product_categ'] ]]</para>
188- </td>
189- <td>
190- <para style="P6">
191+ <para style="P10">[[ repeatIn(get_production_group(data['form'] ), 'p' ) ]]</para>
192+ <para style="P10">[[ p['code'] ]]::[[ p['name'] ]]</para>
193+ </td>
194+ <td>
195+ <para style="P11">[[ formatLang(p['product_qty']) ]]</para>
196+ </td>
197+ <td>
198+ <para style="P10">[[ p['product_uom'] ]]</para>
199+ </td>
200+ <td>
201+ <para style="P10">[[ p['product_categ'] ]]</para>
202+ </td>
203+ <td>
204+ <para style="P7">
205 <font color="white"> </font>
206 </para>
207 </td>
208 </tr>
209 </blockTable>
210- <para style="P4">
211+ <para style="P5">
212 <font color="white"> </font>
213 </para>
214- <para style="P4">
215+ <para style="P5">
216 <font color="white"> </font>
217 </para>
218 </section>
219- <para style="P11">
220+ <para style="P13">
221 <font color="white"> </font>
222 </para>
223 </story>
224
225=== added file 'report_process_production/report/process_production_report_rml.patch'
226--- report_process_production/report/process_production_report_rml.patch 1970-01-01 00:00:00 +0000
227+++ report_process_production/report/process_production_report_rml.patch 2012-10-19 21:05:23 +0000
228@@ -0,0 +1,99 @@
229+=== modified file 'report_process_production/report/process_production_report.rml'
230+--- report_process_production/report/process_production_report.rml 2012-10-19 20:18:22 +0000
231++++ report_process_production/report/process_production_report.rml 2012-10-19 20:26:01 +0000
232+@@ -2,6 +2,19 @@
233+ <document filename="test.pdf">
234+ <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
235+ <pageTemplate id="first">
236++ <pageGraphics>
237++ <setFont name="Courier-Bold" size="12.0"/>
238++ <drawCentredString x="10.5cm" y="0.8cm">Página: <pageNumber/></drawCentredString>
239++ <place x="18.0cm" y="25.0cm" width="90" height="60">
240++ <blockTable colWidths="85" style="Table_order">
241++ <tr>
242++ <td>
243++ <para style="P7">Impreso: [[time.strftime('%d-%b-%Y')]]</para>
244++ </td>
245++ </tr>
246++ </blockTable>
247++ </place>
248++ </pageGraphics>
249+ <frame id="first" x1="28.0" y1="57.0" width="556" height="678"/>
250+ </pageTemplate>
251+ </template>
252+@@ -10,6 +23,11 @@
253+ <blockAlignment value="LEFT"/>
254+ <blockValign value="TOP"/>
255+ </blockTableStyle>
256++ <blockTableStyle id="Table_order">
257++ <blockAlignment value="LEFT"/>
258++ <blockValign value="TOP"/>
259++ <lineStyle kind="GRID" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
260++ </blockTableStyle>
261+ <blockTableStyle id="Table2">
262+ <blockAlignment value="LEFT"/>
263+ <blockValign value="TOP"/>
264+@@ -35,19 +53,19 @@
265+ <blockValign value="TOP"/>
266+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
267+ <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
268+- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
269++ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,-1"/>
270+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
271+ <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
272+- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
273++ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,-1"/>
274+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
275+ <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
276+- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
277++ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,-1"/>
278+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
279+ <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
280+- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
281++ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,-1"/>
282+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
283+ <lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1"/>
284+- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
285++ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,-1"/>
286+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
287+ </blockTableStyle>
288+ <blockTableStyle id="Table3">
289+@@ -75,23 +93,23 @@
290+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
291+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
292+ <lineStyle kind="LINEAFTER" colorName="#000000" start="0,1" stop="0,-1"/>
293+- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="0,1"/>
294++ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="0,-1"/>
295+ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
296+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
297+ <lineStyle kind="LINEAFTER" colorName="#000000" start="1,1" stop="1,-1"/>
298+- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
299++ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,-1"/>
300+ <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
301+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
302+ <lineStyle kind="LINEAFTER" colorName="#000000" start="2,1" stop="2,-1"/>
303+- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
304++ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,-1"/>
305+ <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
306+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
307+ <lineStyle kind="LINEAFTER" colorName="#000000" start="3,1" stop="3,-1"/>
308+- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
309++ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,-1"/>
310+ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
311+ <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
312+ <lineStyle kind="LINEAFTER" colorName="#000000" start="4,1" stop="4,-1"/>
313+- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
314++ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,-1"/>
315+ <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
316+ </blockTableStyle>
317+ <initialize>
318+@@ -109,7 +127,7 @@
319+ <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
320+ <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
321+ <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
322+- <paraStyle name="P13" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
323++ <paraStyle name="P13" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
324+ <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
325+ <paraStyle name="Standard" fontName="Helvetica"/>
326+ <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
327+
328
329=== removed file 'report_process_production/report/process_production_report_rml.patch'
330--- report_process_production/report/process_production_report_rml.patch 2012-10-18 23:24:09 +0000
331+++ report_process_production/report/process_production_report_rml.patch 1970-01-01 00:00:00 +0000
332@@ -1,310 +0,0 @@
333-=== modified file 'report_process_production/report/process_production_report.rml'
334---- report_process_production/report/process_production_report.rml 2012-10-18 23:20:04 +0000
335-+++ report_process_production/report/process_production_report.rml 2012-10-18 23:20:27 +0000
336-@@ -2,6 +2,19 @@
337- <document filename="test.pdf">
338- <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
339- <pageTemplate id="first">
340-+ <pageGraphics>
341-+ <setFont name="Courier-Bold" size="12.0"/>
342-+ <drawCentredString x="10.5cm" y="0.8cm">Página: <pageNumber/></drawCentredString>
343-+ <place x="18.0cm" y="25.0cm" width="90" height="60">
344-+ <blockTable colWidths="85" style="Table_order">
345-+ <tr>
346-+ <td>
347-+ <para style="P7">Impreso: [[time.strftime('%d-%b-%Y')]]</para>
348-+ </td>
349-+ </tr>
350-+ </blockTable>
351-+ </place>
352-+ </pageGraphics>
353- <frame id="first" x1="28.0" y1="57.0" width="556" height="678"/>
354- </pageTemplate>
355- </template>
356-@@ -10,6 +23,11 @@
357- <blockAlignment value="LEFT"/>
358- <blockValign value="TOP"/>
359- </blockTableStyle>
360-+ <blockTableStyle id="Table_order">
361-+ <blockAlignment value="LEFT"/>
362-+ <blockValign value="TOP"/>
363-+ <lineStyle kind="GRID" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
364-+ </blockTableStyle>
365- <blockTableStyle id="Table2">
366- <blockAlignment value="LEFT"/>
367- <blockValign value="TOP"/>
368-@@ -35,19 +53,19 @@
369- <blockValign value="TOP"/>
370- <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
371- <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
372-- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
373-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,-1"/>
374- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
375- <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
376-- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
377-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,-1"/>
378- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
379- <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
380-- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
381-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,-1"/>
382- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
383- <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
384-- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
385-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,-1"/>
386- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
387- <lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1"/>
388-- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
389-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,-1"/>
390- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
391- </blockTableStyle>
392- <blockTableStyle id="Table3">
393-@@ -75,23 +93,23 @@
394- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
395- <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
396- <lineStyle kind="LINEAFTER" colorName="#000000" start="0,1" stop="0,-1"/>
397-- <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="0,1"/>
398-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="0,-1"/>
399- <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
400- <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
401- <lineStyle kind="LINEAFTER" colorName="#000000" start="1,1" stop="1,-1"/>
402-- <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,1"/>
403-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="1,1" stop="1,-1"/>
404- <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
405- <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
406- <lineStyle kind="LINEAFTER" colorName="#000000" start="2,1" stop="2,-1"/>
407-- <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,1"/>
408-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,1" stop="2,-1"/>
409- <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
410- <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
411- <lineStyle kind="LINEAFTER" colorName="#000000" start="3,1" stop="3,-1"/>
412-- <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,1"/>
413-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="3,1" stop="3,-1"/>
414- <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
415- <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
416- <lineStyle kind="LINEAFTER" colorName="#000000" start="4,1" stop="4,-1"/>
417-- <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,1"/>
418-+ <lineStyle kind="LINEABOVE" colorName="#000000" start="4,1" stop="4,-1"/>
419- <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
420- </blockTableStyle>
421- <initialize>
422-@@ -100,17 +118,18 @@
423- <paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
424- <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
425- <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
426-- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
427-- <paraStyle name="P5" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
428-- <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
429-- <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
430-- <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
431-+ <paraStyle name="P4" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
432-+ <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
433-+ <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
434-+ <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
435-+ <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
436- <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
437-- <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
438-- <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
439-- <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
440-- <paraStyle name="P13" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
441-- <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
442-+ <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
443-+ <paraStyle name="P11" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
444-+ <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
445-+ <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
446-+ <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
447-+ <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
448- <paraStyle name="Standard" fontName="Helvetica"/>
449- <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
450- <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
451-@@ -125,123 +144,123 @@
452- </stylesheet>
453- <story>
454- <section>
455-- <para style="P4">[[ repeatIn(get_sin(data['form']), 's') ]]</para>
456-- <para style="P14">Reporte de proceso de producción</para>
457-+ <para style="P13">[[ repeatIn(get_sin(data['form']), 's') ]]</para>
458-+ <para style="P12">Reporte de proceso de producción</para>
459- <blockTable colWidths="242.0,61.0,66.0,122.0,62.0" style="Table2">
460- <tr>
461- <td>
462-- <para style="P8">[[ s['name'] ]]</para>
463-- </td>
464-- <td>
465-- <para style="P8">[[ s['qty'] ]]</para>
466-- </td>
467-- <td>
468-- <para style="P8">[[ s['uom'] ]]</para>
469-- </td>
470-- <td>
471-- <para style="P8">[[ s['categ'] ]]</para>
472-- </td>
473-- <td>
474-- <para style="P8">[[ s['real'] ]]</para>
475-+ <para style="P7">[[ s['name'] ]]</para>
476-+ </td>
477-+ <td>
478-+ <para style="P7">[[ s['qty'] ]]</para>
479-+ </td>
480-+ <td>
481-+ <para style="P7">[[ s['uom'] ]]</para>
482-+ </td>
483-+ <td>
484-+ <para style="P7">[[ s['categ'] ]]</para>
485-+ </td>
486-+ <td>
487-+ <para style="P7">[[ s['real'] ]]</para>
488- </td>
489- </tr>
490- </blockTable>
491- <para style="P1">
492- <font color="white"> </font>
493- </para>
494-- <para style="P6">
495-+ <para style="P5">
496- <font color="white"> </font>
497- </para>
498- </section>
499- <section>
500-- <para style="P9">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
501-+ <para style="P8">[[ repeatIn(get_table(data['form'],objects),'o') ]]</para>
502- <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>
503- <blockTable colWidths="242.0,61.0,66.0,121.0,62.0" style="Table1">
504- <tr>
505- <td>
506-- <para style="P10">[[ repeatIn(get_production(data['form'], o.id ), 'p' ) ]]</para>
507-- <para style="P10">[[ p.product_id.default_code]]:: [[ p.product_id.name ]]</para>
508-- </td>
509-- <td>
510-- <para style="P11">[[ formatLang(p.product_qty) ]]</para>
511-- </td>
512-- <td>
513-- <para style="P10">[[ p.product_uom.name ]]</para>
514-- </td>
515-- <td>
516-- <para style="P10">[[ p.product_id.categ_id.name ]]</para>
517-- </td>
518-- <td>
519-- <para style="P7">
520-+ <para style="P9">[[ repeatIn(get_production(data['form'], o.id ), 'p' ) ]]</para>
521-+ <para style="P9">[[ p.product_id.default_code]]:: [[ p.product_id.name ]]</para>
522-+ </td>
523-+ <td>
524-+ <para style="P10">[[ formatLang(p.product_qty) ]]</para>
525-+ </td>
526-+ <td>
527-+ <para style="P9">[[ p.product_uom.name ]]</para>
528-+ </td>
529-+ <td>
530-+ <para style="P9">[[ p.product_id.categ_id.name ]]</para>
531-+ </td>
532-+ <td>
533-+ <para style="P6">
534- <font color="white"> </font>
535- </para>
536- </td>
537- </tr>
538- </blockTable>
539-- <para style="P5">
540-+ <para style="P4">
541- <font color="white"> </font>
542- </para>
543- </section>
544-- <para style="P5">
545-+ <para style="P4">
546- <font color="white"> </font>
547- </para>
548-- <para style="P13">______________________________________________________________________________________________________________________________________________________________________</para>
549-- <para style="P13">
550-+ <para style="P11">______________________________________________________________________________________________________________________________________________________________________</para>
551-+ <para style="P11">
552- <font color="white"> </font>
553- </para>
554- <section>
555-- <para style="P12">[[ repeatIn(get_group(data['form']), 'g') ]]</para>
556-- <para style="P14">Reporte de proceso de producción agrupado</para>
557-+ <para style="P14">[[ repeatIn(get_group(data['form']), 'g') ]]</para>
558-+ <para style="P12">Reporte de proceso de producción agrupado</para>
559- <para style="P2">
560- <font color="white"> </font>
561- </para>
562- <blockTable colWidths="241.0,63.0,66.0,121.0,61.0" style="Table3">
563- <tr>
564- <td>
565-- <para style="P8">Nombre</para>
566-- </td>
567-- <td>
568-- <para style="P8">Cantidad</para>
569-- </td>
570-- <td>
571-- <para style="P8">UOM</para>
572-- </td>
573-- <td>
574-- <para style="P8">Categoria</para>
575-- </td>
576-- <td>
577-- <para style="P8">Real</para>
578-+ <para style="P7">Nombre</para>
579-+ </td>
580-+ <td>
581-+ <para style="P7">Cantidad</para>
582-+ </td>
583-+ <td>
584-+ <para style="P7">UOM</para>
585-+ </td>
586-+ <td>
587-+ <para style="P7">Categoria</para>
588-+ </td>
589-+ <td>
590-+ <para style="P7">Real</para>
591- </td>
592- </tr>
593- <tr>
594- <td>
595-- <para style="P10">[[ repeatIn(get_production_group(data['form'] ), 'p' ) ]]</para>
596-- <para style="P10">[[ p['code'] ]]::[[ p['name'] ]]</para>
597-- </td>
598-- <td>
599-- <para style="P11">[[ formatLang(p['product_qty']) ]]</para>
600-- </td>
601-- <td>
602-- <para style="P10">[[ p['product_uom'] ]]</para>
603-- </td>
604-- <td>
605-- <para style="P10">[[ p['product_categ'] ]]</para>
606-- </td>
607-- <td>
608-- <para style="P7">
609-+ <para style="P9">[[ repeatIn(get_production_group(data['form'] ), 'p' ) ]]</para>
610-+ <para style="P9">[[ p['code'] ]]::[[ p['name'] ]]</para>
611-+ </td>
612-+ <td>
613-+ <para style="P10">[[ formatLang(p['product_qty']) ]]</para>
614-+ </td>
615-+ <td>
616-+ <para style="P9">[[ p['product_uom'] ]]</para>
617-+ </td>
618-+ <td>
619-+ <para style="P9">[[ p['product_categ'] ]]</para>
620-+ </td>
621-+ <td>
622-+ <para style="P6">
623- <font color="white"> </font>
624- </para>
625- </td>
626- </tr>
627- </blockTable>
628-- <para style="P5">
629-+ <para style="P4">
630- <font color="white"> </font>
631- </para>
632-- <para style="P5">
633-+ <para style="P4">
634- <font color="white"> </font>
635- </para>
636- </section>
637-- <para style="P13">
638-+ <para style="P11">
639- <font color="white"> </font>
640- </para>
641- </story>
642-