Mentis

Merge lp:~matjaz-6/openerpsl/openerpsl_01_07 into lp:openerpsl/7.0

  1. openerpsl_01_07
  2. Merge into 7.0
Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 290
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_01_07
Merge into: lp:openerpsl/7.0
Diff against target: 1119 lines (+415/-410)
3 files modified
inovatim_reports/report/account_print_invoice.rml (+188/-191)
inovatim_reports/report/sale_order.rml (+78/-70)
inovatim_reports/report/stock_picking.rml (+149/-149)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_01_07
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+202664@code.launchpad.net

Description of the change

[FIX] inovatim_reports (fixed translations of values)

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 'inovatim_reports/report/account_print_invoice.rml'
2--- inovatim_reports/report/account_print_invoice.rml 2014-01-22 11:35:04 +0000
3+++ inovatim_reports/report/account_print_invoice.rml 2014-01-22 12:58:48 +0000
4@@ -111,35 +111,32 @@
5 <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
6 <paraStyle name="P2" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
7 <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
8- <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
9- <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
10- <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
11- <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
12- <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
13- <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
14- <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
15+ <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
16+ <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
17+ <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
18+ <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
19+ <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
20+ <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
21+ <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
22 <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
23- <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
24- <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
25- <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
26- <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
27- <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
28- <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
29- <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
30- <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
31- <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
32- <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
33- <paraStyle name="P22" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
34+ <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
35+ <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
36+ <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
37+ <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
38+ <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
39+ <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
40+ <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
41+ <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
42+ <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
43+ <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
44+ <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
45 <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
46- <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
47- <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
48- <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
49- <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
50- <paraStyle name="P28" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
51- <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
52- <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
53- <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
54- <paraStyle name="P32" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
55+ <paraStyle name="P24" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
56+ <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
57+ <paraStyle name="P26" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
58+ <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
59+ <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
60+ <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
61 <paraStyle name="Standard" fontName="Helvetica"/>
62 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
63 <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
64@@ -193,13 +190,13 @@
65 </para>
66 </td>
67 <td>
68- <para style="P6">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
69- <para style="P5">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
70- <para style="P5">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
71- <para style="P5">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
72- <para style="P5">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
73- <para style="P5">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
74- <para style="P5">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
75+ <para style="P7">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
76+ <para style="P6">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
77+ <para style="P6">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
78+ <para style="P6">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
79+ <para style="P6">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
80+ <para style="P6">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
81+ <para style="P6">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
82 </td>
83 </tr>
84 </blockTable>
85@@ -209,31 +206,31 @@
86 <blockTable colWidths="269.0" style="Table_naslov">
87 <tr>
88 <td>
89- <para style="P9">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
90- </td>
91- </tr>
92- <tr>
93- <td>
94- <para style="P9">[[ (o.partner_id.street) or '' ]]</para>
95- </td>
96- </tr>
97- <tr>
98- <td>
99- <para style="P9">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
100- </td>
101- </tr>
102- <tr>
103- <td>
104- <para style="P9">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
105+ <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
106+ </td>
107+ </tr>
108+ <tr>
109+ <td>
110+ <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
111+ </td>
112+ </tr>
113+ <tr>
114+ <td>
115+ <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
116+ </td>
117+ </tr>
118+ <tr>
119+ <td>
120+ <para style="P10">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
121 </td>
122 </tr>
123 </blockTable>
124- <para style="P19">
125+ <para style="P21">
126 <font color="white"> </font>
127 </para>
128 </td>
129 <td>
130- <para style="P7">
131+ <para style="P8">
132 <font color="white"> </font>
133 </para>
134 </td>
135@@ -241,42 +238,42 @@
136 <blockTable colWidths="104.0,87.0" style="Table_invoice_data">
137 <tr>
138 <td>
139- <para style="P20">Ljubljana:</para>
140- </td>
141- <td>
142- <para style="P20">[[ formatLang(o.date_invoice_creation,date=True) ]]</para>
143- </td>
144- </tr>
145- <tr>
146- <td>
147- <para style="P20">Delivery Date:</para>
148- </td>
149- <td>
150- <para style="P20">[[ formatLang(o.date_invoice,date=True) ]]</para>
151- </td>
152- </tr>
153- <tr>
154- <td>
155- <para style="P20">Due Date:</para>
156- </td>
157- <td>
158- <para style="P19">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para>
159- </td>
160- </tr>
161- <tr>
162- <td>
163- <para style="P20">Payment Term:</para>
164- </td>
165- <td>
166- <para style="P20">[[ o.payment_term.name ]]</para>
167- </td>
168- </tr>
169- <tr>
170- <td>
171- <para style="P20">Partner phone:</para>
172- </td>
173- <td>
174- <para style="P20">[[ o.partner_id.mobile]]</para>
175+ <para style="P22">Ljubljana:</para>
176+ </td>
177+ <td>
178+ <para style="P22">[[ formatLang(o.date_invoice_creation,date=True) ]]</para>
179+ </td>
180+ </tr>
181+ <tr>
182+ <td>
183+ <para style="P22">Delivery Date:</para>
184+ </td>
185+ <td>
186+ <para style="P22">[[ formatLang(o.date_invoice,date=True) ]]</para>
187+ </td>
188+ </tr>
189+ <tr>
190+ <td>
191+ <para style="P22">Due Date:</para>
192+ </td>
193+ <td>
194+ <para style="P21">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para>
195+ </td>
196+ </tr>
197+ <tr>
198+ <td>
199+ <para style="P22">Payment Term:</para>
200+ </td>
201+ <td>
202+ <para style="P22">[[ o.payment_term.name ]]</para>
203+ </td>
204+ </tr>
205+ <tr>
206+ <td>
207+ <para style="P22">Partner phone:</para>
208+ </td>
209+ <td>
210+ <para style="P22">[[ o.partner_id.mobile]]</para>
211 </td>
212 </tr>
213 </blockTable>
214@@ -295,7 +292,7 @@
215 <blockTable colWidths="265.0,265.0" style="Table_Customer_data">
216 <tr>
217 <td>
218- <para style="P8">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
219+ <para style="P9">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
220 </td>
221 <td>
222 <para style="P1">
223@@ -307,34 +304,34 @@
224 <blockTable colWidths="49.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" repeatRows="1" style="Table7">
225 <tr>
226 <td>
227- <para style="P21">Code</para>
228- </td>
229- <td>
230- <para style="P21">Description</para>
231- </td>
232- <td>
233- <para style="P23">Quantity</para>
234- </td>
235- <td>
236- <para style="P23">UM</para>
237- </td>
238- <td>
239- <para style="P24">Package</para>
240- </td>
241- <td>
242- <para style="P24">LOT</para>
243- </td>
244- <td>
245- <para style="P24">Unit Price </para>
246- </td>
247- <td>
248- <para style="P24">Disc.</para>
249- </td>
250- <td>
251- <para style="P23">DDV (%)</para>
252- </td>
253- <td>
254- <para style="P24">Price (EUR)</para>
255+ <para style="P23">Code</para>
256+ </td>
257+ <td>
258+ <para style="P23">Description</para>
259+ </td>
260+ <td>
261+ <para style="P25">Quantity</para>
262+ </td>
263+ <td>
264+ <para style="P25">UM</para>
265+ </td>
266+ <td>
267+ <para style="P26">Package</para>
268+ </td>
269+ <td>
270+ <para style="P26">LOT</para>
271+ </td>
272+ <td>
273+ <para style="P26">Unit Price </para>
274+ </td>
275+ <td>
276+ <para style="P26">Disc.</para>
277+ </td>
278+ <td>
279+ <para style="P25">DDV (%)</para>
280+ </td>
281+ <td>
282+ <para style="P26">Price (EUR)</para>
283 </td>
284 </tr>
285 </blockTable>
286@@ -343,36 +340,36 @@
287 <blockTable colWidths="49.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" style="Table8">
288 <tr>
289 <td>
290- <para style="P12">[[ l.product_id.default_code ]]</para>
291- </td>
292- <td>
293- <para style="P11">[[ l.product_id.name_template ]]</para>
294- </td>
295- <td>
296- <para style="P17">[[ get_packets(l) ]] </para>
297- </td>
298- <td>
299- <para style="P17">[[ get_units(l) ]] </para>
300- </td>
301- <td>
302- <para style="P17">[[ formatLang(l.quantity)]] </para>
303- </td>
304- <td>
305- <para style="P17">
306+ <para style="P13">[[ l.product_id.default_code ]]</para>
307+ </td>
308+ <td>
309+ <para style="P12">[[ l.product_id.name_template ]]</para>
310+ </td>
311+ <td>
312+ <para style="P18">[[ formatLang(get_packets(l)) ]] </para>
313+ </td>
314+ <td>
315+ <para style="P18">[[ get_units(l) ]] </para>
316+ </td>
317+ <td>
318+ <para style="P18">[[ formatLang(l.quantity)]] </para>
319+ </td>
320+ <td>
321+ <para style="P18">
322 <font color="white"> </font>
323 </para>
324 </td>
325 <td>
326- <para style="P18">[[ formatLang(l.price_unit) ]]</para>
327- </td>
328- <td>
329- <para style="P17">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para>
330- </td>
331- <td>
332- <para style="P26">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para>
333- </td>
334- <td>
335- <para style="P16">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
336+ <para style="P19">[[ formatLang(l.price_unit) ]]</para>
337+ </td>
338+ <td>
339+ <para style="P18">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para>
340+ </td>
341+ <td>
342+ <para style="P28">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para>
343+ </td>
344+ <td>
345+ <para style="P17">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
346 </td>
347 </tr>
348 </blockTable>
349@@ -380,34 +377,34 @@
350 <blockTable colWidths="280.0,248.0" style="Table10">
351 <tr>
352 <td>
353- <para style="P13">Net Total:</para>
354- </td>
355- <td>
356- <para style="P15">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
357- </td>
358- </tr>
359- <tr>
360- <td>
361- <para style="P13">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
362- </td>
363- <td>
364- <para style="P15">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
365- </td>
366- </tr>
367- <tr>
368- <td>
369- <para style="P25">Taxes:</para>
370- </td>
371- <td>
372- <para style="P15">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para>
373- </td>
374- </tr>
375- <tr>
376- <td>
377- <para style="P22">Total:</para>
378- </td>
379- <td>
380- <para style="P27">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
381+ <para style="P14">Net Total:</para>
382+ </td>
383+ <td>
384+ <para style="P16">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
385+ </td>
386+ </tr>
387+ <tr>
388+ <td>
389+ <para style="P14">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
390+ </td>
391+ <td>
392+ <para style="P16">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
393+ </td>
394+ </tr>
395+ <tr>
396+ <td>
397+ <para style="P27">Taxes:</para>
398+ </td>
399+ <td>
400+ <para style="P16">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para>
401+ </td>
402+ </tr>
403+ <tr>
404+ <td>
405+ <para style="P24">Total:</para>
406+ </td>
407+ <td>
408+ <para style="P29">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para>
409 </td>
410 </tr>
411 </blockTable>
412@@ -418,10 +415,10 @@
413 <tr>
414 <td>
415 <para style="terp_default_8">Delivery method: [[ o.sale_order_id.incoterm.name ]]</para>
416- <para style="terp_default_8">Total net weight: [[ get_total_weight(o) ]] kg</para>
417+ <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
418 </td>
419 <td>
420- <para style="P32">
421+ <para style="P20">
422 <font color="white"> </font>
423 </para>
424 </td>
425@@ -433,8 +430,8 @@
426 <blockTable colWidths="530.0" style="Table_notes">
427 <tr>
428 <td>
429- <para style="P13">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para>
430- <para style="P13">
431+ <para style="P14">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para>
432+ <para style="P14">
433 <font color="white"> </font>
434 </para>
435 </td>
436@@ -458,7 +455,7 @@
437 </tr>
438 <tr>
439 <td>
440- <para style="P28">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
441+ <para style="P4">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
442 </td>
443 </tr>
444 <tr>
445@@ -467,19 +464,19 @@
446 </td>
447 </tr>
448 </blockTable>
449- <para style="P10">
450- <font color="white"> </font>
451- </para>
452- <para style="P10">
453- <font color="white"> </font>
454- </para>
455- <para style="P10">
456- <font color="white"> </font>
457- </para>
458- <para style="P10">
459- <font color="white"> </font>
460- </para>
461- <para style="P10">
462+ <para style="P11">
463+ <font color="white"> </font>
464+ </para>
465+ <para style="P11">
466+ <font color="white"> </font>
467+ </para>
468+ <para style="P11">
469+ <font color="white"> </font>
470+ </para>
471+ <para style="P11">
472+ <font color="white"> </font>
473+ </para>
474+ <para style="P11">
475 <font color="white"> </font>
476 </para>
477 <blockTable colWidths="293.0,96.0,135.0" style="Fakturiral">
478@@ -490,10 +487,10 @@
479 </para>
480 </td>
481 <td>
482- <para style="P4">Invoice issued by:</para>
483+ <para style="P5">Invoice issued by:</para>
484 </td>
485 <td>
486- <para style="P14">[[ o.user_id.name ]]</para>
487+ <para style="P15">[[ o.user_id.name ]]</para>
488 </td>
489 </tr>
490 </blockTable>
491
492=== modified file 'inovatim_reports/report/account_print_invoice.sxw'
493Binary files inovatim_reports/report/account_print_invoice.sxw 2014-01-22 11:35:04 +0000 and inovatim_reports/report/account_print_invoice.sxw 2014-01-22 12:58:48 +0000 differ
494=== modified file 'inovatim_reports/report/sale_order.rml'
495--- inovatim_reports/report/sale_order.rml 2014-01-22 11:35:04 +0000
496+++ inovatim_reports/report/sale_order.rml 2014-01-22 12:58:48 +0000
497@@ -120,17 +120,17 @@
498 <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
499 <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
500 <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
501- <paraStyle name="P15" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
502- <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
503- <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
504+ <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
505+ <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
506+ <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
507 <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
508- <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
509- <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
510+ <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
511+ <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
512 <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
513 <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
514- <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
515- <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
516- <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
517+ <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
518+ <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
519+ <paraStyle name="P25" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
520 <paraStyle name="Standard" fontName="Helvetica"/>
521 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
522 <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
523@@ -193,20 +193,20 @@
524 <para style="P10">
525 <font color="white"> </font>
526 </para>
527- <para style="P17">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
528+ <para style="P16">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
529 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>
530 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>
531 <para style="P10">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>
532 <para style="P10">
533 <font color="white"> </font>
534 </para>
535- <para style="P17">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
536+ <para style="P16">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
537 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>
538 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>
539 <para style="P6">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
540 </td>
541 <td>
542- <blockTable colWidths="148.0,123.0" style="Table_order_inf">
543+ <blockTable colWidths="137.0,133.0" style="Table_order_inf">
544 <tr>
545 <td>
546 <para style="P2">Ljubljana,</para>
547@@ -289,34 +289,34 @@
548 <blockTable colWidths="55.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" repeatRows="1" style="Table4">
549 <tr>
550 <td>
551- <para style="P21">Code</para>
552- </td>
553- <td>
554- <para style="P21">Description</para>
555- </td>
556- <td>
557- <para style="P23">Quantity</para>
558- </td>
559- <td>
560- <para style="P23">UM</para>
561- </td>
562- <td>
563- <para style="P23">Package</para>
564- </td>
565- <td>
566- <para style="P23">LOT</para>
567- </td>
568- <td>
569- <para style="P23">Unit Price</para>
570- </td>
571- <td>
572- <para style="P23">Disc.</para>
573- </td>
574- <td>
575- <para style="P22">Taxes (%)</para>
576- </td>
577- <td>
578- <para style="P23">Price (€)</para>
579+ <para style="P20">Code</para>
580+ </td>
581+ <td>
582+ <para style="P20">Description</para>
583+ </td>
584+ <td>
585+ <para style="P22">Quantity</para>
586+ </td>
587+ <td>
588+ <para style="P22">UM</para>
589+ </td>
590+ <td>
591+ <para style="P22">Package</para>
592+ </td>
593+ <td>
594+ <para style="P22">LOT</para>
595+ </td>
596+ <td>
597+ <para style="P22">Unit Price</para>
598+ </td>
599+ <td>
600+ <para style="P22">Disc.</para>
601+ </td>
602+ <td>
603+ <para style="P21">Taxes (%)</para>
604+ </td>
605+ <td>
606+ <para style="P22">Price (€)</para>
607 </td>
608 </tr>
609 </blockTable>
610@@ -331,30 +331,30 @@
611 <para style="P8">[[ line.product_id.name_template ]] </para>
612 </td>
613 <td>
614- <para style="P18">[[ line.product_uom_qty ]] </para>
615- </td>
616- <td>
617- <para style="P18">[[ line.product_uom.name ]]</para>
618- </td>
619- <td>
620- <para style="P18">[[ formatLang(line.product_uos_qty) ]]</para>
621- </td>
622- <td>
623- <para style="P18">
624+ <para style="P17">[[ line.product_uom_qty ]] </para>
625+ </td>
626+ <td>
627+ <para style="P17">[[ line.product_uom.name ]]</para>
628+ </td>
629+ <td>
630+ <para style="P17">[[ formatLang(line.product_uos_qty) ]]</para>
631+ </td>
632+ <td>
633+ <para style="P17">
634 <font color="white"> </font>
635 </para>
636 </td>
637 <td>
638- <para style="P18">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
639- </td>
640- <td>
641- <para style="P19">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>
642- </td>
643- <td>
644- <para style="P24">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
645- </td>
646- <td>
647- <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
648+ <para style="P17">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
649+ </td>
650+ <td>
651+ <para style="P18">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>
652+ </td>
653+ <td>
654+ <para style="P23">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
655+ </td>
656+ <td>
657+ <para style="P17">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
658 </td>
659 </tr>
660 </blockTable>
661@@ -365,7 +365,7 @@
662 <para style="P5">Net Total:</para>
663 </td>
664 <td>
665- <para style="P20">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
666+ <para style="P19">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
667 </td>
668 </tr>
669 <tr>
670@@ -373,7 +373,7 @@
671 <para style="P5">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
672 </td>
673 <td>
674- <para style="P20">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
675+ <para style="P19">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
676 </td>
677 </tr>
678 <tr>
679@@ -381,15 +381,15 @@
680 <para style="P5">Taxes :</para>
681 </td>
682 <td>
683- <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
684+ <para style="P19">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
685 </td>
686 </tr>
687 <tr>
688 <td>
689- <para style="P16">Total :</para>
690+ <para style="P15">Total :</para>
691 </td>
692 <td>
693- <para style="P25">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
694+ <para style="P24">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
695 </td>
696 </tr>
697 </blockTable>
698@@ -400,7 +400,7 @@
699 <tr>
700 <td>
701 <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
702- <para style="P12">Total net weight: [[ get_total_weight(o) ]] kg</para>
703+ <para style="P12">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
704 </td>
705 </tr>
706 </blockTable>
707@@ -413,11 +413,19 @@
708 <blockTable colWidths="539.0" style="Table_prosti_opis">
709 <tr>
710 <td>
711- <para style="terp_default_9">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Inovatim d.o.o. TRR: 290000055545161 pri Unicredit Banka Slovenija d.d. Prevzem je možen na lokaciji podjetja, INOVATIM d.o.o., Koprska ulica 106g, 1000 Ljubljana, od pon-pet, med 8:30 in 16:30 uro, ali v primeru nakupa lesa, v Skladišču Lesnina na Tržaški 135 v Ljubljani od pon-pet, med 7:00 in 14:00 uro.S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med vzorcem in končnim proizvodom, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>
712- <para style="terp_default_9">
713- <font color="white"> </font>
714- </para>
715- <para style="terp_default_9">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
716+ <para style="P25">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Inovatim d.o.o. TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para>
717+ <para style="P25">
718+ <font color="white"> </font>
719+ </para>
720+ <para style="P25">Prevzem je možen na lokaciji podjetja, INOVATIM d.o.o., Koprska ulica 106g, 1000 Ljubljana, od pon-pet, med 8:30 in 16:30 uro, ali v primeru nakupa lesa, v Skladišču Lesnina na Tržaški 135 v Ljubljani od pon-pet, med 7:00 in 14:00 uro.</para>
721+ <para style="P25">
722+ <font color="white"> </font>
723+ </para>
724+ <para style="P25">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med vzorcem in končnim proizvodom, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>
725+ <para style="P25">
726+ <font color="white"> </font>
727+ </para>
728+ <para style="P25">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
729 </td>
730 </tr>
731 </blockTable>
732
733=== modified file 'inovatim_reports/report/sale_order.sxw'
734Binary files inovatim_reports/report/sale_order.sxw 2014-01-22 11:35:04 +0000 and inovatim_reports/report/sale_order.sxw 2014-01-22 12:58:48 +0000 differ
735=== modified file 'inovatim_reports/report/stock_picking.rml'
736--- inovatim_reports/report/stock_picking.rml 2014-01-22 11:35:04 +0000
737+++ inovatim_reports/report/stock_picking.rml 2014-01-22 12:58:48 +0000
738@@ -35,6 +35,7 @@
739 <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/>
740 <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/>
741 <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/>
742+ <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/>
743 <lineStyle kind="LINEAFTER" colorName="#666666" start="3,0" stop="3,-1"/>
744 <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/>
745 <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/>
746@@ -95,22 +96,21 @@
747 <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
748 <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
749 <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
750- <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT"/>
751- <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT"/>
752- <paraStyle name="P6" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT"/>
753- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
754- <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
755- <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
756- <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
757- <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
758- <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
759+ <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
760+ <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
761+ <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
762+ <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
763+ <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
764+ <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
765+ <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
766+ <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
767+ <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
768 <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
769- <paraStyle name="P14" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
770- <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
771- <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
772- <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
773- <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
774- <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
775+ <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
776+ <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
777+ <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
778+ <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
779+ <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="6.0"/>
780 <paraStyle name="Standard" fontName="Helvetica"/>
781 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
782 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
783@@ -156,22 +156,22 @@
784 </para>
785 </td>
786 <td>
787- <para style="P7">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
788- <para style="P7">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
789- <para style="P7">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
790+ <para style="P4">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
791+ <para style="P4">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
792+ <para style="P4">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
793 </td>
794 </tr>
795 </blockTable>
796 <blockTable colWidths="264.0,273.0" style="Table2">
797 <tr>
798 <td>
799- <para style="P8">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
800- <para style="P8">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
801- <para style="P8">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
802- <para style="P8">[[ picking.partner_id.name ]]</para>
803- <para style="P8">[[ picking.partner_id.street ]]</para>
804- <para style="P8">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
805- <para style="P8">[[ picking.partner_id.country_id.name ]]</para>
806+ <para style="P5">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
807+ <para style="P5">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
808+ <para style="P5">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
809+ <para style="P5">[[ picking.partner_id.name ]]</para>
810+ <para style="P5">[[ picking.partner_id.street ]]</para>
811+ <para style="P5">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
812+ <para style="P5">[[ picking.partner_id.country_id.name ]]</para>
813 </td>
814 <td>
815 <blockTable colWidths="161.0,107.0" style="Table_picking_info">
816@@ -220,11 +220,11 @@
817 <para style="P2">Total net weight:</para>
818 </td>
819 <td>
820- <para style="P2">[[ get_total_weight(picking) ]] kg</para>
821+ <para style="P2">[[ formatLang(get_total_weight(picking)) ]] kg</para>
822 </td>
823 </tr>
824 </blockTable>
825- <para style="P9">
826+ <para style="P6">
827 <font color="white"> </font>
828 </para>
829 </td>
830@@ -236,25 +236,25 @@
831 <blockTable colWidths="53.0,246.0,51.0,28.0,45.0,36.0,59.0" repeatRows="1" style="Move_Line_Header">
832 <tr>
833 <td>
834- <para style="P11">Code</para>
835- </td>
836- <td>
837- <para style="P11">Description</para>
838- </td>
839- <td>
840- <para style="P11">Quantity</para>
841- </td>
842- <td>
843- <para style="P11">UM</para>
844- </td>
845- <td>
846- <para style="P11">Package</para>
847- </td>
848- <td>
849- <para style="P13">LOT</para>
850- </td>
851- <td>
852- <para style="P12">Price/unit</para>
853+ <para style="P8">Code</para>
854+ </td>
855+ <td>
856+ <para style="P8">Description</para>
857+ </td>
858+ <td>
859+ <para style="P8">Quantity</para>
860+ </td>
861+ <td>
862+ <para style="P8">UM</para>
863+ </td>
864+ <td>
865+ <para style="P8">Package</para>
866+ </td>
867+ <td>
868+ <para style="P10">LOT</para>
869+ </td>
870+ <td>
871+ <para style="P9">Price/unit</para>
872 </td>
873 </tr>
874 </blockTable>
875@@ -264,29 +264,29 @@
876 <blockTable colWidths="54.0,246.0,51.0,28.0,45.0,36.0,62.0" style="Move_Line_Contect_Assign_State">
877 <tr>
878 <td>
879- <para style="P16">[[ move_lines.product_id.default_code ]]</para>
880- </td>
881- <td>
882- <para style="P15">[[ move_lines.product_id.name_template ]]</para>
883- </td>
884- <td>
885- <para style="P17">[[ get_packets(move_lines) ]]</para>
886- </td>
887- <td>
888- <para style="P17">[[ get_units(move_lines) ]]</para>
889- </td>
890- <td>
891- <para style="P15">
892- <font color="white"> </font>
893- </para>
894- </td>
895- <td>
896- <para style="P10">
897- <font color="white"> </font>
898- </para>
899- </td>
900- <td>
901- <para style="P10">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
902+ <para style="P13">[[ move_lines.product_id.default_code ]]</para>
903+ </td>
904+ <td>
905+ <para style="P12">[[ move_lines.product_id.name_template ]]</para>
906+ </td>
907+ <td>
908+ <para style="P14">[[ formatLang(get_packets(move_lines)) ]]</para>
909+ </td>
910+ <td>
911+ <para style="P14">[[ get_units(move_lines) ]]</para>
912+ </td>
913+ <td>
914+ <para style="P12">
915+ <font color="white"> </font>
916+ </para>
917+ </td>
918+ <td>
919+ <para style="P7">
920+ <font color="white"> </font>
921+ </para>
922+ </td>
923+ <td>
924+ <para style="P7">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
925 </td>
926 </tr>
927 </blockTable>
928@@ -299,29 +299,29 @@
929 <blockTable colWidths="55.0,246.0,50.0,28.0,45.0,36.0,61.0" style="Table1">
930 <tr>
931 <td>
932- <para style="P16">[[ move_lines.product_id.default_code ]]</para>
933- </td>
934- <td>
935- <para style="P15">[[ move_lines.product_id.name_template ]]</para>
936- </td>
937- <td>
938- <para style="P17">[[ get_packets(move_lines) ]]</para>
939- </td>
940- <td>
941- <para style="P17">[[ get_units(move_lines) ]]</para>
942- </td>
943- <td>
944- <para style="P15">
945- <font color="white"> </font>
946- </para>
947- </td>
948- <td>
949- <para style="P10">
950- <font color="white"> </font>
951- </para>
952- </td>
953- <td>
954- <para style="P10">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
955+ <para style="P13">[[ move_lines.product_id.default_code ]]</para>
956+ </td>
957+ <td>
958+ <para style="P12">[[ move_lines.product_id.name_template ]]</para>
959+ </td>
960+ <td>
961+ <para style="P14">[[ formatLang(get_packets(move_lines)) ]]</para>
962+ </td>
963+ <td>
964+ <para style="P14">[[ get_units(move_lines) ]]</para>
965+ </td>
966+ <td>
967+ <para style="P12">
968+ <font color="white"> </font>
969+ </para>
970+ </td>
971+ <td>
972+ <para style="P7">
973+ <font color="white"> </font>
974+ </para>
975+ </td>
976+ <td>
977+ <para style="P7">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
978 </td>
979 </tr>
980 </blockTable>
981@@ -332,7 +332,7 @@
982 <blockTable colWidths="538.0" style="Table_notes">
983 <tr>
984 <td>
985- <para style="P14">[[ format(picking.note or '') ]]</para>
986+ <para style="P11">[[ format(picking.note or '') ]]</para>
987 </td>
988 </tr>
989 </blockTable>
990@@ -342,70 +342,70 @@
991 <blockTable colWidths="538.0" style="Table_noga">
992 <tr>
993 <td>
994- <para style="P4">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o. !</para>
995- </td>
996- </tr>
997- <tr>
998- <td>
999- <para style="P4">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
1000- </td>
1001- </tr>
1002- <tr>
1003- <td>
1004- <para style="P5">Garancija za dobavljeno blago: 12 mesecev od dneva dobave. Garancija se ne upošteva za blago, ki je že uporabljeno oz. montirano v nasprotju z navodili prodajalca.</para>
1005- </td>
1006- </tr>
1007- <tr>
1008- <td>
1009- <para style="P6">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
1010- </td>
1011- </tr>
1012- <tr>
1013- <td>
1014- <para style="P4">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
1015+ <para style="P16">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
1016+ </td>
1017+ </tr>
1018+ <tr>
1019+ <td>
1020+ <para style="P16">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
1021+ </td>
1022+ </tr>
1023+ <tr>
1024+ <td>
1025+ <para style="P17">Garancija za dobavljeno blago: 12 mesecev od dneva dobave. Garancija se ne upošteva za blago, ki je že uporabljeno oz. montirano v nasprotju z navodili prodajalca.</para>
1026+ </td>
1027+ </tr>
1028+ <tr>
1029+ <td>
1030+ <para style="P18">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
1031+ </td>
1032+ </tr>
1033+ <tr>
1034+ <td>
1035+ <para style="P16">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
1036 </td>
1037 </tr>
1038 </blockTable>
1039- <para style="Standard">
1040- <font color="white"> </font>
1041- </para>
1042- <para style="P10">
1043- <font color="white"> </font>
1044- </para>
1045- <para style="P10">
1046- <font color="white"> </font>
1047- </para>
1048- <para style="P10">
1049- <font color="white"> </font>
1050- </para>
1051- <para style="P10">
1052- <font color="white"> </font>
1053- </para>
1054- <para style="P10">
1055- <font color="white"> </font>
1056- </para>
1057- <para style="P10">
1058- <font color="white"> </font>
1059- </para>
1060- <para style="P10">
1061- <font color="white"> </font>
1062- </para>
1063- <para style="P10">
1064- <font color="white"> </font>
1065- </para>
1066- <para style="P10">
1067- <font color="white"> </font>
1068- </para>
1069- <para style="P10">
1070- <font color="white"> </font>
1071- </para>
1072- <para style="P10">
1073+ <para style="terp_default_8">
1074+ <font color="white"> </font>
1075+ </para>
1076+ <para style="terp_default_8">
1077+ <font color="white"> </font>
1078+ </para>
1079+ <para style="terp_default_8">
1080+ <font color="white"> </font>
1081+ </para>
1082+ <para style="terp_default_8">
1083+ <font color="white"> </font>
1084+ </para>
1085+ <para style="terp_default_8">
1086+ <font color="white"> </font>
1087+ </para>
1088+ <para style="terp_default_8">
1089+ <font color="white"> </font>
1090+ </para>
1091+ <para style="terp_default_8">
1092+ <font color="white"> </font>
1093+ </para>
1094+ <para style="terp_default_8">
1095+ <font color="white"> </font>
1096+ </para>
1097+ <para style="terp_default_8">
1098+ <font color="white"> </font>
1099+ </para>
1100+ <para style="terp_default_8">
1101+ <font color="white"> </font>
1102+ </para>
1103+ <para style="terp_default_8">
1104+ <font color="white"> </font>
1105+ </para>
1106+ <para style="terp_default_8">
1107 <font color="white"> </font>
1108 </para>
1109 <blockTable colWidths="189.0,185.0,163.0" style="Table_izdal_prejel">
1110 <tr>
1111 <td>
1112- <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para>
1113+ <para style="P15">Issued by: [[ picking.deliver_id.name ]]</para>
1114 </td>
1115 <td>
1116 <para style="P3">Received by:</para>
1117
1118=== modified file 'inovatim_reports/report/stock_picking.sxw'
1119Binary files inovatim_reports/report/stock_picking.sxw 2014-01-22 11:35:04 +0000 and inovatim_reports/report/stock_picking.sxw 2014-01-22 12:58:48 +0000 differ

Subscribers

People subscribed via source and target branches