Merge lp:~matjaz-6/openerpsl/openerpsl_02_17 into lp:openerpsl/7.0
- openerpsl_02_17
- Merge into 7.0
Proposed by
Matjaz Kalic
Status: | Merged |
---|---|
Merged at revision: | 339 |
Proposed branch: | lp:~matjaz-6/openerpsl/openerpsl_02_17 |
Merge into: | lp:openerpsl/7.0 |
Diff against target: |
1042 lines (+382/-313) 9 files modified
novaqua_reports/__init__.py (+1/-0) novaqua_reports/__openerp__.py (+2/-1) novaqua_reports/report/account_print_invoice.rml (+149/-154) novaqua_reports/report/purchase_order.rml (+1/-1) novaqua_reports/report/sale_order.rml (+103/-105) novaqua_reports/report/stock_picking.py (+15/-0) novaqua_reports/report/stock_picking.rml (+60/-52) novaqua_reports/res_partner.py (+34/-0) novaqua_reports/res_partner_view.xml (+17/-0) |
To merge this branch: | bzr merge lp:~matjaz-6/openerpsl/openerpsl_02_17 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mentis | Pending | ||
Review via email:
|
Commit message
Description of the change
[MOD] novaqua_reports
To post a comment you must log in.
- 339. By Dušan Laznik (Mentis)
-
[MOD] novaqua_reports
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'novaqua_reports/__init__.py' | |||
2 | --- novaqua_reports/__init__.py 2014-01-27 12:26:32 +0000 | |||
3 | +++ novaqua_reports/__init__.py 2014-02-25 13:12:03 +0000 | |||
4 | @@ -22,3 +22,4 @@ | |||
5 | 22 | import report | 22 | import report |
6 | 23 | import novaqua_reports | 23 | import novaqua_reports |
7 | 24 | import account_payment_term | 24 | import account_payment_term |
8 | 25 | import res_partner | ||
9 | 25 | 26 | ||
10 | === modified file 'novaqua_reports/__openerp__.py' | |||
11 | --- novaqua_reports/__openerp__.py 2014-01-20 08:10:25 +0000 | |||
12 | +++ novaqua_reports/__openerp__.py 2014-02-25 13:12:03 +0000 | |||
13 | @@ -24,12 +24,13 @@ | |||
14 | 24 | "version": "1.0", | 24 | "version": "1.0", |
15 | 25 | "author": "Mentis d.o.o.", | 25 | "author": "Mentis d.o.o.", |
16 | 26 | "category": "Generic Modules", | 26 | "category": "Generic Modules", |
18 | 27 | "depends": ['sale','purchase','account','stock'], | 27 | "depends": ['base','sale','purchase','account','stock'], |
19 | 28 | "description": """Novaqua Reports - replacing original OpenERP reports. """, | 28 | "description": """Novaqua Reports - replacing original OpenERP reports. """, |
20 | 29 | "init_xml": [], | 29 | "init_xml": [], |
21 | 30 | "update_xml": [ | 30 | "update_xml": [ |
22 | 31 | 'novaqua_reports.xml', | 31 | 'novaqua_reports.xml', |
23 | 32 | 'account_payment_term_view.xml', | 32 | 'account_payment_term_view.xml', |
24 | 33 | 'res_partner_view.xml', | ||
25 | 33 | ], | 34 | ], |
26 | 34 | "demo_xml": [], | 35 | "demo_xml": [], |
27 | 35 | "active": False, | 36 | "active": False, |
28 | 36 | 37 | ||
29 | === modified file 'novaqua_reports/report/account_print_invoice.rml' | |||
30 | --- novaqua_reports/report/account_print_invoice.rml 2014-01-28 11:43:49 +0000 | |||
31 | +++ novaqua_reports/report/account_print_invoice.rml 2014-02-25 13:12:03 +0000 | |||
32 | @@ -106,29 +106,25 @@ | |||
33 | 106 | <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 106 | <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
34 | 107 | <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 107 | <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
35 | 108 | <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 108 | <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
44 | 109 | <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 109 | <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
45 | 110 | <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 110 | <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
46 | 111 | <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 111 | <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
47 | 112 | <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 112 | <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
48 | 113 | <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 113 | <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
49 | 114 | <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 114 | <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
50 | 115 | <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 115 | <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
51 | 116 | <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
52 | 117 | <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 117 | <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
58 | 118 | <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> | 118 | <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
59 | 119 | <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> | 119 | <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
60 | 120 | <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 120 | <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
61 | 121 | <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"/> | 121 | <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
62 | 122 | <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 122 | <paraStyle name="P23" rightIndent="-0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> |
63 | 123 | <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 123 | <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
72 | 124 | <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 124 | <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
73 | 125 | <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 125 | <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
74 | 126 | <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"/> | 126 | <paraStyle name="P27" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
75 | 127 | <paraStyle name="P28" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | 127 | <paraStyle name="P28" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
68 | 128 | <paraStyle name="P29" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/> | ||
69 | 129 | <paraStyle name="P30" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
70 | 130 | <paraStyle name="P31" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
71 | 131 | <paraStyle name="P32" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
76 | 132 | <paraStyle name="Standard" fontName="Helvetica"/> | 128 | <paraStyle name="Standard" fontName="Helvetica"/> |
77 | 133 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 129 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
78 | 134 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 130 | <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
79 | @@ -209,42 +205,42 @@ | |||
80 | 209 | <blockTable colWidths="104.0,87.0" style="Table_invoice_data"> | 205 | <blockTable colWidths="104.0,87.0" style="Table_invoice_data"> |
81 | 210 | <tr> | 206 | <tr> |
82 | 211 | <td> | 207 | <td> |
119 | 212 | <para style="P18">Ljubljana:</para> | 208 | <para style="P19">Ljubljana:</para> |
120 | 213 | </td> | 209 | </td> |
121 | 214 | <td> | 210 | <td> |
122 | 215 | <para style="P18">[[ formatLang(o.date_invoice_creation,date=True) ]]</para> | 211 | <para style="P19">[[ formatLang(o.date_invoice_creation,date=True) ]]</para> |
123 | 216 | </td> | 212 | </td> |
124 | 217 | </tr> | 213 | </tr> |
125 | 218 | <tr> | 214 | <tr> |
126 | 219 | <td> | 215 | <td> |
127 | 220 | <para style="P18">Delivery Date:</para> | 216 | <para style="P19">Delivery Date:</para> |
128 | 221 | </td> | 217 | </td> |
129 | 222 | <td> | 218 | <td> |
130 | 223 | <para style="P18">[[ formatLang(o.date_invoice,date=True) ]]</para> | 219 | <para style="P19">[[ formatLang(o.date_invoice,date=True) ]]</para> |
131 | 224 | </td> | 220 | </td> |
132 | 225 | </tr> | 221 | </tr> |
133 | 226 | <tr> | 222 | <tr> |
134 | 227 | <td> | 223 | <td> |
135 | 228 | <para style="P18">Due Date:</para> | 224 | <para style="P19">Due Date:</para> |
136 | 229 | </td> | 225 | </td> |
137 | 230 | <td> | 226 | <td> |
138 | 231 | <para style="P17">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para> | 227 | <para style="P18">[[ (o.payment_term.date_due_note) or formatLang(o.date_due,date=True) ]] </para> |
139 | 232 | </td> | 228 | </td> |
140 | 233 | </tr> | 229 | </tr> |
141 | 234 | <tr> | 230 | <tr> |
142 | 235 | <td> | 231 | <td> |
143 | 236 | <para style="P18">Payment Term:</para> | 232 | <para style="P19">Payment Term:</para> |
144 | 237 | </td> | 233 | </td> |
145 | 238 | <td> | 234 | <td> |
146 | 239 | <para style="P18">[[ o.payment_term.name ]]</para> | 235 | <para style="P19">[[ o.payment_term.name ]]</para> |
147 | 240 | </td> | 236 | </td> |
148 | 241 | </tr> | 237 | </tr> |
149 | 242 | <tr> | 238 | <tr> |
150 | 243 | <td> | 239 | <td> |
151 | 244 | <para style="P18">Partner phone:</para> | 240 | <para style="P19">Partner phone:</para> |
152 | 245 | </td> | 241 | </td> |
153 | 246 | <td> | 242 | <td> |
154 | 247 | <para style="P18">[[ o.partner_id.mobile or o.partner_id.phone]]</para> | 243 | <para style="P19">[[ o.partner_id.mobile or o.partner_id.phone]]</para> |
155 | 248 | </td> | 244 | </td> |
156 | 249 | </tr> | 245 | </tr> |
157 | 250 | </blockTable> | 246 | </blockTable> |
158 | @@ -275,28 +271,28 @@ | |||
159 | 275 | <blockTable colWidths="49.0,220.0,54.0,36.0,54.0,32.0,27.0,57.0" repeatRows="1" style="Table7"> | 271 | <blockTable colWidths="49.0,220.0,54.0,36.0,54.0,32.0,27.0,57.0" repeatRows="1" style="Table7"> |
160 | 276 | <tr> | 272 | <tr> |
161 | 277 | <td> | 273 | <td> |
184 | 278 | <para style="P21">Code</para> | 274 | <para style="P22">Code</para> |
185 | 279 | </td> | 275 | </td> |
186 | 280 | <td> | 276 | <td> |
187 | 281 | <para style="P21">Description</para> | 277 | <para style="P22">Description</para> |
188 | 282 | </td> | 278 | </td> |
189 | 283 | <td> | 279 | <td> |
190 | 284 | <para style="P23">Quantity</para> | 280 | <para style="P24">Quantity</para> |
191 | 285 | </td> | 281 | </td> |
192 | 286 | <td> | 282 | <td> |
193 | 287 | <para style="P23">UM</para> | 283 | <para style="P24">UM</para> |
194 | 288 | </td> | 284 | </td> |
195 | 289 | <td> | 285 | <td> |
196 | 290 | <para style="P24">Unit Price </para> | 286 | <para style="P25">Unit Price </para> |
197 | 291 | </td> | 287 | </td> |
198 | 292 | <td> | 288 | <td> |
199 | 293 | <para style="P24">Disc.</para> | 289 | <para style="P25">Disc.</para> |
200 | 294 | </td> | 290 | </td> |
201 | 295 | <td> | 291 | <td> |
202 | 296 | <para style="P23">DDV (%)</para> | 292 | <para style="P24">DDV (%)</para> |
203 | 297 | </td> | 293 | </td> |
204 | 298 | <td> | 294 | <td> |
205 | 299 | <para style="P24">Price (EUR)</para> | 295 | <para style="P25">Price (EUR)</para> |
206 | 300 | </td> | 296 | </td> |
207 | 301 | </tr> | 297 | </tr> |
208 | 302 | </blockTable> | 298 | </blockTable> |
209 | @@ -308,25 +304,25 @@ | |||
210 | 308 | <para style="P9">[[ l.product_id.default_code ]]</para> | 304 | <para style="P9">[[ l.product_id.default_code ]]</para> |
211 | 309 | </td> | 305 | </td> |
212 | 310 | <td> | 306 | <td> |
232 | 311 | <para style="P8">[[ l.product_id.name_template ]]</para> | 307 | <para style="P8">[[ l.name ]]</para> |
233 | 312 | </td> | 308 | </td> |
234 | 313 | <td> | 309 | <td> |
235 | 314 | <para style="P15">[[ formatLang(get_uom_qty(l)) ]] </para> | 310 | <para style="P16">[[ formatLang(get_uom_qty(l)) ]] </para> |
236 | 315 | </td> | 311 | </td> |
237 | 316 | <td> | 312 | <td> |
238 | 317 | <para style="P14">[[ get_units(l) ]] </para> | 313 | <para style="P15">[[ get_units(l) ]] </para> |
239 | 318 | </td> | 314 | </td> |
240 | 319 | <td> | 315 | <td> |
241 | 320 | <para style="P15">[[ formatLang(l.price_unit) ]]</para> | 316 | <para style="P16">[[ formatLang(l.price_unit) ]]</para> |
242 | 321 | </td> | 317 | </td> |
243 | 322 | <td> | 318 | <td> |
244 | 323 | <para style="P14">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para> | 319 | <para style="P15">[[ formatLang(l.quantity*l.price_unit*l.discount/100, digits=get_digits(dp='Account')) ]]</para> |
245 | 324 | </td> | 320 | </td> |
246 | 325 | <td> | 321 | <td> |
247 | 326 | <para style="P26">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para> | 322 | <para style="P27">[[ ', '.join([ formatLang(lt.amount*100, digits=get_digits(dp='Account')) or '' for lt in l.invoice_line_tax_id ]) ]]</para> |
248 | 327 | </td> | 323 | </td> |
249 | 328 | <td> | 324 | <td> |
250 | 329 | <para style="P13">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para> | 325 | <para style="P14">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
251 | 330 | </td> | 326 | </td> |
252 | 331 | </tr> | 327 | </tr> |
253 | 332 | </blockTable> | 328 | </blockTable> |
254 | @@ -334,38 +330,38 @@ | |||
255 | 334 | <blockTable colWidths="280.0,248.0" style="Table10"> | 330 | <blockTable colWidths="280.0,248.0" style="Table10"> |
256 | 335 | <tr> | 331 | <tr> |
257 | 336 | <td> | 332 | <td> |
286 | 337 | <para style="P10">Net Total:</para> | 333 | <para style="P11">Net Total:</para> |
287 | 338 | </td> | 334 | </td> |
288 | 339 | <td> | 335 | <td> |
289 | 340 | <para style="P12">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para> | 336 | <para style="P13">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para> |
290 | 341 | </td> | 337 | </td> |
291 | 342 | </tr> | 338 | </tr> |
292 | 343 | <tr> | 339 | <tr> |
293 | 344 | <td> | 340 | <td> |
294 | 345 | <para style="P10">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> | 341 | <para style="P11">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> |
295 | 346 | </td> | 342 | </td> |
296 | 347 | <td> | 343 | <td> |
297 | 348 | <para style="P12">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para> | 344 | <para style="P13">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para> |
298 | 349 | </td> | 345 | </td> |
299 | 350 | </tr> | 346 | </tr> |
300 | 351 | <tr> | 347 | <tr> |
301 | 352 | <td> | 348 | <td> |
302 | 353 | <para style="P25">Taxes:</para> | 349 | <para style="P26">Taxes:</para> |
303 | 354 | </td> | 350 | </td> |
304 | 355 | <td> | 351 | <td> |
305 | 356 | <para style="P12">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para> | 352 | <para style="P13">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]]</para> |
306 | 357 | </td> | 353 | </td> |
307 | 358 | </tr> | 354 | </tr> |
308 | 359 | <tr> | 355 | <tr> |
309 | 360 | <td> | 356 | <td> |
310 | 361 | <para style="P22">Total:</para> | 357 | <para style="P23">Total:</para> |
311 | 362 | </td> | 358 | </td> |
312 | 363 | <td> | 359 | <td> |
313 | 364 | <para style="P27">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para> | 360 | <para style="P28">[[ formatLang(o.amount_total, digits=get_digits(dp='Account'), grouping=True) ]]</para> |
314 | 365 | </td> | 361 | </td> |
315 | 366 | </tr> | 362 | </tr> |
316 | 367 | </blockTable> | 363 | </blockTable> |
318 | 368 | <para style="P19">-</para> | 364 | <para style="P20">-</para> |
319 | 369 | <blockTable colWidths="355.0,175.0" style="Table_teža"> | 365 | <blockTable colWidths="355.0,175.0" style="Table_teža"> |
320 | 370 | <tr> | 366 | <tr> |
321 | 371 | <td> | 367 | <td> |
322 | @@ -373,18 +369,18 @@ | |||
323 | 373 | <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> | 369 | <para style="terp_default_8">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> |
324 | 374 | </td> | 370 | </td> |
325 | 375 | <td> | 371 | <td> |
327 | 376 | <para style="P16"> | 372 | <para style="P17"> |
328 | 377 | <font color="white"> </font> | 373 | <font color="white"> </font> |
329 | 378 | </para> | 374 | </para> |
330 | 379 | </td> | 375 | </td> |
331 | 380 | </tr> | 376 | </tr> |
332 | 381 | </blockTable> | 377 | </blockTable> |
334 | 382 | <para style="P19">-</para> | 378 | <para style="P20">-</para> |
335 | 383 | <blockTable colWidths="530.0" style="Table_notes"> | 379 | <blockTable colWidths="530.0" style="Table_notes"> |
336 | 384 | <tr> | 380 | <tr> |
337 | 385 | <td> | 381 | <td> |
340 | 386 | <para style="P10">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para> | 382 | <para style="P11">[[ (o.comment and format(o.comment )) or removeParentNode('blockTable') ]]</para> |
341 | 387 | <para style="P10"> | 383 | <para style="P11"> |
342 | 388 | <font color="white"> </font> | 384 | <font color="white"> </font> |
343 | 389 | </para> | 385 | </para> |
344 | 390 | </td> | 386 | </td> |
345 | @@ -393,23 +389,22 @@ | |||
346 | 393 | <blockTable colWidths="530.0" style="Table_noga"> | 389 | <blockTable colWidths="530.0" style="Table_noga"> |
347 | 394 | <tr> | 390 | <tr> |
348 | 395 | <td> | 391 | <td> |
366 | 396 | <para style="P8">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o. | 392 | <para style="P8">Do popolnega plačila računa ostaja blago last podjetja NOVAQUA d.o.o. Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para> |
367 | 397 | Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para> | 393 | </td> |
368 | 398 | </td> | 394 | </tr> |
369 | 399 | </tr> | 395 | <tr> |
370 | 400 | <tr> | 396 | <td> |
371 | 401 | <td> | 397 | <para style="P10">Garancija:</para> |
372 | 402 | <para style="P31">Garancija:</para> | 398 | </td> |
373 | 403 | </td> | 399 | </tr> |
374 | 404 | </tr> | 400 | <tr> |
375 | 405 | <tr> | 401 | <td> |
376 | 406 | <td> | 402 | <para style="P10"><font face="Helvetica">12 mesecev</font> na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih 14 dni.</para> |
377 | 407 | <para style="P31"><u>12 mesecev</u> na elektrotehniko, za bazenske črpalke se upošteva ob dokazilu, da so kartuše bile redno zamenjane vsakih 14 dni.</para> | 403 | </td> |
378 | 408 | </td> | 404 | </tr> |
379 | 409 | </tr> | 405 | <tr> |
380 | 410 | <tr> | 406 | <td> |
381 | 411 | <td> | 407 | <para style="P10"><font face="Helvetica">3 mesece</font> na bazensko folijo, napihljive blazine in ostali program.</para> |
365 | 412 | <para style="P31"><u>3 mesece</u> na bazensko folijo, napihljive blazine in ostali program.</para> | ||
382 | 413 | </td> | 408 | </td> |
383 | 414 | </tr> | 409 | </tr> |
384 | 415 | <tr> | 410 | <tr> |
385 | @@ -418,11 +413,11 @@ | |||
386 | 418 | </td> | 413 | </td> |
387 | 419 | </tr> | 414 | </tr> |
388 | 420 | </blockTable> | 415 | </blockTable> |
394 | 421 | <para style="P20">-</para> | 416 | <para style="P21">-</para> |
395 | 422 | <para style="P20">-</para> | 417 | <para style="P21">-</para> |
396 | 423 | <para style="P20">-</para> | 418 | <para style="P21">-</para> |
397 | 424 | <para style="P20">-</para> | 419 | <para style="P21">-</para> |
398 | 425 | <para style="P20">-</para> | 420 | <para style="P21">-</para> |
399 | 426 | <blockTable colWidths="293.0,96.0,135.0" style="Fakturiral"> | 421 | <blockTable colWidths="293.0,96.0,135.0" style="Fakturiral"> |
400 | 427 | <tr> | 422 | <tr> |
401 | 428 | <td> | 423 | <td> |
402 | @@ -434,7 +429,7 @@ | |||
403 | 434 | <para style="P2">Invoice issued by:</para> | 429 | <para style="P2">Invoice issued by:</para> |
404 | 435 | </td> | 430 | </td> |
405 | 436 | <td> | 431 | <td> |
407 | 437 | <para style="P11">[[ o.user_id.name ]]</para> | 432 | <para style="P12">[[ o.user_id.name ]]</para> |
408 | 438 | </td> | 433 | </td> |
409 | 439 | </tr> | 434 | </tr> |
410 | 440 | </blockTable> | 435 | </blockTable> |
411 | 441 | 436 | ||
412 | === modified file 'novaqua_reports/report/account_print_invoice.sxw' | |||
413 | 442 | Binary files novaqua_reports/report/account_print_invoice.sxw 2014-01-28 11:43:49 +0000 and novaqua_reports/report/account_print_invoice.sxw 2014-02-25 13:12:03 +0000 differ | 437 | Binary files novaqua_reports/report/account_print_invoice.sxw 2014-01-28 11:43:49 +0000 and novaqua_reports/report/account_print_invoice.sxw 2014-02-25 13:12:03 +0000 differ |
414 | === modified file 'novaqua_reports/report/purchase_order.rml' | |||
415 | --- novaqua_reports/report/purchase_order.rml 2014-01-27 12:26:32 +0000 | |||
416 | +++ novaqua_reports/report/purchase_order.rml 2014-02-25 13:12:03 +0000 | |||
417 | @@ -273,7 +273,7 @@ | |||
418 | 273 | <para style="P15">[[ line.product_id.default_code ]]</para> | 273 | <para style="P15">[[ line.product_id.default_code ]]</para> |
419 | 274 | </td> | 274 | </td> |
420 | 275 | <td> | 275 | <td> |
422 | 276 | <para style="P14">[[ line.product_id.name_template ]]</para> | 276 | <para style="P14">[[ line.name ]]</para> |
423 | 277 | </td> | 277 | </td> |
424 | 278 | <td> | 278 | <td> |
425 | 279 | <para style="P8">[[ formatLang(line.product_qty ) ]] </para> | 279 | <para style="P8">[[ formatLang(line.product_qty ) ]] </para> |
426 | 280 | 280 | ||
427 | === modified file 'novaqua_reports/report/purchase_order.sxw' | |||
428 | 281 | Binary files novaqua_reports/report/purchase_order.sxw 2014-01-27 12:26:32 +0000 and novaqua_reports/report/purchase_order.sxw 2014-02-25 13:12:03 +0000 differ | 281 | Binary files novaqua_reports/report/purchase_order.sxw 2014-01-27 12:26:32 +0000 and novaqua_reports/report/purchase_order.sxw 2014-02-25 13:12:03 +0000 differ |
429 | === modified file 'novaqua_reports/report/sale_order.rml' | |||
430 | --- novaqua_reports/report/sale_order.rml 2014-01-28 11:43:49 +0000 | |||
431 | +++ novaqua_reports/report/sale_order.rml 2014-02-25 13:12:03 +0000 | |||
432 | @@ -105,30 +105,28 @@ | |||
433 | 105 | <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 105 | <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
434 | 106 | <paraStyle name="P3" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 106 | <paraStyle name="P3" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
435 | 107 | <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 107 | <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
460 | 108 | <paraStyle name="P5" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 108 | <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
461 | 109 | <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 109 | <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
462 | 110 | <paraStyle name="P7" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 110 | <paraStyle name="P7" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
463 | 111 | <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 111 | <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
464 | 112 | <paraStyle name="P9" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 112 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
465 | 113 | <paraStyle name="P10" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> | 113 | <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
466 | 114 | <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> | 114 | <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
467 | 115 | <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> | 115 | <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
468 | 116 | <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 116 | <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
469 | 117 | <paraStyle name="P14" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 117 | <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> |
470 | 118 | <paraStyle name="P15" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 118 | <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> |
471 | 119 | <paraStyle name="P16" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 119 | <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
472 | 120 | <paraStyle name="P17" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 120 | <paraStyle name="P17" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
473 | 121 | <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 121 | <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
474 | 122 | <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 122 | <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
475 | 123 | <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 123 | <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
476 | 124 | <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 124 | <paraStyle name="P21" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
477 | 125 | <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 125 | <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
478 | 126 | <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 126 | <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
479 | 127 | <paraStyle name="P24" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> | 127 | <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
480 | 128 | <paraStyle name="P25" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 128 | <paraStyle name="P25" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
481 | 129 | <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 129 | <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
458 | 130 | <paraStyle name="P27" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
459 | 131 | <paraStyle name="P28" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
482 | 132 | <paraStyle name="Standard" fontName="Helvetica"/> | 130 | <paraStyle name="Standard" fontName="Helvetica"/> |
483 | 133 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> | 131 | <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> |
484 | 134 | <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/> | 132 | <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/> |
485 | @@ -171,37 +169,37 @@ | |||
486 | 171 | <blockTable colWidths="270.0,270.0" style="Table_naslov"> | 169 | <blockTable colWidths="270.0,270.0" style="Table_naslov"> |
487 | 172 | <tr> | 170 | <tr> |
488 | 173 | <td> | 171 | <td> |
490 | 174 | <para style="P11"> | 172 | <para style="P14"> |
491 | 175 | <font color="white"> </font> | 173 | <font color="white"> </font> |
492 | 176 | </para> | 174 | </para> |
493 | 177 | </td> | 175 | </td> |
494 | 178 | <td> | 176 | <td> |
497 | 179 | <para style="P12">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para> | 177 | <para style="P15">[[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para> |
498 | 180 | <para style="P12">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para> | 178 | <para style="P15">[[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]</para> |
499 | 181 | </td> | 179 | </td> |
500 | 182 | </tr> | 180 | </tr> |
501 | 183 | </blockTable> | 181 | </blockTable> |
502 | 184 | <blockTable colWidths="264.0,276.0" style="Table_customer_data"> | 182 | <blockTable colWidths="264.0,276.0" style="Table_customer_data"> |
503 | 185 | <tr> | 183 | <tr> |
504 | 186 | <td> | 184 | <td> |
523 | 187 | <para style="P9">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> | 185 | <para style="P11">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
524 | 188 | <para style="P9">[[ (o.partner_id.street) or '' ]]</para> | 186 | <para style="P11">[[ (o.partner_id.street) or '' ]]</para> |
525 | 189 | <para style="P9">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> | 187 | <para style="P11">[[ (o.partner_id.zip) or '' ]] [[ (o.partner_id.city) or '' ]]</para> |
526 | 190 | <para style="P9">[[ (o.partner_id.country_id.name) or '' ]]</para> | 188 | <para style="P11">[[ (o.partner_id.country_id.name) or '' ]]</para> |
527 | 191 | <para style="P9"> | 189 | <para style="P11"> |
528 | 192 | <font color="white"> </font> | 190 | <font color="white"> </font> |
529 | 193 | </para> | 191 | </para> |
530 | 194 | <para style="P14">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para> | 192 | <para style="P17">[[ (o.partner_id == o.partner_shipping_id) and removeParentNode('para') ]] Shipping address :</para> |
531 | 195 | <para style="P9">[[ ((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> | 193 | <para style="P11">[[ ((o.partner_id <> o.partner_shipping_id) and (o.partner_shipping_id and o.partner_id.title and o.partner_shipping_id.title.name)) or removeParentNode('para') ]]</para> |
532 | 196 | <para style="P9">[[ ((o.partner_id <> o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para> | 194 | <para style="P11">[[ ((o.partner_id <> o.partner_shipping_id) and o.partner_shipping_id and o.partner_shipping_id.name) or removeParentNode('para') ]] </para> |
533 | 197 | <para style="P9">[[ (o.partner_id <> o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para> | 195 | <para style="P11">[[ (o.partner_id <> o.partner_shipping_id) and (o.partner_shipping_id and display_address(o.partner_shipping_id)) or removeParentNode('para') ]]</para> |
534 | 198 | <para style="P9"> | 196 | <para style="P11"> |
535 | 199 | <font color="white"> </font> | 197 | <font color="white"> </font> |
536 | 200 | </para> | 198 | </para> |
537 | 201 | <para style="P14">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para> | 199 | <para style="P17">[[ o.partner_id == o.partner_invoice_id and removeParentNode('para') ]] Invoice address :</para> |
538 | 202 | <para style="P9">[[ ((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> | 200 | <para style="P11">[[ ((o.partner_id <> o.partner_invoice_id) and (o.partner_invoice_id and o.partner_id.title and o.partner_invoice_id.title.name)) or removeParentNode('para') ]]</para> |
539 | 203 | <para style="P9">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para> | 201 | <para style="P11">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and o.partner_invoice_id.name) or removeParentNode('para') ]]</para> |
540 | 204 | <para style="P5">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para> | 202 | <para style="P7">[[ ((o.partner_id <> o.partner_invoice_id) and o.partner_invoice_id and display_address(o.partner_invoice_id)) or removeParentNode('para') ]]</para> |
541 | 205 | </td> | 203 | </td> |
542 | 206 | <td> | 204 | <td> |
543 | 207 | <blockTable colWidths="126.0,144.0" style="Table_order_inf"> | 205 | <blockTable colWidths="126.0,144.0" style="Table_order_inf"> |
544 | @@ -210,7 +208,7 @@ | |||
545 | 210 | <para style="P2">Ljubljana,</para> | 208 | <para style="P2">Ljubljana,</para> |
546 | 211 | </td> | 209 | </td> |
547 | 212 | <td> | 210 | <td> |
549 | 213 | <para style="P6">[[ formatLang(o.date_order, date = True) ]]</para> | 211 | <para style="P8">[[ formatLang(o.date_order, date = True) ]]</para> |
550 | 214 | </td> | 212 | </td> |
551 | 215 | </tr> | 213 | </tr> |
552 | 216 | <tr> | 214 | <tr> |
553 | @@ -218,7 +216,7 @@ | |||
554 | 218 | <para style="P2">Expiration date:</para> | 216 | <para style="P2">Expiration date:</para> |
555 | 219 | </td> | 217 | </td> |
556 | 220 | <td> | 218 | <td> |
558 | 221 | <para style="P6"> | 219 | <para style="P8"> |
559 | 222 | <font color="white"> </font> | 220 | <font color="white"> </font> |
560 | 223 | </para> | 221 | </para> |
561 | 224 | </td> | 222 | </td> |
562 | @@ -260,7 +258,7 @@ | |||
563 | 260 | </td> | 258 | </td> |
564 | 261 | </tr> | 259 | </tr> |
565 | 262 | </blockTable> | 260 | </blockTable> |
567 | 263 | <para style="P11"> | 261 | <para style="P14"> |
568 | 264 | <font color="white"> </font> | 262 | <font color="white"> </font> |
569 | 265 | </para> | 263 | </para> |
570 | 266 | </td> | 264 | </td> |
571 | @@ -278,7 +276,7 @@ | |||
572 | 278 | </para> | 276 | </para> |
573 | 279 | </td> | 277 | </td> |
574 | 280 | <td> | 278 | <td> |
576 | 281 | <para style="P18"> | 279 | <para style="P21"> |
577 | 282 | <font color="white"> </font> | 280 | <font color="white"> </font> |
578 | 283 | </para> | 281 | </para> |
579 | 284 | </td> | 282 | </td> |
580 | @@ -287,28 +285,28 @@ | |||
581 | 287 | <blockTable colWidths="55.0,216.0,58.0,34.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4"> | 285 | <blockTable colWidths="55.0,216.0,58.0,34.0,57.0,32.0,27.0,57.0" repeatRows="1" style="Table4"> |
582 | 288 | <tr> | 286 | <tr> |
583 | 289 | <td> | 287 | <td> |
606 | 290 | <para style="P19">Code</para> | 288 | <para style="P22">Code</para> |
607 | 291 | </td> | 289 | </td> |
608 | 292 | <td> | 290 | <td> |
609 | 293 | <para style="P19">Description</para> | 291 | <para style="P22">Description</para> |
610 | 294 | </td> | 292 | </td> |
611 | 295 | <td> | 293 | <td> |
612 | 296 | <para style="P21">Quantity</para> | 294 | <para style="P24">Quantity</para> |
613 | 297 | </td> | 295 | </td> |
614 | 298 | <td> | 296 | <td> |
615 | 299 | <para style="P21">UM</para> | 297 | <para style="P24">UM</para> |
616 | 300 | </td> | 298 | </td> |
617 | 301 | <td> | 299 | <td> |
618 | 302 | <para style="P21">Unit Price</para> | 300 | <para style="P24">Unit Price</para> |
619 | 303 | </td> | 301 | </td> |
620 | 304 | <td> | 302 | <td> |
621 | 305 | <para style="P21">Disc.</para> | 303 | <para style="P24">Disc.</para> |
622 | 306 | </td> | 304 | </td> |
623 | 307 | <td> | 305 | <td> |
624 | 308 | <para style="P20">Taxes (%)</para> | 306 | <para style="P23">Taxes (%)</para> |
625 | 309 | </td> | 307 | </td> |
626 | 310 | <td> | 308 | <td> |
627 | 311 | <para style="P21">Price (€)</para> | 309 | <para style="P24">Price (€)</para> |
628 | 312 | </td> | 310 | </td> |
629 | 313 | </tr> | 311 | </tr> |
630 | 314 | </blockTable> | 312 | </blockTable> |
631 | @@ -317,28 +315,28 @@ | |||
632 | 317 | <blockTable colWidths="56.0,216.0,58.0,34.0,58.0,32.0,28.0,54.0" style="Table5"> | 315 | <blockTable colWidths="56.0,216.0,58.0,34.0,58.0,32.0,28.0,54.0" style="Table5"> |
633 | 318 | <tr> | 316 | <tr> |
634 | 319 | <td> | 317 | <td> |
657 | 320 | <para style="P8">[[ line.product_id.default_code ]]</para> | 318 | <para style="P10">[[ line.product_id.default_code ]]</para> |
658 | 321 | </td> | 319 | </td> |
659 | 322 | <td> | 320 | <td> |
660 | 323 | <para style="P7">[[ line.product_id.name_template ]] </para> | 321 | <para style="P9">[[ line.name ]] </para> |
661 | 324 | </td> | 322 | </td> |
662 | 325 | <td> | 323 | <td> |
663 | 326 | <para style="P15">[[ line.product_uom_qty ]] </para> | 324 | <para style="P18">[[ line.product_uom_qty ]] </para> |
664 | 327 | </td> | 325 | </td> |
665 | 328 | <td> | 326 | <td> |
666 | 329 | <para style="P15">[[ line.product_uom.name ]]</para> | 327 | <para style="P18">[[ line.product_uom.name ]]</para> |
667 | 330 | </td> | 328 | </td> |
668 | 331 | <td> | 329 | <td> |
669 | 332 | <para style="P15">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para> | 330 | <para style="P18">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price')) ]]</para> |
670 | 333 | </td> | 331 | </td> |
671 | 334 | <td> | 332 | <td> |
672 | 335 | <para style="P16">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para> | 333 | <para style="P19">[[ formatLang( line.product_uom_qty*line.price_unit*line.discount/100 ) ]] </para> |
673 | 336 | </td> | 334 | </td> |
674 | 337 | <td> | 335 | <td> |
675 | 338 | <para style="P22">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para> | 336 | <para style="P25">[[ ', '.join(map(lambda x: formatLang( x.amount*100, digits=get_digits(dp='Account')), line.tax_id)) ]]</para> |
676 | 339 | </td> | 337 | </td> |
677 | 340 | <td> | 338 | <td> |
678 | 341 | <para style="P15">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para> | 339 | <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
679 | 342 | </td> | 340 | </td> |
680 | 343 | </tr> | 341 | </tr> |
681 | 344 | </blockTable> | 342 | </blockTable> |
682 | @@ -349,7 +347,7 @@ | |||
683 | 349 | <para style="P4">Net Total:</para> | 347 | <para style="P4">Net Total:</para> |
684 | 350 | </td> | 348 | </td> |
685 | 351 | <td> | 349 | <td> |
687 | 352 | <para style="P17">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para> | 350 | <para style="P20">[[ formatLang(get_total_net(o) , digits=get_digits(dp='Account')) ]]</para> |
688 | 353 | </td> | 351 | </td> |
689 | 354 | </tr> | 352 | </tr> |
690 | 355 | <tr> | 353 | <tr> |
691 | @@ -357,7 +355,7 @@ | |||
692 | 357 | <para style="P4">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> | 355 | <para style="P4">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> |
693 | 358 | </td> | 356 | </td> |
694 | 359 | <td> | 357 | <td> |
696 | 360 | <para style="P17">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para> | 358 | <para style="P20">[[ formatLang(get_total_discount(o) , digits=get_digits(dp='Account')) ]]</para> |
697 | 361 | </td> | 359 | </td> |
698 | 362 | </tr> | 360 | </tr> |
699 | 363 | <tr> | 361 | <tr> |
700 | @@ -365,45 +363,45 @@ | |||
701 | 365 | <para style="P4">Taxes :</para> | 363 | <para style="P4">Taxes :</para> |
702 | 366 | </td> | 364 | </td> |
703 | 367 | <td> | 365 | <td> |
705 | 368 | <para style="P17">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para> | 366 | <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para> |
706 | 369 | </td> | 367 | </td> |
707 | 370 | </tr> | 368 | </tr> |
708 | 371 | <tr> | 369 | <tr> |
709 | 372 | <td> | 370 | <td> |
711 | 373 | <para style="P13">Total :</para> | 371 | <para style="P16">Total :</para> |
712 | 374 | </td> | 372 | </td> |
713 | 375 | <td> | 373 | <td> |
715 | 376 | <para style="P23">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para> | 374 | <para style="P26">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para> |
716 | 377 | </td> | 375 | </td> |
717 | 378 | </tr> | 376 | </tr> |
718 | 379 | </blockTable> | 377 | </blockTable> |
720 | 380 | <para style="P10">-</para> | 378 | <para style="P12">-</para> |
721 | 381 | <blockTable colWidths="539.0" style="Table_dobava"> | 379 | <blockTable colWidths="539.0" style="Table_dobava"> |
722 | 382 | <tr> | 380 | <tr> |
723 | 383 | <td> | 381 | <td> |
724 | 384 | <para style="P4">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para> | 382 | <para style="P4">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para> |
726 | 385 | <para style="P11">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> | 383 | <para style="P14">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> |
727 | 386 | </td> | 384 | </td> |
728 | 387 | </tr> | 385 | </tr> |
729 | 388 | </blockTable> | 386 | </blockTable> |
732 | 389 | <para style="P10">-</para> | 387 | <para style="P12">-</para> |
733 | 390 | <para style="P10">-</para> | 388 | <para style="P12">-</para> |
734 | 391 | <blockTable colWidths="539.0" style="Table_prosti_opis"> | 389 | <blockTable colWidths="539.0" style="Table_prosti_opis"> |
735 | 392 | <tr> | 390 | <tr> |
736 | 393 | <td> | 391 | <td> |
738 | 394 | <para style="P28">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d., oziroma izvedeno plačilo po pogojih plačevanja, predstavljenih v Splošnih prodajnih pogojih na www.bazeni24.si.</para> | 392 | <para style="P13">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d., oziroma izvedeno plačilo po pogojih plačevanja, predstavljenih v Splošnih prodajnih pogojih na www.bazeni24.si.</para> |
739 | 395 | </td> | 393 | </td> |
740 | 396 | </tr> | 394 | </tr> |
741 | 397 | </blockTable> | 395 | </blockTable> |
742 | 398 | <blockTable colWidths="539.0" style="Table_bold"> | 396 | <blockTable colWidths="539.0" style="Table_bold"> |
743 | 399 | <tr> | 397 | <tr> |
744 | 400 | <td> | 398 | <td> |
746 | 401 | <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 artiklov od fizičnih vzorcev ali predstavljenih artiklov na sliki na spletni strani www.bazeni24.si</para> | 399 | <para style="P5">S potrditvijo ponudbe kupec hkrati potrjuje, da je bil v celoti seznanjen s pogoji poslovanja in morebitnimi odstopanji v dimenziji, strukturi in barvi artiklov od fizičnih vzorcev ali predstavljenih artiklov na sliki na spletni strani www.bazeni24.si</para> |
747 | 402 | </td> | 400 | </td> |
748 | 403 | </tr> | 401 | </tr> |
749 | 404 | <tr> | 402 | <tr> |
750 | 405 | <td> | 403 | <td> |
752 | 406 | <para style="P26">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone]], [[ o.user_id.email ]]</para> | 404 | <para style="P6">Za več informacij pokličite vašo kontaktno osebo: [[ o.user_id.name ]], [[ o.user_id.partner_id.mobile or o.user_id.partner_id.phone]], [[ o.user_id.email ]]</para> |
753 | 407 | </td> | 405 | </td> |
754 | 408 | </tr> | 406 | </tr> |
755 | 409 | </blockTable> | 407 | </blockTable> |
756 | 410 | 408 | ||
757 | === modified file 'novaqua_reports/report/sale_order.sxw' | |||
758 | 411 | Binary files novaqua_reports/report/sale_order.sxw 2014-01-28 11:43:49 +0000 and novaqua_reports/report/sale_order.sxw 2014-02-25 13:12:03 +0000 differ | 409 | Binary files novaqua_reports/report/sale_order.sxw 2014-01-28 11:43:49 +0000 and novaqua_reports/report/sale_order.sxw 2014-02-25 13:12:03 +0000 differ |
759 | === modified file 'novaqua_reports/report/stock_picking.py' | |||
760 | --- novaqua_reports/report/stock_picking.py 2014-01-28 09:25:55 +0000 | |||
761 | +++ novaqua_reports/report/stock_picking.py 2014-02-25 13:12:03 +0000 | |||
762 | @@ -34,6 +34,7 @@ | |||
763 | 34 | 'get_total_weight':self._get_total_weight, | 34 | 'get_total_weight':self._get_total_weight, |
764 | 35 | 'get_packets': self._get_packets, | 35 | 'get_packets': self._get_packets, |
765 | 36 | 'get_units': self._get_units, | 36 | 'get_units': self._get_units, |
766 | 37 | 'get_price': self._get_price, | ||
767 | 37 | }) | 38 | }) |
768 | 38 | def _get_product_desc(self,move_line): | 39 | def _get_product_desc(self,move_line): |
769 | 39 | if move_line.sale_line_id.name: | 40 | if move_line.sale_line_id.name: |
770 | @@ -56,6 +57,20 @@ | |||
771 | 56 | return '' | 57 | return '' |
772 | 57 | else: | 58 | else: |
773 | 58 | return res | 59 | return res |
774 | 60 | |||
775 | 61 | def _get_price(self, move_line): | ||
776 | 62 | line_obj = self.pool.get('sale.order.line') | ||
777 | 63 | line_ids = line_obj.search(self.cr, self.uid, [('id', '=' , move_line.sale_line_id.id)]) | ||
778 | 64 | |||
779 | 65 | res_prices = line_obj.browse(self.cr, self.uid, line_ids)[0]['order_partner_id'].delivery_prices | ||
780 | 66 | if res_prices: | ||
781 | 67 | res = line_obj.browse(self.cr, self.uid, line_ids)[0]['price_unit'] | ||
782 | 68 | if res: | ||
783 | 69 | return res | ||
784 | 70 | else: | ||
785 | 71 | return '' | ||
786 | 72 | else: | ||
787 | 73 | return '' | ||
788 | 59 | 74 | ||
789 | 60 | def _get_units(self, move_line): | 75 | def _get_units(self, move_line): |
790 | 61 | line_obj = self.pool.get('sale.order.line') | 76 | line_obj = self.pool.get('sale.order.line') |
791 | 62 | 77 | ||
792 | === modified file 'novaqua_reports/report/stock_picking.rml' | |||
793 | --- novaqua_reports/report/stock_picking.rml 2014-01-27 12:26:32 +0000 | |||
794 | +++ novaqua_reports/report/stock_picking.rml 2014-02-25 13:12:03 +0000 | |||
795 | @@ -83,15 +83,15 @@ | |||
796 | 83 | </initialize> | 83 | </initialize> |
797 | 84 | <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 84 | <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
798 | 85 | <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 85 | <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
808 | 86 | <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> | 86 | <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
809 | 87 | <paraStyle name="P4" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> | 87 | <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> |
810 | 88 | <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> | 88 | <paraStyle name="P5" fontName="Helvetica" fontSize="7.0" leading="9" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/> |
811 | 89 | <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 89 | <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
812 | 90 | <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 90 | <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
813 | 91 | <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 91 | <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
814 | 92 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 92 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
815 | 93 | <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 93 | <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
816 | 94 | <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 94 | <paraStyle name="P11" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
817 | 95 | <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 95 | <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
818 | 96 | <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 96 | <paraStyle name="P13" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
819 | 97 | <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> | 97 | <paraStyle name="P14" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
820 | @@ -145,9 +145,9 @@ | |||
821 | 145 | </para> | 145 | </para> |
822 | 146 | </td> | 146 | </td> |
823 | 147 | <td> | 147 | <td> |
827 | 148 | <para style="P6">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> | 148 | <para style="P7">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
828 | 149 | <para style="P6">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> | 149 | <para style="P7">Incoming Shipment: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
829 | 150 | <para style="P6">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> | 150 | <para style="P7">Internal Shipment: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para> |
830 | 151 | </td> | 151 | </td> |
831 | 152 | </tr> | 152 | </tr> |
832 | 153 | </blockTable> | 153 | </blockTable> |
833 | @@ -198,6 +198,14 @@ | |||
834 | 198 | </tr> | 198 | </tr> |
835 | 199 | <tr> | 199 | <tr> |
836 | 200 | <td> | 200 | <td> |
837 | 201 | <para style="P3">Partner phone:</para> | ||
838 | 202 | </td> | ||
839 | 203 | <td> | ||
840 | 204 | <para style="P3">[[ picking.partner_id.mobile or picking.partner_id.phone]]</para> | ||
841 | 205 | </td> | ||
842 | 206 | </tr> | ||
843 | 207 | <tr> | ||
844 | 208 | <td> | ||
845 | 201 | <para style="P2">Delivery method:</para> | 209 | <para style="P2">Delivery method:</para> |
846 | 202 | </td> | 210 | </td> |
847 | 203 | <td> | 211 | <td> |
848 | @@ -213,7 +221,7 @@ | |||
849 | 213 | </td> | 221 | </td> |
850 | 214 | </tr> | 222 | </tr> |
851 | 215 | </blockTable> | 223 | </blockTable> |
853 | 216 | <para style="P7"> | 224 | <para style="P8"> |
854 | 217 | <font color="white"> </font> | 225 | <font color="white"> </font> |
855 | 218 | </para> | 226 | </para> |
856 | 219 | </td> | 227 | </td> |
857 | @@ -225,19 +233,19 @@ | |||
858 | 225 | <blockTable colWidths="53.0,276.0,66.0,34.0,88.0" repeatRows="1" style="Move_Line_Header"> | 233 | <blockTable colWidths="53.0,276.0,66.0,34.0,88.0" repeatRows="1" style="Move_Line_Header"> |
859 | 226 | <tr> | 234 | <tr> |
860 | 227 | <td> | 235 | <td> |
874 | 228 | <para style="P9">Code</para> | 236 | <para style="P10">Code</para> |
875 | 229 | </td> | 237 | </td> |
876 | 230 | <td> | 238 | <td> |
877 | 231 | <para style="P9">Description</para> | 239 | <para style="P10">Description</para> |
878 | 232 | </td> | 240 | </td> |
879 | 233 | <td> | 241 | <td> |
880 | 234 | <para style="P9">Quantity</para> | 242 | <para style="P10">Quantity</para> |
881 | 235 | </td> | 243 | </td> |
882 | 236 | <td> | 244 | <td> |
883 | 237 | <para style="P9">UM</para> | 245 | <para style="P10">UM</para> |
884 | 238 | </td> | 246 | </td> |
885 | 239 | <td> | 247 | <td> |
886 | 240 | <para style="P10">Price (€) / unit</para> | 248 | <para style="P11">Price (€) / unit</para> |
887 | 241 | </td> | 249 | </td> |
888 | 242 | </tr> | 250 | </tr> |
889 | 243 | </blockTable> | 251 | </blockTable> |
890 | @@ -250,7 +258,7 @@ | |||
891 | 250 | <para style="P14">[[ move_lines.product_id.default_code ]]</para> | 258 | <para style="P14">[[ move_lines.product_id.default_code ]]</para> |
892 | 251 | </td> | 259 | </td> |
893 | 252 | <td> | 260 | <td> |
895 | 253 | <para style="P13">[[ move_lines.product_id.name_template ]]</para> | 261 | <para style="P13">[[ move_lines.name ]]</para> |
896 | 254 | </td> | 262 | </td> |
897 | 255 | <td> | 263 | <td> |
898 | 256 | <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para> | 264 | <para style="P15">[[ formatLang(get_packets(move_lines)) ]]</para> |
899 | @@ -259,7 +267,7 @@ | |||
900 | 259 | <para style="P15">[[ get_units(move_lines) ]]</para> | 267 | <para style="P15">[[ get_units(move_lines) ]]</para> |
901 | 260 | </td> | 268 | </td> |
902 | 261 | <td> | 269 | <td> |
904 | 262 | <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para> | 270 | <para style="P9">[[ formatLang(get_price(move_lines), digits=get_digits(dp='Account')) ]]</para> |
905 | 263 | </td> | 271 | </td> |
906 | 264 | </tr> | 272 | </tr> |
907 | 265 | </blockTable> | 273 | </blockTable> |
908 | @@ -284,7 +292,7 @@ | |||
909 | 284 | <para style="P15">[[ get_units(move_lines) ]]</para> | 292 | <para style="P15">[[ get_units(move_lines) ]]</para> |
910 | 285 | </td> | 293 | </td> |
911 | 286 | <td> | 294 | <td> |
913 | 287 | <para style="P8">[[ formatLang(move_lines.sale_line_id.price_unit, digits=get_digits(dp='Account')) ]]</para> | 295 | <para style="P9">[[ formatLang(get_price(move_lines), digits=get_digits(dp='Account')) ]]</para> |
914 | 288 | </td> | 296 | </td> |
915 | 289 | </tr> | 297 | </tr> |
916 | 290 | </blockTable> | 298 | </blockTable> |
917 | @@ -301,27 +309,27 @@ | |||
918 | 301 | <blockTable colWidths="538.0" style="Table_noga"> | 309 | <blockTable colWidths="538.0" style="Table_noga"> |
919 | 302 | <tr> | 310 | <tr> |
920 | 303 | <td> | 311 | <td> |
942 | 304 | <para style="P4">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para> | 312 | <para style="P5">Do popolnega plačila računa ostaja blago last podjetja INOVATIM d.o.o.</para> |
943 | 305 | </td> | 313 | </td> |
944 | 306 | </tr> | 314 | </tr> |
945 | 307 | <tr> | 315 | <tr> |
946 | 308 | <td> | 316 | <td> |
947 | 309 | <para style="P4">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para> | 317 | <para style="P5">Za nepravočasno plačane račune zaračunavamo zakonsko zamudne obresti.</para> |
948 | 310 | </td> | 318 | </td> |
949 | 311 | </tr> | 319 | </tr> |
950 | 312 | <tr> | 320 | <tr> |
951 | 313 | <td> | 321 | <td> |
952 | 314 | <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> | 322 | <para style="P4">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> |
953 | 315 | </td> | 323 | </td> |
954 | 316 | </tr> | 324 | </tr> |
955 | 317 | <tr> | 325 | <tr> |
956 | 318 | <td> | 326 | <td> |
957 | 319 | <para style="P19">Opomba: Kamen in les sta naravna materiala, zato lahko pride do odstopanj v dimenziji, strukturi in barvi med <font face="Helvetica-Bold">vzorcem</font> in <font face="Helvetica-Bold">končnim proizvodom</font>. Za les in lesene artikle so opredeljena merila kakovosti po smernicah VEH.</para> | 327 | <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> |
958 | 320 | </td> | 328 | </td> |
959 | 321 | </tr> | 329 | </tr> |
960 | 322 | <tr> | 330 | <tr> |
961 | 323 | <td> | 331 | <td> |
962 | 324 | <para style="P4">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para> | 332 | <para style="P5">Osebni prevzem: Skladišče Lesnina na Tržaški 135 v Ljubljani, vsak delavnik med 7:00 – 14:00.</para> |
963 | 325 | </td> | 333 | </td> |
964 | 326 | </tr> | 334 | </tr> |
965 | 327 | </blockTable> | 335 | </blockTable> |
966 | @@ -342,10 +350,10 @@ | |||
967 | 342 | <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para> | 350 | <para style="P18">Issued by: [[ picking.deliver_id.name ]]</para> |
968 | 343 | </td> | 351 | </td> |
969 | 344 | <td> | 352 | <td> |
971 | 345 | <para style="P5">Received by:</para> | 353 | <para style="P6">Received by:</para> |
972 | 346 | </td> | 354 | </td> |
973 | 347 | <td> | 355 | <td> |
975 | 348 | <para style="P5">Place, date:</para> | 356 | <para style="P6">Place, date:</para> |
976 | 349 | </td> | 357 | </td> |
977 | 350 | </tr> | 358 | </tr> |
978 | 351 | </blockTable> | 359 | </blockTable> |
979 | 352 | 360 | ||
980 | === modified file 'novaqua_reports/report/stock_picking.sxw' | |||
981 | 353 | Binary files novaqua_reports/report/stock_picking.sxw 2014-01-27 12:26:32 +0000 and novaqua_reports/report/stock_picking.sxw 2014-02-25 13:12:03 +0000 differ | 361 | Binary files novaqua_reports/report/stock_picking.sxw 2014-01-27 12:26:32 +0000 and novaqua_reports/report/stock_picking.sxw 2014-02-25 13:12:03 +0000 differ |
982 | === added file 'novaqua_reports/res_partner.py' | |||
983 | --- novaqua_reports/res_partner.py 1970-01-01 00:00:00 +0000 | |||
984 | +++ novaqua_reports/res_partner.py 2014-02-25 13:12:03 +0000 | |||
985 | @@ -0,0 +1,34 @@ | |||
986 | 1 | # -*- coding: utf-8 -*- | ||
987 | 2 | ############################################################################## | ||
988 | 3 | # | ||
989 | 4 | # OpenERP, Open Source Management Solution | ||
990 | 5 | # Copyright (C) 2004-TODAY OpenERP s.a. (<http://www.openerp.com>). | ||
991 | 6 | # Copyright (C) 2013-TODAY Mentis d.o.o. (<http://www.mentis.si/openerp>) | ||
992 | 7 | # | ||
993 | 8 | # This program is free software: you can redistribute it and/or modify | ||
994 | 9 | # it under the terms of the GNU Affero General Public License as | ||
995 | 10 | # published by the Free Software Foundation, either version 3 of the | ||
996 | 11 | # License, or (at your option) any later version. | ||
997 | 12 | # | ||
998 | 13 | # This program is distributed in the hope that it will be useful, | ||
999 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1000 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1001 | 16 | # GNU Affero General Public License for more details. | ||
1002 | 17 | # | ||
1003 | 18 | # You should have received a copy of the GNU Affero General Public License | ||
1004 | 19 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1005 | 20 | # | ||
1006 | 21 | ############################################################################## | ||
1007 | 22 | |||
1008 | 23 | from osv import fields, osv | ||
1009 | 24 | from tools.translate import _ | ||
1010 | 25 | |||
1011 | 26 | class res_partner(osv.Model): | ||
1012 | 27 | _inherit = 'res.partner' | ||
1013 | 28 | |||
1014 | 29 | _columns = { | ||
1015 | 30 | 'delivery_prices': fields.boolean('Prices on delivery report'), | ||
1016 | 31 | } | ||
1017 | 32 | _defaults = { | ||
1018 | 33 | 'delivery_prices': False, | ||
1019 | 34 | } | ||
1020 | 0 | \ No newline at end of file | 35 | \ No newline at end of file |
1021 | 1 | 36 | ||
1022 | === added file 'novaqua_reports/res_partner_view.xml' | |||
1023 | --- novaqua_reports/res_partner_view.xml 1970-01-01 00:00:00 +0000 | |||
1024 | +++ novaqua_reports/res_partner_view.xml 2014-02-25 13:12:03 +0000 | |||
1025 | @@ -0,0 +1,17 @@ | |||
1026 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1027 | 2 | <openerp> | ||
1028 | 3 | <data> | ||
1029 | 4 | <record id="view_partner_form_inherit" model="ir.ui.view"> | ||
1030 | 5 | <field name="name">res.partner.form.inherit</field> | ||
1031 | 6 | <field name="model">res.partner</field> | ||
1032 | 7 | <field name="inherit_id" ref="base.view_partner_form"/> | ||
1033 | 8 | <field name="arch" type="xml"> | ||
1034 | 9 | <xpath expr="//form/sheet/notebook/page[@string='Sales & Purchases']/group/group" position="before"> | ||
1035 | 10 | <group> | ||
1036 | 11 | <field name="delivery_prices"/> | ||
1037 | 12 | </group> | ||
1038 | 13 | </xpath> | ||
1039 | 14 | </field> | ||
1040 | 15 | </record> | ||
1041 | 16 | </data> | ||
1042 | 17 | </openerp> |