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: 292
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_01_07
Merge into: lp:openerpsl/7.0
Diff against target: 1024 lines (+307/-356)
8 files modified
inovatim_reports/i18n/en_US.po (+2/-2)
inovatim_reports/i18n/inovatim_reports.pot (+1/-1)
inovatim_reports/i18n/sl.po (+2/-2)
inovatim_reports/i18n/sl_SI.po (+4/-4)
inovatim_reports/report/account_print_invoice.rml (+6/-30)
inovatim_reports/report/purchase_order.rml (+65/-75)
inovatim_reports/report/sale_order.rml (+93/-81)
inovatim_reports/report/stock_picking.rml (+134/-161)
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+202715@code.launchpad.net

Description of the change

[FIX] inovatim_reports (size fixes)

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/i18n/en_US.po'
2--- inovatim_reports/i18n/en_US.po 2014-01-22 16:24:16 +0000
3+++ inovatim_reports/i18n/en_US.po 2014-01-22 17:14:42 +0000
4@@ -461,8 +461,8 @@
5 #: report:stock.picking.list.inovatim:0
6 #: report:stock.picking.list.inovatim.out:0
7 #: report:stock.picking.list.inovatim.in:0
8-msgid "Price €/unit"
9-msgstr "Price €/unit"
10+msgid "Price (€) / unit"
11+msgstr "Price (€) / unit"
12
13 #. module: inovatim_reports
14 #: report:stock.picking.list.inovatim:0
15
16=== modified file 'inovatim_reports/i18n/inovatim_reports.pot'
17--- inovatim_reports/i18n/inovatim_reports.pot 2014-01-22 16:24:16 +0000
18+++ inovatim_reports/i18n/inovatim_reports.pot 2014-01-22 17:14:42 +0000
19@@ -461,7 +461,7 @@
20 #: report:stock.picking.list.inovatim:0
21 #: report:stock.picking.list.inovatim.out:0
22 #: report:stock.picking.list.inovatim.in:0
23-msgid "Price €/unit"
24+msgid "Price (€) / unit"
25 msgstr ""
26
27 #. module: inovatim_reports
28
29=== modified file 'inovatim_reports/i18n/sl.po'
30--- inovatim_reports/i18n/sl.po 2014-01-22 16:24:16 +0000
31+++ inovatim_reports/i18n/sl.po 2014-01-22 17:14:42 +0000
32@@ -461,8 +461,8 @@
33 #: report:stock.picking.list.inovatim:0
34 #: report:stock.picking.list.inovatim.out:0
35 #: report:stock.picking.list.inovatim.in:0
36-msgid "Price €/unit"
37-msgstr "Cena €/enoto"
38+msgid "Price (€) / unit"
39+msgstr "Cena (€) / enoto"
40
41 #. module: inovatim_reports
42 #: report:stock.picking.list.inovatim:0
43
44=== modified file 'inovatim_reports/i18n/sl_SI.po'
45--- inovatim_reports/i18n/sl_SI.po 2014-01-22 16:24:16 +0000
46+++ inovatim_reports/i18n/sl_SI.po 2014-01-22 17:14:42 +0000
47@@ -461,8 +461,8 @@
48 #: report:stock.picking.list.inovatim:0
49 #: report:stock.picking.list.inovatim.out:0
50 #: report:stock.picking.list.inovatim.in:0
51-msgid "Price €/unit"
52-msgstr "Cena €/enoto"
53+msgid "Price (€) / unit"
54+msgstr "Cena (€) / enoto"
55
56 #. module: inovatim_reports
57 #: report:stock.picking.list.inovatim:0
58@@ -516,5 +516,5 @@
59
60 #. module: inovatim_reports
61 #: report:purchase.order.inovatim:0
62-msgid "Net Price"
63-msgstr "Neto cena"
64+msgid "Net Price (€)"
65+msgstr "Neto cena (€)"
66
67=== modified file 'inovatim_reports/report/account_print_invoice.rml'
68--- inovatim_reports/report/account_print_invoice.rml 2014-01-22 16:24:16 +0000
69+++ inovatim_reports/report/account_print_invoice.rml 2014-01-22 17:14:42 +0000
70@@ -19,10 +19,6 @@
71 <blockAlignment value="LEFT"/>
72 <blockValign value="TOP"/>
73 </blockTableStyle>
74- <blockTableStyle id="Table_naslov">
75- <blockAlignment value="LEFT"/>
76- <blockValign value="TOP"/>
77- </blockTableStyle>
78 <blockTableStyle id="Table_invoice_data">
79 <blockAlignment value="LEFT"/>
80 <blockValign value="TOP"/>
81@@ -139,6 +135,7 @@
82 <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
83 <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
84 <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
85+ <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
86 <paraStyle name="Standard" fontName="Helvetica"/>
87 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
88 <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
89@@ -205,31 +202,10 @@
90 <blockTable colWidths="276.0,56.0,198.0" repeatRows="1" style="Table1">
91 <tr>
92 <td>
93- <blockTable colWidths="269.0" style="Table_naslov">
94- <tr>
95- <td>
96- <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
97- </td>
98- </tr>
99- <tr>
100- <td>
101- <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
102- </td>
103- </tr>
104- <tr>
105- <td>
106- <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
107- </td>
108- </tr>
109- <tr>
110- <td>
111- <para style="P10">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
112- </td>
113- </tr>
114- </blockTable>
115- <para style="P20">
116- <font color="white"> </font>
117- </para>
118+ <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
119+ <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
120+ <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
121+ <para style="P10">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
122 </td>
123 <td>
124 <para style="P8">
125@@ -453,7 +429,7 @@
126 </tr>
127 <tr>
128 <td>
129- <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>
130+ <para style="P4">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>
131 </td>
132 </tr>
133 <tr>
134
135=== modified file 'inovatim_reports/report/account_print_invoice.sxw'
136Binary files inovatim_reports/report/account_print_invoice.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/account_print_invoice.sxw 2014-01-22 17:14:42 +0000 differ
137=== modified file 'inovatim_reports/report/purchase_order.rml'
138--- inovatim_reports/report/purchase_order.rml 2014-01-22 16:24:16 +0000
139+++ inovatim_reports/report/purchase_order.rml 2014-01-22 17:14:42 +0000
140@@ -98,20 +98,19 @@
141 <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
142 <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
143 <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
144- <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
145- <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
146+ <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
147+ <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
148 <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
149- <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
150- <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
151- <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
152+ <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
153+ <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
154+ <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
155 <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
156- <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
157- <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
158- <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
159- <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
160- <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
161+ <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
162+ <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
163+ <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
164+ <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
165+ <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
166 <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
167- <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
168 <paraStyle name="Standard" fontName="Helvetica"/>
169 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
170 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
171@@ -168,16 +167,16 @@
172 <blockTable colWidths="277.0" style="Tableau2">
173 <tr>
174 <td>
175- <para style="P6">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
176- <para style="P6">[[ (o.partner_id.street) or '' ]]</para>
177- <para style="P6">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
178- <para style="P6">[[ (o.partner_id.country_id.name) or '' ]]</para>
179+ <para style="P18">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
180+ <para style="P18">[[ (o.partner_id.street) or '' ]]</para>
181+ <para style="P18">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
182+ <para style="P18">[[ (o.partner_id.country_id.name) or '' ]]</para>
183 </td>
184 </tr>
185 <tr>
186 <td>
187 <para style="P18">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
188- <para style="P7">Shipping address :</para>
189+ <para style="P18">Shipping address :</para>
190 <para style="P18">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
191 <para style="P18">[[ (o.dest_address_id and display_address(o.dest_address_id)) or (o.warehouse_id and display_address(o.warehouse_id.partner_address_id)) or <font face="Helvetica">removeParentNode('para')</font>]]</para>
192 </td>
193@@ -191,18 +190,18 @@
194 <blockTable colWidths="146.0,111.0" style="Table_order_data">
195 <tr>
196 <td>
197- <para style="P8">Order Date:</para>
198+ <para style="P6">Order Date:</para>
199 </td>
200 <td>
201- <para style="P8">[[formatLang(o.date_order,date=True) ]]</para>
202+ <para style="P6">[[formatLang(o.date_order,date=True) ]]</para>
203 </td>
204 </tr>
205 <tr>
206 <td>
207- <para style="P8">Validated By:</para>
208+ <para style="P6">Validated By:</para>
209 </td>
210 <td>
211- <para style="P8">[[ (o.validator and o.validator.name) or '' ]]</para>
212+ <para style="P6">[[ (o.validator and o.validator.name) or '' ]]</para>
213 </td>
214 </tr>
215 </blockTable>
216@@ -248,25 +247,25 @@
217 <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
218 <tr>
219 <td>
220- <para style="P11">Customer reference</para>
221- </td>
222- <td>
223- <para style="P12">Code</para>
224- </td>
225- <td>
226- <para style="P12">Description</para>
227- </td>
228- <td>
229- <para style="P13">Quantity</para>
230- </td>
231- <td>
232- <para style="P13">UM</para>
233- </td>
234- <td>
235- <para style="P14">Unit Price</para>
236- </td>
237- <td>
238- <para style="P14">Net Price (€) </para>
239+ <para style="P9">Customer reference</para>
240+ </td>
241+ <td>
242+ <para style="P10">Code</para>
243+ </td>
244+ <td>
245+ <para style="P10">Description</para>
246+ </td>
247+ <td>
248+ <para style="P11">Quantity</para>
249+ </td>
250+ <td>
251+ <para style="P11">UM</para>
252+ </td>
253+ <td>
254+ <para style="P12">Unit Price</para>
255+ </td>
256+ <td>
257+ <para style="P12">Net Price (€) </para>
258 </td>
259 </tr>
260 </blockTable>
261@@ -275,25 +274,25 @@
262 <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content">
263 <tr>
264 <td>
265- <para style="P16">[[ line.customer_ref ]]</para>
266- </td>
267- <td>
268- <para style="P16">[[ line.product_id.default_code ]]</para>
269- </td>
270- <td>
271- <para style="P15">[[ line.product_id.name_template ]]</para>
272- </td>
273- <td>
274- <para style="P9">[[ formatLang(line.product_qty ) ]] </para>
275- </td>
276- <td>
277- <para style="P9">[[ line.product_uom.name ]]</para>
278- </td>
279- <td>
280- <para style="P9">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
281- </td>
282- <td>
283- <para style="P9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
284+ <para style="P14">[[ line.customer_ref ]]</para>
285+ </td>
286+ <td>
287+ <para style="P14">[[ line.product_id.default_code ]]</para>
288+ </td>
289+ <td>
290+ <para style="P13">[[ line.product_id.name_template ]]</para>
291+ </td>
292+ <td>
293+ <para style="P7">[[ formatLang(line.product_qty ) ]] </para>
294+ </td>
295+ <td>
296+ <para style="P7">[[ line.product_uom.name ]]</para>
297+ </td>
298+ <td>
299+ <para style="P7">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
300+ </td>
301+ <td>
302+ <para style="P7">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
303 </td>
304 </tr>
305 <tr>
306@@ -338,18 +337,18 @@
307 <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail">
308 <tr>
309 <td>
310- <para style="P17">Net Total:</para>
311+ <para style="P15">Net Total:</para>
312 </td>
313 <td>
314- <para style="P10">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
315+ <para style="P8">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
316 </td>
317 </tr>
318 <tr>
319 <td>
320- <para style="P17">Taxes:</para>
321+ <para style="P15">Taxes:</para>
322 </td>
323 <td>
324- <para style="P10">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
325+ <para style="P8">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
326 </td>
327 </tr>
328 <tr>
329@@ -357,23 +356,14 @@
330 <para style="P5">Total:</para>
331 </td>
332 <td>
333- <para style="P19">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
334+ <para style="P16">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
335 </td>
336 </tr>
337 </blockTable>
338- <para style="terp_default_8">
339- <font color="white"> </font>
340- </para>
341- <para style="terp_default_9">
342- <font color="white"> </font>
343- </para>
344- <para style="terp_default_9">
345- <font color="white"> </font>
346- </para>
347+ <para style="P17">-</para>
348+ <para style="P17">-</para>
349 <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
350- <para style="terp_default_9">
351- <font color="white"> </font>
352- </para>
353+ <para style="P17">-</para>
354 <para style="terp_default_9">Payment terms: [[ (o.payment_term_id and o.payment_term_id.note and format(o.payment_term_id and o.payment_term_id.note)) or removeParentNode('para') ]]</para>
355 </story>
356 </document>
357
358=== modified file 'inovatim_reports/report/purchase_order.sxw'
359Binary files inovatim_reports/report/purchase_order.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/purchase_order.sxw 2014-01-22 17:14:42 +0000 differ
360=== modified file 'inovatim_reports/report/sale_order.rml'
361--- inovatim_reports/report/sale_order.rml 2014-01-22 16:24:16 +0000
362+++ inovatim_reports/report/sale_order.rml 2014-01-22 17:14:42 +0000
363@@ -104,6 +104,10 @@
364 <blockAlignment value="LEFT"/>
365 <blockValign value="TOP"/>
366 </blockTableStyle>
367+ <blockTableStyle id="Table_bold">
368+ <blockAlignment value="LEFT"/>
369+ <blockValign value="TOP"/>
370+ </blockTableStyle>
371 <initialize>
372 <paraStyle name="all" alignment="justify"/>
373 </initialize>
374@@ -118,21 +122,23 @@
375 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
376 <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
377 <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
378- <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
379- <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
380- <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
381- <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
382- <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
383- <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
384+ <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
385+ <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
386+ <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
387+ <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
388+ <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
389+ <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
390 <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
391- <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
392- <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
393- <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
394+ <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
395+ <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
396+ <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
397 <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
398- <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
399- <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
400- <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
401- <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
402+ <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
403+ <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
404+ <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
405+ <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
406+ <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
407+ <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
408 <paraStyle name="Standard" fontName="Helvetica"/>
409 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
410 <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
411@@ -175,13 +181,13 @@
412 <blockTable colWidths="270.0,270.0" style="Table_naslov">
413 <tr>
414 <td>
415- <para style="P13">
416+ <para style="P14">
417 <font color="white"> </font>
418 </para>
419 </td>
420 <td>
421- <para style="P14">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
422- <para style="P14">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
423+ <para style="P15">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
424+ <para style="P15">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
425 </td>
426 </tr>
427 </blockTable>
428@@ -195,14 +201,14 @@
429 <para style="P10">
430 <font color="white"> </font>
431 </para>
432- <para style="P16">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
433+ <para style="P17">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
434 <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>
435 <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>
436 <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>
437 <para style="P10">
438 <font color="white"> </font>
439 </para>
440- <para style="P16">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
441+ <para style="P17">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
442 <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>
443 <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>
444 <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>
445@@ -264,7 +270,7 @@
446 </td>
447 </tr>
448 </blockTable>
449- <para style="P13">
450+ <para style="P14">
451 <font color="white"> </font>
452 </para>
453 </td>
454@@ -282,7 +288,7 @@
455 </para>
456 </td>
457 <td>
458- <para style="P25">
459+ <para style="P21">
460 <font color="white"> </font>
461 </para>
462 </td>
463@@ -291,34 +297,34 @@
464 <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">
465 <tr>
466 <td>
467- <para style="P20">Code</para>
468- </td>
469- <td>
470- <para style="P20">Description</para>
471- </td>
472- <td>
473- <para style="P22">Quantity</para>
474- </td>
475- <td>
476- <para style="P22">UM</para>
477- </td>
478- <td>
479- <para style="P22">Package</para>
480- </td>
481- <td>
482- <para style="P22">LOT</para>
483- </td>
484- <td>
485- <para style="P22">Unit Price</para>
486- </td>
487- <td>
488- <para style="P22">Disc.</para>
489- </td>
490- <td>
491- <para style="P21">Taxes (%)</para>
492- </td>
493- <td>
494- <para style="P22">Price (€)</para>
495+ <para style="P22">Code</para>
496+ </td>
497+ <td>
498+ <para style="P22">Description</para>
499+ </td>
500+ <td>
501+ <para style="P24">Quantity</para>
502+ </td>
503+ <td>
504+ <para style="P24">UM</para>
505+ </td>
506+ <td>
507+ <para style="P24">Package</para>
508+ </td>
509+ <td>
510+ <para style="P24">LOT</para>
511+ </td>
512+ <td>
513+ <para style="P24">Unit Price</para>
514+ </td>
515+ <td>
516+ <para style="P24">Disc.</para>
517+ </td>
518+ <td>
519+ <para style="P23">Taxes (%)</para>
520+ </td>
521+ <td>
522+ <para style="P24">Price (€)</para>
523 </td>
524 </tr>
525 </blockTable>
526@@ -333,30 +339,30 @@
527 <para style="P8">[[ line.product_id.name_template ]] </para>
528 </td>
529 <td>
530- <para style="P17">[[ line.product_uom_qty ]] </para>
531- </td>
532- <td>
533- <para style="P17">[[ line.product_uom.name ]]</para>
534- </td>
535- <td>
536- <para style="P25">[[ get_packets(line) ]] </para>
537- </td>
538- <td>
539- <para style="P17">
540+ <para style="P18">[[ line.product_uom_qty ]] </para>
541+ </td>
542+ <td>
543+ <para style="P18">[[ line.product_uom.name ]]</para>
544+ </td>
545+ <td>
546+ <para style="P21">[[ get_packets(line) ]] </para>
547+ </td>
548+ <td>
549+ <para style="P18">
550 <font color="white"> </font>
551 </para>
552 </td>
553 <td>
554- <para style="P17">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
555- </td>
556- <td>
557- <para style="P18">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>
558- </td>
559- <td>
560- <para style="P23">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
561- </td>
562- <td>
563- <para style="P17">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
564+ <para style="P18">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
565+ </td>
566+ <td>
567+ <para style="P19">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>
568+ </td>
569+ <td>
570+ <para style="P25">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
571+ </td>
572+ <td>
573+ <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
574 </td>
575 </tr>
576 </blockTable>
577@@ -367,7 +373,7 @@
578 <para style="P5">Net Total:</para>
579 </td>
580 <td>
581- <para style="P19">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
582+ <para style="P20">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
583 </td>
584 </tr>
585 <tr>
586@@ -375,7 +381,7 @@
587 <para style="P5">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
588 </td>
589 <td>
590- <para style="P19">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
591+ <para style="P20">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
592 </td>
593 </tr>
594 <tr>
595@@ -383,39 +389,45 @@
596 <para style="P5">Taxes :</para>
597 </td>
598 <td>
599- <para style="P19">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
600+ <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
601 </td>
602 </tr>
603 <tr>
604 <td>
605- <para style="P15">Total :</para>
606+ <para style="P16">Total :</para>
607 </td>
608 <td>
609- <para style="P24">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
610+ <para style="P26">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
611 </td>
612 </tr>
613 </blockTable>
614- <para style="P26">-</para>
615+ <para style="P12">-</para>
616 <blockTable colWidths="539.0" style="Table_dobava">
617 <tr>
618 <td>
619 <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
620- <para style="P12">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
621+ <para style="P13">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
622 </td>
623 </tr>
624 </blockTable>
625- <para style="P26">-</para>
626- <para style="P26">-</para>
627+ <para style="P12">-</para>
628+ <para style="P12">-</para>
629 <blockTable colWidths="539.0" style="Table_prosti_opis">
630 <tr>
631 <td>
632 <para style="P11">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>
633- <para style="P26">-</para>
634+ <para style="P12">-</para>
635 <para style="P11">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>
636- <para style="P26">-</para>
637+ <para style="P12">-</para>
638 <para style="P11">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>
639- <para style="P26">-</para>
640- <para style="P11">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
641+ <para style="P12">-</para>
642+ </td>
643+ </tr>
644+ </blockTable>
645+ <blockTable colWidths="539.0" style="Table_bold">
646+ <tr>
647+ <td>
648+ <para style="P28">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
649 </td>
650 </tr>
651 </blockTable>
652
653=== modified file 'inovatim_reports/report/sale_order.sxw'
654Binary files inovatim_reports/report/sale_order.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/sale_order.sxw 2014-01-22 17:14:42 +0000 differ
655=== modified file 'inovatim_reports/report/stock_picking.rml'
656--- inovatim_reports/report/stock_picking.rml 2014-01-22 12:58:03 +0000
657+++ inovatim_reports/report/stock_picking.rml 2014-01-22 17:14:42 +0000
658@@ -95,22 +95,24 @@
659 </initialize>
660 <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
661 <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
662- <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
663- <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
664- <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
665- <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
666- <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
667- <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
668- <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
669- <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
670- <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
671- <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
672- <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
673- <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
674- <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
675- <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
676- <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
677- <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="6.0"/>
678+ <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
679+ <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
680+ <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
681+ <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
682+ <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
683+ <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
684+ <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
685+ <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
686+ <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
687+ <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
688+ <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
689+ <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
690+ <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
691+ <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
692+ <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
693+ <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
694+ <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
695+ <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
696 <paraStyle name="Standard" fontName="Helvetica"/>
697 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
698 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
699@@ -156,22 +158,22 @@
700 </para>
701 </td>
702 <td>
703- <para style="P4">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
704- <para style="P4">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
705- <para style="P4">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
706+ <para style="P6">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
707+ <para style="P6">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
708+ <para style="P6">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
709 </td>
710 </tr>
711 </blockTable>
712 <blockTable colWidths="264.0,273.0" style="Table2">
713 <tr>
714 <td>
715- <para style="P5">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
716- <para style="P5">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
717- <para style="P5">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
718- <para style="P5">[[ picking.partner_id.name ]]</para>
719- <para style="P5">[[ picking.partner_id.street ]]</para>
720- <para style="P5">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
721- <para style="P5">[[ picking.partner_id.country_id.name ]]</para>
722+ <para style="P16">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
723+ <para style="P16">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
724+ <para style="P16">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
725+ <para style="P16">[[ picking.partner_id.name ]]</para>
726+ <para style="P16">[[ picking.partner_id.street ]]</para>
727+ <para style="P16">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
728+ <para style="P16">[[ picking.partner_id.country_id.name ]]</para>
729 </td>
730 <td>
731 <blockTable colWidths="161.0,107.0" style="Table_picking_info">
732@@ -224,7 +226,7 @@
733 </td>
734 </tr>
735 </blockTable>
736- <para style="P6">
737+ <para style="P7">
738 <font color="white"> </font>
739 </para>
740 </td>
741@@ -236,25 +238,25 @@
742 <blockTable colWidths="53.0,246.0,51.0,28.0,45.0,36.0,59.0" repeatRows="1" style="Move_Line_Header">
743 <tr>
744 <td>
745- <para style="P8">Code</para>
746- </td>
747- <td>
748- <para style="P8">Description</para>
749- </td>
750- <td>
751- <para style="P8">Quantity</para>
752- </td>
753- <td>
754- <para style="P8">UM</para>
755- </td>
756- <td>
757- <para style="P8">Package</para>
758- </td>
759- <td>
760- <para style="P10">LOT</para>
761- </td>
762- <td>
763- <para style="P9">Price/unit</para>
764+ <para style="P9">Code</para>
765+ </td>
766+ <td>
767+ <para style="P9">Description</para>
768+ </td>
769+ <td>
770+ <para style="P9">Quantity</para>
771+ </td>
772+ <td>
773+ <para style="P9">UM</para>
774+ </td>
775+ <td>
776+ <para style="P9">Package</para>
777+ </td>
778+ <td>
779+ <para style="P11">LOT</para>
780+ </td>
781+ <td>
782+ <para style="P10">Price (€) / unit</para>
783 </td>
784 </tr>
785 </blockTable>
786@@ -264,29 +266,29 @@
787 <blockTable colWidths="54.0,246.0,51.0,28.0,45.0,36.0,62.0" style="Move_Line_Contect_Assign_State">
788 <tr>
789 <td>
790- <para style="P13">[[ move_lines.product_id.default_code ]]</para>
791- </td>
792- <td>
793- <para style="P12">[[ move_lines.product_id.name_template ]]</para>
794- </td>
795- <td>
796- <para style="P14">[[ formatLang(get_packets(move_lines)) ]]</para>
797- </td>
798- <td>
799- <para style="P14">[[ get_units(move_lines) ]]</para>
800- </td>
801- <td>
802- <para style="P12">
803- <font color="white"> </font>
804- </para>
805- </td>
806- <td>
807- <para style="P7">
808- <font color="white"> </font>
809- </para>
810- </td>
811- <td>
812- <para style="P7">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
813+ <para style="P14">[[ move_lines.product_id.default_code ]]</para>
814+ </td>
815+ <td>
816+ <para style="P13">[[ move_lines.product_id.name_template ]]</para>
817+ </td>
818+ <td>
819+ <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
820+ </td>
821+ <td>
822+ <para style="P15">[[ get_units(move_lines) ]]</para>
823+ </td>
824+ <td>
825+ <para style="P13">
826+ <font color="white"> </font>
827+ </para>
828+ </td>
829+ <td>
830+ <para style="P8">
831+ <font color="white"> </font>
832+ </para>
833+ </td>
834+ <td>
835+ <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
836 </td>
837 </tr>
838 </blockTable>
839@@ -299,119 +301,90 @@
840 <blockTable colWidths="55.0,246.0,50.0,28.0,45.0,36.0,61.0" style="Table1">
841 <tr>
842 <td>
843- <para style="P13">[[ move_lines.product_id.default_code ]]</para>
844- </td>
845- <td>
846- <para style="P12">[[ move_lines.product_id.name_template ]]</para>
847- </td>
848- <td>
849- <para style="P14">[[ formatLang(get_packets(move_lines)) ]]</para>
850- </td>
851- <td>
852- <para style="P14">[[ get_units(move_lines) ]]</para>
853- </td>
854- <td>
855- <para style="P12">
856- <font color="white"> </font>
857- </para>
858- </td>
859- <td>
860- <para style="P7">
861- <font color="white"> </font>
862- </para>
863- </td>
864- <td>
865- <para style="P7">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
866+ <para style="P14">[[ move_lines.product_id.default_code ]]</para>
867+ </td>
868+ <td>
869+ <para style="P13">[[ move_lines.product_id.name_template ]]</para>
870+ </td>
871+ <td>
872+ <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
873+ </td>
874+ <td>
875+ <para style="P15">[[ get_units(move_lines) ]]</para>
876+ </td>
877+ <td>
878+ <para style="P13">
879+ <font color="white"> </font>
880+ </para>
881+ </td>
882+ <td>
883+ <para style="P8">
884+ <font color="white"> </font>
885+ </para>
886+ </td>
887+ <td>
888+ <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
889 </td>
890 </tr>
891 </blockTable>
892 </section>
893- <para style="terp_default_9">
894- <font color="white"> </font>
895- </para>
896+ <para style="P17">-</para>
897 <blockTable colWidths="538.0" style="Table_notes">
898 <tr>
899 <td>
900- <para style="P11">[[ format(picking.note or '') ]]</para>
901+ <para style="P12">[[ format(picking.note or '') ]]</para>
902 </td>
903 </tr>
904 </blockTable>
905- <para style="terp_default_9">
906- <font color="white"> </font>
907- </para>
908+ <para style="P17">-</para>
909 <blockTable colWidths="538.0" style="Table_noga">
910 <tr>
911 <td>
912- <para style="P16">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
913- </td>
914- </tr>
915- <tr>
916- <td>
917- <para style="P16">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
918- </td>
919- </tr>
920- <tr>
921- <td>
922- <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>
923- </td>
924- </tr>
925- <tr>
926- <td>
927- <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>
928- </td>
929- </tr>
930- <tr>
931- <td>
932- <para style="P16">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
933+ <para style="P4">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
934+ </td>
935+ </tr>
936+ <tr>
937+ <td>
938+ <para style="P4">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
939+ </td>
940+ </tr>
941+ <tr>
942+ <td>
943+ <para style="P3">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>
944+ </td>
945+ </tr>
946+ <tr>
947+ <td>
948+ <para style="P19">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>
949+ </td>
950+ </tr>
951+ <tr>
952+ <td>
953+ <para style="P4">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
954 </td>
955 </tr>
956 </blockTable>
957- <para style="terp_default_8">
958- <font color="white"> </font>
959- </para>
960- <para style="terp_default_8">
961- <font color="white"> </font>
962- </para>
963- <para style="terp_default_8">
964- <font color="white"> </font>
965- </para>
966- <para style="terp_default_8">
967- <font color="white"> </font>
968- </para>
969- <para style="terp_default_8">
970- <font color="white"> </font>
971- </para>
972- <para style="terp_default_8">
973- <font color="white"> </font>
974- </para>
975- <para style="terp_default_8">
976- <font color="white"> </font>
977- </para>
978- <para style="terp_default_8">
979- <font color="white"> </font>
980- </para>
981- <para style="terp_default_8">
982- <font color="white"> </font>
983- </para>
984- <para style="terp_default_8">
985- <font color="white"> </font>
986- </para>
987- <para style="terp_default_8">
988- <font color="white"> </font>
989- </para>
990- <para style="terp_default_8">
991+ <para style="P17">-</para>
992+ <para style="P17">-</para>
993+ <para style="P17">-</para>
994+ <para style="P17">-</para>
995+ <para style="P17">-</para>
996+ <para style="P17">-</para>
997+ <para style="P17">-</para>
998+ <para style="P17">-</para>
999+ <para style="P17">
1000 <font color="white"> </font>
1001 </para>
1002 <blockTable colWidths="189.0,185.0,163.0" style="Table_izdal_prejel">
1003 <tr>
1004 <td>
1005- <para style="P15">Issued by: [[ picking.deliver_id.name ]]</para>
1006- </td>
1007- <td>
1008- <para style="P3">Received by:</para>
1009- </td>
1010- <td>
1011- <para style="P3">Place, date:</para>
1012+ <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para>
1013+ </td>
1014+ <td>
1015+ <para style="P5">Received by:</para>
1016+ </td>
1017+ <td>
1018+ <para style="P5">Place, date:</para>
1019 </td>
1020 </tr>
1021 </blockTable>
1022
1023=== modified file 'inovatim_reports/report/stock_picking.sxw'
1024Binary files inovatim_reports/report/stock_picking.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/stock_picking.sxw 2014-01-22 17:14:42 +0000 differ

Subscribers

People subscribed via source and target branches