Mentis

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

  1. openerpsl_01_07
  2. Merge into 7.0
Proposed by Matjaz Kalic
Status: Merged
Merged at revision: 292
Proposed branch: lp:~matjaz-6/openerpsl/openerpsl_01_07
Merge into: lp:openerpsl/7.0
Diff against target: 1024 lines (+307/-356)
8 files modified
inovatim_reports/i18n/en_US.po (+2/-2)
inovatim_reports/i18n/inovatim_reports.pot (+1/-1)
inovatim_reports/i18n/sl.po (+2/-2)
inovatim_reports/i18n/sl_SI.po (+4/-4)
inovatim_reports/report/account_print_invoice.rml (+6/-30)
inovatim_reports/report/purchase_order.rml (+65/-75)
inovatim_reports/report/sale_order.rml (+93/-81)
inovatim_reports/report/stock_picking.rml (+134/-161)
To merge this branch: bzr merge lp:~matjaz-6/openerpsl/openerpsl_01_07
Reviewer Review Type Date Requested Status
Mentis Pending
Review via email: mp+202715@code.launchpad.net

Description of the change

[FIX] inovatim_reports (size fixes)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'inovatim_reports/i18n/en_US.po'
--- inovatim_reports/i18n/en_US.po 2014-01-22 16:24:16 +0000
+++ inovatim_reports/i18n/en_US.po 2014-01-22 17:14:42 +0000
@@ -461,8 +461,8 @@
461#: report:stock.picking.list.inovatim:0461#: report:stock.picking.list.inovatim:0
462#: report:stock.picking.list.inovatim.out:0462#: report:stock.picking.list.inovatim.out:0
463#: report:stock.picking.list.inovatim.in:0463#: report:stock.picking.list.inovatim.in:0
464msgid "Price €/unit"464msgid "Price (€) / unit"
465msgstr "Price €/unit"465msgstr "Price (€) / unit"
466466
467#. module: inovatim_reports467#. module: inovatim_reports
468#: report:stock.picking.list.inovatim:0468#: report:stock.picking.list.inovatim:0
469469
=== modified file 'inovatim_reports/i18n/inovatim_reports.pot'
--- inovatim_reports/i18n/inovatim_reports.pot 2014-01-22 16:24:16 +0000
+++ inovatim_reports/i18n/inovatim_reports.pot 2014-01-22 17:14:42 +0000
@@ -461,7 +461,7 @@
461#: report:stock.picking.list.inovatim:0461#: report:stock.picking.list.inovatim:0
462#: report:stock.picking.list.inovatim.out:0462#: report:stock.picking.list.inovatim.out:0
463#: report:stock.picking.list.inovatim.in:0463#: report:stock.picking.list.inovatim.in:0
464msgid "Price €/unit"464msgid "Price (€) / unit"
465msgstr ""465msgstr ""
466466
467#. module: inovatim_reports467#. module: inovatim_reports
468468
=== modified file 'inovatim_reports/i18n/sl.po'
--- inovatim_reports/i18n/sl.po 2014-01-22 16:24:16 +0000
+++ inovatim_reports/i18n/sl.po 2014-01-22 17:14:42 +0000
@@ -461,8 +461,8 @@
461#: report:stock.picking.list.inovatim:0461#: report:stock.picking.list.inovatim:0
462#: report:stock.picking.list.inovatim.out:0462#: report:stock.picking.list.inovatim.out:0
463#: report:stock.picking.list.inovatim.in:0463#: report:stock.picking.list.inovatim.in:0
464msgid "Price €/unit"464msgid "Price (€) / unit"
465msgstr "Cena €/enoto"465msgstr "Cena (€) / enoto"
466466
467#. module: inovatim_reports467#. module: inovatim_reports
468#: report:stock.picking.list.inovatim:0468#: report:stock.picking.list.inovatim:0
469469
=== modified file 'inovatim_reports/i18n/sl_SI.po'
--- inovatim_reports/i18n/sl_SI.po 2014-01-22 16:24:16 +0000
+++ inovatim_reports/i18n/sl_SI.po 2014-01-22 17:14:42 +0000
@@ -461,8 +461,8 @@
461#: report:stock.picking.list.inovatim:0461#: report:stock.picking.list.inovatim:0
462#: report:stock.picking.list.inovatim.out:0462#: report:stock.picking.list.inovatim.out:0
463#: report:stock.picking.list.inovatim.in:0463#: report:stock.picking.list.inovatim.in:0
464msgid "Price €/unit"464msgid "Price (€) / unit"
465msgstr "Cena €/enoto"465msgstr "Cena (€) / enoto"
466466
467#. module: inovatim_reports467#. module: inovatim_reports
468#: report:stock.picking.list.inovatim:0468#: report:stock.picking.list.inovatim:0
@@ -516,5 +516,5 @@
516516
517#. module: inovatim_reports517#. module: inovatim_reports
518#: report:purchase.order.inovatim:0518#: report:purchase.order.inovatim:0
519msgid "Net Price"519msgid "Net Price (€)"
520msgstr "Neto cena"520msgstr "Neto cena (€)"
521521
=== modified file 'inovatim_reports/report/account_print_invoice.rml'
--- inovatim_reports/report/account_print_invoice.rml 2014-01-22 16:24:16 +0000
+++ inovatim_reports/report/account_print_invoice.rml 2014-01-22 17:14:42 +0000
@@ -19,10 +19,6 @@
19 <blockAlignment value="LEFT"/>19 <blockAlignment value="LEFT"/>
20 <blockValign value="TOP"/>20 <blockValign value="TOP"/>
21 </blockTableStyle>21 </blockTableStyle>
22 <blockTableStyle id="Table_naslov">
23 <blockAlignment value="LEFT"/>
24 <blockValign value="TOP"/>
25 </blockTableStyle>
26 <blockTableStyle id="Table_invoice_data">22 <blockTableStyle id="Table_invoice_data">
27 <blockAlignment value="LEFT"/>23 <blockAlignment value="LEFT"/>
28 <blockValign value="TOP"/>24 <blockValign value="TOP"/>
@@ -139,6 +135,7 @@
139 <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>135 <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
140 <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>136 <paraStyle name="P29" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
141 <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>137 <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
138 <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
142 <paraStyle name="Standard" fontName="Helvetica"/>139 <paraStyle name="Standard" fontName="Helvetica"/>
143 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>140 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
144 <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>141 <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -205,31 +202,10 @@
205 <blockTable colWidths="276.0,56.0,198.0" repeatRows="1" style="Table1">202 <blockTable colWidths="276.0,56.0,198.0" repeatRows="1" style="Table1">
206 <tr>203 <tr>
207 <td>204 <td>
208 <blockTable colWidths="269.0" style="Table_naslov">205 <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>
209 <tr>206 <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
210 <td>207 <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
211 <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]]</para>208 <para style="P10">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
212 </td>
213 </tr>
214 <tr>
215 <td>
216 <para style="P10">[[ (o.partner_id.street) or '' ]]</para>
217 </td>
218 </tr>
219 <tr>
220 <td>
221 <para style="P10">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
222 </td>
223 </tr>
224 <tr>
225 <td>
226 <para style="P10">[[ (o.partner_id.country and o.partner_id.country.name != 'Slovenija' and o.partner_id.country.name) ]]</para>
227 </td>
228 </tr>
229 </blockTable>
230 <para style="P20">
231 <font color="white"> </font>
232 </para>
233 </td>209 </td>
234 <td>210 <td>
235 <para style="P8">211 <para style="P8">
@@ -453,7 +429,7 @@
453 </tr>429 </tr>
454 <tr>430 <tr>
455 <td>431 <td>
456 <para style="P4">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>432 <para style="P4">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
457 </td>433 </td>
458 </tr>434 </tr>
459 <tr>435 <tr>
460436
=== modified file 'inovatim_reports/report/account_print_invoice.sxw'
461Binary files inovatim_reports/report/account_print_invoice.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/account_print_invoice.sxw 2014-01-22 17:14:42 +0000 differ437Binary files inovatim_reports/report/account_print_invoice.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/account_print_invoice.sxw 2014-01-22 17:14:42 +0000 differ
=== modified file 'inovatim_reports/report/purchase_order.rml'
--- inovatim_reports/report/purchase_order.rml 2014-01-22 16:24:16 +0000
+++ inovatim_reports/report/purchase_order.rml 2014-01-22 17:14:42 +0000
@@ -98,20 +98,19 @@
98 <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>98 <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
99 <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>99 <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
100 <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>100 <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
101 <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>101 <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
102 <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>102 <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
103 <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>103 <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
104 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>104 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
105 <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>105 <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
106 <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>106 <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
107 <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>107 <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
108 <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>108 <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
109 <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>109 <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
110 <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>110 <paraStyle name="P15" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
111 <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>111 <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
112 <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>112 <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
113 <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>113 <paraStyle name="P18" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
114 <paraStyle name="P19" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
115 <paraStyle name="Standard" fontName="Helvetica"/>114 <paraStyle name="Standard" fontName="Helvetica"/>
116 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>115 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
117 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>116 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -168,16 +167,16 @@
168 <blockTable colWidths="277.0" style="Tableau2">167 <blockTable colWidths="277.0" style="Tableau2">
169 <tr>168 <tr>
170 <td>169 <td>
171 <para style="P6">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>170 <para style="P18">[[ (o.partner_id and o.partner_id.name) or '' ]] </para>
172 <para style="P6">[[ (o.partner_id.street) or '' ]]</para>171 <para style="P18">[[ (o.partner_id.street) or '' ]]</para>
173 <para style="P6">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>172 <para style="P18">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para>
174 <para style="P6">[[ (o.partner_id.country_id.name) or '' ]]</para>173 <para style="P18">[[ (o.partner_id.country_id.name) or '' ]]</para>
175 </td>174 </td>
176 </tr>175 </tr>
177 <tr>176 <tr>
178 <td>177 <td>
179 <para style="P18">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>178 <para style="P18">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para>
180 <para style="P7">Shipping address :</para>179 <para style="P18">Shipping address :</para>
181 <para style="P18">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>180 <para style="P18">[[ (o.dest_address_id and o.dest_address_id.name) or (o.warehouse_id and o.warehouse_id.name) or '']] </para>
182 <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>181 <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>
183 </td>182 </td>
@@ -191,18 +190,18 @@
191 <blockTable colWidths="146.0,111.0" style="Table_order_data">190 <blockTable colWidths="146.0,111.0" style="Table_order_data">
192 <tr>191 <tr>
193 <td>192 <td>
194 <para style="P8">Order Date:</para>193 <para style="P6">Order Date:</para>
195 </td>194 </td>
196 <td>195 <td>
197 <para style="P8">[[formatLang(o.date_order,date=True) ]]</para>196 <para style="P6">[[formatLang(o.date_order,date=True) ]]</para>
198 </td>197 </td>
199 </tr>198 </tr>
200 <tr>199 <tr>
201 <td>200 <td>
202 <para style="P8">Validated By:</para>201 <para style="P6">Validated By:</para>
203 </td>202 </td>
204 <td>203 <td>
205 <para style="P8">[[ (o.validator and o.validator.name) or '' ]]</para>204 <para style="P6">[[ (o.validator and o.validator.name) or '' ]]</para>
206 </td>205 </td>
207 </tr>206 </tr>
208 </blockTable>207 </blockTable>
@@ -248,25 +247,25 @@
248 <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line">247 <blockTable colWidths="64.0,64.0,242.0,48.0,36.0,33.0,47.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
249 <tr>248 <tr>
250 <td>249 <td>
251 <para style="P11">Customer reference</para>250 <para style="P9">Customer reference</para>
252 </td>251 </td>
253 <td>252 <td>
254 <para style="P12">Code</para>253 <para style="P10">Code</para>
255 </td>254 </td>
256 <td>255 <td>
257 <para style="P12">Description</para>256 <para style="P10">Description</para>
258 </td>257 </td>
259 <td>258 <td>
260 <para style="P13">Quantity</para>259 <para style="P11">Quantity</para>
261 </td>260 </td>
262 <td>261 <td>
263 <para style="P13">UM</para>262 <para style="P11">UM</para>
264 </td>263 </td>
265 <td>264 <td>
266 <para style="P14">Unit Price</para>265 <para style="P12">Unit Price</para>
267 </td>266 </td>
268 <td>267 <td>
269 <para style="P14">Net Price (€) </para>268 <para style="P12">Net Price (€) </para>
270 </td>269 </td>
271 </tr>270 </tr>
272 </blockTable>271 </blockTable>
@@ -275,25 +274,25 @@
275 <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content">274 <blockTable colWidths="62.0,65.0,242.0,49.0,36.0,33.0,47.0" style="Table_Order_Pur_line_Content">
276 <tr>275 <tr>
277 <td>276 <td>
278 <para style="P16">[[ line.customer_ref ]]</para>277 <para style="P14">[[ line.customer_ref ]]</para>
279 </td>278 </td>
280 <td>279 <td>
281 <para style="P16">[[ line.product_id.default_code ]]</para>280 <para style="P14">[[ line.product_id.default_code ]]</para>
282 </td>281 </td>
283 <td>282 <td>
284 <para style="P15">[[ line.product_id.name_template ]]</para>283 <para style="P13">[[ line.product_id.name_template ]]</para>
285 </td>284 </td>
286 <td>285 <td>
287 <para style="P9">[[ formatLang(line.product_qty ) ]] </para>286 <para style="P7">[[ formatLang(line.product_qty ) ]] </para>
288 </td>287 </td>
289 <td>288 <td>
290 <para style="P9">[[ line.product_uom.name ]]</para>289 <para style="P7">[[ line.product_uom.name ]]</para>
291 </td>290 </td>
292 <td>291 <td>
293 <para style="P9">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>292 <para style="P7">[[ formatLang(line.price_unit, digits=get_digits(dp='Account') ) ]]</para>
294 </td>293 </td>
295 <td>294 <td>
296 <para style="P9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>295 <para style="P7">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account') ) ]]</para>
297 </td>296 </td>
298 </tr>297 </tr>
299 <tr>298 <tr>
@@ -338,18 +337,18 @@
338 <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail">337 <blockTable colWidths="134.0,400.0" style="Table_All_Total_Detail">
339 <tr>338 <tr>
340 <td>339 <td>
341 <para style="P17">Net Total:</para>340 <para style="P15">Net Total:</para>
342 </td>341 </td>
343 <td>342 <td>
344 <para style="P10">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>343 <para style="P8">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
345 </td>344 </td>
346 </tr>345 </tr>
347 <tr>346 <tr>
348 <td>347 <td>
349 <para style="P17">Taxes:</para>348 <para style="P15">Taxes:</para>
350 </td>349 </td>
351 <td>350 <td>
352 <para style="P10">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>351 <para style="P8">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
353 </td>352 </td>
354 </tr>353 </tr>
355 <tr>354 <tr>
@@ -357,23 +356,14 @@
357 <para style="P5">Total:</para>356 <para style="P5">Total:</para>
358 </td>357 </td>
359 <td>358 <td>
360 <para style="P19">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>359 <para style="P16">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
361 </td>360 </td>
362 </tr>361 </tr>
363 </blockTable>362 </blockTable>
364 <para style="terp_default_8">363 <para style="P17">-</para>
365 <font color="white"> </font>364 <para style="P17">-</para>
366 </para>
367 <para style="terp_default_9">
368 <font color="white"> </font>
369 </para>
370 <para style="terp_default_9">
371 <font color="white"> </font>
372 </para>
373 <para style="terp_default_9">[[ format(o.notes or '') ]]</para>365 <para style="terp_default_9">[[ format(o.notes or '') ]]</para>
374 <para style="terp_default_9">366 <para style="P17">-</para>
375 <font color="white"> </font>
376 </para>
377 <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>367 <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>
378 </story>368 </story>
379</document>369</document>
380370
=== modified file 'inovatim_reports/report/purchase_order.sxw'
381Binary files inovatim_reports/report/purchase_order.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/purchase_order.sxw 2014-01-22 17:14:42 +0000 differ371Binary files inovatim_reports/report/purchase_order.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/purchase_order.sxw 2014-01-22 17:14:42 +0000 differ
=== modified file 'inovatim_reports/report/sale_order.rml'
--- inovatim_reports/report/sale_order.rml 2014-01-22 16:24:16 +0000
+++ inovatim_reports/report/sale_order.rml 2014-01-22 17:14:42 +0000
@@ -104,6 +104,10 @@
104 <blockAlignment value="LEFT"/>104 <blockAlignment value="LEFT"/>
105 <blockValign value="TOP"/>105 <blockValign value="TOP"/>
106 </blockTableStyle>106 </blockTableStyle>
107 <blockTableStyle id="Table_bold">
108 <blockAlignment value="LEFT"/>
109 <blockValign value="TOP"/>
110 </blockTableStyle>
107 <initialize>111 <initialize>
108 <paraStyle name="all" alignment="justify"/>112 <paraStyle name="all" alignment="justify"/>
109 </initialize>113 </initialize>
@@ -118,21 +122,23 @@
118 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>122 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
119 <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>123 <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
120 <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>124 <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
121 <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>125 <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
122 <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>126 <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
123 <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>127 <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
124 <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>128 <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/>
125 <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>129 <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
126 <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>130 <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
127 <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>131 <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
128 <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>132 <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
129 <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>133 <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
130 <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>134 <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
131 <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>135 <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
132 <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>136 <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
133 <paraStyle name="P24" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>137 <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
134 <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>138 <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
135 <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>139 <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
140 <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
141 <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
136 <paraStyle name="Standard" fontName="Helvetica"/>142 <paraStyle name="Standard" fontName="Helvetica"/>
137 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>143 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
138 <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>144 <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -175,13 +181,13 @@
175 <blockTable colWidths="270.0,270.0" style="Table_naslov">181 <blockTable colWidths="270.0,270.0" style="Table_naslov">
176 <tr>182 <tr>
177 <td>183 <td>
178 <para style="P13">184 <para style="P14">
179 <font color="white"> </font>185 <font color="white"> </font>
180 </para>186 </para>
181 </td>187 </td>
182 <td>188 <td>
183 <para style="P14">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>189 <para style="P15">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
184 <para style="P14">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>190 <para style="P15">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
185 </td>191 </td>
186 </tr>192 </tr>
187 </blockTable>193 </blockTable>
@@ -195,14 +201,14 @@
195 <para style="P10">201 <para style="P10">
196 <font color="white"> </font>202 <font color="white"> </font>
197 </para>203 </para>
198 <para style="P16">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>204 <para style="P17">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para>
199 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>205 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para>
200 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>206 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para>
201 <para style="P10">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>207 <para style="P10">[[ (o.partner_id &lt;&gt; o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para>
202 <para style="P10">208 <para style="P10">
203 <font color="white"> </font>209 <font color="white"> </font>
204 </para>210 </para>
205 <para style="P16">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>211 <para style="P17">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para>
206 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>212 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para>
207 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>213 <para style="P10">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para>
208 <para style="P6">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>214 <para style="P6">[[ ((o.partner_id &lt;&gt; o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para>
@@ -264,7 +270,7 @@
264 </td>270 </td>
265 </tr>271 </tr>
266 </blockTable>272 </blockTable>
267 <para style="P13">273 <para style="P14">
268 <font color="white"> </font>274 <font color="white"> </font>
269 </para>275 </para>
270 </td>276 </td>
@@ -282,7 +288,7 @@
282 </para>288 </para>
283 </td>289 </td>
284 <td>290 <td>
285 <para style="P25">291 <para style="P21">
286 <font color="white"> </font>292 <font color="white"> </font>
287 </para>293 </para>
288 </td>294 </td>
@@ -291,34 +297,34 @@
291 <blockTable colWidths="55.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" repeatRows="1" style="Table4">297 <blockTable colWidths="55.0,207.0,38.0,22.0,33.0,33.0,33.0,32.0,27.0,57.0" repeatRows="1" style="Table4">
292 <tr>298 <tr>
293 <td>299 <td>
294 <para style="P20">Code</para>300 <para style="P22">Code</para>
295 </td>301 </td>
296 <td>302 <td>
297 <para style="P20">Description</para>303 <para style="P22">Description</para>
298 </td>304 </td>
299 <td>305 <td>
300 <para style="P22">Quantity</para>306 <para style="P24">Quantity</para>
301 </td>307 </td>
302 <td>308 <td>
303 <para style="P22">UM</para>309 <para style="P24">UM</para>
304 </td>310 </td>
305 <td>311 <td>
306 <para style="P22">Package</para>312 <para style="P24">Package</para>
307 </td>313 </td>
308 <td>314 <td>
309 <para style="P22">LOT</para>315 <para style="P24">LOT</para>
310 </td>316 </td>
311 <td>317 <td>
312 <para style="P22">Unit Price</para>318 <para style="P24">Unit Price</para>
313 </td>319 </td>
314 <td>320 <td>
315 <para style="P22">Disc.</para>321 <para style="P24">Disc.</para>
316 </td>322 </td>
317 <td>323 <td>
318 <para style="P21">Taxes (%)</para>324 <para style="P23">Taxes (%)</para>
319 </td>325 </td>
320 <td>326 <td>
321 <para style="P22">Price (€)</para>327 <para style="P24">Price (€)</para>
322 </td>328 </td>
323 </tr>329 </tr>
324 </blockTable>330 </blockTable>
@@ -333,30 +339,30 @@
333 <para style="P8">[[ line.product_id.name_template ]] </para>339 <para style="P8">[[ line.product_id.name_template ]] </para>
334 </td>340 </td>
335 <td>341 <td>
336 <para style="P17">[[ line.product_uom_qty ]] </para>342 <para style="P18">[[ line.product_uom_qty ]] </para>
337 </td>343 </td>
338 <td>344 <td>
339 <para style="P17">[[ line.product_uom.name ]]</para>345 <para style="P18">[[ line.product_uom.name ]]</para>
340 </td>346 </td>
341 <td>347 <td>
342 <para style="P25">[[ get_packets(line) ]] </para>348 <para style="P21">[[ get_packets(line) ]] </para>
343 </td>349 </td>
344 <td>350 <td>
345 <para style="P17">351 <para style="P18">
346 <font color="white"> </font>352 <font color="white"> </font>
347 </para>353 </para>
348 </td>354 </td>
349 <td>355 <td>
350 <para style="P17">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>356 <para style="P18">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para>
351 </td>357 </td>
352 <td>358 <td>
353 <para style="P18">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>359 <para style="P19">[[ formatLang( (line.product_uos and line.product_uos_qty or line.product_uom_qty)*line.price_unit*line.discount/100 ) ]] </para>
354 </td>360 </td>
355 <td>361 <td>
356 <para style="P23">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>362 <para style="P25">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para>
357 </td>363 </td>
358 <td>364 <td>
359 <para style="P17">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>365 <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para>
360 </td>366 </td>
361 </tr>367 </tr>
362 </blockTable>368 </blockTable>
@@ -367,7 +373,7 @@
367 <para style="P5">Net Total:</para>373 <para style="P5">Net Total:</para>
368 </td>374 </td>
369 <td>375 <td>
370 <para style="P19">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>376 <para style="P20">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para>
371 </td>377 </td>
372 </tr>378 </tr>
373 <tr>379 <tr>
@@ -375,7 +381,7 @@
375 <para style="P5">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>381 <para style="P5">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para>
376 </td>382 </td>
377 <td>383 <td>
378 <para style="P19">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>384 <para style="P20">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para>
379 </td>385 </td>
380 </tr>386 </tr>
381 <tr>387 <tr>
@@ -383,39 +389,45 @@
383 <para style="P5">Taxes :</para>389 <para style="P5">Taxes :</para>
384 </td>390 </td>
385 <td>391 <td>
386 <para style="P19">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>392 <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para>
387 </td>393 </td>
388 </tr>394 </tr>
389 <tr>395 <tr>
390 <td>396 <td>
391 <para style="P15">Total :</para>397 <para style="P16">Total :</para>
392 </td>398 </td>
393 <td>399 <td>
394 <para style="P24">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>400 <para style="P26">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para>
395 </td>401 </td>
396 </tr>402 </tr>
397 </blockTable>403 </blockTable>
398 <para style="P26">-</para>404 <para style="P12">-</para>
399 <blockTable colWidths="539.0" style="Table_dobava">405 <blockTable colWidths="539.0" style="Table_dobava">
400 <tr>406 <tr>
401 <td>407 <td>
402 <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>408 <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para>
403 <para style="P12">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>409 <para style="P13">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para>
404 </td>410 </td>
405 </tr>411 </tr>
406 </blockTable>412 </blockTable>
407 <para style="P26">-</para>413 <para style="P12">-</para>
408 <para style="P26">-</para>414 <para style="P12">-</para>
409 <blockTable colWidths="539.0" style="Table_prosti_opis">415 <blockTable colWidths="539.0" style="Table_prosti_opis">
410 <tr>416 <tr>
411 <td>417 <td>
412 <para style="P11">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Inovatim d.o.o. TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para>418 <para style="P11">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Inovatim d.o.o. TRR: 290000055545161 pri Unicredit Banka Slovenija d.d.</para>
413 <para style="P26">-</para>419 <para style="P12">-</para>
414 <para style="P11">Prevzem je možen na lokaciji podjetja, INOVATIM d.o.o., Koprska ulica 106g, 1000 Ljubljana, od pon-pet, med 8:30 in 16:30 uro, ali v primeru nakupa lesa, v Skladišču Lesnina na Tržaški 135 v Ljubljani od pon-pet, med 7:00 in 14:00 uro.</para>420 <para style="P11">Prevzem je možen na lokaciji podjetja, INOVATIM d.o.o., Koprska ulica 106g, 1000 Ljubljana, od pon-pet, med 8:30 in 16:30 uro, ali v primeru nakupa lesa, v Skladišču Lesnina na Tržaški 135 v Ljubljani od pon-pet, med 7:00 in 14:00 uro.</para>
415 <para style="P26">-</para>421 <para style="P12">-</para>
416 <para style="P11">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med vzorcem in končnim proizvodom, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>422 <para style="P11">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi med vzorcem in končnim proizvodom, v primeru nakupa lesa in lesenih artiklov tudi z odstopanji, ki so opredeljena po smernicah VEH in s tem dopustna. </para>
417 <para style="P26">-</para>423 <para style="P12">-</para>
418 <para style="P11">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>424 </td>
425 </tr>
426 </blockTable>
427 <blockTable colWidths="539.0" style="Table_bold">
428 <tr>
429 <td>
430 <para style="P28">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile ]], [[ o.user_id.email ]]</para>
419 </td>431 </td>
420 </tr>432 </tr>
421 </blockTable>433 </blockTable>
422434
=== modified file 'inovatim_reports/report/sale_order.sxw'
423Binary files inovatim_reports/report/sale_order.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/sale_order.sxw 2014-01-22 17:14:42 +0000 differ435Binary files inovatim_reports/report/sale_order.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/sale_order.sxw 2014-01-22 17:14:42 +0000 differ
=== modified file 'inovatim_reports/report/stock_picking.rml'
--- inovatim_reports/report/stock_picking.rml 2014-01-22 12:58:03 +0000
+++ inovatim_reports/report/stock_picking.rml 2014-01-22 17:14:42 +0000
@@ -95,22 +95,24 @@
95 </initialize>95 </initialize>
96 <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>96 <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
97 <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>97 <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
98 <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>98 <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
99 <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>99 <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
100 <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>100 <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
101 <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>101 <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
102 <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>102 <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
103 <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>103 <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
104 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>104 <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
105 <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>105 <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
106 <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>106 <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
107 <paraStyle name="P12" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>107 <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
108 <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>108 <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
109 <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>109 <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
110 <paraStyle name="P15" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>110 <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
111 <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>111 <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
112 <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>112 <paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
113 <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" spaceBefore="0.0" spaceAfter="6.0"/>113 <paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
114 <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="6.0"/>
115 <paraStyle name="P20" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
114 <paraStyle name="Standard" fontName="Helvetica"/>116 <paraStyle name="Standard" fontName="Helvetica"/>
115 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>117 <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
116 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>118 <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -156,22 +158,22 @@
156 </para>158 </para>
157 </td>159 </td>
158 <td>160 <td>
159 <para style="P4">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>161 <para style="P6">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
160 <para style="P4">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>162 <para style="P6">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
161 <para style="P4">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>163 <para style="P6">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
162 </td>164 </td>
163 </tr>165 </tr>
164 </blockTable>166 </blockTable>
165 <blockTable colWidths="264.0,273.0" style="Table2">167 <blockTable colWidths="264.0,273.0" style="Table2">
166 <tr>168 <tr>
167 <td>169 <td>
168 <para style="P5">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>170 <para style="P16">[[ (picking.type == 'in' or removeParentNode('para')) and '' ]]</para>
169 <para style="P5">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>171 <para style="P16">[[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
170 <para style="P5">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>172 <para style="P16">Warehouse Address: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
171 <para style="P5">[[ picking.partner_id.name ]]</para>173 <para style="P16">[[ picking.partner_id.name ]]</para>
172 <para style="P5">[[ picking.partner_id.street ]]</para>174 <para style="P16">[[ picking.partner_id.street ]]</para>
173 <para style="P5">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>175 <para style="P16">[[ picking.partner_id.zip ]] [[ picking.partner_id.city ]]</para>
174 <para style="P5">[[ picking.partner_id.country_id.name ]]</para>176 <para style="P16">[[ picking.partner_id.country_id.name ]]</para>
175 </td>177 </td>
176 <td>178 <td>
177 <blockTable colWidths="161.0,107.0" style="Table_picking_info">179 <blockTable colWidths="161.0,107.0" style="Table_picking_info">
@@ -224,7 +226,7 @@
224 </td>226 </td>
225 </tr>227 </tr>
226 </blockTable>228 </blockTable>
227 <para style="P6">229 <para style="P7">
228 <font color="white"> </font>230 <font color="white"> </font>
229 </para>231 </para>
230 </td>232 </td>
@@ -236,25 +238,25 @@
236 <blockTable colWidths="53.0,246.0,51.0,28.0,45.0,36.0,59.0" repeatRows="1" style="Move_Line_Header">238 <blockTable colWidths="53.0,246.0,51.0,28.0,45.0,36.0,59.0" repeatRows="1" style="Move_Line_Header">
237 <tr>239 <tr>
238 <td>240 <td>
239 <para style="P8">Code</para>241 <para style="P9">Code</para>
240 </td>242 </td>
241 <td>243 <td>
242 <para style="P8">Description</para>244 <para style="P9">Description</para>
243 </td>245 </td>
244 <td>246 <td>
245 <para style="P8">Quantity</para>247 <para style="P9">Quantity</para>
246 </td>248 </td>
247 <td>249 <td>
248 <para style="P8">UM</para>250 <para style="P9">UM</para>
249 </td>251 </td>
250 <td>252 <td>
251 <para style="P8">Package</para>253 <para style="P9">Package</para>
252 </td>254 </td>
253 <td>255 <td>
254 <para style="P10">LOT</para>256 <para style="P11">LOT</para>
255 </td>257 </td>
256 <td>258 <td>
257 <para style="P9">Price/unit</para>259 <para style="P10">Price (€) / unit</para>
258 </td>260 </td>
259 </tr>261 </tr>
260 </blockTable>262 </blockTable>
@@ -264,29 +266,29 @@
264 <blockTable colWidths="54.0,246.0,51.0,28.0,45.0,36.0,62.0" style="Move_Line_Contect_Assign_State">266 <blockTable colWidths="54.0,246.0,51.0,28.0,45.0,36.0,62.0" style="Move_Line_Contect_Assign_State">
265 <tr>267 <tr>
266 <td>268 <td>
267 <para style="P13">[[ move_lines.product_id.default_code ]]</para>269 <para style="P14">[[ move_lines.product_id.default_code ]]</para>
268 </td>270 </td>
269 <td>271 <td>
270 <para style="P12">[[ move_lines.product_id.name_template ]]</para>272 <para style="P13">[[ move_lines.product_id.name_template ]]</para>
271 </td>273 </td>
272 <td>274 <td>
273 <para style="P14">[[ formatLang(get_packets(move_lines)) ]]</para>275 <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
274 </td>276 </td>
275 <td>277 <td>
276 <para style="P14">[[ get_units(move_lines) ]]</para>278 <para style="P15">[[ get_units(move_lines) ]]</para>
277 </td>279 </td>
278 <td>280 <td>
279 <para style="P12">281 <para style="P13">
280 <font color="white"> </font>282 <font color="white"> </font>
281 </para>283 </para>
282 </td>284 </td>
283 <td>285 <td>
284 <para style="P7">286 <para style="P8">
285 <font color="white"> </font>287 <font color="white"> </font>
286 </para>288 </para>
287 </td>289 </td>
288 <td>290 <td>
289 <para style="P7">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>291 <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
290 </td>292 </td>
291 </tr>293 </tr>
292 </blockTable>294 </blockTable>
@@ -299,119 +301,90 @@
299 <blockTable colWidths="55.0,246.0,50.0,28.0,45.0,36.0,61.0" style="Table1">301 <blockTable colWidths="55.0,246.0,50.0,28.0,45.0,36.0,61.0" style="Table1">
300 <tr>302 <tr>
301 <td>303 <td>
302 <para style="P13">[[ move_lines.product_id.default_code ]]</para>304 <para style="P14">[[ move_lines.product_id.default_code ]]</para>
303 </td>305 </td>
304 <td>306 <td>
305 <para style="P12">[[ move_lines.product_id.name_template ]]</para>307 <para style="P13">[[ move_lines.product_id.name_template ]]</para>
306 </td>308 </td>
307 <td>309 <td>
308 <para style="P14">[[ formatLang(get_packets(move_lines)) ]]</para>310 <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para>
309 </td>311 </td>
310 <td>312 <td>
311 <para style="P14">[[ get_units(move_lines) ]]</para>313 <para style="P15">[[ get_units(move_lines) ]]</para>
312 </td>314 </td>
313 <td>315 <td>
314 <para style="P12">316 <para style="P13">
315 <font color="white"> </font>317 <font color="white"> </font>
316 </para>318 </para>
317 </td>319 </td>
318 <td>320 <td>
319 <para style="P7">321 <para style="P8">
320 <font color="white"> </font>322 <font color="white"> </font>
321 </para>323 </para>
322 </td>324 </td>
323 <td>325 <td>
324 <para style="P7">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>326 <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para>
325 </td>327 </td>
326 </tr>328 </tr>
327 </blockTable>329 </blockTable>
328 </section>330 </section>
329 <para style="terp_default_9">331 <para style="P17">-</para>
330 <font color="white"> </font>
331 </para>
332 <blockTable colWidths="538.0" style="Table_notes">332 <blockTable colWidths="538.0" style="Table_notes">
333 <tr>333 <tr>
334 <td>334 <td>
335 <para style="P11">[[ format(picking.note or '') ]]</para>335 <para style="P12">[[ format(picking.note or '') ]]</para>
336 </td>336 </td>
337 </tr>337 </tr>
338 </blockTable>338 </blockTable>
339 <para style="terp_default_9">339 <para style="P17">-</para>
340 <font color="white"> </font>
341 </para>
342 <blockTable colWidths="538.0" style="Table_noga">340 <blockTable colWidths="538.0" style="Table_noga">
343 <tr>341 <tr>
344 <td>342 <td>
345 <para style="P16">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>343 <para style="P4">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para>
346 </td>344 </td>
347 </tr>345 </tr>
348 <tr>346 <tr>
349 <td>347 <td>
350 <para style="P16">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>348 <para style="P4">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para>
351 </td>349 </td>
352 </tr>350 </tr>
353 <tr>351 <tr>
354 <td>352 <td>
355 <para style="P17">Garancija za dobavljeno blago: 12 mesecev od dneva dobave. Garancija se ne upošteva za blago, ki je že uporabljeno oz. montirano v nasprotju z navodili prodajalca.</para>353 <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>
356 </td>354 </td>
357 </tr>355 </tr>
358 <tr>356 <tr>
359 <td>357 <td>
360 <para style="P18">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>358 <para style="P19">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica">vzorcem</font> in <font face="Helvetica">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para>
361 </td>359 </td>
362 </tr>360 </tr>
363 <tr>361 <tr>
364 <td>362 <td>
365 <para style="P16">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>363 <para style="P4">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para>
366 </td>364 </td>
367 </tr>365 </tr>
368 </blockTable>366 </blockTable>
369 <para style="terp_default_8">367 <para style="P17">-</para>
370 <font color="white"> </font>368 <para style="P17">-</para>
371 </para>369 <para style="P17">-</para>
372 <para style="terp_default_8">370 <para style="P17">-</para>
373 <font color="white"> </font>371 <para style="P17">-</para>
374 </para>372 <para style="P17">-</para>
375 <para style="terp_default_8">373 <para style="P17">-</para>
376 <font color="white"> </font>374 <para style="P17">-</para>
377 </para>375 <para style="P17">
378 <para style="terp_default_8">
379 <font color="white"> </font>
380 </para>
381 <para style="terp_default_8">
382 <font color="white"> </font>
383 </para>
384 <para style="terp_default_8">
385 <font color="white"> </font>
386 </para>
387 <para style="terp_default_8">
388 <font color="white"> </font>
389 </para>
390 <para style="terp_default_8">
391 <font color="white"> </font>
392 </para>
393 <para style="terp_default_8">
394 <font color="white"> </font>
395 </para>
396 <para style="terp_default_8">
397 <font color="white"> </font>
398 </para>
399 <para style="terp_default_8">
400 <font color="white"> </font>
401 </para>
402 <para style="terp_default_8">
403 <font color="white"> </font>376 <font color="white"> </font>
404 </para>377 </para>
405 <blockTable colWidths="189.0,185.0,163.0" style="Table_izdal_prejel">378 <blockTable colWidths="189.0,185.0,163.0" style="Table_izdal_prejel">
406 <tr>379 <tr>
407 <td>380 <td>
408 <para style="P15">Issued by: [[ picking.deliver_id.name ]]</para>381 <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para>
409 </td>382 </td>
410 <td>383 <td>
411 <para style="P3">Received by:</para>384 <para style="P5">Received by:</para>
412 </td>385 </td>
413 <td>386 <td>
414 <para style="P3">Place, date:</para>387 <para style="P5">Place, date:</para>
415 </td>388 </td>
416 </tr>389 </tr>
417 </blockTable>390 </blockTable>
418391
=== modified file 'inovatim_reports/report/stock_picking.sxw'
419Binary files inovatim_reports/report/stock_picking.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/stock_picking.sxw 2014-01-22 17:14:42 +0000 differ392Binary files inovatim_reports/report/stock_picking.sxw 2014-01-22 16:24:16 +0000 and inovatim_reports/report/stock_picking.sxw 2014-01-22 17:14:42 +0000 differ

Subscribers

People subscribed via source and target branches