Merge lp:~matjaz-6/openerpsl/openerpsl_01_25 into lp:openerpsl/7.0
- openerpsl_01_25
- Merge into 7.0
Proposed by
Matjaz Kalic
Status: | Merged |
---|---|
Merged at revision: | 313 |
Proposed branch: | lp:~matjaz-6/openerpsl/openerpsl_01_25 |
Merge into: | lp:openerpsl/7.0 |
Diff against target: |
3418 lines (+1442/-1046) 17 files modified
inovatim_reports/report/purchase_order.rml (+64/-108) inovatim_reports/report/sale_order.rml (+2/-2) novaqua_reports/__init__.py (+1/-0) novaqua_reports/i18n/en_US.po (+154/-64) novaqua_reports/i18n/novaqua_reports.pot (+154/-63) novaqua_reports/i18n/sl.po (+154/-62) novaqua_reports/i18n/sl_SI.po (+154/-62) novaqua_reports/novaqua_reports.py (+76/-0) novaqua_reports/report/__init__.py (+1/-0) novaqua_reports/report/account_print_invoice.py (+31/-7) novaqua_reports/report/account_print_invoice.rml (+180/-207) novaqua_reports/report/purchase_order.py (+34/-0) novaqua_reports/report/purchase_order.rml (+105/-145) novaqua_reports/report/sale_order.py (+24/-5) novaqua_reports/report/sale_order.rml (+157/-142) novaqua_reports/report/stock_picking.py (+1/-1) novaqua_reports/report/stock_picking.rml (+150/-178) |
To merge this branch: | bzr merge lp:~matjaz-6/openerpsl/openerpsl_01_25 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mentis | Pending | ||
Review via email: mp+203313@code.launchpad.net |
Commit message
Description of the change
[FIX] novaqua_reports (new layout, translations)
To post a comment you must log in.
- 313. By Dušan Laznik (Mentis)
-
[FIX] novaqua_reports (new layout, translations)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'inovatim_reports/report/purchase_order.rml' |
2 | --- inovatim_reports/report/purchase_order.rml 2014-01-22 17:14:14 +0000 |
3 | +++ inovatim_reports/report/purchase_order.rml 2014-01-27 12:27:10 +0000 |
4 | @@ -74,13 +74,6 @@ |
5 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> |
6 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> |
7 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> |
8 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> |
9 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> |
10 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> |
11 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> |
12 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> |
13 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> |
14 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> |
15 | </blockTableStyle> |
16 | <blockTableStyle id="Table_All_Total_Detail"> |
17 | <blockAlignment value="LEFT"/> |
18 | @@ -99,18 +92,18 @@ |
19 | <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
20 | <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
21 | <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
22 | - <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
23 | - <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
24 | - <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
25 | - <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
26 | + <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
27 | + <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
28 | + <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
29 | + <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
30 | <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
31 | <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
32 | - <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
33 | - <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
34 | - <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
35 | - <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
36 | - <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
37 | - <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
38 | + <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
39 | + <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
40 | + <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
41 | + <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
42 | + <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
43 | + <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
44 | <paraStyle name="Standard" fontName="Helvetica"/> |
45 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
46 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
47 | @@ -167,18 +160,18 @@ |
48 | <blockTable colWidths="277.0" style="Tableau2"> |
49 | <tr> |
50 | <td> |
51 | - <para style="P18">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
52 | - <para style="P18">[[ (o.partner_id.street) or '' ]]</para> |
53 | - <para style="P18">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
54 | - <para style="P18">[[ (o.partner_id.country_id.name) or '' ]]</para> |
55 | + <para style="P17">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
56 | + <para style="P17">[[ (o.partner_id.street) or '' ]]</para> |
57 | + <para style="P17">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
58 | + <para style="P17">[[ (o.partner_id.country_id.name) or '' ]]</para> |
59 | </td> |
60 | </tr> |
61 | <tr> |
62 | <td> |
63 | - <para style="P18">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> |
64 | - <para style="P18">Shipping address :</para> |
65 | - <para style="P18">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para> |
66 | - <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> |
67 | + <para style="P17">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> |
68 | + <para style="P17">Shipping address :</para> |
69 | + <para style="P17">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para> |
70 | + <para style="P17">[[ (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> |
71 | </td> |
72 | </tr> |
73 | </blockTable> |
74 | @@ -247,25 +240,25 @@ |
75 | <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> |
76 | <tr> |
77 | <td> |
78 | - <para style="P9">Customer reference</para> |
79 | - </td> |
80 | - <td> |
81 | - <para style="P10">Code</para> |
82 | - </td> |
83 | - <td> |
84 | - <para style="P10">Description</para> |
85 | - </td> |
86 | - <td> |
87 | - <para style="P11">Quantity</para> |
88 | - </td> |
89 | - <td> |
90 | - <para style="P11">UM</para> |
91 | - </td> |
92 | - <td> |
93 | - <para style="P12">Unit Price</para> |
94 | - </td> |
95 | - <td> |
96 | - <para style="P12">Net Price (€) </para> |
97 | + <para style="P10">Customer reference</para> |
98 | + </td> |
99 | + <td> |
100 | + <para style="P11">Code</para> |
101 | + </td> |
102 | + <td> |
103 | + <para style="P11">Description</para> |
104 | + </td> |
105 | + <td> |
106 | + <para style="P12">Quantity</para> |
107 | + </td> |
108 | + <td> |
109 | + <para style="P12">UM</para> |
110 | + </td> |
111 | + <td> |
112 | + <para style="P13">Unit Price</para> |
113 | + </td> |
114 | + <td> |
115 | + <para style="P13">Net Price (€) </para> |
116 | </td> |
117 | </tr> |
118 | </blockTable> |
119 | @@ -274,62 +267,25 @@ |
120 | <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content"> |
121 | <tr> |
122 | <td> |
123 | - <para style="P14">[[ line.customer_ref ]]</para> |
124 | - </td> |
125 | - <td> |
126 | - <para style="P14">[[ line.product_id.default_code ]]</para> |
127 | - </td> |
128 | - <td> |
129 | - <para style="P13">[[ line.product_id.name_template ]]</para> |
130 | - </td> |
131 | - <td> |
132 | - <para style="P7">[[ formatLang(line.product_qty ) ]] </para> |
133 | - </td> |
134 | - <td> |
135 | - <para style="P7">[[ line.product_uom.name ]]</para> |
136 | - </td> |
137 | - <td> |
138 | - <para style="P7">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para> |
139 | - </td> |
140 | - <td> |
141 | - <para style="P7">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para> |
142 | - </td> |
143 | - </tr> |
144 | - <tr> |
145 | - <td> |
146 | - <para style="terp_default_8_Italic"> |
147 | - <font color="white"> </font> |
148 | - </para> |
149 | - </td> |
150 | - <td> |
151 | - <para style="terp_default_8_Italic"> |
152 | - <font color="white"> </font> |
153 | - </para> |
154 | - </td> |
155 | - <td> |
156 | - <para style="terp_default_8_Italic"> |
157 | - <font color="white"> </font> |
158 | - </para> |
159 | - </td> |
160 | - <td> |
161 | - <para style="terp_default_Right_9"> |
162 | - <font color="white"> </font> |
163 | - </para> |
164 | - </td> |
165 | - <td> |
166 | - <para style="terp_default_Right_9"> |
167 | - <font color="white"> </font> |
168 | - </para> |
169 | - </td> |
170 | - <td> |
171 | - <para style="terp_default_Right_9"> |
172 | - <font color="white"> </font> |
173 | - </para> |
174 | - </td> |
175 | - <td> |
176 | - <para style="terp_default_Right_9"> |
177 | - <font color="white"> </font> |
178 | - </para> |
179 | + <para style="P15">[[ line.customer_ref ]]</para> |
180 | + </td> |
181 | + <td> |
182 | + <para style="P15">[[ line.product_id.default_code ]]</para> |
183 | + </td> |
184 | + <td> |
185 | + <para style="P14">[[ line.product_id.name_template ]]</para> |
186 | + </td> |
187 | + <td> |
188 | + <para style="P8">[[ formatLang(line.product_qty ) ]] </para> |
189 | + </td> |
190 | + <td> |
191 | + <para style="P8">[[ line.product_uom.name ]]</para> |
192 | + </td> |
193 | + <td> |
194 | + <para style="P8">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para> |
195 | + </td> |
196 | + <td> |
197 | + <para style="P8">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para> |
198 | </td> |
199 | </tr> |
200 | </blockTable> |
201 | @@ -337,18 +293,18 @@ |
202 | <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail"> |
203 | <tr> |
204 | <td> |
205 | - <para style="P15">Net Total:</para> |
206 | + <para style="P16">Net Total:</para> |
207 | </td> |
208 | <td> |
209 | - <para style="P8">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
210 | + <para style="P9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
211 | </td> |
212 | </tr> |
213 | <tr> |
214 | <td> |
215 | - <para style="P15">Taxes:</para> |
216 | + <para style="P16">Taxes:</para> |
217 | </td> |
218 | <td> |
219 | - <para style="P8">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
220 | + <para style="P9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
221 | </td> |
222 | </tr> |
223 | <tr> |
224 | @@ -356,14 +312,14 @@ |
225 | <para style="P5">Total:</para> |
226 | </td> |
227 | <td> |
228 | - <para style="P16">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
229 | + <para style="P18">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
230 | </td> |
231 | </tr> |
232 | </blockTable> |
233 | - <para style="P17">-</para> |
234 | - <para style="P17">-</para> |
235 | + <para style="P7">-</para> |
236 | + <para style="P7">-</para> |
237 | <para style="terp_default_9">[[ format(o.notes or '') ]]</para> |
238 | - <para style="P17">-</para> |
239 | + <para style="P7">-</para> |
240 | <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> |
241 | </story> |
242 | </document> |
243 | |
244 | === modified file 'inovatim_reports/report/purchase_order.sxw' |
245 | Binary files inovatim_reports/report/purchase_order.sxw 2014-01-22 17:14:14 +0000 and inovatim_reports/report/purchase_order.sxw 2014-01-27 12:27:10 +0000 differ |
246 | === modified file 'inovatim_reports/report/sale_order.rml' |
247 | --- inovatim_reports/report/sale_order.rml 2014-01-27 10:41:36 +0000 |
248 | +++ inovatim_reports/report/sale_order.rml 2014-01-27 12:27:10 +0000 |
249 | @@ -253,7 +253,7 @@ |
250 | <para style="P2">Salesperson:</para> |
251 | </td> |
252 | <td> |
253 | - <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]]</para> |
254 | + <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone ]]</para> |
255 | </td> |
256 | </tr> |
257 | <tr> |
258 | @@ -418,7 +418,7 @@ |
259 | <para style="P13">-</para> |
260 | <para style="P12">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> |
261 | <para style="P13">-</para> |
262 | - <para style="P12">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para> |
263 | + <para style="P12">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para> |
264 | <para style="P13">-</para> |
265 | </td> |
266 | </tr> |
267 | |
268 | === modified file 'inovatim_reports/report/sale_order.sxw' |
269 | Binary files inovatim_reports/report/sale_order.sxw 2014-01-27 10:41:36 +0000 and inovatim_reports/report/sale_order.sxw 2014-01-27 12:27:10 +0000 differ |
270 | === modified file 'novaqua_reports/__init__.py' |
271 | --- novaqua_reports/__init__.py 2014-01-20 08:10:25 +0000 |
272 | +++ novaqua_reports/__init__.py 2014-01-27 12:27:10 +0000 |
273 | @@ -20,4 +20,5 @@ |
274 | ############################################################################## |
275 | |
276 | import report |
277 | +import novaqua_reports |
278 | import account_payment_term |
279 | |
280 | === modified file 'novaqua_reports/i18n/en_US.po' |
281 | --- novaqua_reports/i18n/en_US.po 2014-01-20 08:10:25 +0000 |
282 | +++ novaqua_reports/i18n/en_US.po 2014-01-27 12:27:10 +0000 |
283 | @@ -87,6 +87,7 @@ |
284 | |
285 | #. module: novaqua_reports |
286 | #: report:account.invoice.novaqua:0 |
287 | +#: report:sale.order.novaqua:0 |
288 | msgid "Total net weight:" |
289 | msgstr "Total net weight:" |
290 | |
291 | @@ -162,16 +163,19 @@ |
292 | |
293 | #. module: novaqua_reports |
294 | #: report:account.invoice.novaqua:0 |
295 | +#: report:purchase.order.novaqua:0 |
296 | msgid "Taxes:" |
297 | msgstr "Taxes:" |
298 | |
299 | #. module: novaqua_reports |
300 | #: report:account.invoice.novaqua:0 |
301 | +#: report:purchase.order.novaqua:0 |
302 | msgid "Total:" |
303 | msgstr "Total:" |
304 | |
305 | #. module: novaqua_reports |
306 | #: report:account.invoice.novaqua:0 |
307 | +#: report:purchase.order.novaqua:0 |
308 | msgid "Unit Price" |
309 | msgstr "Unit Price" |
310 | |
311 | @@ -241,6 +245,7 @@ |
312 | |
313 | #. module: novaqua_reports |
314 | #: report:sale.order.novaqua:0 |
315 | +#: report:purchase.order.novaqua:0 |
316 | msgid "Net Total:" |
317 | msgstr "Net Total:" |
318 | |
319 | @@ -256,6 +261,7 @@ |
320 | |
321 | #. module: novaqua_reports |
322 | #: report:sale.order.novaqua:0 |
323 | +#: report:purchase.order.novaqua:0 |
324 | msgid "Payment terms:" |
325 | msgstr "Payment terms:" |
326 | |
327 | @@ -316,6 +322,7 @@ |
328 | |
329 | #. module: novaqua_reports |
330 | #: report:sale.order.novaqua:0 |
331 | +#: report:purchase.order.novaqua:0 |
332 | msgid "VAT:" |
333 | msgstr "VAT:" |
334 | |
335 | @@ -348,83 +355,166 @@ |
336 | |
337 | |
338 | |
339 | - |
340 | - |
341 | - |
342 | - |
343 | - |
344 | -#. module: novaqua_reports |
345 | -#: report:stock.picking.list.mentis:0 |
346 | -msgid "Customer Address:" |
347 | -msgstr "Customer Address:" |
348 | - |
349 | -#. module: novaqua_reports |
350 | -#: report:stock.picking.list.mentis:0 |
351 | +#. module: novaqua_reports |
352 | +#: report:stock.picking.list.novaqua:0 |
353 | +#: report:stock.picking.list.novaqua.out:0 |
354 | +#: report:stock.picking.list.novaqua.in:0 |
355 | msgid "Delivery Order:" |
356 | msgstr "Delivery Order:" |
357 | |
358 | #. module: novaqua_reports |
359 | -#: report:stock.picking.list.mentis:0 |
360 | +#: report:stock.picking.list.novaqua:0 |
361 | +#: report:stock.picking.list.novaqua.out:0 |
362 | +#: report:stock.picking.list.novaqua.in:0 |
363 | +msgid "Incoming Shipment:" |
364 | +msgstr "Incoming Shipment:" |
365 | + |
366 | +#. module: novaqua_reports |
367 | +#: report:stock.picking.list.novaqua:0 |
368 | +#: report:stock.picking.list.novaqua.out:0 |
369 | +#: report:stock.picking.list.novaqua.in:0 |
370 | +msgid "Internal Shipment:" |
371 | +msgstr "Internal Shipment:" |
372 | + |
373 | +#. module: novaqua_reports |
374 | +#: report:stock.picking.list.novaqua:0 |
375 | +#: report:stock.picking.list.novaqua.out:0 |
376 | +#: report:stock.picking.list.novaqua.in:0 |
377 | +msgid "Warehouse Address:" |
378 | +msgstr "Warehouse Address:" |
379 | + |
380 | +#. module: novaqua_reports |
381 | +#: report:stock.picking.list.novaqua:0 |
382 | +#: report:stock.picking.list.novaqua.out:0 |
383 | +#: report:stock.picking.list.novaqua.in:0 |
384 | +msgid "Scheduled Date:" |
385 | +msgstr "Scheduled Date:" |
386 | + |
387 | +#. module: novaqua_reports |
388 | +#: report:stock.picking.list.novaqua:0 |
389 | +#: report:stock.picking.list.novaqua.out:0 |
390 | +#: report:stock.picking.list.novaqua.in:0 |
391 | +msgid "Order:" |
392 | +msgstr "Order:" |
393 | + |
394 | +#. module: novaqua_reports |
395 | +#: report:stock.picking.list.novaqua:0 |
396 | +#: report:stock.picking.list.novaqua.out:0 |
397 | +#: report:stock.picking.list.novaqua.in:0 |
398 | +msgid "Customer reference:" |
399 | +msgstr "Customer reference:" |
400 | + |
401 | +#. module: novaqua_reports |
402 | +#: report:stock.picking.list.novaqua:0 |
403 | +#: report:stock.picking.list.novaqua.out:0 |
404 | +#: report:stock.picking.list.novaqua.in:0 |
405 | +msgid "Delivery method:" |
406 | +msgstr "Delivery method:" |
407 | + |
408 | +#. module: novaqua_reports |
409 | +#: report:stock.picking.list.novaqua:0 |
410 | +#: report:stock.picking.list.novaqua.out:0 |
411 | +#: report:stock.picking.list.novaqua.in:0 |
412 | +msgid "Total net weight:" |
413 | +msgstr "Total net weight:" |
414 | + |
415 | +#. module: novaqua_reports |
416 | +#: report:stock.picking.list.novaqua:0 |
417 | +#: report:stock.picking.list.novaqua.out:0 |
418 | +#: report:stock.picking.list.novaqua.in:0 |
419 | +#: report:purchase.order.novaqua:0 |
420 | +msgid "Code" |
421 | +msgstr "Code" |
422 | + |
423 | +#. module: novaqua_reports |
424 | +#: report:stock.picking.list.novaqua:0 |
425 | +#: report:stock.picking.list.novaqua.out:0 |
426 | +#: report:stock.picking.list.novaqua.in:0 |
427 | +#: report:purchase.order.novaqua:0 |
428 | msgid "Description" |
429 | msgstr "Description" |
430 | |
431 | #. module: novaqua_reports |
432 | -#: report:stock.picking.list.mentis:0 |
433 | +#: report:stock.picking.list.novaqua:0 |
434 | +#: report:stock.picking.list.novaqua.out:0 |
435 | +#: report:stock.picking.list.novaqua.in:0 |
436 | +#: report:purchase.order.novaqua:0 |
437 | +msgid "Quantity" |
438 | +msgstr "Quantity" |
439 | + |
440 | +#. module: novaqua_reports |
441 | +#: report:stock.picking.list.novaqua:0 |
442 | +#: report:stock.picking.list.novaqua.out:0 |
443 | +#: report:stock.picking.list.novaqua.in:0 |
444 | +#: report:purchase.order.novaqua:0 |
445 | +msgid "UM" |
446 | +msgstr "UM" |
447 | + |
448 | +#. module: novaqua_reports |
449 | +#: report:stock.picking.list.novaqua:0 |
450 | +#: report:stock.picking.list.novaqua.out:0 |
451 | +#: report:stock.picking.list.novaqua.in:0 |
452 | +msgid "Package" |
453 | +msgstr "Package" |
454 | + |
455 | +#. module: novaqua_reports |
456 | +#: report:stock.picking.list.novaqua:0 |
457 | +#: report:stock.picking.list.novaqua.out:0 |
458 | +#: report:stock.picking.list.novaqua.in:0 |
459 | +msgid "Price (€) / unit" |
460 | +msgstr "Price (€) / unit" |
461 | + |
462 | +#. module: novaqua_reports |
463 | +#: report:stock.picking.list.novaqua:0 |
464 | +#: report:stock.picking.list.novaqua.out:0 |
465 | +#: report:stock.picking.list.novaqua.in:0 |
466 | msgid "Issued by:" |
467 | msgstr "Issued by:" |
468 | |
469 | #. module: novaqua_reports |
470 | -#: report:stock.picking.list.mentis:0 |
471 | -msgid "Order:" |
472 | -msgstr "Order:" |
473 | - |
474 | -#. module: novaqua_reports |
475 | -#: report:stock.picking.list.mentis:0 |
476 | -msgid "Order quantity" |
477 | -msgstr "Order quantity" |
478 | - |
479 | -#. module: novaqua_reports |
480 | -#: report:stock.picking.list.mentis:0 |
481 | -msgid "Place, date:" |
482 | -msgstr "Place, date:" |
483 | - |
484 | -#. module: novaqua_reports |
485 | -#: report:stock.picking.list.mentis:0 |
486 | -msgid "Quantity" |
487 | -msgstr "Quantity" |
488 | - |
489 | -#. module: novaqua_reports |
490 | -#: report:stock.picking.list.mentis:0 |
491 | +#: report:stock.picking.list.novaqua:0 |
492 | +#: report:stock.picking.list.novaqua.out:0 |
493 | +#: report:stock.picking.list.novaqua.in:0 |
494 | msgid "Received by:" |
495 | msgstr "Received by:" |
496 | |
497 | #. module: novaqua_reports |
498 | -#: report:stock.picking.list.mentis:0 |
499 | -msgid "Scheduled Date:" |
500 | -msgstr "Scheduled Date:" |
501 | - |
502 | -#. module: novaqua_reports |
503 | -#: report:stock.picking.list.mentis:0 |
504 | -msgid "Weight:" |
505 | -msgstr "Weight:" |
506 | - |
507 | -#. module: novaqua_reports |
508 | -#: report:stock.picking.list.mentis:0 |
509 | -msgid "Supplier Address:" |
510 | -msgstr "Supplier Address:" |
511 | - |
512 | -#. module: novaqua_reports |
513 | -#: report:stock.picking.list.mentis:0 |
514 | -msgid "Warehouse Address:" |
515 | -msgstr "Warehouse Address:" |
516 | - |
517 | -#. module: novaqua_reports |
518 | -#: report:stock.picking.list.mentis:0 |
519 | -msgid "Incoming Shipment:" |
520 | -msgstr "Incoming Shipment:" |
521 | - |
522 | -#. module: novaqua_reports |
523 | -#: report:stock.picking.list.mentis:0 |
524 | -msgid "Internal Shipment:" |
525 | -msgstr "Internal Shipment:" |
526 | - |
527 | +#: report:stock.picking.list.novaqua:0 |
528 | +#: report:stock.picking.list.novaqua.out:0 |
529 | +#: report:stock.picking.list.novaqua.in:0 |
530 | +msgid "Place, date:" |
531 | +msgstr "Place, date:" |
532 | + |
533 | + |
534 | + |
535 | + |
536 | + |
537 | +#. module: novaqua_reports |
538 | +#: report:purchase.order.novaqua:0 |
539 | +msgid "Purchase Order Confirmation:" |
540 | +msgstr "Purchase Order Confirmation:" |
541 | + |
542 | +#. module: novaqua_reports |
543 | +#: report:purchase.order.novaqua:0 |
544 | +msgid "Request for Quotation:" |
545 | +msgstr "Request for Quotation:" |
546 | + |
547 | +#. module: novaqua_reports |
548 | +#: report:purchase.order.novaqua:0 |
549 | +msgid "Order Date:" |
550 | +msgstr "Order Date:" |
551 | + |
552 | +#. module: novaqua_reports |
553 | +#: report:purchase.order.novaqua:0 |
554 | +msgid "Validated By:" |
555 | +msgstr "Validated By:" |
556 | + |
557 | +#. module: novaqua_reports |
558 | +#: report:purchase.order.novaqua:0 |
559 | +msgid "Customer reference" |
560 | +msgstr "Customer reference" |
561 | + |
562 | +#. module: novaqua_reports |
563 | +#: report:purchase.order.novaqua:0 |
564 | +msgid "Net Price (€)" |
565 | +msgstr "Net Price (€)" |
566 | |
567 | === modified file 'novaqua_reports/i18n/novaqua_reports.pot' |
568 | --- novaqua_reports/i18n/novaqua_reports.pot 2014-01-20 08:10:25 +0000 |
569 | +++ novaqua_reports/i18n/novaqua_reports.pot 2014-01-27 12:27:10 +0000 |
570 | @@ -87,6 +87,7 @@ |
571 | |
572 | #. module: novaqua_reports |
573 | #: report:account.invoice.novaqua:0 |
574 | +#: report:sale.order.novaqua:0 |
575 | msgid "Total net weight:" |
576 | msgstr "" |
577 | |
578 | @@ -162,16 +163,19 @@ |
579 | |
580 | #. module: novaqua_reports |
581 | #: report:account.invoice.novaqua:0 |
582 | +#: report:purchase.order.novaqua:0 |
583 | msgid "Taxes:" |
584 | msgstr "" |
585 | |
586 | #. module: novaqua_reports |
587 | #: report:account.invoice.novaqua:0 |
588 | +#: report:purchase.order.novaqua:0 |
589 | msgid "Total:" |
590 | msgstr "" |
591 | |
592 | #. module: novaqua_reports |
593 | #: report:account.invoice.novaqua:0 |
594 | +#: report:purchase.order.novaqua:0 |
595 | msgid "Unit Price" |
596 | msgstr "" |
597 | |
598 | @@ -241,6 +245,7 @@ |
599 | |
600 | #. module: novaqua_reports |
601 | #: report:sale.order.novaqua:0 |
602 | +#: report:purchase.order.novaqua:0 |
603 | msgid "Net Total:" |
604 | msgstr "" |
605 | |
606 | @@ -256,6 +261,7 @@ |
607 | |
608 | #. module: novaqua_reports |
609 | #: report:sale.order.novaqua:0 |
610 | +#: report:purchase.order.novaqua:0 |
611 | msgid "Payment terms:" |
612 | msgstr "" |
613 | |
614 | @@ -316,6 +322,7 @@ |
615 | |
616 | #. module: novaqua_reports |
617 | #: report:sale.order.novaqua:0 |
618 | +#: report:purchase.order.novaqua:0 |
619 | msgid "VAT:" |
620 | msgstr "" |
621 | |
622 | @@ -348,82 +355,166 @@ |
623 | |
624 | |
625 | |
626 | - |
627 | - |
628 | - |
629 | - |
630 | -#. module: novaqua_reports |
631 | -#: report:stock.picking.list.mentis:0 |
632 | -msgid "Customer Address:" |
633 | -msgstr "" |
634 | - |
635 | -#. module: novaqua_reports |
636 | -#: report:stock.picking.list.mentis:0 |
637 | +#. module: novaqua_reports |
638 | +#: report:stock.picking.list.novaqua:0 |
639 | +#: report:stock.picking.list.novaqua.out:0 |
640 | +#: report:stock.picking.list.novaqua.in:0 |
641 | msgid "Delivery Order:" |
642 | msgstr "" |
643 | |
644 | #. module: novaqua_reports |
645 | -#: report:stock.picking.list.mentis:0 |
646 | +#: report:stock.picking.list.novaqua:0 |
647 | +#: report:stock.picking.list.novaqua.out:0 |
648 | +#: report:stock.picking.list.novaqua.in:0 |
649 | +msgid "Incoming Shipment:" |
650 | +msgstr "" |
651 | + |
652 | +#. module: novaqua_reports |
653 | +#: report:stock.picking.list.novaqua:0 |
654 | +#: report:stock.picking.list.novaqua.out:0 |
655 | +#: report:stock.picking.list.novaqua.in:0 |
656 | +msgid "Internal Shipment:" |
657 | +msgstr "" |
658 | + |
659 | +#. module: novaqua_reports |
660 | +#: report:stock.picking.list.novaqua:0 |
661 | +#: report:stock.picking.list.novaqua.out:0 |
662 | +#: report:stock.picking.list.novaqua.in:0 |
663 | +msgid "Warehouse Address:" |
664 | +msgstr "" |
665 | + |
666 | +#. module: novaqua_reports |
667 | +#: report:stock.picking.list.novaqua:0 |
668 | +#: report:stock.picking.list.novaqua.out:0 |
669 | +#: report:stock.picking.list.novaqua.in:0 |
670 | +msgid "Scheduled Date:" |
671 | +msgstr "" |
672 | + |
673 | +#. module: novaqua_reports |
674 | +#: report:stock.picking.list.novaqua:0 |
675 | +#: report:stock.picking.list.novaqua.out:0 |
676 | +#: report:stock.picking.list.novaqua.in:0 |
677 | +msgid "Order:" |
678 | +msgstr "" |
679 | + |
680 | +#. module: novaqua_reports |
681 | +#: report:stock.picking.list.novaqua:0 |
682 | +#: report:stock.picking.list.novaqua.out:0 |
683 | +#: report:stock.picking.list.novaqua.in:0 |
684 | +msgid "Customer reference:" |
685 | +msgstr "" |
686 | + |
687 | +#. module: novaqua_reports |
688 | +#: report:stock.picking.list.novaqua:0 |
689 | +#: report:stock.picking.list.novaqua.out:0 |
690 | +#: report:stock.picking.list.novaqua.in:0 |
691 | +msgid "Delivery method:" |
692 | +msgstr "" |
693 | + |
694 | +#. module: novaqua_reports |
695 | +#: report:stock.picking.list.novaqua:0 |
696 | +#: report:stock.picking.list.novaqua.out:0 |
697 | +#: report:stock.picking.list.novaqua.in:0 |
698 | +msgid "Total net weight:" |
699 | +msgstr "" |
700 | + |
701 | +#. module: novaqua_reports |
702 | +#: report:stock.picking.list.novaqua:0 |
703 | +#: report:stock.picking.list.novaqua.out:0 |
704 | +#: report:stock.picking.list.novaqua.in:0 |
705 | +#: report:purchase.order.novaqua:0 |
706 | +msgid "Code" |
707 | +msgstr "" |
708 | + |
709 | +#. module: novaqua_reports |
710 | +#: report:stock.picking.list.novaqua:0 |
711 | +#: report:stock.picking.list.novaqua.out:0 |
712 | +#: report:stock.picking.list.novaqua.in:0 |
713 | +#: report:purchase.order.novaqua:0 |
714 | msgid "Description" |
715 | msgstr "" |
716 | |
717 | #. module: novaqua_reports |
718 | -#: report:stock.picking.list.mentis:0 |
719 | +#: report:stock.picking.list.novaqua:0 |
720 | +#: report:stock.picking.list.novaqua.out:0 |
721 | +#: report:stock.picking.list.novaqua.in:0 |
722 | +#: report:purchase.order.novaqua:0 |
723 | +msgid "Quantity" |
724 | +msgstr "" |
725 | + |
726 | +#. module: novaqua_reports |
727 | +#: report:stock.picking.list.novaqua:0 |
728 | +#: report:stock.picking.list.novaqua.out:0 |
729 | +#: report:stock.picking.list.novaqua.in:0 |
730 | +#: report:purchase.order.novaqua:0 |
731 | +msgid "UM" |
732 | +msgstr "" |
733 | + |
734 | +#. module: novaqua_reports |
735 | +#: report:stock.picking.list.novaqua:0 |
736 | +#: report:stock.picking.list.novaqua.out:0 |
737 | +#: report:stock.picking.list.novaqua.in:0 |
738 | +msgid "Package" |
739 | +msgstr "" |
740 | + |
741 | +#. module: novaqua_reports |
742 | +#: report:stock.picking.list.novaqua:0 |
743 | +#: report:stock.picking.list.novaqua.out:0 |
744 | +#: report:stock.picking.list.novaqua.in:0 |
745 | +msgid "Price (€) / unit" |
746 | +msgstr "" |
747 | + |
748 | +#. module: novaqua_reports |
749 | +#: report:stock.picking.list.novaqua:0 |
750 | +#: report:stock.picking.list.novaqua.out:0 |
751 | +#: report:stock.picking.list.novaqua.in:0 |
752 | msgid "Issued by:" |
753 | msgstr "" |
754 | |
755 | #. module: novaqua_reports |
756 | -#: report:stock.picking.list.mentis:0 |
757 | -msgid "Order:" |
758 | -msgstr "" |
759 | - |
760 | -#. module: novaqua_reports |
761 | -#: report:stock.picking.list.mentis:0 |
762 | -msgid "Order quantity" |
763 | -msgstr "" |
764 | - |
765 | -#. module: novaqua_reports |
766 | -#: report:stock.picking.list.mentis:0 |
767 | -msgid "Place, date:" |
768 | -msgstr "" |
769 | - |
770 | -#. module: novaqua_reports |
771 | -#: report:stock.picking.list.mentis:0 |
772 | -msgid "Quantity" |
773 | -msgstr "" |
774 | - |
775 | -#. module: novaqua_reports |
776 | -#: report:stock.picking.list.mentis:0 |
777 | +#: report:stock.picking.list.novaqua:0 |
778 | +#: report:stock.picking.list.novaqua.out:0 |
779 | +#: report:stock.picking.list.novaqua.in:0 |
780 | msgid "Received by:" |
781 | msgstr "" |
782 | |
783 | #. module: novaqua_reports |
784 | -#: report:stock.picking.list.mentis:0 |
785 | -msgid "Scheduled Date:" |
786 | -msgstr "" |
787 | - |
788 | -#. module: novaqua_reports |
789 | -#: report:stock.picking.list.mentis:0 |
790 | -msgid "Weight:" |
791 | -msgstr "" |
792 | - |
793 | -#. module: novaqua_reports |
794 | -#: report:stock.picking.list.mentis:0 |
795 | -msgid "Supplier Address:" |
796 | -msgstr "" |
797 | - |
798 | -#. module: novaqua_reports |
799 | -#: report:stock.picking.list.mentis:0 |
800 | -msgid "Warehouse Address:" |
801 | -msgstr "" |
802 | - |
803 | -#. module: novaqua_reports |
804 | -#: report:stock.picking.list.mentis:0 |
805 | -msgid "Incoming Shipment:" |
806 | -msgstr "" |
807 | - |
808 | -#. module: novaqua_reports |
809 | -#: report:stock.picking.list.mentis:0 |
810 | -msgid "Internal Shipment:" |
811 | -msgstr "" |
812 | - |
813 | +#: report:stock.picking.list.novaqua:0 |
814 | +#: report:stock.picking.list.novaqua.out:0 |
815 | +#: report:stock.picking.list.novaqua.in:0 |
816 | +msgid "Place, date:" |
817 | +msgstr "" |
818 | + |
819 | + |
820 | + |
821 | + |
822 | + |
823 | +#. module: novaqua_reports |
824 | +#: report:purchase.order.novaqua:0 |
825 | +msgid "Purchase Order Confirmation:" |
826 | +msgstr "" |
827 | + |
828 | +#. module: novaqua_reports |
829 | +#: report:purchase.order.novaqua:0 |
830 | +msgid "Request for Quotation:" |
831 | +msgstr "" |
832 | + |
833 | +#. module: novaqua_reports |
834 | +#: report:purchase.order.novaqua:0 |
835 | +msgid "Order Date:" |
836 | +msgstr "" |
837 | + |
838 | +#. module: novaqua_reports |
839 | +#: report:purchase.order.novaqua:0 |
840 | +msgid "Validated By:" |
841 | +msgstr "" |
842 | + |
843 | +#. module: novaqua_reports |
844 | +#: report:purchase.order.novaqua:0 |
845 | +msgid "Customer reference" |
846 | +msgstr "" |
847 | + |
848 | +#. module: novaqua_reports |
849 | +#: report:purchase.order.novaqua:0 |
850 | +msgid "Net Price (€)" |
851 | +msgstr "" |
852 | |
853 | === modified file 'novaqua_reports/i18n/sl.po' |
854 | --- novaqua_reports/i18n/sl.po 2014-01-20 08:10:25 +0000 |
855 | +++ novaqua_reports/i18n/sl.po 2014-01-27 12:27:10 +0000 |
856 | @@ -87,6 +87,7 @@ |
857 | |
858 | #. module: novaqua_reports |
859 | #: report:account.invoice.novaqua:0 |
860 | +#: report:sale.order.novaqua:0 |
861 | msgid "Total net weight:" |
862 | msgstr "Skupaj neto teža:" |
863 | |
864 | @@ -162,16 +163,19 @@ |
865 | |
866 | #. module: novaqua_reports |
867 | #: report:account.invoice.novaqua:0 |
868 | +#: report:purchase.order.novaqua:0 |
869 | msgid "Taxes:" |
870 | msgstr "Davki:" |
871 | |
872 | #. module: novaqua_reports |
873 | #: report:account.invoice.novaqua:0 |
874 | +#: report:purchase.order.novaqua:0 |
875 | msgid "Total:" |
876 | msgstr "Skupaj:" |
877 | |
878 | #. module: novaqua_reports |
879 | #: report:account.invoice.novaqua:0 |
880 | +#: report:purchase.order.novaqua:0 |
881 | msgid "Unit Price" |
882 | msgstr "Cena enote" |
883 | |
884 | @@ -241,6 +245,7 @@ |
885 | |
886 | #. module: novaqua_reports |
887 | #: report:sale.order.novaqua:0 |
888 | +#: report:purchase.order.novaqua:0 |
889 | msgid "Net Total:" |
890 | msgstr "Skupaj neto:" |
891 | |
892 | @@ -256,6 +261,7 @@ |
893 | |
894 | #. module: novaqua_reports |
895 | #: report:sale.order.novaqua:0 |
896 | +#: report:purchase.order.novaqua:0 |
897 | msgid "Payment terms:" |
898 | msgstr "Plačilni pogoji:" |
899 | |
900 | @@ -316,6 +322,7 @@ |
901 | |
902 | #. module: novaqua_reports |
903 | #: report:sale.order.novaqua:0 |
904 | +#: report:purchase.order.novaqua:0 |
905 | msgid "VAT:" |
906 | msgstr "ID DDV:" |
907 | |
908 | @@ -348,81 +355,166 @@ |
909 | |
910 | |
911 | |
912 | - |
913 | - |
914 | - |
915 | -#. module: novaqua_reports |
916 | -#: report:stock.picking.list.mentis:0 |
917 | -msgid "Customer Address:" |
918 | -msgstr "Kontaktni naslov:" |
919 | - |
920 | -#. module: novaqua_reports |
921 | -#: report:stock.picking.list.mentis:0 |
922 | +#. module: novaqua_reports |
923 | +#: report:stock.picking.list.novaqua:0 |
924 | +#: report:stock.picking.list.novaqua.out:0 |
925 | +#: report:stock.picking.list.novaqua.in:0 |
926 | msgid "Delivery Order:" |
927 | msgstr "Dobavnica:" |
928 | |
929 | #. module: novaqua_reports |
930 | -#: report:stock.picking.list.mentis:0 |
931 | +#: report:stock.picking.list.novaqua:0 |
932 | +#: report:stock.picking.list.novaqua.out:0 |
933 | +#: report:stock.picking.list.novaqua.in:0 |
934 | +msgid "Incoming Shipment:" |
935 | +msgstr "Prihajajoče pošiljke:" |
936 | + |
937 | +#. module: novaqua_reports |
938 | +#: report:stock.picking.list.novaqua:0 |
939 | +#: report:stock.picking.list.novaqua.out:0 |
940 | +#: report:stock.picking.list.novaqua.in:0 |
941 | +msgid "Internal Shipment:" |
942 | +msgstr "Interna pošiljka:" |
943 | + |
944 | +#. module: novaqua_reports |
945 | +#: report:stock.picking.list.novaqua:0 |
946 | +#: report:stock.picking.list.novaqua.out:0 |
947 | +#: report:stock.picking.list.novaqua.in:0 |
948 | +msgid "Warehouse Address:" |
949 | +msgstr "Naslov skladišča:" |
950 | + |
951 | +#. module: novaqua_reports |
952 | +#: report:stock.picking.list.novaqua:0 |
953 | +#: report:stock.picking.list.novaqua.out:0 |
954 | +#: report:stock.picking.list.novaqua.in:0 |
955 | +msgid "Scheduled Date:" |
956 | +msgstr "Načrtovani datum:" |
957 | + |
958 | +#. module: novaqua_reports |
959 | +#: report:stock.picking.list.novaqua:0 |
960 | +#: report:stock.picking.list.novaqua.out:0 |
961 | +#: report:stock.picking.list.novaqua.in:0 |
962 | +msgid "Order:" |
963 | +msgstr "Naročilo:" |
964 | + |
965 | +#. module: novaqua_reports |
966 | +#: report:stock.picking.list.novaqua:0 |
967 | +#: report:stock.picking.list.novaqua.out:0 |
968 | +#: report:stock.picking.list.novaqua.in:0 |
969 | +msgid "Customer reference:" |
970 | +msgstr "Referenca kupca:" |
971 | + |
972 | +#. module: novaqua_reports |
973 | +#: report:stock.picking.list.novaqua:0 |
974 | +#: report:stock.picking.list.novaqua.out:0 |
975 | +#: report:stock.picking.list.novaqua.in:0 |
976 | +msgid "Delivery method:" |
977 | +msgstr "Način dostave:" |
978 | + |
979 | +#. module: novaqua_reports |
980 | +#: report:stock.picking.list.novaqua:0 |
981 | +#: report:stock.picking.list.novaqua.out:0 |
982 | +#: report:stock.picking.list.novaqua.in:0 |
983 | +msgid "Total net weight:" |
984 | +msgstr "Skupaj neto teža:" |
985 | + |
986 | +#. module: novaqua_reports |
987 | +#: report:stock.picking.list.novaqua:0 |
988 | +#: report:stock.picking.list.novaqua.out:0 |
989 | +#: report:stock.picking.list.novaqua.in:0 |
990 | +#: report:purchase.order.novaqua:0 |
991 | +msgid "Code" |
992 | +msgstr "Koda" |
993 | + |
994 | +#. module: novaqua_reports |
995 | +#: report:stock.picking.list.novaqua:0 |
996 | +#: report:stock.picking.list.novaqua.out:0 |
997 | +#: report:stock.picking.list.novaqua.in:0 |
998 | +#: report:purchase.order.novaqua:0 |
999 | msgid "Description" |
1000 | msgstr "Opis" |
1001 | |
1002 | #. module: novaqua_reports |
1003 | -#: report:stock.picking.list.mentis:0 |
1004 | +#: report:stock.picking.list.novaqua:0 |
1005 | +#: report:stock.picking.list.novaqua.out:0 |
1006 | +#: report:stock.picking.list.novaqua.in:0 |
1007 | +#: report:purchase.order.novaqua:0 |
1008 | +msgid "Quantity" |
1009 | +msgstr "Količina" |
1010 | + |
1011 | +#. module: novaqua_reports |
1012 | +#: report:stock.picking.list.novaqua:0 |
1013 | +#: report:stock.picking.list.novaqua.out:0 |
1014 | +#: report:stock.picking.list.novaqua.in:0 |
1015 | +#: report:purchase.order.novaqua:0 |
1016 | +msgid "UM" |
1017 | +msgstr "EM" |
1018 | + |
1019 | +#. module: novaqua_reports |
1020 | +#: report:stock.picking.list.novaqua:0 |
1021 | +#: report:stock.picking.list.novaqua.out:0 |
1022 | +#: report:stock.picking.list.novaqua.in:0 |
1023 | +msgid "Package" |
1024 | +msgstr "Paketi" |
1025 | + |
1026 | +#. module: novaqua_reports |
1027 | +#: report:stock.picking.list.novaqua:0 |
1028 | +#: report:stock.picking.list.novaqua.out:0 |
1029 | +#: report:stock.picking.list.novaqua.in:0 |
1030 | +msgid "Price (€) / unit" |
1031 | +msgstr "Cena (€) / enoto" |
1032 | + |
1033 | +#. module: novaqua_reports |
1034 | +#: report:stock.picking.list.novaqua:0 |
1035 | +#: report:stock.picking.list.novaqua.out:0 |
1036 | +#: report:stock.picking.list.novaqua.in:0 |
1037 | msgid "Issued by:" |
1038 | msgstr "Izdal:" |
1039 | |
1040 | #. module: novaqua_reports |
1041 | -#: report:stock.picking.list.mentis:0 |
1042 | -msgid "Order:" |
1043 | -msgstr "Naročilo:" |
1044 | - |
1045 | -#. module: novaqua_reports |
1046 | -#: report:stock.picking.list.mentis:0 |
1047 | -msgid "Order quantity" |
1048 | -msgstr "Naročena količina" |
1049 | - |
1050 | -#. module: novaqua_reports |
1051 | -#: report:stock.picking.list.mentis:0 |
1052 | -msgid "Place, date:" |
1053 | -msgstr "Kraj, datum:" |
1054 | - |
1055 | -#. module: novaqua_reports |
1056 | -#: report:stock.picking.list.mentis:0 |
1057 | -msgid "Quantity" |
1058 | -msgstr "Dobavljena količina" |
1059 | - |
1060 | -#. module: novaqua_reports |
1061 | -#: report:stock.picking.list.mentis:0 |
1062 | +#: report:stock.picking.list.novaqua:0 |
1063 | +#: report:stock.picking.list.novaqua.out:0 |
1064 | +#: report:stock.picking.list.novaqua.in:0 |
1065 | msgid "Received by:" |
1066 | msgstr "Prevzel:" |
1067 | |
1068 | #. module: novaqua_reports |
1069 | -#: report:stock.picking.list.mentis:0 |
1070 | -msgid "Scheduled Date:" |
1071 | -msgstr "Načrtovani datum:" |
1072 | - |
1073 | -#. module: novaqua_reports |
1074 | -#: report:stock.picking.list.mentis:0 |
1075 | -msgid "Weight:" |
1076 | -msgstr "Teža" |
1077 | - |
1078 | -#. module: novaqua_reports |
1079 | -#: report:stock.picking.list.mentis:0 |
1080 | -msgid "Supplier Address:" |
1081 | -msgstr "Naslov dobavitelja:" |
1082 | - |
1083 | -#. module: novaqua_reports |
1084 | -#: report:stock.picking.list.mentis:0 |
1085 | -msgid "Warehouse Address:" |
1086 | -msgstr "Naslov skladišča:" |
1087 | - |
1088 | -#. module: novaqua_reports |
1089 | -#: report:stock.picking.list.mentis:0 |
1090 | -msgid "Incoming Shipment:" |
1091 | -msgstr "Prihajajoče pošiljke:" |
1092 | - |
1093 | -#. module: novaqua_reports |
1094 | -#: report:stock.picking.list.mentis:0 |
1095 | -msgid "Internal Shipment:" |
1096 | -msgstr "Interna pošiljka:" |
1097 | - |
1098 | +#: report:stock.picking.list.novaqua:0 |
1099 | +#: report:stock.picking.list.novaqua.out:0 |
1100 | +#: report:stock.picking.list.novaqua.in:0 |
1101 | +msgid "Place, date:" |
1102 | +msgstr "Kraj, datum:" |
1103 | + |
1104 | + |
1105 | + |
1106 | + |
1107 | + |
1108 | +#. module: novaqua_reports |
1109 | +#: report:purchase.order.novaqua:0 |
1110 | +msgid "Purchase Order Confirmation:" |
1111 | +msgstr "Nabavni nalog:" |
1112 | + |
1113 | +#. module: novaqua_reports |
1114 | +#: report:purchase.order.novaqua:0 |
1115 | +msgid "Request for Quotation:" |
1116 | +msgstr "Ponudba:" |
1117 | + |
1118 | +#. module: novaqua_reports |
1119 | +#: report:purchase.order.novaqua:0 |
1120 | +msgid "Order Date:" |
1121 | +msgstr "Datum naročila:" |
1122 | + |
1123 | +#. module: novaqua_reports |
1124 | +#: report:purchase.order.novaqua:0 |
1125 | +msgid "Validated By:" |
1126 | +msgstr "Naročnik:" |
1127 | + |
1128 | +#. module: novaqua_reports |
1129 | +#: report:purchase.order.novaqua:0 |
1130 | +msgid "Customer reference" |
1131 | +msgstr "Kupčeva ref." |
1132 | + |
1133 | +#. module: novaqua_reports |
1134 | +#: report:purchase.order.novaqua:0 |
1135 | +msgid "Net Price (€)" |
1136 | +msgstr "Neto cena (€)" |
1137 | |
1138 | === modified file 'novaqua_reports/i18n/sl_SI.po' |
1139 | --- novaqua_reports/i18n/sl_SI.po 2014-01-20 08:10:25 +0000 |
1140 | +++ novaqua_reports/i18n/sl_SI.po 2014-01-27 12:27:10 +0000 |
1141 | @@ -87,6 +87,7 @@ |
1142 | |
1143 | #. module: novaqua_reports |
1144 | #: report:account.invoice.novaqua:0 |
1145 | +#: report:sale.order.novaqua:0 |
1146 | msgid "Total net weight:" |
1147 | msgstr "Skupaj neto teža:" |
1148 | |
1149 | @@ -162,16 +163,19 @@ |
1150 | |
1151 | #. module: novaqua_reports |
1152 | #: report:account.invoice.novaqua:0 |
1153 | +#: report:purchase.order.novaqua:0 |
1154 | msgid "Taxes:" |
1155 | msgstr "Davki:" |
1156 | |
1157 | #. module: novaqua_reports |
1158 | #: report:account.invoice.novaqua:0 |
1159 | +#: report:purchase.order.novaqua:0 |
1160 | msgid "Total:" |
1161 | msgstr "Skupaj:" |
1162 | |
1163 | #. module: novaqua_reports |
1164 | #: report:account.invoice.novaqua:0 |
1165 | +#: report:purchase.order.novaqua:0 |
1166 | msgid "Unit Price" |
1167 | msgstr "Cena enote" |
1168 | |
1169 | @@ -241,6 +245,7 @@ |
1170 | |
1171 | #. module: novaqua_reports |
1172 | #: report:sale.order.novaqua:0 |
1173 | +#: report:purchase.order.novaqua:0 |
1174 | msgid "Net Total:" |
1175 | msgstr "Skupaj neto:" |
1176 | |
1177 | @@ -256,6 +261,7 @@ |
1178 | |
1179 | #. module: novaqua_reports |
1180 | #: report:sale.order.novaqua:0 |
1181 | +#: report:purchase.order.novaqua:0 |
1182 | msgid "Payment terms:" |
1183 | msgstr "Plačilni pogoji:" |
1184 | |
1185 | @@ -316,6 +322,7 @@ |
1186 | |
1187 | #. module: novaqua_reports |
1188 | #: report:sale.order.novaqua:0 |
1189 | +#: report:purchase.order.novaqua:0 |
1190 | msgid "VAT:" |
1191 | msgstr "ID DDV:" |
1192 | |
1193 | @@ -348,81 +355,166 @@ |
1194 | |
1195 | |
1196 | |
1197 | - |
1198 | - |
1199 | - |
1200 | -#. module: novaqua_reports |
1201 | -#: report:stock.picking.list.mentis:0 |
1202 | -msgid "Customer Address:" |
1203 | -msgstr "Kontaktni naslov:" |
1204 | - |
1205 | -#. module: novaqua_reports |
1206 | -#: report:stock.picking.list.mentis:0 |
1207 | +#. module: novaqua_reports |
1208 | +#: report:stock.picking.list.novaqua:0 |
1209 | +#: report:stock.picking.list.novaqua.out:0 |
1210 | +#: report:stock.picking.list.novaqua.in:0 |
1211 | msgid "Delivery Order:" |
1212 | msgstr "Dobavnica:" |
1213 | |
1214 | #. module: novaqua_reports |
1215 | -#: report:stock.picking.list.mentis:0 |
1216 | +#: report:stock.picking.list.novaqua:0 |
1217 | +#: report:stock.picking.list.novaqua.out:0 |
1218 | +#: report:stock.picking.list.novaqua.in:0 |
1219 | +msgid "Incoming Shipment:" |
1220 | +msgstr "Prihajajoče pošiljke:" |
1221 | + |
1222 | +#. module: novaqua_reports |
1223 | +#: report:stock.picking.list.novaqua:0 |
1224 | +#: report:stock.picking.list.novaqua.out:0 |
1225 | +#: report:stock.picking.list.novaqua.in:0 |
1226 | +msgid "Internal Shipment:" |
1227 | +msgstr "Interna pošiljka:" |
1228 | + |
1229 | +#. module: novaqua_reports |
1230 | +#: report:stock.picking.list.novaqua:0 |
1231 | +#: report:stock.picking.list.novaqua.out:0 |
1232 | +#: report:stock.picking.list.novaqua.in:0 |
1233 | +msgid "Warehouse Address:" |
1234 | +msgstr "Naslov skladišča:" |
1235 | + |
1236 | +#. module: novaqua_reports |
1237 | +#: report:stock.picking.list.novaqua:0 |
1238 | +#: report:stock.picking.list.novaqua.out:0 |
1239 | +#: report:stock.picking.list.novaqua.in:0 |
1240 | +msgid "Scheduled Date:" |
1241 | +msgstr "Načrtovani datum:" |
1242 | + |
1243 | +#. module: novaqua_reports |
1244 | +#: report:stock.picking.list.novaqua:0 |
1245 | +#: report:stock.picking.list.novaqua.out:0 |
1246 | +#: report:stock.picking.list.novaqua.in:0 |
1247 | +msgid "Order:" |
1248 | +msgstr "Naročilo:" |
1249 | + |
1250 | +#. module: novaqua_reports |
1251 | +#: report:stock.picking.list.novaqua:0 |
1252 | +#: report:stock.picking.list.novaqua.out:0 |
1253 | +#: report:stock.picking.list.novaqua.in:0 |
1254 | +msgid "Customer reference:" |
1255 | +msgstr "Referenca kupca:" |
1256 | + |
1257 | +#. module: novaqua_reports |
1258 | +#: report:stock.picking.list.novaqua:0 |
1259 | +#: report:stock.picking.list.novaqua.out:0 |
1260 | +#: report:stock.picking.list.novaqua.in:0 |
1261 | +msgid "Delivery method:" |
1262 | +msgstr "Način dostave:" |
1263 | + |
1264 | +#. module: novaqua_reports |
1265 | +#: report:stock.picking.list.novaqua:0 |
1266 | +#: report:stock.picking.list.novaqua.out:0 |
1267 | +#: report:stock.picking.list.novaqua.in:0 |
1268 | +msgid "Total net weight:" |
1269 | +msgstr "Skupaj neto teža:" |
1270 | + |
1271 | +#. module: novaqua_reports |
1272 | +#: report:stock.picking.list.novaqua:0 |
1273 | +#: report:stock.picking.list.novaqua.out:0 |
1274 | +#: report:stock.picking.list.novaqua.in:0 |
1275 | +#: report:purchase.order.novaqua:0 |
1276 | +msgid "Code" |
1277 | +msgstr "Koda" |
1278 | + |
1279 | +#. module: novaqua_reports |
1280 | +#: report:stock.picking.list.novaqua:0 |
1281 | +#: report:stock.picking.list.novaqua.out:0 |
1282 | +#: report:stock.picking.list.novaqua.in:0 |
1283 | +#: report:purchase.order.novaqua:0 |
1284 | msgid "Description" |
1285 | msgstr "Opis" |
1286 | |
1287 | #. module: novaqua_reports |
1288 | -#: report:stock.picking.list.mentis:0 |
1289 | +#: report:stock.picking.list.novaqua:0 |
1290 | +#: report:stock.picking.list.novaqua.out:0 |
1291 | +#: report:stock.picking.list.novaqua.in:0 |
1292 | +#: report:purchase.order.novaqua:0 |
1293 | +msgid "Quantity" |
1294 | +msgstr "Količina" |
1295 | + |
1296 | +#. module: novaqua_reports |
1297 | +#: report:stock.picking.list.novaqua:0 |
1298 | +#: report:stock.picking.list.novaqua.out:0 |
1299 | +#: report:stock.picking.list.novaqua.in:0 |
1300 | +#: report:purchase.order.novaqua:0 |
1301 | +msgid "UM" |
1302 | +msgstr "EM" |
1303 | + |
1304 | +#. module: novaqua_reports |
1305 | +#: report:stock.picking.list.novaqua:0 |
1306 | +#: report:stock.picking.list.novaqua.out:0 |
1307 | +#: report:stock.picking.list.novaqua.in:0 |
1308 | +msgid "Package" |
1309 | +msgstr "Paketi" |
1310 | + |
1311 | +#. module: novaqua_reports |
1312 | +#: report:stock.picking.list.novaqua:0 |
1313 | +#: report:stock.picking.list.novaqua.out:0 |
1314 | +#: report:stock.picking.list.novaqua.in:0 |
1315 | +msgid "Price (€) / unit" |
1316 | +msgstr "Cena (€) / enoto" |
1317 | + |
1318 | +#. module: novaqua_reports |
1319 | +#: report:stock.picking.list.novaqua:0 |
1320 | +#: report:stock.picking.list.novaqua.out:0 |
1321 | +#: report:stock.picking.list.novaqua.in:0 |
1322 | msgid "Issued by:" |
1323 | msgstr "Izdal:" |
1324 | |
1325 | #. module: novaqua_reports |
1326 | -#: report:stock.picking.list.mentis:0 |
1327 | -msgid "Order:" |
1328 | -msgstr "Naročilo:" |
1329 | - |
1330 | -#. module: novaqua_reports |
1331 | -#: report:stock.picking.list.mentis:0 |
1332 | -msgid "Order quantity" |
1333 | -msgstr "Naročena količina" |
1334 | - |
1335 | -#. module: novaqua_reports |
1336 | -#: report:stock.picking.list.mentis:0 |
1337 | -msgid "Place, date:" |
1338 | -msgstr "Kraj, datum:" |
1339 | - |
1340 | -#. module: novaqua_reports |
1341 | -#: report:stock.picking.list.mentis:0 |
1342 | -msgid "Quantity" |
1343 | -msgstr "Dobavljena količina" |
1344 | - |
1345 | -#. module: novaqua_reports |
1346 | -#: report:stock.picking.list.mentis:0 |
1347 | +#: report:stock.picking.list.novaqua:0 |
1348 | +#: report:stock.picking.list.novaqua.out:0 |
1349 | +#: report:stock.picking.list.novaqua.in:0 |
1350 | msgid "Received by:" |
1351 | msgstr "Prevzel:" |
1352 | |
1353 | #. module: novaqua_reports |
1354 | -#: report:stock.picking.list.mentis:0 |
1355 | -msgid "Scheduled Date:" |
1356 | -msgstr "Načrtovani datum:" |
1357 | - |
1358 | -#. module: novaqua_reports |
1359 | -#: report:stock.picking.list.mentis:0 |
1360 | -msgid "Weight:" |
1361 | -msgstr "Teža" |
1362 | - |
1363 | -#. module: novaqua_reports |
1364 | -#: report:stock.picking.list.mentis:0 |
1365 | -msgid "Supplier Address:" |
1366 | -msgstr "Naslov dobavitelja:" |
1367 | - |
1368 | -#. module: novaqua_reports |
1369 | -#: report:stock.picking.list.mentis:0 |
1370 | -msgid "Warehouse Address:" |
1371 | -msgstr "Naslov skladišča:" |
1372 | - |
1373 | -#. module: novaqua_reports |
1374 | -#: report:stock.picking.list.mentis:0 |
1375 | -msgid "Incoming Shipment:" |
1376 | -msgstr "Prihajajoče pošiljke:" |
1377 | - |
1378 | -#. module: novaqua_reports |
1379 | -#: report:stock.picking.list.mentis:0 |
1380 | -msgid "Internal Shipment:" |
1381 | -msgstr "Interna pošiljka:" |
1382 | - |
1383 | +#: report:stock.picking.list.novaqua:0 |
1384 | +#: report:stock.picking.list.novaqua.out:0 |
1385 | +#: report:stock.picking.list.novaqua.in:0 |
1386 | +msgid "Place, date:" |
1387 | +msgstr "Kraj, datum:" |
1388 | + |
1389 | + |
1390 | + |
1391 | + |
1392 | + |
1393 | +#. module: novaqua_reports |
1394 | +#: report:purchase.order.novaqua:0 |
1395 | +msgid "Purchase Order Confirmation:" |
1396 | +msgstr "Nabavni nalog:" |
1397 | + |
1398 | +#. module: novaqua_reports |
1399 | +#: report:purchase.order.novaqua:0 |
1400 | +msgid "Request for Quotation:" |
1401 | +msgstr "Ponudba:" |
1402 | + |
1403 | +#. module: novaqua_reports |
1404 | +#: report:purchase.order.novaqua:0 |
1405 | +msgid "Order Date:" |
1406 | +msgstr "Datum naročila:" |
1407 | + |
1408 | +#. module: novaqua_reports |
1409 | +#: report:purchase.order.novaqua:0 |
1410 | +msgid "Validated By:" |
1411 | +msgstr "Naročnik:" |
1412 | + |
1413 | +#. module: novaqua_reports |
1414 | +#: report:purchase.order.novaqua:0 |
1415 | +msgid "Customer reference" |
1416 | +msgstr "Kupčeva ref." |
1417 | + |
1418 | +#. module: novaqua_reports |
1419 | +#: report:purchase.order.novaqua:0 |
1420 | +msgid "Net Price (€)" |
1421 | +msgstr "Neto cena (€)" |
1422 | |
1423 | === added file 'novaqua_reports/novaqua_reports.py' |
1424 | --- novaqua_reports/novaqua_reports.py 1970-01-01 00:00:00 +0000 |
1425 | +++ novaqua_reports/novaqua_reports.py 2014-01-27 12:27:10 +0000 |
1426 | @@ -0,0 +1,76 @@ |
1427 | +# -*- coding: utf-8 -*- |
1428 | +############################################################################## |
1429 | +# |
1430 | +# OpenERP, Open Source Management Solution |
1431 | +# Copyright (C) 2014 Mentis d.o.o. |
1432 | +# |
1433 | +# This program is free software: you can redistribute it and/or modify |
1434 | +# it under the terms of the GNU Affero General Public License as |
1435 | +# published by the Free Software Foundation, either version 3 of the |
1436 | +# License, or (at your option) any later version. |
1437 | +# |
1438 | +# This program is distributed in the hope that it will be useful, |
1439 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1440 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1441 | +# GNU Affero General Public License for more details. |
1442 | +# |
1443 | +# You should have received a copy of the GNU Affero General Public License |
1444 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1445 | +# |
1446 | +############################################################################## |
1447 | + |
1448 | +from osv import fields, osv |
1449 | +from tools.translate import _ |
1450 | + |
1451 | +class sale_order(osv.osv): |
1452 | + _inherit = "sale.order" |
1453 | + |
1454 | + def print_quotation(self, cr, uid, ids, context=None): |
1455 | + res = super(sale_order,self).print_quotation(cr, uid, ids, context) |
1456 | + if res['report_name'] == 'sale.order': |
1457 | + res['report_name'] = 'sale.order.novaqua' |
1458 | + return res |
1459 | + |
1460 | +sale_order() |
1461 | + |
1462 | +class account_invoice(osv.osv): |
1463 | + _inherit = "account.invoice" |
1464 | + |
1465 | + def invoice_print(self, cr, uid, ids, context=None): |
1466 | + res = super(account_invoice,self).invoice_print(cr, uid, ids, context) |
1467 | + if res['report_name'] == 'account.invoice': |
1468 | + res['report_name'] = 'account.invoice.novaqua' |
1469 | + return res |
1470 | + |
1471 | +account_invoice() |
1472 | + |
1473 | +class purchase_order(osv.osv): |
1474 | + _inherit = "purchase.order" |
1475 | + |
1476 | + def print_quotation(self, cr, uid, ids, context=None): |
1477 | + res = super(purchase_order,self).print_quotation(cr, uid, ids, context) |
1478 | + if res['report_name'] == 'purchase.quotation': |
1479 | + res['report_name'] = 'purchase.order.novaqua' |
1480 | + return res |
1481 | + |
1482 | +purchase_order() |
1483 | + |
1484 | +class stock_picking(osv.osv): |
1485 | + _inherit = 'stock.picking' |
1486 | + _columns = { |
1487 | + 'deliver_id': fields.many2one('res.users', 'User'), |
1488 | + } |
1489 | + |
1490 | +stock_picking() |
1491 | + |
1492 | +class stock_picking_out(osv.osv): |
1493 | + _inherit = 'stock.picking.out' |
1494 | + _columns = { |
1495 | + 'deliver_id': fields.many2one('res.users', 'User'), |
1496 | + } |
1497 | + |
1498 | + def action_process(self, cr, uid, ids, context=None): |
1499 | + self.pool.get('stock.picking').write(cr, uid, ids, {'deliver_id':uid}) |
1500 | + return super(stock_picking_out, self).action_process(cr, uid, ids, context=context) |
1501 | + |
1502 | +stock_picking_out() |
1503 | |
1504 | === modified file 'novaqua_reports/report/__init__.py' |
1505 | --- novaqua_reports/report/__init__.py 2014-01-20 08:10:25 +0000 |
1506 | +++ novaqua_reports/report/__init__.py 2014-01-27 12:27:10 +0000 |
1507 | @@ -22,3 +22,4 @@ |
1508 | import account_print_invoice |
1509 | import sale_order |
1510 | import stock_picking |
1511 | +import purchase_order |
1512 | |
1513 | === modified file 'novaqua_reports/report/account_print_invoice.py' |
1514 | --- novaqua_reports/report/account_print_invoice.py 2014-01-20 08:10:25 +0000 |
1515 | +++ novaqua_reports/report/account_print_invoice.py 2014-01-27 12:27:10 +0000 |
1516 | @@ -29,8 +29,9 @@ |
1517 | 'time': time, |
1518 | 'get_total_discount': self._get_total_discount, |
1519 | 'get_total_net': self._get_total_net, |
1520 | - 'get_packets': self._get_packets, |
1521 | + 'get_uom_qty': self._get_uom_qty, |
1522 | 'get_units': self._get_units, |
1523 | + 'get_uos_qty': self._get_uos_qty, |
1524 | 'get_total_weight': self._get_total_weight, |
1525 | }) |
1526 | |
1527 | @@ -46,10 +47,16 @@ |
1528 | value_total += line.quantity * line.price_unit |
1529 | return value_total |
1530 | |
1531 | - def _get_packets(self, invoice_line): |
1532 | + def _get_uom_qty(self, invoice_line): |
1533 | line_obj = self.pool.get('sale.order.line') |
1534 | line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)]) |
1535 | - res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom_qty'] |
1536 | + |
1537 | + sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0] |
1538 | + if sale_line.product_uom.id != invoice_line.uos_id.id: |
1539 | + res = sale_line.product_uom_qty |
1540 | + else: |
1541 | + res = invoice_line.quantity |
1542 | + |
1543 | if res == 0: |
1544 | return '' |
1545 | else: |
1546 | @@ -58,10 +65,27 @@ |
1547 | def _get_units(self, invoice_line): |
1548 | line_obj = self.pool.get('sale.order.line') |
1549 | line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)]) |
1550 | - res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom'] |
1551 | - if res: |
1552 | - return res.name |
1553 | - else: |
1554 | + |
1555 | + sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0] |
1556 | + if sale_line.product_uom.id != invoice_line.uos_id.id: |
1557 | + #res = sale_line.product_uom.name |
1558 | + return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', invoice_line.partner_id.lang, sale_line.product_uom.name) |
1559 | + else: |
1560 | + #res = invoice_line.uos_id.name |
1561 | + return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', invoice_line.partner_id.lang, invoice_line.uos_id.name) |
1562 | + |
1563 | + def _get_uos_qty(self, invoice_line): |
1564 | + line_obj = self.pool.get('sale.order.line') |
1565 | + line_ids = line_obj.search(self.cr, self.uid, [('invoice_lines', '=' , invoice_line.id)]) |
1566 | + |
1567 | + sale_line = line_obj.browse(self.cr, self.uid, line_ids)[0] |
1568 | + if invoice_line.uos_id.id != sale_line.product_uom.id: |
1569 | + res = invoice_line.quantity |
1570 | + if res == 0: |
1571 | + return '' |
1572 | + else: |
1573 | + return res |
1574 | + else: |
1575 | return '' |
1576 | |
1577 | def _get_total_weight(self, invoice): |
1578 | |
1579 | === modified file 'novaqua_reports/report/account_print_invoice.rml' |
1580 | --- novaqua_reports/report/account_print_invoice.rml 2014-01-20 08:10:25 +0000 |
1581 | +++ novaqua_reports/report/account_print_invoice.rml 2014-01-27 12:27:10 +0000 |
1582 | @@ -2,7 +2,7 @@ |
1583 | <document filename="test.pdf"> |
1584 | <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> |
1585 | <pageTemplate id="first"> |
1586 | - <frame id="first" x1="34.0" y1="28.0" width="530" height="786"/> |
1587 | + <frame id="first" x1="34.0" y1="57.0" width="530" height="757"/> |
1588 | </pageTemplate> |
1589 | </template> |
1590 | <stylesheet> |
1591 | @@ -19,10 +19,6 @@ |
1592 | <blockAlignment value="LEFT"/> |
1593 | <blockValign value="TOP"/> |
1594 | </blockTableStyle> |
1595 | - <blockTableStyle id="Table_naslov"> |
1596 | - <blockAlignment value="LEFT"/> |
1597 | - <blockValign value="TOP"/> |
1598 | - </blockTableStyle> |
1599 | <blockTableStyle id="Table_invoice_data"> |
1600 | <blockAlignment value="LEFT"/> |
1601 | <blockValign value="TOP"/> |
1602 | @@ -43,6 +39,7 @@ |
1603 | <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> |
1604 | <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> |
1605 | <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> |
1606 | + <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/> |
1607 | <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> |
1608 | <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> |
1609 | <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/> |
1610 | @@ -67,7 +64,7 @@ |
1611 | <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/> |
1612 | <blockBackground colorName="#e6e6e6" start="7,0" stop="7,-1"/> |
1613 | </blockTableStyle> |
1614 | - <blockTableStyle id="Table2"> |
1615 | + <blockTableStyle id="Table8"> |
1616 | <blockAlignment value="LEFT"/> |
1617 | <blockValign value="TOP"/> |
1618 | </blockTableStyle> |
1619 | @@ -85,6 +82,10 @@ |
1620 | <blockAlignment value="LEFT"/> |
1621 | <blockValign value="TOP"/> |
1622 | </blockTableStyle> |
1623 | + <blockTableStyle id="Table_notes"> |
1624 | + <blockAlignment value="LEFT"/> |
1625 | + <blockValign value="TOP"/> |
1626 | + </blockTableStyle> |
1627 | <blockTableStyle id="Table_noga"> |
1628 | <blockAlignment value="LEFT"/> |
1629 | <blockValign value="TOP"/> |
1630 | @@ -97,34 +98,34 @@ |
1631 | <paraStyle name="all" alignment="justify"/> |
1632 | </initialize> |
1633 | <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1634 | - <paraStyle name="P2" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1635 | - <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1636 | - <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/> |
1637 | - <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1638 | - <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"/> |
1639 | - <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"/> |
1640 | - <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"/> |
1641 | - <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1642 | - <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1643 | + <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1644 | + <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1645 | + <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1646 | + <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1647 | + <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1648 | + <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1649 | + <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1650 | + <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1651 | + <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
1652 | <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1653 | <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1654 | <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1655 | - <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1656 | - <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1657 | - <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
1658 | - <paraStyle name="P17" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
1659 | - <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
1660 | - <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
1661 | - <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1662 | - <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1663 | - <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1664 | - <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> |
1665 | - <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1666 | - <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
1667 | - <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1668 | - <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1669 | - <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
1670 | - <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
1671 | + <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1672 | + <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
1673 | + <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1674 | + <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1675 | + <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1676 | + <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1677 | + <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
1678 | + <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
1679 | + <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
1680 | + <paraStyle name="P23" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
1681 | + <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
1682 | + <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
1683 | + <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
1684 | + <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
1685 | + <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1686 | + <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
1687 | <paraStyle name="Standard" fontName="Helvetica"/> |
1688 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
1689 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
1690 | @@ -164,6 +165,7 @@ |
1691 | <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> |
1692 | <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
1693 | <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
1694 | + <paraStyle name="Endnote" rightIndent="0.0" leftIndent="17.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/> |
1695 | <images/> |
1696 | </stylesheet> |
1697 | <story> |
1698 | @@ -177,49 +179,26 @@ |
1699 | </para> |
1700 | </td> |
1701 | <td> |
1702 | - <para style="P7">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1703 | - <para style="P6">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para> |
1704 | - <para style="P6">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para> |
1705 | - <para style="P6">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1706 | - <para style="P6">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1707 | - <para style="P6">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1708 | - <para style="P6">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1709 | + <para style="P5">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1710 | + <para style="P4">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para> |
1711 | + <para style="P4">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para> |
1712 | + <para style="P4">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1713 | + <para style="P4">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1714 | + <para style="P4">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1715 | + <para style="P4">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para> |
1716 | </td> |
1717 | </tr> |
1718 | </blockTable> |
1719 | <blockTable colWidths="276.0,56.0,198.0" repeatRows="1" style="Table1"> |
1720 | <tr> |
1721 | <td> |
1722 | - <blockTable colWidths="269.0" style="Table_naslov"> |
1723 | - <tr> |
1724 | - <td> |
1725 | - <para style="P9">[[ (o.partner_id and o.partner_id.name) or '' ]]</para> |
1726 | - </td> |
1727 | - </tr> |
1728 | - <tr> |
1729 | - <td> |
1730 | - <para style="P9">[[ (o.partner_id.street) or '' ]]</para> |
1731 | - </td> |
1732 | - </tr> |
1733 | - <tr> |
1734 | - <td> |
1735 | - <para style="P9">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
1736 | - </td> |
1737 | - </tr> |
1738 | - <tr> |
1739 | - <td> |
1740 | - <para style="P9"> |
1741 | - <font color="white"> </font> |
1742 | - </para> |
1743 | - </td> |
1744 | - </tr> |
1745 | - </blockTable> |
1746 | - <para style="P14"> |
1747 | - <font color="white"> </font> |
1748 | - </para> |
1749 | + <para style="P8">[[ (o.partner_id and o.partner_id.name) or '' ]]</para> |
1750 | + <para style="P8">[[ (o.partner_id.street) or '' ]]</para> |
1751 | + <para style="P8">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
1752 | + <para style="P8">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para> |
1753 | </td> |
1754 | <td> |
1755 | - <para style="P8"> |
1756 | + <para style="P6"> |
1757 | <font color="white"> </font> |
1758 | </para> |
1759 | </td> |
1760 | @@ -227,42 +206,42 @@ |
1761 | <blockTable colWidths="104.0,87.0" style="Table_invoice_data"> |
1762 | <tr> |
1763 | <td> |
1764 | - <para style="P15">Ljubljana:</para> |
1765 | - </td> |
1766 | - <td> |
1767 | - <para style="P15">[[ formatLang(o.date_invoice_creation,date=True) ]]</para> |
1768 | - </td> |
1769 | - </tr> |
1770 | - <tr> |
1771 | - <td> |
1772 | - <para style="P15">Delivery Date:</para> |
1773 | - </td> |
1774 | - <td> |
1775 | - <para style="P15">[[ formatLang(o.date_invoice,date=True) ]]</para> |
1776 | - </td> |
1777 | - </tr> |
1778 | - <tr> |
1779 | - <td> |
1780 | - <para style="P15">Due Date:</para> |
1781 | - </td> |
1782 | - <td> |
1783 | - <para style="P14">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para> |
1784 | - </td> |
1785 | - </tr> |
1786 | - <tr> |
1787 | - <td> |
1788 | - <para style="P15">Payment Term:</para> |
1789 | - </td> |
1790 | - <td> |
1791 | - <para style="P15">[[ o.payment_term.name ]]</para> |
1792 | - </td> |
1793 | - </tr> |
1794 | - <tr> |
1795 | - <td> |
1796 | - <para style="P15">Partner phone:</para> |
1797 | - </td> |
1798 | - <td> |
1799 | - <para style="P15">[[ o.partner_id.mobile]]</para> |
1800 | + <para style="P19">Ljubljana:</para> |
1801 | + </td> |
1802 | + <td> |
1803 | + <para style="P19">[[ formatLang(o.date_invoice_creation,date=True) ]]</para> |
1804 | + </td> |
1805 | + </tr> |
1806 | + <tr> |
1807 | + <td> |
1808 | + <para style="P19">Delivery Date:</para> |
1809 | + </td> |
1810 | + <td> |
1811 | + <para style="P19">[[ formatLang(o.date_invoice,date=True) ]]</para> |
1812 | + </td> |
1813 | + </tr> |
1814 | + <tr> |
1815 | + <td> |
1816 | + <para style="P19">Due Date:</para> |
1817 | + </td> |
1818 | + <td> |
1819 | + <para style="P18">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para> |
1820 | + </td> |
1821 | + </tr> |
1822 | + <tr> |
1823 | + <td> |
1824 | + <para style="P19">Payment Term:</para> |
1825 | + </td> |
1826 | + <td> |
1827 | + <para style="P19">[[ o.payment_term.name ]]</para> |
1828 | + </td> |
1829 | + </tr> |
1830 | + <tr> |
1831 | + <td> |
1832 | + <para style="P19">Partner phone:</para> |
1833 | + </td> |
1834 | + <td> |
1835 | + <para style="P19">[[ o.partner_id.mobile or o.partner_id.phone]]</para> |
1836 | </td> |
1837 | </tr> |
1838 | </blockTable> |
1839 | @@ -281,7 +260,7 @@ |
1840 | <blockTable colWidths="265.0,265.0" style="Table_Customer_data"> |
1841 | <tr> |
1842 | <td> |
1843 | - <para style="P9">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> |
1844 | + <para style="P7">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> |
1845 | </td> |
1846 | <td> |
1847 | <para style="P1"> |
1848 | @@ -290,61 +269,61 @@ |
1849 | </td> |
1850 | </tr> |
1851 | </blockTable> |
1852 | - <blockTable colWidths="49.0,216.0,55.0,36.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table7"> |
1853 | + <blockTable colWidths="49.0,220.0,54.0,36.0,54.0,32.0,27.0,57.0" repeatRows="1" style="Table7"> |
1854 | <tr> |
1855 | <td> |
1856 | - <para style="P16">Code</para> |
1857 | - </td> |
1858 | - <td> |
1859 | - <para style="P16">Description</para> |
1860 | - </td> |
1861 | - <td> |
1862 | - <para style="P18">Quantity</para> |
1863 | - </td> |
1864 | - <td> |
1865 | - <para style="P18">UM</para> |
1866 | - </td> |
1867 | - <td> |
1868 | - <para style="P19">Unit Price </para> |
1869 | - </td> |
1870 | - <td> |
1871 | - <para style="P19">Disc.</para> |
1872 | - </td> |
1873 | - <td> |
1874 | - <para style="P18">DDV (%)</para> |
1875 | - </td> |
1876 | - <td> |
1877 | - <para style="P19">Price (EUR)</para> |
1878 | + <para style="P22">Code</para> |
1879 | + </td> |
1880 | + <td> |
1881 | + <para style="P22">Description</para> |
1882 | + </td> |
1883 | + <td> |
1884 | + <para style="P24">Quantity</para> |
1885 | + </td> |
1886 | + <td> |
1887 | + <para style="P24">UM</para> |
1888 | + </td> |
1889 | + <td> |
1890 | + <para style="P25">Unit Price </para> |
1891 | + </td> |
1892 | + <td> |
1893 | + <para style="P25">Disc.</para> |
1894 | + </td> |
1895 | + <td> |
1896 | + <para style="P24">DDV (%)</para> |
1897 | + </td> |
1898 | + <td> |
1899 | + <para style="P25">Price (EUR)</para> |
1900 | </td> |
1901 | </tr> |
1902 | </blockTable> |
1903 | <section> |
1904 | <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para> |
1905 | - <blockTable colWidths="49.0,216.0,55.0,36.0,57.0,32.0,27.0,57.0" style="Table2"> |
1906 | + <blockTable colWidths="49.0,220.0,54.0,36.0,54.0,32.0,27.0,57.0" style="Table8"> |
1907 | <tr> |
1908 | <td> |
1909 | - <para style="P28">[[ l.product_id.default_code ]]</para> |
1910 | - </td> |
1911 | - <td> |
1912 | - <para style="P27">[[ l.product_id.name_template ]]</para> |
1913 | - </td> |
1914 | - <td> |
1915 | - <para style="P25">[[ get_packets(l) ]] </para> |
1916 | - </td> |
1917 | - <td> |
1918 | - <para style="P25">[[ get_units(l) ]] </para> |
1919 | - </td> |
1920 | - <td> |
1921 | - <para style="P26">[[ formatLang(l.price_unit) ]]</para> |
1922 | - </td> |
1923 | - <td> |
1924 | - <para style="P25">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para> |
1925 | - </td> |
1926 | - <td> |
1927 | - <para style="P29">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para> |
1928 | - </td> |
1929 | - <td> |
1930 | - <para style="P24">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
1931 | + <para style="P10">[[ l.product_id.default_code ]]</para> |
1932 | + </td> |
1933 | + <td> |
1934 | + <para style="P9">[[ l.product_id.name_template ]]</para> |
1935 | + </td> |
1936 | + <td> |
1937 | + <para style="P16">[[ formatLang(get_uom_qty(l)) ]] </para> |
1938 | + </td> |
1939 | + <td> |
1940 | + <para style="P15">[[ get_units(l) ]] </para> |
1941 | + </td> |
1942 | + <td> |
1943 | + <para style="P16">[[ formatLang(l.price_unit) ]]</para> |
1944 | + </td> |
1945 | + <td> |
1946 | + <para style="P15">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para> |
1947 | + </td> |
1948 | + <td> |
1949 | + <para style="P27">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para> |
1950 | + </td> |
1951 | + <td> |
1952 | + <para style="P14">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
1953 | </td> |
1954 | </tr> |
1955 | </blockTable> |
1956 | @@ -368,7 +347,7 @@ |
1957 | </tr> |
1958 | <tr> |
1959 | <td> |
1960 | - <para style="P20">Taxes:</para> |
1961 | + <para style="P26">Taxes:</para> |
1962 | </td> |
1963 | <td> |
1964 | <para style="P13">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para> |
1965 | @@ -376,76 +355,70 @@ |
1966 | </tr> |
1967 | <tr> |
1968 | <td> |
1969 | - <para style="P17">Total:</para> |
1970 | + <para style="P23">Total:</para> |
1971 | </td> |
1972 | <td> |
1973 | - <para style="P21">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para> |
1974 | + <para style="P28">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para> |
1975 | </td> |
1976 | </tr> |
1977 | </blockTable> |
1978 | - <para style="Text body"/> |
1979 | - <para style="Text body"> |
1980 | - <font color="white"> </font> |
1981 | - </para> |
1982 | + <para style="P20">-</para> |
1983 | <blockTable colWidths="355.0,175.0" style="Table_teža"> |
1984 | <tr> |
1985 | <td> |
1986 | - <para style="P4">Delivery method: [[ o.sale_order_id.incoterm.name ]]</para> |
1987 | - <para style="P4">Total net weight: [[ get_total_weight(o) ]] kg</para> |
1988 | - </td> |
1989 | - <td> |
1990 | - <para style="Table Contents"> |
1991 | - <font color="white"> </font> |
1992 | - </para> |
1993 | - </td> |
1994 | - </tr> |
1995 | - </blockTable> |
1996 | - <para style="terp_default_9">[[ (o.comment and format(o.comment )) or removeParentNode('para') ]]</para> |
1997 | - <para style="terp_default_9">[[ (o.fiscal_position and o.fiscal_position.note and format(o.fiscal_position.note)) or removeParentNode('para') ]]</para> |
1998 | - <para style="P10"> |
1999 | - <font color="white"> </font> |
2000 | - </para> |
2001 | + <para style="terp_default_8">Delivery method: [[ o.sale_order_id.incoterm.name ]]</para> |
2002 | + <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> |
2003 | + </td> |
2004 | + <td> |
2005 | + <para style="P17"> |
2006 | + <font color="white"> </font> |
2007 | + </para> |
2008 | + </td> |
2009 | + </tr> |
2010 | + </blockTable> |
2011 | + <para style="P20">-</para> |
2012 | + <blockTable colWidths="530.0" style="Table_notes"> |
2013 | + <tr> |
2014 | + <td> |
2015 | + <para style="P11">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para> |
2016 | + <para style="P11"> |
2017 | + <font color="white"> </font> |
2018 | + </para> |
2019 | + </td> |
2020 | + </tr> |
2021 | + </blockTable> |
2022 | <blockTable colWidths="530.0" style="Table_noga"> |
2023 | <tr> |
2024 | <td> |
2025 | - <para style="P2"> |
2026 | - <font face="Helvetica">Garancija:</font> |
2027 | - </para> |
2028 | - </td> |
2029 | - </tr> |
2030 | - <tr> |
2031 | - <td> |
2032 | - <para style="P3">12 mesecev: <font face="Helvetica">na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih |
2033 | - 14 dni. |
2034 | -</font></para> |
2035 | - </td> |
2036 | - </tr> |
2037 | - <tr> |
2038 | - <td> |
2039 | - <para style="P3">3 mesece: <font face="Helvetica">na bazensko folijo in ostali program. |
2040 | - Garancija se ne upošteva pri fizičnih poškodbah, ki so posledica malomarnega ravnanja z blagom. |
2041 | -</font></para> |
2042 | - </td> |
2043 | - </tr> |
2044 | - <tr> |
2045 | - <td> |
2046 | - <para style="P3">Zahvaljujemo se vam za zaupanje! |
2047 | -</para> |
2048 | - </td> |
2049 | - </tr> |
2050 | - <tr> |
2051 | - <td> |
2052 | - <para style="P3">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o. |
2053 | -</para> |
2054 | + <para style="P2">Garancija:</para> |
2055 | + </td> |
2056 | + </tr> |
2057 | + <tr> |
2058 | + <td> |
2059 | + <para style="P2">12 mesecev: <font face="Helvetica">na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih 14 dni. </font></para> |
2060 | + </td> |
2061 | + </tr> |
2062 | + <tr> |
2063 | + <td> |
2064 | + <para style="P2">3 mesece: <font face="Helvetica">na bazensko folijo in ostali program. Garancija se ne upošteva pri fizičnih poškodbah, ki so posledica malomarnega ravnanja z blagom. </font></para> |
2065 | + </td> |
2066 | + </tr> |
2067 | + <tr> |
2068 | + <td> |
2069 | + <para style="P2">Zahvaljujemo se vam za zaupanje! </para> |
2070 | + </td> |
2071 | + </tr> |
2072 | + <tr> |
2073 | + <td> |
2074 | + <para style="P2">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o. </para> |
2075 | </td> |
2076 | </tr> |
2077 | </blockTable> |
2078 | - <para style="P10"> |
2079 | - <font color="white"> </font> |
2080 | - </para> |
2081 | - <para style="P10"> |
2082 | - <font color="white"> </font> |
2083 | - </para> |
2084 | + <para style="P21">-</para> |
2085 | + <para style="P21">-</para> |
2086 | + <para style="P21">-</para> |
2087 | + <para style="P21">-</para> |
2088 | + <para style="P21">-</para> |
2089 | <blockTable colWidths="293.0,96.0,135.0" style="Fakturiral"> |
2090 | <tr> |
2091 | <td> |
2092 | @@ -454,7 +427,7 @@ |
2093 | </para> |
2094 | </td> |
2095 | <td> |
2096 | - <para style="P5">Invoice issued by:</para> |
2097 | + <para style="P3">Invoice issued by:</para> |
2098 | </td> |
2099 | <td> |
2100 | <para style="P12">[[ o.user_id.name ]]</para> |
2101 | |
2102 | === modified file 'novaqua_reports/report/account_print_invoice.sxw' |
2103 | Binary files novaqua_reports/report/account_print_invoice.sxw 2014-01-20 08:10:25 +0000 and novaqua_reports/report/account_print_invoice.sxw 2014-01-27 12:27:10 +0000 differ |
2104 | === added file 'novaqua_reports/report/purchase_order.py' |
2105 | --- novaqua_reports/report/purchase_order.py 1970-01-01 00:00:00 +0000 |
2106 | +++ novaqua_reports/report/purchase_order.py 2014-01-27 12:27:10 +0000 |
2107 | @@ -0,0 +1,34 @@ |
2108 | +# -*- coding: utf-8 -*- |
2109 | +############################################################################## |
2110 | +# |
2111 | +# OpenERP, Open Source Management Solution |
2112 | +# Copyright (C) 2014 Mentis d.o.o. |
2113 | +# |
2114 | +# This program is free software: you can redistribute it and/or modify |
2115 | +# it under the terms of the GNU Affero General Public License as |
2116 | +# published by the Free Software Foundation, either version 3 of the |
2117 | +# License, or (at your option) any later version. |
2118 | +# |
2119 | +# This program is distributed in the hope that it will be useful, |
2120 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
2121 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2122 | +# GNU Affero General Public License for more details. |
2123 | +# |
2124 | +# You should have received a copy of the GNU Affero General Public License |
2125 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
2126 | +# |
2127 | +############################################################################## |
2128 | + |
2129 | +import time |
2130 | +from openerp.report import report_sxw |
2131 | +from openerp.osv import osv |
2132 | + |
2133 | +class order(report_sxw.rml_parse): |
2134 | + def __init__(self, cr, uid, name, context): |
2135 | + super(order, self).__init__(cr, uid, name, context=context) |
2136 | + self.localcontext.update({'time': time}) |
2137 | + |
2138 | +report_sxw.report_sxw('report.purchase.order.novaqua','purchase.order','novaqua_reports/report/purchase_order.rml',parser=order) |
2139 | + |
2140 | +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
2141 | + |
2142 | |
2143 | === modified file 'novaqua_reports/report/purchase_order.rml' |
2144 | --- novaqua_reports/report/purchase_order.rml 2014-01-20 08:10:25 +0000 |
2145 | +++ novaqua_reports/report/purchase_order.rml 2014-01-27 12:27:10 +0000 |
2146 | @@ -50,15 +50,19 @@ |
2147 | <lineStyle kind="LINEABOVE" colorName="#666666" start="4,0" stop="4,0"/> |
2148 | <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/> |
2149 | <lineStyle kind="LINEBEFORE" colorName="#666666" start="5,0" stop="5,-1"/> |
2150 | - <lineStyle kind="LINEAFTER" colorName="#666666" start="5,0" stop="5,-1"/> |
2151 | <lineStyle kind="LINEABOVE" colorName="#666666" start="5,0" stop="5,0"/> |
2152 | <lineStyle kind="LINEBELOW" colorName="#666666" start="5,-1" stop="5,-1"/> |
2153 | + <lineStyle kind="LINEBEFORE" colorName="#666666" start="6,0" stop="6,-1"/> |
2154 | + <lineStyle kind="LINEAFTER" colorName="#666666" start="6,0" stop="6,-1"/> |
2155 | + <lineStyle kind="LINEABOVE" colorName="#666666" start="6,0" stop="6,0"/> |
2156 | + <lineStyle kind="LINEBELOW" colorName="#666666" start="6,-1" stop="6,-1"/> |
2157 | <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/> |
2158 | <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/> |
2159 | <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/> |
2160 | <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/> |
2161 | <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/> |
2162 | <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-1"/> |
2163 | + <blockBackground colorName="#e6e6e6" start="6,0" stop="6,-1"/> |
2164 | </blockTableStyle> |
2165 | <blockTableStyle id="Table_Order_Pur_line_Content"> |
2166 | <blockAlignment value="LEFT"/> |
2167 | @@ -69,21 +73,15 @@ |
2168 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> |
2169 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> |
2170 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> |
2171 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> |
2172 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> |
2173 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> |
2174 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> |
2175 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> |
2176 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> |
2177 | + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> |
2178 | </blockTableStyle> |
2179 | <blockTableStyle id="Table_All_Total_Detail"> |
2180 | <blockAlignment value="LEFT"/> |
2181 | <blockValign value="TOP"/> |
2182 | - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> |
2183 | + <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/> |
2184 | <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> |
2185 | - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> |
2186 | + <lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="0,2"/> |
2187 | <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> |
2188 | - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> |
2189 | </blockTableStyle> |
2190 | <initialize> |
2191 | <paraStyle name="all" alignment="justify"/> |
2192 | @@ -92,8 +90,20 @@ |
2193 | <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
2194 | <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
2195 | <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2196 | - <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2197 | - <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2198 | + <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2199 | + <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2200 | + <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
2201 | + <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2202 | + <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2203 | + <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
2204 | + <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2205 | + <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2206 | + <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2207 | + <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2208 | + <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
2209 | + <paraStyle name="P16" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2210 | + <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2211 | + <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2212 | <paraStyle name="Standard" fontName="Helvetica"/> |
2213 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
2214 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
2215 | @@ -139,8 +149,8 @@ |
2216 | </para> |
2217 | </td> |
2218 | <td> |
2219 | - <para style="P2">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation N° [[ o.name ]]</para> |
2220 | - <para style="P1">[[ o.state<>'draft' and removeParentNode('para') ]] Request for Quotation N° [[ o.name ]]</para> |
2221 | + <para style="P2">[[ o.state=='draft' and removeParentNode('para') ]] Purchase Order Confirmation: [[ o.name ]]</para> |
2222 | + <para style="P1">[[ o.state<>'draft' and removeParentNode('para') ]] Request for Quotation: [[ o.name ]]</para> |
2223 | </td> |
2224 | </tr> |
2225 | </blockTable> |
2226 | @@ -150,18 +160,18 @@ |
2227 | <blockTable colWidths="277.0" style="Tableau2"> |
2228 | <tr> |
2229 | <td> |
2230 | - <para style="P6">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
2231 | - <para style="P6">[[ (o.partner_id.street) or '' ]]</para> |
2232 | - <para style="P6">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
2233 | - <para style="P6">[[ (o.partner_id.country_id.name) or '' ]]</para> |
2234 | + <para style="P17">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
2235 | + <para style="P17">[[ (o.partner_id.street) or '' ]]</para> |
2236 | + <para style="P17">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
2237 | + <para style="P17">[[ (o.partner_id.country_id.name) or '' ]]</para> |
2238 | </td> |
2239 | </tr> |
2240 | <tr> |
2241 | <td> |
2242 | - <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> |
2243 | - <para style="terp_default_Bold_9">Shipping address :</para> |
2244 | - <para style="terp_default_9">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para> |
2245 | - <para style="terp_default_9">[[ (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" size="9.0">removeParentNode('para')</font><font face="Helvetica" size="9.0">]]</font></para> |
2246 | + <para style="P17">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> |
2247 | + <para style="P17">Shipping address :</para> |
2248 | + <para style="P17">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para> |
2249 | + <para style="P17">[[ (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> |
2250 | </td> |
2251 | </tr> |
2252 | </blockTable> |
2253 | @@ -170,21 +180,21 @@ |
2254 | </para> |
2255 | </td> |
2256 | <td> |
2257 | - <blockTable colWidths="104.0,153.0" style="Table_order_data"> |
2258 | + <blockTable colWidths="146.0,111.0" style="Table_order_data"> |
2259 | <tr> |
2260 | <td> |
2261 | - <para style="P5">Order Date:</para> |
2262 | + <para style="P6">Order Date:</para> |
2263 | </td> |
2264 | <td> |
2265 | - <para style="P5">[[formatLang(o.date_order,date=True) ]]</para> |
2266 | + <para style="P6">[[formatLang(o.date_order,date=True) ]]</para> |
2267 | </td> |
2268 | </tr> |
2269 | <tr> |
2270 | <td> |
2271 | - <para style="P5">Validated By:</para> |
2272 | + <para style="P6">Validated By:</para> |
2273 | </td> |
2274 | <td> |
2275 | - <para style="P5">[[ (o.validator and o.validator.name) or '' ]]</para> |
2276 | + <para style="P6">[[ (o.validator and o.validator.name) or '' ]]</para> |
2277 | </td> |
2278 | </tr> |
2279 | </blockTable> |
2280 | @@ -227,139 +237,89 @@ |
2281 | </td> |
2282 | </tr> |
2283 | </blockTable> |
2284 | - <blockTable colWidths="114.0,177.0,81.0,81.0,36.0,45.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> |
2285 | + <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> |
2286 | <tr> |
2287 | <td> |
2288 | - <para style="terp_tblheader_Details">Customer ref.</para> |
2289 | - </td> |
2290 | - <td> |
2291 | - <para style="terp_tblheader_Details">Description</para> |
2292 | - </td> |
2293 | - <td> |
2294 | - <para style="terp_tblheader_Details_Centre">Qty</para> |
2295 | - </td> |
2296 | - <td> |
2297 | - <para style="terp_tblheader_Details_Centre">UM</para> |
2298 | - </td> |
2299 | - <td> |
2300 | - <para style="terp_tblheader_Details_Right">Unit Price</para> |
2301 | - </td> |
2302 | - <td> |
2303 | - <para style="terp_tblheader_Details_Right">Net Price</para> |
2304 | + <para style="P10">Customer reference</para> |
2305 | + </td> |
2306 | + <td> |
2307 | + <para style="P11">Code</para> |
2308 | + </td> |
2309 | + <td> |
2310 | + <para style="P11">Description</para> |
2311 | + </td> |
2312 | + <td> |
2313 | + <para style="P12">Quantity</para> |
2314 | + </td> |
2315 | + <td> |
2316 | + <para style="P12">UM</para> |
2317 | + </td> |
2318 | + <td> |
2319 | + <para style="P13">Unit Price</para> |
2320 | + </td> |
2321 | + <td> |
2322 | + <para style="P13">Net Price (€) </para> |
2323 | </td> |
2324 | </tr> |
2325 | </blockTable> |
2326 | <section> |
2327 | <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para> |
2328 | - <blockTable colWidths="114.0,177.0,81.0,81.0,36.0,45.0" style="Table_Order_Pur_line_Content"> |
2329 | - <tr> |
2330 | - <td> |
2331 | - <para style="terp_default_9">[[ line.customer_ref ]]</para> |
2332 | - </td> |
2333 | - <td> |
2334 | - <para style="terp_default_9">[[ line.name ]]</para> |
2335 | - </td> |
2336 | - <td> |
2337 | - <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] </para> |
2338 | - </td> |
2339 | - <td> |
2340 | - <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para> |
2341 | - </td> |
2342 | - <td> |
2343 | - <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para> |
2344 | - </td> |
2345 | - <td> |
2346 | - <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para> |
2347 | - </td> |
2348 | - </tr> |
2349 | - <tr> |
2350 | - <td> |
2351 | - <para style="terp_default_8_Italic"> |
2352 | - <font color="white"> </font> |
2353 | - </para> |
2354 | - </td> |
2355 | - <td> |
2356 | - <para style="terp_default_8_Italic"> |
2357 | - <font color="white"> </font> |
2358 | - </para> |
2359 | - </td> |
2360 | - <td> |
2361 | - <para style="terp_default_Right_9"> |
2362 | - <font color="white"> </font> |
2363 | - </para> |
2364 | - </td> |
2365 | - <td> |
2366 | - <para style="terp_default_Right_9"> |
2367 | - <font color="white"> </font> |
2368 | - </para> |
2369 | - </td> |
2370 | - <td> |
2371 | - <para style="terp_default_Right_9"> |
2372 | - <font color="white"> </font> |
2373 | - </para> |
2374 | - </td> |
2375 | - <td> |
2376 | - <para style="terp_default_Right_9"> |
2377 | - <font color="white"> </font> |
2378 | - </para> |
2379 | + <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content"> |
2380 | + <tr> |
2381 | + <td> |
2382 | + <para style="P15">[[ line.customer_ref ]]</para> |
2383 | + </td> |
2384 | + <td> |
2385 | + <para style="P15">[[ line.product_id.default_code ]]</para> |
2386 | + </td> |
2387 | + <td> |
2388 | + <para style="P14">[[ line.product_id.name_template ]]</para> |
2389 | + </td> |
2390 | + <td> |
2391 | + <para style="P8">[[ formatLang(line.product_qty ) ]] </para> |
2392 | + </td> |
2393 | + <td> |
2394 | + <para style="P8">[[ line.product_uom.name ]]</para> |
2395 | + </td> |
2396 | + <td> |
2397 | + <para style="P8">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para> |
2398 | + </td> |
2399 | + <td> |
2400 | + <para style="P8">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para> |
2401 | </td> |
2402 | </tr> |
2403 | </blockTable> |
2404 | </section> |
2405 | - <blockTable colWidths="394.0,55.0,85.0" style="Table_All_Total_Detail"> |
2406 | - <tr> |
2407 | - <td> |
2408 | - <para style="terp_default_9"> |
2409 | - <font color="white"> </font> |
2410 | - </para> |
2411 | - </td> |
2412 | - <td> |
2413 | - <para style="terp_default_9">Net Total:</para> |
2414 | - </td> |
2415 | - <td> |
2416 | - <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
2417 | - </td> |
2418 | - </tr> |
2419 | - <tr> |
2420 | - <td> |
2421 | - <para style="terp_default_9"> |
2422 | - <font color="white"> </font> |
2423 | - </para> |
2424 | - </td> |
2425 | - <td> |
2426 | - <para style="terp_default_9">Taxes:</para> |
2427 | - </td> |
2428 | - <td> |
2429 | - <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
2430 | - </td> |
2431 | - </tr> |
2432 | - <tr> |
2433 | - <td> |
2434 | - <para style="terp_default_9"> |
2435 | - <font color="white"> </font> |
2436 | - </para> |
2437 | - </td> |
2438 | - <td> |
2439 | - <para style="terp_default_Bold_9">Total:</para> |
2440 | - </td> |
2441 | - <td> |
2442 | - <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
2443 | + <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail"> |
2444 | + <tr> |
2445 | + <td> |
2446 | + <para style="P16">Net Total:</para> |
2447 | + </td> |
2448 | + <td> |
2449 | + <para style="P9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
2450 | + </td> |
2451 | + </tr> |
2452 | + <tr> |
2453 | + <td> |
2454 | + <para style="P16">Taxes:</para> |
2455 | + </td> |
2456 | + <td> |
2457 | + <para style="P9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
2458 | + </td> |
2459 | + </tr> |
2460 | + <tr> |
2461 | + <td> |
2462 | + <para style="P5">Total:</para> |
2463 | + </td> |
2464 | + <td> |
2465 | + <para style="P18">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para> |
2466 | </td> |
2467 | </tr> |
2468 | </blockTable> |
2469 | - <para style="terp_default_8"> |
2470 | - <font color="white"> </font> |
2471 | - </para> |
2472 | - <para style="terp_default_9"> |
2473 | - <font color="white"> </font> |
2474 | - </para> |
2475 | - <para style="terp_default_9"> |
2476 | - <font color="white"> </font> |
2477 | - </para> |
2478 | + <para style="P7">-</para> |
2479 | + <para style="P7">-</para> |
2480 | <para style="terp_default_9">[[ format(o.notes or '') ]]</para> |
2481 | - <para style="terp_default_9"> |
2482 | - <font color="white"> </font> |
2483 | - </para> |
2484 | + <para style="P7">-</para> |
2485 | <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> |
2486 | </story> |
2487 | </document> |
2488 | |
2489 | === modified file 'novaqua_reports/report/purchase_order.sxw' |
2490 | Binary files novaqua_reports/report/purchase_order.sxw 2014-01-20 08:10:25 +0000 and novaqua_reports/report/purchase_order.sxw 2014-01-27 12:27:10 +0000 differ |
2491 | === modified file 'novaqua_reports/report/sale_order.py' |
2492 | --- novaqua_reports/report/sale_order.py 2014-01-20 08:10:25 +0000 |
2493 | +++ novaqua_reports/report/sale_order.py 2014-01-27 12:27:10 +0000 |
2494 | @@ -2,7 +2,7 @@ |
2495 | ############################################################################## |
2496 | # |
2497 | # OpenERP, Open Source Management Solution |
2498 | -# Copyright (C) 2013 Mentis d.o.o. |
2499 | +# Copyright (C) 2014 Mentis d.o.o. |
2500 | # |
2501 | # This program is free software: you can redistribute it and/or modify |
2502 | # it under the terms of the GNU Affero General Public License as |
2503 | @@ -30,15 +30,18 @@ |
2504 | 'get_total_discount': self._get_total_discount, |
2505 | 'get_total_net': self._get_total_net, |
2506 | 'get_units': self._get_units, |
2507 | + 'get_packets': self._get_packets, |
2508 | + 'get_total_weight': self._get_total_weight, |
2509 | }) |
2510 | |
2511 | def _get_total_discount(self, order): |
2512 | disc_total = 0 |
2513 | for line in order.order_line: |
2514 | - if line.product_uos: |
2515 | - disc_tmp = line.product_uos_qty * line.price_unit * line.discount / 100 |
2516 | - else: |
2517 | - disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100 |
2518 | + #if line.product_uos: |
2519 | + # disc_tmp = line.product_uos_qty * line.price_unit * line.discount / 100 |
2520 | + #else: |
2521 | + # disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100 |
2522 | + disc_tmp = line.product_uom_qty * line.price_unit * line.discount / 100 |
2523 | disc_total += disc_tmp |
2524 | |
2525 | return disc_total |
2526 | @@ -63,4 +66,20 @@ |
2527 | else: |
2528 | return '' |
2529 | |
2530 | + def _get_total_weight(self, sale): |
2531 | + line_obj = self.pool.get('sale.order.line') |
2532 | + line_ids = line_obj.search(self.cr, self.uid, [('order_id', '=' , sale.id)]) |
2533 | + sum = 0 |
2534 | + for sale_line in line_obj.browse(self.cr, self. uid, line_ids): |
2535 | + sum = sum + sale_line.product_uom_qty * sale_line.product_id.weight |
2536 | + |
2537 | + return sum |
2538 | + |
2539 | + def _get_packets(self, sale_line): |
2540 | + if sale_line.product_uos.id and sale_line.product_uom.id != sale_line.product_uos.id: |
2541 | + return sale_line.product_uos_qty |
2542 | + else: |
2543 | + return '' |
2544 | + |
2545 | + |
2546 | report_sxw.report_sxw('report.sale.order.novaqua', 'sale.order', 'novaqua_reports/report/sale_order.rml', parser=order, header="external") |
2547 | |
2548 | === modified file 'novaqua_reports/report/sale_order.rml' |
2549 | --- novaqua_reports/report/sale_order.rml 2014-01-20 08:10:25 +0000 |
2550 | +++ novaqua_reports/report/sale_order.rml 2014-01-27 12:27:10 +0000 |
2551 | @@ -39,6 +39,7 @@ |
2552 | <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/> |
2553 | <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/> |
2554 | <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/> |
2555 | + <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/> |
2556 | <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/> |
2557 | <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/> |
2558 | <lineStyle kind="LINEBEFORE" colorName="#666666" start="4,0" stop="4,-1"/> |
2559 | @@ -85,35 +86,48 @@ |
2560 | <lineStyle kind="LINEABOVE" colorName="#000000" start="1,3" stop="1,3"/> |
2561 | <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> |
2562 | </blockTableStyle> |
2563 | + <blockTableStyle id="Table_dobava"> |
2564 | + <blockAlignment value="LEFT"/> |
2565 | + <blockValign value="TOP"/> |
2566 | + </blockTableStyle> |
2567 | <blockTableStyle id="Table_prosti_opis"> |
2568 | <blockAlignment value="LEFT"/> |
2569 | <blockValign value="TOP"/> |
2570 | </blockTableStyle> |
2571 | + <blockTableStyle id="Table_bold"> |
2572 | + <blockAlignment value="LEFT"/> |
2573 | + <blockValign value="TOP"/> |
2574 | + </blockTableStyle> |
2575 | <initialize> |
2576 | <paraStyle name="all" alignment="justify"/> |
2577 | </initialize> |
2578 | <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2579 | <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2580 | - <paraStyle name="P3" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2581 | - <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2582 | - <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2583 | - <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2584 | - <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2585 | - <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
2586 | - <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
2587 | - <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> |
2588 | - <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> |
2589 | - <paraStyle name="P12" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> |
2590 | - <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2591 | - <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2592 | - <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2593 | - <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2594 | - <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2595 | - <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2596 | - <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2597 | - <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2598 | - <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2599 | - <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2600 | + <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2601 | + <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> |
2602 | + <paraStyle name="P5" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2603 | + <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2604 | + <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2605 | + <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2606 | + <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2607 | + <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
2608 | + <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2609 | + <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
2610 | + <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
2611 | + <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> |
2612 | + <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" textColor="#000000"/> |
2613 | + <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> |
2614 | + <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2615 | + <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2616 | + <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2617 | + <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2618 | + <paraStyle name="P21" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2619 | + <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
2620 | + <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2621 | + <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2622 | + <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
2623 | + <paraStyle name="P26" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2624 | + <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
2625 | <paraStyle name="Standard" fontName="Helvetica"/> |
2626 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
2627 | <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/> |
2628 | @@ -156,46 +170,46 @@ |
2629 | <blockTable colWidths="270.0,270.0" style="Table_naslov"> |
2630 | <tr> |
2631 | <td> |
2632 | - <para style="P10"> |
2633 | + <para style="P14"> |
2634 | <font color="white"> </font> |
2635 | </para> |
2636 | </td> |
2637 | <td> |
2638 | - <para style="P11">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para> |
2639 | - <para style="P11">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para> |
2640 | + <para style="P16">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para> |
2641 | + <para style="P16">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para> |
2642 | </td> |
2643 | </tr> |
2644 | </blockTable> |
2645 | <blockTable colWidths="264.0,276.0" style="Table_customer_data"> |
2646 | <tr> |
2647 | <td> |
2648 | - <para style="P5">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
2649 | - <para style="P5">[[ (o.partner_id.street) or '' ]]</para> |
2650 | - <para style="P5">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
2651 | - <para style="P5">[[ (o.partner_id.country_id.name) or '' ]]</para> |
2652 | - <para style="P5"> |
2653 | - <font color="white"> </font> |
2654 | - </para> |
2655 | - <para style="P13">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para> |
2656 | - <para style="P5">[[ ((o.partner_id <> 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> |
2657 | - <para style="P5">[[ ((o.partner_id <> o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para> |
2658 | - <para style="P5">[[ (o.partner_id <> o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para> |
2659 | - <para style="P5"> |
2660 | - <font color="white"> </font> |
2661 | - </para> |
2662 | - <para style="P13">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para> |
2663 | - <para style="P5">[[ ((o.partner_id <> 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> |
2664 | - <para style="P5">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para> |
2665 | - <para style="P1">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para> |
2666 | + <para style="P11">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
2667 | + <para style="P11">[[ (o.partner_id.street) or '' ]]</para> |
2668 | + <para style="P11">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
2669 | + <para style="P11">[[ (o.partner_id.country_id.name) or '' ]]</para> |
2670 | + <para style="P11"> |
2671 | + <font color="white"> </font> |
2672 | + </para> |
2673 | + <para style="P18">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para> |
2674 | + <para style="P11">[[ ((o.partner_id <> 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> |
2675 | + <para style="P11">[[ ((o.partner_id <> o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para> |
2676 | + <para style="P11">[[ (o.partner_id <> o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para> |
2677 | + <para style="P11"> |
2678 | + <font color="white"> </font> |
2679 | + </para> |
2680 | + <para style="P18">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para> |
2681 | + <para style="P11">[[ ((o.partner_id <> 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> |
2682 | + <para style="P11">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para> |
2683 | + <para style="P7">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para> |
2684 | </td> |
2685 | <td> |
2686 | - <blockTable colWidths="148.0,123.0" style="Table_order_inf"> |
2687 | + <blockTable colWidths="137.0,133.0" style="Table_order_inf"> |
2688 | <tr> |
2689 | <td> |
2690 | <para style="P2">Ljubljana,</para> |
2691 | </td> |
2692 | <td> |
2693 | - <para style="P6">[[ formatLang(o.date_order, date = True) ]]</para> |
2694 | + <para style="P8">[[ formatLang(o.date_order, date = True) ]]</para> |
2695 | </td> |
2696 | </tr> |
2697 | <tr> |
2698 | @@ -203,7 +217,7 @@ |
2699 | <para style="P2">Expiration date:</para> |
2700 | </td> |
2701 | <td> |
2702 | - <para style="P6"> |
2703 | + <para style="P8"> |
2704 | <font color="white"> </font> |
2705 | </para> |
2706 | </td> |
2707 | @@ -229,7 +243,7 @@ |
2708 | <para style="P2">Salesperson:</para> |
2709 | </td> |
2710 | <td> |
2711 | - <para style="P2">[[ o.user_id.name ]],</para> |
2712 | + <para style="P2">[[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone ]]</para> |
2713 | </td> |
2714 | </tr> |
2715 | <tr> |
2716 | @@ -239,11 +253,13 @@ |
2717 | </para> |
2718 | </td> |
2719 | <td> |
2720 | - <para style="P2">tel.:[[ o.user_id.partner_id.mobile ]]</para> |
2721 | + <para style="P2"> |
2722 | + <font color="white"> </font> |
2723 | + </para> |
2724 | </td> |
2725 | </tr> |
2726 | </blockTable> |
2727 | - <para style="P10"> |
2728 | + <para style="P14"> |
2729 | <font color="white"> </font> |
2730 | </para> |
2731 | </td> |
2732 | @@ -256,72 +272,72 @@ |
2733 | <tr> |
2734 | <td> |
2735 | <para style="P1">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> |
2736 | - <para style="P3"> |
2737 | + <para style="P5"> |
2738 | <font color="white"> </font> |
2739 | </para> |
2740 | </td> |
2741 | <td> |
2742 | - <para style="P9"> |
2743 | + <para style="P22"> |
2744 | <font color="white"> </font> |
2745 | </para> |
2746 | </td> |
2747 | </tr> |
2748 | </blockTable> |
2749 | - <blockTable colWidths="55.0,220.0,51.0,37.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4"> |
2750 | + <blockTable colWidths="55.0,216.0,58.0,34.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4"> |
2751 | <tr> |
2752 | <td> |
2753 | - <para style="P18">Code</para> |
2754 | - </td> |
2755 | - <td> |
2756 | - <para style="P18">Description</para> |
2757 | - </td> |
2758 | - <td> |
2759 | - <para style="P20">Quantity</para> |
2760 | - </td> |
2761 | - <td> |
2762 | - <para style="P20">UM</para> |
2763 | - </td> |
2764 | - <td> |
2765 | - <para style="P20">Unit Price</para> |
2766 | - </td> |
2767 | - <td> |
2768 | - <para style="P20">Disc.</para> |
2769 | - </td> |
2770 | - <td> |
2771 | - <para style="P19">Taxes (%)</para> |
2772 | - </td> |
2773 | - <td> |
2774 | - <para style="P20">Price (€)</para> |
2775 | + <para style="P23">Code</para> |
2776 | + </td> |
2777 | + <td> |
2778 | + <para style="P23">Description</para> |
2779 | + </td> |
2780 | + <td> |
2781 | + <para style="P25">Quantity</para> |
2782 | + </td> |
2783 | + <td> |
2784 | + <para style="P25">UM</para> |
2785 | + </td> |
2786 | + <td> |
2787 | + <para style="P25">Unit Price</para> |
2788 | + </td> |
2789 | + <td> |
2790 | + <para style="P25">Disc.</para> |
2791 | + </td> |
2792 | + <td> |
2793 | + <para style="P24">Taxes (%)</para> |
2794 | + </td> |
2795 | + <td> |
2796 | + <para style="P25">Price (€)</para> |
2797 | </td> |
2798 | </tr> |
2799 | </blockTable> |
2800 | <section> |
2801 | <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para> |
2802 | - <blockTable colWidths="56.0,219.0,51.0,37.0,58.0,32.0,28.0,55.0" style="Table5"> |
2803 | + <blockTable colWidths="56.0,216.0,58.0,34.0,58.0,32.0,28.0,54.0" style="Table5"> |
2804 | <tr> |
2805 | <td> |
2806 | - <para style="P8">[[ line.product_id.default_code ]]</para> |
2807 | - </td> |
2808 | - <td> |
2809 | - <para style="P7">[[ line.product_id.name_template ]] </para> |
2810 | - </td> |
2811 | - <td> |
2812 | - <para style="P15">[[ line.product_uom_qty ]] </para> |
2813 | - </td> |
2814 | - <td> |
2815 | - <para style="P15">[[ line.product_uom.name ]]</para> |
2816 | - </td> |
2817 | - <td> |
2818 | - <para style="P15">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para> |
2819 | - </td> |
2820 | - <td> |
2821 | - <para style="P16">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para> |
2822 | - </td> |
2823 | - <td> |
2824 | - <para style="P21">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para> |
2825 | - </td> |
2826 | - <td> |
2827 | - <para style="P15">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
2828 | + <para style="P10">[[ line.product_id.default_code ]]</para> |
2829 | + </td> |
2830 | + <td> |
2831 | + <para style="P9">[[ line.product_id.name_template ]] </para> |
2832 | + </td> |
2833 | + <td> |
2834 | + <para style="P19">[[ line.product_uom_qty ]] </para> |
2835 | + </td> |
2836 | + <td> |
2837 | + <para style="P19">[[ line.product_uom.name ]]</para> |
2838 | + </td> |
2839 | + <td> |
2840 | + <para style="P19">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para> |
2841 | + </td> |
2842 | + <td> |
2843 | + <para style="P20">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para> |
2844 | + </td> |
2845 | + <td> |
2846 | + <para style="P26">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para> |
2847 | + </td> |
2848 | + <td> |
2849 | + <para style="P19">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
2850 | </td> |
2851 | </tr> |
2852 | </blockTable> |
2853 | @@ -329,60 +345,59 @@ |
2854 | <blockTable colWidths="270.0,270.0" style="Table_tax"> |
2855 | <tr> |
2856 | <td> |
2857 | - <para style="P4">Net Total:</para> |
2858 | - </td> |
2859 | - <td> |
2860 | - <para style="P17">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para> |
2861 | - </td> |
2862 | - </tr> |
2863 | - <tr> |
2864 | - <td> |
2865 | - <para style="P4">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> |
2866 | - </td> |
2867 | - <td> |
2868 | - <para style="P17">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para> |
2869 | - </td> |
2870 | - </tr> |
2871 | - <tr> |
2872 | - <td> |
2873 | - <para style="P4">Taxes :</para> |
2874 | - </td> |
2875 | - <td> |
2876 | - <para style="P17">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para> |
2877 | - </td> |
2878 | - </tr> |
2879 | - <tr> |
2880 | - <td> |
2881 | - <para style="P14">Total :</para> |
2882 | - </td> |
2883 | - <td> |
2884 | - <para style="P22">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para> |
2885 | - </td> |
2886 | - </tr> |
2887 | - </blockTable> |
2888 | - <para style="terp_default_8"> |
2889 | - <font color="white"> </font> |
2890 | - </para> |
2891 | - <para style="terp_default_9"> |
2892 | - <font color="white"> </font> |
2893 | - </para> |
2894 | - <para style="terp_default_9"> |
2895 | - <font color="white"> </font> |
2896 | - </para> |
2897 | - <para style="terp_default_9">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para> |
2898 | - <para style="terp_default_9"> |
2899 | - <font color="white"> </font> |
2900 | - </para> |
2901 | + <para style="P6">Net Total:</para> |
2902 | + </td> |
2903 | + <td> |
2904 | + <para style="P21">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para> |
2905 | + </td> |
2906 | + </tr> |
2907 | + <tr> |
2908 | + <td> |
2909 | + <para style="P6">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> |
2910 | + </td> |
2911 | + <td> |
2912 | + <para style="P21">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para> |
2913 | + </td> |
2914 | + </tr> |
2915 | + <tr> |
2916 | + <td> |
2917 | + <para style="P6">Taxes :</para> |
2918 | + </td> |
2919 | + <td> |
2920 | + <para style="P21">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para> |
2921 | + </td> |
2922 | + </tr> |
2923 | + <tr> |
2924 | + <td> |
2925 | + <para style="P17">Total :</para> |
2926 | + </td> |
2927 | + <td> |
2928 | + <para style="P27">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para> |
2929 | + </td> |
2930 | + </tr> |
2931 | + </blockTable> |
2932 | + <para style="P12">-</para> |
2933 | + <blockTable colWidths="539.0" style="Table_dobava"> |
2934 | + <tr> |
2935 | + <td> |
2936 | + <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para> |
2937 | + <para style="P13">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> |
2938 | + </td> |
2939 | + </tr> |
2940 | + </blockTable> |
2941 | + <para style="P12">-</para> |
2942 | + <para style="P12">-</para> |
2943 | <blockTable colWidths="539.0" style="Table_prosti_opis"> |
2944 | <tr> |
2945 | <td> |
2946 | - <para style="P9">Za potrditev ponudbe prosimo za plačilo na TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para> |
2947 | - <para style="P9">Za več informacij lahko pokličete vašo kontaktno osebo: [[ o.user_id.name ]], telefon: [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para> |
2948 | + <para style="P15">Za potrditev ponudbe prosimo za plačilo na TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para> |
2949 | </td> |
2950 | </tr> |
2951 | + </blockTable> |
2952 | + <blockTable colWidths="539.0" style="Table_bold"> |
2953 | <tr> |
2954 | <td> |
2955 | - <para style="P12">[[ o.company_id.name in ['Inovatim d.o.o.'] and removeParentNode('para') ]] tekst</para> |
2956 | + <para style="P4">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para> |
2957 | </td> |
2958 | </tr> |
2959 | </blockTable> |
2960 | |
2961 | === modified file 'novaqua_reports/report/sale_order.sxw' |
2962 | Binary files novaqua_reports/report/sale_order.sxw 2014-01-20 08:10:25 +0000 and novaqua_reports/report/sale_order.sxw 2014-01-27 12:27:10 +0000 differ |
2963 | === modified file 'novaqua_reports/report/stock_picking.py' |
2964 | --- novaqua_reports/report/stock_picking.py 2014-01-20 08:10:25 +0000 |
2965 | +++ novaqua_reports/report/stock_picking.py 2014-01-27 12:27:10 +0000 |
2966 | @@ -62,7 +62,7 @@ |
2967 | line_ids = line_obj.search(self.cr, self.uid, [('id', '=' , move_line.sale_line_id.id)]) |
2968 | res = line_obj.browse(self.cr, self.uid, line_ids)[0]['product_uom'] |
2969 | if res: |
2970 | - return res.name |
2971 | + return self.pool.get('ir.translation')._get_source(self.cr, self.uid, None, 'model', move_line.partner_id.lang, res.name) |
2972 | else: |
2973 | return '' |
2974 | |
2975 | |
2976 | === modified file 'novaqua_reports/report/stock_picking.rml' |
2977 | --- novaqua_reports/report/stock_picking.rml 2014-01-20 08:10:25 +0000 |
2978 | +++ novaqua_reports/report/stock_picking.rml 2014-01-27 12:27:10 +0000 |
2979 | @@ -26,13 +26,27 @@ |
2980 | <blockTableStyle id="Move_Line_Header"> |
2981 | <blockAlignment value="LEFT"/> |
2982 | <blockValign value="TOP"/> |
2983 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> |
2984 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> |
2985 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> |
2986 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> |
2987 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> |
2988 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> |
2989 | - <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/> |
2990 | + <lineStyle kind="LINEBEFORE" colorName="#666666" start="0,0" stop="0,-1"/> |
2991 | + <lineStyle kind="LINEABOVE" colorName="#666666" start="0,0" stop="0,0"/> |
2992 | + <lineStyle kind="LINEBELOW" colorName="#666666" start="0,-1" stop="0,-1"/> |
2993 | + <lineStyle kind="LINEBEFORE" colorName="#666666" start="1,0" stop="1,-1"/> |
2994 | + <lineStyle kind="LINEABOVE" colorName="#666666" start="1,0" stop="1,0"/> |
2995 | + <lineStyle kind="LINEBELOW" colorName="#666666" start="1,-1" stop="1,-1"/> |
2996 | + <lineStyle kind="LINEBEFORE" colorName="#666666" start="2,0" stop="2,-1"/> |
2997 | + <lineStyle kind="LINEABOVE" colorName="#666666" start="2,0" stop="2,0"/> |
2998 | + <lineStyle kind="LINEBELOW" colorName="#666666" start="2,-1" stop="2,-1"/> |
2999 | + <lineStyle kind="LINEBEFORE" colorName="#666666" start="3,0" stop="3,-1"/> |
3000 | + <lineStyle kind="LINEAFTER" colorName="#666666" start="3,0" stop="3,-1"/> |
3001 | + <lineStyle kind="LINEABOVE" colorName="#666666" start="3,0" stop="3,0"/> |
3002 | + <lineStyle kind="LINEBELOW" colorName="#666666" start="3,-1" stop="3,-1"/> |
3003 | + <lineStyle kind="LINEAFTER" colorName="#666666" start="4,0" stop="4,-1"/> |
3004 | + <lineStyle kind="LINEABOVE" colorName="#666666" start="4,0" stop="4,0"/> |
3005 | + <lineStyle kind="LINEBELOW" colorName="#666666" start="4,-1" stop="4,-1"/> |
3006 | + <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/> |
3007 | + <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/> |
3008 | + <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/> |
3009 | + <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/> |
3010 | + <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/> |
3011 | </blockTableStyle> |
3012 | <blockTableStyle id="Move_Line_Contect_Assign_State"> |
3013 | <blockAlignment value="LEFT"/> |
3014 | @@ -42,8 +56,6 @@ |
3015 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> |
3016 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> |
3017 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> |
3018 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> |
3019 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> |
3020 | </blockTableStyle> |
3021 | <blockTableStyle id="Table1"> |
3022 | <blockAlignment value="LEFT"/> |
3023 | @@ -53,8 +65,10 @@ |
3024 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> |
3025 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> |
3026 | <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> |
3027 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> |
3028 | - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> |
3029 | + </blockTableStyle> |
3030 | + <blockTableStyle id="Table_notes"> |
3031 | + <blockAlignment value="LEFT"/> |
3032 | + <blockValign value="TOP"/> |
3033 | </blockTableStyle> |
3034 | <blockTableStyle id="Table_noga"> |
3035 | <blockAlignment value="LEFT"/> |
3036 | @@ -69,14 +83,23 @@ |
3037 | </initialize> |
3038 | <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3039 | <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3040 | - <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
3041 | - <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3042 | - <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3043 | - <paraStyle name="P6" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT"/> |
3044 | - <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT"/> |
3045 | - <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
3046 | - <paraStyle name="P9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
3047 | - <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3048 | + <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> |
3049 | + <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> |
3050 | + <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
3051 | + <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3052 | + <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3053 | + <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3054 | + <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
3055 | + <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3056 | + <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
3057 | + <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
3058 | + <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
3059 | + <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
3060 | + <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
3061 | + <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
3062 | + <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
3063 | + <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
3064 | + <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/> |
3065 | <paraStyle name="Standard" fontName="Helvetica"/> |
3066 | <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> |
3067 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
3068 | @@ -113,6 +136,7 @@ |
3069 | </stylesheet> |
3070 | <story> |
3071 | <para style="terp_default_8">[[repeatIn(objects,'picking')]] </para> |
3072 | + <para style="terp_default_8">[[ setLang(picking.partner_id.lang) ]]</para> |
3073 | <blockTable colWidths="269.0,269.0" style="Table_Address_detail"> |
3074 | <tr> |
3075 | <td> |
3076 | @@ -121,28 +145,28 @@ |
3077 | </para> |
3078 | </td> |
3079 | <td> |
3080 | - <para style="P4">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
3081 | - <para style="P4">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
3082 | - <para style="P4">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
3083 | + <para style="P6">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
3084 | + <para style="P6">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
3085 | + <para style="P6">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
3086 | </td> |
3087 | </tr> |
3088 | </blockTable> |
3089 | <blockTable colWidths="264.0,273.0" style="Table2"> |
3090 | <tr> |
3091 | <td> |
3092 | - <para style="P9">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para> |
3093 | - <para style="P9">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para> |
3094 | - <para style="P9">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para> |
3095 | - <para style="P9">[[ picking.partner_id.name ]]</para> |
3096 | - <para style="P9">[[ picking.partner_id.street ]]</para> |
3097 | - <para style="P9">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para> |
3098 | - <para style="P9">[[ picking.partner_id.country_id.name ]]</para> |
3099 | + <para style="P16">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para> |
3100 | + <para style="P16">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para> |
3101 | + <para style="P16">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para> |
3102 | + <para style="P16">[[ picking.partner_id.name ]]</para> |
3103 | + <para style="P16">[[ picking.partner_id.street ]]</para> |
3104 | + <para style="P16">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para> |
3105 | + <para style="P16">[[ picking.partner_id.country_id.name ]]</para> |
3106 | </td> |
3107 | <td> |
3108 | - <blockTable colWidths="175.0,93.0" style="Table_picking_info"> |
3109 | + <blockTable colWidths="161.0,107.0" style="Table_picking_info"> |
3110 | <tr> |
3111 | <td> |
3112 | - <para style="P1">Ljubljana, dne:</para> |
3113 | + <para style="P1">Ljubljana:</para> |
3114 | </td> |
3115 | <td> |
3116 | <para style="P1">[[ formatLang(picking.date,date = True) ]]</para> |
3117 | @@ -174,7 +198,7 @@ |
3118 | </tr> |
3119 | <tr> |
3120 | <td> |
3121 | - <para style="P2">Način dostave:</para> |
3122 | + <para style="P2">Delivery method:</para> |
3123 | </td> |
3124 | <td> |
3125 | <para style="P2">[[ picking.sale_id.incoterm.name ]]</para> |
3126 | @@ -182,14 +206,14 @@ |
3127 | </tr> |
3128 | <tr> |
3129 | <td> |
3130 | - <para style="P2">Teža:</para> |
3131 | + <para style="P2">Total net weight:</para> |
3132 | </td> |
3133 | <td> |
3134 | - <para style="P2">[[ get_total_weight(picking) ]] kg</para> |
3135 | + <para style="P2">[[ formatLang(get_total_weight(picking)) ]] kg</para> |
3136 | </td> |
3137 | </tr> |
3138 | </blockTable> |
3139 | - <para style="P10"> |
3140 | + <para style="P7"> |
3141 | <font color="white"> </font> |
3142 | </para> |
3143 | </td> |
3144 | @@ -198,60 +222,44 @@ |
3145 | <para style="terp_default_5cm_Above_Space"> |
3146 | <font color="white"> </font> |
3147 | </para> |
3148 | - <blockTable colWidths="53.0,229.0,51.0,45.0,45.0,36.0,59.0" repeatRows="1" style="Move_Line_Header"> |
3149 | + <blockTable colWidths="53.0,276.0,66.0,34.0,88.0" repeatRows="1" style="Move_Line_Header"> |
3150 | <tr> |
3151 | <td> |
3152 | - <para style="terp_tblheader_Details">Code</para> |
3153 | - </td> |
3154 | - <td> |
3155 | - <para style="terp_tblheader_Details">Name</para> |
3156 | - </td> |
3157 | - <td> |
3158 | - <para style="terp_tblheader_Details">Qty</para> |
3159 | - </td> |
3160 | - <td> |
3161 | - <para style="terp_tblheader_Details">Units</para> |
3162 | - </td> |
3163 | - <td> |
3164 | - <para style="terp_tblheader_Details">Packets</para> |
3165 | - </td> |
3166 | - <td> |
3167 | - <para style="terp_tblheader_Details_Right">LOT</para> |
3168 | - </td> |
3169 | - <td> |
3170 | - <para style="terp_tblheader_Details_Right">Price/unit</para> |
3171 | + <para style="P9">Code</para> |
3172 | + </td> |
3173 | + <td> |
3174 | + <para style="P9">Description</para> |
3175 | + </td> |
3176 | + <td> |
3177 | + <para style="P9">Quantity</para> |
3178 | + </td> |
3179 | + <td> |
3180 | + <para style="P9">UM</para> |
3181 | + </td> |
3182 | + <td> |
3183 | + <para style="P10">Price (€) / unit</para> |
3184 | </td> |
3185 | </tr> |
3186 | </blockTable> |
3187 | <section> |
3188 | <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para> |
3189 | <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para> |
3190 | - <blockTable colWidths="54.0,229.0,51.0,45.0,45.0,36.0,62.0" style="Move_Line_Contect_Assign_State"> |
3191 | + <blockTable colWidths="54.0,276.0,66.0,34.0,91.0" style="Move_Line_Contect_Assign_State"> |
3192 | <tr> |
3193 | <td> |
3194 | - <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para> |
3195 | - </td> |
3196 | - <td> |
3197 | - <para style="terp_default_9">[[ move_lines.product_id.name_template ]]</para> |
3198 | - </td> |
3199 | - <td> |
3200 | - <para style="terp_default_9">[[ get_packets(move_lines) ]]</para> |
3201 | - </td> |
3202 | - <td> |
3203 | - <para style="terp_default_9">[[ get_units(move_lines) ]]</para> |
3204 | - </td> |
3205 | - <td> |
3206 | - <para style="terp_default_9"> |
3207 | - <font color="white"> </font> |
3208 | - </para> |
3209 | - </td> |
3210 | - <td> |
3211 | - <para style="terp_default_Right_9"> |
3212 | - <font color="white"> </font> |
3213 | - </para> |
3214 | - </td> |
3215 | - <td> |
3216 | - <para style="terp_default_Right_9">[[ move_lines.sale_line_id.price_unit ]]</para> |
3217 | + <para style="P14">[[ move_lines.product_id.default_code ]]</para> |
3218 | + </td> |
3219 | + <td> |
3220 | + <para style="P13">[[ move_lines.product_id.name_template ]]</para> |
3221 | + </td> |
3222 | + <td> |
3223 | + <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para> |
3224 | + </td> |
3225 | + <td> |
3226 | + <para style="P15">[[ get_units(move_lines) ]]</para> |
3227 | + </td> |
3228 | + <td> |
3229 | + <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para> |
3230 | </td> |
3231 | </tr> |
3232 | </blockTable> |
3233 | @@ -261,119 +269,83 @@ |
3234 | <section> |
3235 | <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para> |
3236 | <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para> |
3237 | - <blockTable colWidths="55.0,229.0,51.0,45.0,45.0,36.0,61.0" style="Table1"> |
3238 | + <blockTable colWidths="55.0,275.0,66.0,35.0,90.0" style="Table1"> |
3239 | <tr> |
3240 | <td> |
3241 | - <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para> |
3242 | - </td> |
3243 | - <td> |
3244 | - <para style="terp_default_9">[[ move_lines.product_id.name_template ]]</para> |
3245 | - </td> |
3246 | - <td> |
3247 | - <para style="terp_default_9">[[ get_packets(move_lines) ]]</para> |
3248 | - </td> |
3249 | - <td> |
3250 | - <para style="terp_default_9">[[ get_units(move_lines) ]]</para> |
3251 | - </td> |
3252 | - <td> |
3253 | - <para style="terp_default_9"> |
3254 | - <font color="white"> </font> |
3255 | - </para> |
3256 | - </td> |
3257 | - <td> |
3258 | - <para style="terp_default_Right_9"> |
3259 | - <font color="white"> </font> |
3260 | - </para> |
3261 | - </td> |
3262 | - <td> |
3263 | - <para style="terp_default_Right_9">[[ move_lines.sale_line_id.price_unit ]]</para> |
3264 | + <para style="P14">[[ move_lines.product_id.default_code ]]</para> |
3265 | + </td> |
3266 | + <td> |
3267 | + <para style="P13">[[ move_lines.product_id.name_template ]]</para> |
3268 | + </td> |
3269 | + <td> |
3270 | + <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para> |
3271 | + </td> |
3272 | + <td> |
3273 | + <para style="P15">[[ get_units(move_lines) ]]</para> |
3274 | + </td> |
3275 | + <td> |
3276 | + <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para> |
3277 | </td> |
3278 | </tr> |
3279 | </blockTable> |
3280 | </section> |
3281 | - <para style="terp_default_9"> |
3282 | - <font color="white"> </font> |
3283 | - </para> |
3284 | - <para style="terp_default_9"> |
3285 | - <font color="white"> </font> |
3286 | - </para> |
3287 | - <para style="terp_default_9"> |
3288 | - <font color="white"> </font> |
3289 | - </para> |
3290 | - <para style="terp_default_9">[[ format(picking.note or '') ]]</para> |
3291 | - <para style="terp_default_9"> |
3292 | - <font color="white"> </font> |
3293 | - </para> |
3294 | - <para style="terp_default_9"> |
3295 | - <font color="white"> </font> |
3296 | - </para> |
3297 | + <para style="P17">-</para> |
3298 | + <blockTable colWidths="538.0" style="Table_notes"> |
3299 | + <tr> |
3300 | + <td> |
3301 | + <para style="P12">[[ format(picking.note or '') ]]</para> |
3302 | + </td> |
3303 | + </tr> |
3304 | + </blockTable> |
3305 | + <para style="P17">-</para> |
3306 | <blockTable colWidths="538.0" style="Table_noga"> |
3307 | <tr> |
3308 | <td> |
3309 | - <para style="P6">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o. !</para> |
3310 | - </td> |
3311 | - </tr> |
3312 | - <tr> |
3313 | - <td> |
3314 | - <para style="P6">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para> |
3315 | - </td> |
3316 | - </tr> |
3317 | - <tr> |
3318 | - <td> |
3319 | - <para style="P7">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> |
3320 | - </td> |
3321 | - </tr> |
3322 | - <tr> |
3323 | - <td> |
3324 | - <para style="P7">Opomba: Kamen in les sta naravna materiala, zato lahko pride do variacij v tonu med vzorcem in končnim proizvodom!</para> |
3325 | - </td> |
3326 | - </tr> |
3327 | - <tr> |
3328 | - <td> |
3329 | - <para style="P6">Skladišče Lesnina na Tržaški 135 v Ljubljani je odprto od 7:00 – 14:00.</para> |
3330 | + <para style="P4">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para> |
3331 | + </td> |
3332 | + </tr> |
3333 | + <tr> |
3334 | + <td> |
3335 | + <para style="P4">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para> |
3336 | + </td> |
3337 | + </tr> |
3338 | + <tr> |
3339 | + <td> |
3340 | + <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> |
3341 | + </td> |
3342 | + </tr> |
3343 | + <tr> |
3344 | + <td> |
3345 | + <para style="P19">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> |
3346 | + </td> |
3347 | + </tr> |
3348 | + <tr> |
3349 | + <td> |
3350 | + <para style="P4">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para> |
3351 | </td> |
3352 | </tr> |
3353 | </blockTable> |
3354 | - <para style="Standard"> |
3355 | - <font color="white"> </font> |
3356 | - </para> |
3357 | - <para style="Standard"> |
3358 | - <font color="white"> </font> |
3359 | - </para> |
3360 | - <para style="Standard"> |
3361 | - <font color="white"> </font> |
3362 | - </para> |
3363 | - <para style="Standard"> |
3364 | - <font color="white"> </font> |
3365 | - </para> |
3366 | - <para style="Standard"> |
3367 | - <font color="white"> </font> |
3368 | - </para> |
3369 | - <para style="Standard"> |
3370 | - <font color="white"> </font> |
3371 | - </para> |
3372 | - <para style="Standard"> |
3373 | - <font color="white"> </font> |
3374 | - </para> |
3375 | - <para style="Standard"> |
3376 | - <font color="white"> </font> |
3377 | - </para> |
3378 | - <para style="Standard"> |
3379 | - <font color="white"> </font> |
3380 | - </para> |
3381 | - <para style="Standard"> |
3382 | - <font color="white"> </font> |
3383 | - </para> |
3384 | - <blockTable colWidths="149.0,179.0,210.0" style="Table_izdal_prejel"> |
3385 | + <para style="P17">-</para> |
3386 | + <para style="P17">-</para> |
3387 | + <para style="P17">-</para> |
3388 | + <para style="P17">-</para> |
3389 | + <para style="P17">-</para> |
3390 | + <para style="P17">-</para> |
3391 | + <para style="P17">-</para> |
3392 | + <para style="P17">-</para> |
3393 | + <para style="P17"> |
3394 | + <font color="white"> </font> |
3395 | + </para> |
3396 | + <blockTable colWidths="189.0,185.0,163.0" style="Table_izdal_prejel"> |
3397 | <tr> |
3398 | <td> |
3399 | - <para style="P3">Issued by: [[ picking.create_uid.name ]]</para> |
3400 | - </td> |
3401 | - <td> |
3402 | - <para style="P3">Received by: ___________________</para> |
3403 | - </td> |
3404 | - <td> |
3405 | - <para style="P3">Place, date: ___________________</para> |
3406 | + <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para> |
3407 | + </td> |
3408 | + <td> |
3409 | + <para style="P5">Received by:</para> |
3410 | + </td> |
3411 | + <td> |
3412 | + <para style="P5">Place, date:</para> |
3413 | </td> |
3414 | </tr> |
3415 | </blockTable> |
3416 | |
3417 | === modified file 'novaqua_reports/report/stock_picking.sxw' |
3418 | Binary files novaqua_reports/report/stock_picking.sxw 2014-01-20 08:10:25 +0000 and novaqua_reports/report/stock_picking.sxw 2014-01-27 12:27:10 +0000 differ |