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