Merge lp:~matjaz-6/openerpsl/openerpsl_01_25 into lp:openerpsl/7.0
- openerpsl_01_25
- Merge into 7.0
Proposed by
Matjaz Kalic
Status: | Merged |
---|---|
Merged at revision: | 318 |
Proposed branch: | lp:~matjaz-6/openerpsl/openerpsl_01_25 |
Merge into: | lp:openerpsl/7.0 |
Diff against target: |
357 lines (+125/-127) 1 file modified
novaqua_reports/report/sale_order.rml (+125/-127) |
To merge this branch: | bzr merge lp:~matjaz-6/openerpsl/openerpsl_01_25 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mentis | Pending | ||
Review via email: mp+203493@code.launchpad.net |
Commit message
Description of the change
[FIX] novaqua_
To post a comment you must log in.
- 318. By Dušan Laznik (Mentis)
-
[FIX] novaqua_
reports/ report/ sale_order (paragraph layout)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'novaqua_reports/report/sale_order.rml' | |||
2 | --- novaqua_reports/report/sale_order.rml 2014-01-28 09:25:55 +0000 | |||
3 | +++ novaqua_reports/report/sale_order.rml 2014-01-28 09:38:38 +0000 | |||
4 | @@ -104,30 +104,29 @@ | |||
5 | 104 | <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 104 | <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
6 | 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"/> |
7 | 106 | <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 106 | <paraStyle name="P3" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
22 | 107 | <paraStyle name="P4" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 107 | <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
23 | 108 | <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 108 | <paraStyle name="P5" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
24 | 109 | <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 109 | <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
25 | 110 | <paraStyle name="P7" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" 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"/> |
26 | 111 | <paraStyle name="P8" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" 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"/> |
27 | 112 | <paraStyle name="P9" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" 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"/> |
28 | 113 | <paraStyle name="P10" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 113 | <paraStyle name="P10" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> |
29 | 114 | <paraStyle name="P11" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> | 114 | <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> |
30 | 115 | <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> | 115 | <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/> |
31 | 116 | <paraStyle name="P13" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> | 116 | <paraStyle name="P13" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/> |
32 | 117 | <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="12.0" spaceAfter="6.0"/> | 117 | <paraStyle name="P14" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/> |
33 | 118 | <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" 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"/> |
34 | 119 | <paraStyle name="P16" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT" 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"/> |
35 | 120 | <paraStyle name="P17" fontName="Helvetica" fontSize="7.0" leading="9" 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"/> |
36 | 121 | <paraStyle name="P18" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" 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"/> |
40 | 122 | <paraStyle name="P19" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 122 | <paraStyle name="P19" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
41 | 123 | <paraStyle name="P20" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | 123 | <paraStyle name="P20" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
42 | 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"/> |
43 | 125 | <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 125 | <paraStyle name="P22" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
44 | 126 | <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> | 126 | <paraStyle name="P23" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
49 | 127 | <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> | 127 | <paraStyle name="P24" fontName="Helvetica" fontSize="7.0" leading="9" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> |
50 | 128 | <paraStyle name="P25" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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"/> |
51 | 129 | <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" textColor="#000000"/> | 129 | <paraStyle name="P26" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> |
48 | 130 | <paraStyle name="P27" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> | ||
52 | 131 | <paraStyle name="Standard" fontName="Helvetica"/> | 130 | <paraStyle name="Standard" fontName="Helvetica"/> |
53 | 132 | <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"/> |
54 | 133 | <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"/> |
55 | @@ -170,37 +169,37 @@ | |||
56 | 170 | <blockTable colWidths="270.0,270.0" style="Table_naslov"> | 169 | <blockTable colWidths="270.0,270.0" style="Table_naslov"> |
57 | 171 | <tr> | 170 | <tr> |
58 | 172 | <td> | 171 | <td> |
60 | 173 | <para style="P13"> | 172 | <para style="P14"> |
61 | 174 | <font color="white"> </font> | 173 | <font color="white"> </font> |
62 | 175 | </para> | 174 | </para> |
63 | 176 | </td> | 175 | </td> |
64 | 177 | <td> | 176 | <td> |
67 | 178 | <para style="P14">[[ 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> |
68 | 179 | <para style="P14">[[ 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> |
69 | 180 | </td> | 179 | </td> |
70 | 181 | </tr> | 180 | </tr> |
71 | 182 | </blockTable> | 181 | </blockTable> |
72 | 183 | <blockTable colWidths="264.0,276.0" style="Table_customer_data"> | 182 | <blockTable colWidths="264.0,276.0" style="Table_customer_data"> |
73 | 184 | <tr> | 183 | <tr> |
74 | 185 | <td> | 184 | <td> |
93 | 186 | <para style="P10">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> | 185 | <para style="P11">[[ (o.partner_id and o.partner_id.name) or '' ]] </para> |
94 | 187 | <para style="P10">[[ (o.partner_id.street) or '' ]]</para> | 186 | <para style="P11">[[ (o.partner_id.street) or '' ]]</para> |
95 | 188 | <para style="P10">[[ (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> |
96 | 189 | <para style="P10">[[ (o.partner_id.country_id.name) or '' ]]</para> | 188 | <para style="P11">[[ (o.partner_id.country_id.name) or '' ]]</para> |
97 | 190 | <para style="P10"> | 189 | <para style="P11"> |
98 | 191 | <font color="white"> </font> | 190 | <font color="white"> </font> |
99 | 192 | </para> | 191 | </para> |
100 | 193 | <para style="P16">[[ (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> |
101 | 194 | <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> | 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> |
102 | 195 | <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> | 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> |
103 | 196 | <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> | 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> |
104 | 197 | <para style="P10"> | 196 | <para style="P11"> |
105 | 198 | <font color="white"> </font> | 197 | <font color="white"> </font> |
106 | 199 | </para> | 198 | </para> |
107 | 200 | <para style="P16">[[ 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> |
108 | 201 | <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> | 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> |
109 | 202 | <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> | 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> |
110 | 203 | <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> | 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> |
111 | 204 | </td> | 203 | </td> |
112 | 205 | <td> | 204 | <td> |
113 | 206 | <blockTable colWidths="126.0,144.0" style="Table_order_inf"> | 205 | <blockTable colWidths="126.0,144.0" style="Table_order_inf"> |
114 | @@ -209,7 +208,7 @@ | |||
115 | 209 | <para style="P2">Ljubljana,</para> | 208 | <para style="P2">Ljubljana,</para> |
116 | 210 | </td> | 209 | </td> |
117 | 211 | <td> | 210 | <td> |
119 | 212 | <para style="P7">[[ formatLang(o.date_order, date = True) ]]</para> | 211 | <para style="P8">[[ formatLang(o.date_order, date = True) ]]</para> |
120 | 213 | </td> | 212 | </td> |
121 | 214 | </tr> | 213 | </tr> |
122 | 215 | <tr> | 214 | <tr> |
123 | @@ -217,7 +216,7 @@ | |||
124 | 217 | <para style="P2">Expiration date:</para> | 216 | <para style="P2">Expiration date:</para> |
125 | 218 | </td> | 217 | </td> |
126 | 219 | <td> | 218 | <td> |
128 | 220 | <para style="P7"> | 219 | <para style="P8"> |
129 | 221 | <font color="white"> </font> | 220 | <font color="white"> </font> |
130 | 222 | </para> | 221 | </para> |
131 | 223 | </td> | 222 | </td> |
132 | @@ -259,7 +258,7 @@ | |||
133 | 259 | </td> | 258 | </td> |
134 | 260 | </tr> | 259 | </tr> |
135 | 261 | </blockTable> | 260 | </blockTable> |
137 | 262 | <para style="P13"> | 261 | <para style="P14"> |
138 | 263 | <font color="white"> </font> | 262 | <font color="white"> </font> |
139 | 264 | </para> | 263 | </para> |
140 | 265 | </td> | 264 | </td> |
141 | @@ -272,12 +271,12 @@ | |||
142 | 272 | <tr> | 271 | <tr> |
143 | 273 | <td> | 272 | <td> |
144 | 274 | <para style="P1">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> | 273 | <para style="P1">VAT: [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para> |
146 | 275 | <para style="P4"> | 274 | <para style="P5"> |
147 | 276 | <font color="white"> </font> | 275 | <font color="white"> </font> |
148 | 277 | </para> | 276 | </para> |
149 | 278 | </td> | 277 | </td> |
150 | 279 | <td> | 278 | <td> |
152 | 280 | <para style="P20"> | 279 | <para style="P21"> |
153 | 281 | <font color="white"> </font> | 280 | <font color="white"> </font> |
154 | 282 | </para> | 281 | </para> |
155 | 283 | </td> | 282 | </td> |
156 | @@ -286,28 +285,28 @@ | |||
157 | 286 | <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"> |
158 | 287 | <tr> | 286 | <tr> |
159 | 288 | <td> | 287 | <td> |
182 | 289 | <para style="P21">Code</para> | 288 | <para style="P22">Code</para> |
183 | 290 | </td> | 289 | </td> |
184 | 291 | <td> | 290 | <td> |
185 | 292 | <para style="P21">Description</para> | 291 | <para style="P22">Description</para> |
186 | 293 | </td> | 292 | </td> |
187 | 294 | <td> | 293 | <td> |
188 | 295 | <para style="P23">Quantity</para> | 294 | <para style="P24">Quantity</para> |
189 | 296 | </td> | 295 | </td> |
190 | 297 | <td> | 296 | <td> |
191 | 298 | <para style="P23">UM</para> | 297 | <para style="P24">UM</para> |
192 | 299 | </td> | 298 | </td> |
193 | 300 | <td> | 299 | <td> |
194 | 301 | <para style="P23">Unit Price</para> | 300 | <para style="P24">Unit Price</para> |
195 | 302 | </td> | 301 | </td> |
196 | 303 | <td> | 302 | <td> |
197 | 304 | <para style="P23">Disc.</para> | 303 | <para style="P24">Disc.</para> |
198 | 305 | </td> | 304 | </td> |
199 | 306 | <td> | 305 | <td> |
200 | 307 | <para style="P22">Taxes (%)</para> | 306 | <para style="P23">Taxes (%)</para> |
201 | 308 | </td> | 307 | </td> |
202 | 309 | <td> | 308 | <td> |
203 | 310 | <para style="P23">Price (€)</para> | 309 | <para style="P24">Price (€)</para> |
204 | 311 | </td> | 310 | </td> |
205 | 312 | </tr> | 311 | </tr> |
206 | 313 | </blockTable> | 312 | </blockTable> |
207 | @@ -316,28 +315,28 @@ | |||
208 | 316 | <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"> |
209 | 317 | <tr> | 316 | <tr> |
210 | 318 | <td> | 317 | <td> |
233 | 319 | <para style="P9">[[ line.product_id.default_code ]]</para> | 318 | <para style="P10">[[ line.product_id.default_code ]]</para> |
234 | 320 | </td> | 319 | </td> |
235 | 321 | <td> | 320 | <td> |
236 | 322 | <para style="P8">[[ line.product_id.name_template ]] </para> | 321 | <para style="P9">[[ line.product_id.name_template ]] </para> |
237 | 323 | </td> | 322 | </td> |
238 | 324 | <td> | 323 | <td> |
239 | 325 | <para style="P17">[[ line.product_uom_qty ]] </para> | 324 | <para style="P18">[[ line.product_uom_qty ]] </para> |
240 | 326 | </td> | 325 | </td> |
241 | 327 | <td> | 326 | <td> |
242 | 328 | <para style="P17">[[ line.product_uom.name ]]</para> | 327 | <para style="P18">[[ line.product_uom.name ]]</para> |
243 | 329 | </td> | 328 | </td> |
244 | 330 | <td> | 329 | <td> |
245 | 331 | <para style="P17">[[ 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> |
246 | 332 | </td> | 331 | </td> |
247 | 333 | <td> | 332 | <td> |
248 | 334 | <para style="P18">[[ 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> |
249 | 335 | </td> | 334 | </td> |
250 | 336 | <td> | 335 | <td> |
251 | 337 | <para style="P24">[[ ', '.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> |
252 | 338 | </td> | 337 | </td> |
253 | 339 | <td> | 338 | <td> |
254 | 340 | <para style="P17">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para> | 339 | <para style="P18">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account')) ]]</para> |
255 | 341 | </td> | 340 | </td> |
256 | 342 | </tr> | 341 | </tr> |
257 | 343 | </blockTable> | 342 | </blockTable> |
258 | @@ -345,61 +344,60 @@ | |||
259 | 345 | <blockTable colWidths="270.0,270.0" style="Table_tax"> | 344 | <blockTable colWidths="270.0,270.0" style="Table_tax"> |
260 | 346 | <tr> | 345 | <tr> |
261 | 347 | <td> | 346 | <td> |
290 | 348 | <para style="P5">Net Total:</para> | 347 | <para style="P6">Net Total:</para> |
291 | 349 | </td> | 348 | </td> |
292 | 350 | <td> | 349 | <td> |
293 | 351 | <para style="P19">[[ 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> |
294 | 352 | </td> | 351 | </td> |
295 | 353 | </tr> | 352 | </tr> |
296 | 354 | <tr> | 353 | <tr> |
297 | 355 | <td> | 354 | <td> |
298 | 356 | <para style="P5">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> | 355 | <para style="P6">Disc. Total: [[ (get_total_discount(o) and ' ') or removeParentNode('tr') ]]</para> |
299 | 357 | </td> | 356 | </td> |
300 | 358 | <td> | 357 | <td> |
301 | 359 | <para style="P19">[[ 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> |
302 | 360 | </td> | 359 | </td> |
303 | 361 | </tr> | 360 | </tr> |
304 | 362 | <tr> | 361 | <tr> |
305 | 363 | <td> | 362 | <td> |
306 | 364 | <para style="P5">Taxes :</para> | 363 | <para style="P6">Taxes :</para> |
307 | 365 | </td> | 364 | </td> |
308 | 366 | <td> | 365 | <td> |
309 | 367 | <para style="P19">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para> | 366 | <para style="P20">[[ formatLang(o.amount_tax , digits=get_digits(dp='Account')) ]]</para> |
310 | 368 | </td> | 367 | </td> |
311 | 369 | </tr> | 368 | </tr> |
312 | 370 | <tr> | 369 | <tr> |
313 | 371 | <td> | 370 | <td> |
314 | 372 | <para style="P15">Total :</para> | 371 | <para style="P16">Total :</para> |
315 | 373 | </td> | 372 | </td> |
316 | 374 | <td> | 373 | <td> |
317 | 375 | <para style="P25">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para> | 374 | <para style="P26">[[ formatLang(o.amount_total , digits=get_digits(dp='Account')) ]]</para> |
318 | 376 | </td> | 375 | </td> |
319 | 377 | </tr> | 376 | </tr> |
320 | 378 | </blockTable> | 377 | </blockTable> |
322 | 379 | <para style="P11">-</para> | 378 | <para style="P12">-</para> |
323 | 380 | <blockTable colWidths="539.0" style="Table_dobava"> | 379 | <blockTable colWidths="539.0" style="Table_dobava"> |
324 | 381 | <tr> | 380 | <tr> |
325 | 382 | <td> | 381 | <td> |
326 | 383 | <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para> | 382 | <para style="P3">Incoterm: [[ (o.incoterm and o.incoterm.name) or removeParentNode('para') ]]</para> |
328 | 384 | <para style="P12">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> | 383 | <para style="P13">Total net weight: [[ formatLang(get_total_weight(o)) ]] kg</para> |
329 | 385 | </td> | 384 | </td> |
330 | 386 | </tr> | 385 | </tr> |
331 | 387 | </blockTable> | 386 | </blockTable> |
334 | 388 | <para style="P11">-</para> | 387 | <para style="P12">-</para> |
335 | 389 | <para style="P11">-</para> | 388 | <para style="P12">-</para> |
336 | 390 | <blockTable colWidths="539.0" style="Table_prosti_opis"> | 389 | <blockTable colWidths="539.0" style="Table_prosti_opis"> |
337 | 391 | <tr> | 390 | <tr> |
338 | 392 | <td> | 391 | <td> |
342 | 393 | <para style="P26">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja | 392 | <para style="terp_default_9">Za potrditev ponudbe se šteje v celoti plačani znesek ponudbe in hkrati razvidno nakazilo na računu podjetja </para> |
343 | 394 | </para> | 393 | <para style="terp_default_9">Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d.</para> |
341 | 395 | <para style="P26">Novaqua d.o.o. TRR: 290000079521718 pri Unicredit Banka Slovenija d.d.</para> | ||
344 | 396 | </td> | 394 | </td> |
345 | 397 | </tr> | 395 | </tr> |
346 | 398 | </blockTable> | 396 | </blockTable> |
347 | 399 | <blockTable colWidths="539.0" style="Table_bold"> | 397 | <blockTable colWidths="539.0" style="Table_bold"> |
348 | 400 | <tr> | 398 | <tr> |
349 | 401 | <td> | 399 | <td> |
351 | 402 | <para style="P27">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> | 400 | <para style="P4">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> |
352 | 403 | </td> | 401 | </td> |
353 | 404 | </tr> | 402 | </tr> |
354 | 405 | </blockTable> | 403 | </blockTable> |
355 | 406 | 404 | ||
356 | === modified file 'novaqua_reports/report/sale_order.sxw' | |||
357 | 407 | Binary files novaqua_reports/report/sale_order.sxw 2014-01-28 09:25:55 +0000 and novaqua_reports/report/sale_order.sxw 2014-01-28 09:38:38 +0000 differ | 405 | Binary files novaqua_reports/report/sale_order.sxw 2014-01-28 09:25:55 +0000 and novaqua_reports/report/sale_order.sxw 2014-01-28 09:38:38 +0000 differ |