Vauxoo Addons

Merge lp:~vauxoo/addons-vauxoo/7.0-aging_due_report-dev-jc into lp:addons-vauxoo/7.0

  1. 7.0-aging_due_report-dev-jc
  2. Merge into 7.0
Proposed by Juan Carlos Hernandez
Status: Merged
Approved by: hbto [Vauxoo] http://www.vauxoo.com
Approved revision: 1118
Merged at revision: 1123
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-aging_due_report-dev-jc
Merge into: lp:addons-vauxoo/7.0
Diff against target: 975 lines (+144/-121)
12 files modified
aging_due_report/data/aging_due_webkit_header.xml (+28/-13)
aging_due_report/data/customer_detail_due_webkit_header.xml (+12/-11)
aging_due_report/data/customer_formal_due_webkit_header.xml (+17/-16)
aging_due_report/data/supplier_aging_due_webkit_header.xml (+17/-17)
aging_due_report/data/supplier_detail_due_webkit_header.xml (+14/-13)
aging_due_report/data/supplier_formal_due_webkit_header.xml (+17/-16)
aging_due_report/report/aging_due_report_html.mako (+1/-1)
aging_due_report/report/detail_due_report_html.mako (+14/-13)
aging_due_report/report/formal_due_report_html.mako (+3/-2)
aging_due_report/report/supplier_aging_due_report_html.mako (+1/-1)
aging_due_report/report/supplier_detail_due_report_html.mako (+12/-11)
aging_due_report/report/supplier_formal_due_report_html.mako (+8/-7)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-aging_due_report-dev-jc
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Approve
Katherine Zaoral (Vauxoo) Pending
Jorge Angel Naranjo Rogel - http://www.vauxoo.com Pending
Juan Carlos Hernandez Pending
Review via email: mp+231649@code.launchpad.net

Description of the change

se cambio el tamaño de letra en general a los 6 reportes en webkit, también se validó el campo date_due y date_invoice

To post a comment you must log in.
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

I did the test in a local environment and

the result are satisfactory

review: Approve
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

runbot is green for this MP

Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

https://docs.google.com/a/vauxoo.com/file/d/0B1w9gokcJL9heng2cngxYlZNWHc/edit?usp=drivesdk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'aging_due_report/data/aging_due_webkit_header.xml'
2--- aging_due_report/data/aging_due_webkit_header.xml 2014-08-07 23:54:30 +0000
3+++ aging_due_report/data/aging_due_webkit_header.xml 2014-08-21 00:10:37 +0000
4@@ -80,7 +80,7 @@
5 border-bottom: 1px solid #DFDFDE;
6 border-top: 1px solid #DFDFDE;
7 background-color: #A41D35;
8- font-size: 10;
9+ font-size: 12;
10 color: white; }
11
12 .table_title {
13@@ -90,7 +90,7 @@
14 .table_title > tbody > tr > th,
15 .table_title > tfoot > tr > th {
16 border-bottom: 2px solid #DFDFDE;
17- font-size: 10;
18+ font-size: 12;
19 color: white; }
20
21 .table_row_border {
22@@ -182,7 +182,7 @@
23 padding: 8px 8px;
24 background: #A41D35;
25 color: white;
26- font-size: 12;
27+ font-size: 14;
28 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif; }
29
30 .panel_box_shadow {
31@@ -233,7 +233,7 @@
32 body {
33 color: black;
34 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Oblique;
35- font-size: 9;
36+ font-size: 11;
37 margin: 0;
38 padding: 0;
39 height: 100%;
40@@ -263,10 +263,10 @@
41 padding-right: 2px;
42 padding-left: 2px;
43 text-align: center;
44- font-size: 8; }
45+ font-size: 10; }
46
47 strong{
48- font-size: 12;
49+ font-size: 14;
50 font-weight: bold;
51 }
52
53@@ -300,7 +300,7 @@
54 }
55
56 td{
57- font-size:9;
58+ font-size:11;
59 }
60
61 .td_without_bottom{
62@@ -332,7 +332,7 @@
63
64 td.total_td {
65 border-top: solid 1.5px #A41D35;
66-font-size: 8;
67+font-size: 10;
68 padding-right: 2px;
69 padding-left: 2px;
70 font-weight: bold;
71@@ -340,7 +340,7 @@
72
73 td.sub_total_td {
74 border-top: solid 1.5px #A41D35;
75-font-size: 8;
76+font-size: 10;
77 padding-right: 2px;
78 padding-left: 2px;
79 color: black; }
80@@ -351,31 +351,46 @@
81 .ITEMSTITLELEFT {
82 text-align: left;
83 font-family: Helvetica-Bold;
84- font-size: 12;
85+ font-size: 14;
86 color: white;
87 }
88
89 .ITEMSTITLERIGHT {
90 text-align: right;
91 font-family: Helvetica-Bold;
92- font-size: 12;
93+ font-size: 14;
94 color: white;
95 }
96
97 .ITEMSLEFT {
98 text-align: LEFT;
99 font-family: Helvetica-Bold;
100- font-size: 9;
101+ font-size: 11;
102 color: black;
103 }
104
105 .ITEMSRIGHT {
106 text-align: right;
107 font-family: Helvetica-Bold;
108- font-size: 9;
109+ font-size: 11;
110 color: black;
111 }
112
113+ .CUSTOMERNAME {
114+ text-align: right;
115+ font-family: Helvetica-Oblique;
116+ font-size: 10;
117+ color: black;
118+ leading: 12;
119+ spaceBefore: 3;
120+ }
121+
122+.CUSTOMERTEXT {
123+ text-align: left;
124+ font-family: Times-BoldItalic;
125+ font-size: 10;
126+ color: black;
127+ }
128
129
130 ]]> </field>
131
132=== modified file 'aging_due_report/data/customer_detail_due_webkit_header.xml'
133--- aging_due_report/data/customer_detail_due_webkit_header.xml 2014-08-16 19:03:39 +0000
134+++ aging_due_report/data/customer_detail_due_webkit_header.xml 2014-08-21 00:10:37 +0000
135@@ -81,7 +81,7 @@
136 border-top: 1px solid #1A1A1A;*/
137 border: 0.5px solid #FFFFFF;
138 background-color: #A41D35;
139- font-size: 8;
140+ font-size: 12;
141 color: white; }
142
143 .table_title {
144@@ -91,7 +91,7 @@
145 .table_title > tbody > tr > th,
146 .table_title > tfoot > tr > th {
147 border-bottom: 2px solid #1A1A1A;
148- font-size: 8;
149+ font-size: 12;
150 color: white; }
151
152 .table_row_border {
153@@ -234,7 +234,7 @@
154 body {
155 color: black;
156 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Bold, Helvetica-Oblique;
157- font-size: 8;
158+ font-size: 11;
159 margin: 0;
160 padding: 0;
161 height: 100%;
162@@ -264,10 +264,10 @@
163 padding-right: 2px;
164 padding-left: 2px;
165 text-align: center;
166- font-size: 7; }
167+ font-size: 10; }
168
169 strong{
170- font-size: 12;
171+ font-size: 14;
172 font-weight: bold;
173 }
174
175@@ -301,7 +301,7 @@
176 }
177
178 td{
179- font-size:7;
180+ font-size:11;
181 }
182
183 .td_without_bottom{
184@@ -352,21 +352,21 @@
185 .ITEMSTITLELEFT {
186 text-align: left;
187 font-family: Helvetica-Bold;
188- font-size: 9;
189+ font-size: 14;
190 color: white;
191 }
192
193 .ITEMSTITLERIGHT {
194 text-align: right;
195 font-family: Helvetica-Bold;
196- font-size: 9;
197+ font-size: 14;
198 color: white;
199 }
200
201 .ITEMSLEFT {
202 text-align: LEFT;
203 font-family: Helvetica-Bold;
204- font-size: 8;
205+ font-size: 11;
206 color: black;
207 border-color: white;
208 }
209@@ -374,7 +374,7 @@
210 .ITEMSRIGHT {
211 text-align: right;
212 font-family: Helvetica-Bold;
213- font-size: 8;
214+ font-size: 11;
215 color: black;
216 border-color: white;
217 }
218@@ -396,13 +396,14 @@
219 .CUSTOMERCENTER {
220 text-align: center;
221 font-family: Times-BoldItalic;
222- font-size: 10;
223+ font-size: 12;
224 color: black;
225 }
226
227 .ITEMBOLD{
228 background-color: lightgrey;
229 font-weight: bold;
230+ font-size: 12;
231 }
232 ]]> </field>
233 <field name="name">Aging Detail Report Webkit</field>
234
235=== modified file 'aging_due_report/data/customer_formal_due_webkit_header.xml'
236--- aging_due_report/data/customer_formal_due_webkit_header.xml 2014-08-07 23:54:30 +0000
237+++ aging_due_report/data/customer_formal_due_webkit_header.xml 2014-08-21 00:10:37 +0000
238@@ -80,7 +80,7 @@
239 border-bottom: 1px solid #1A1A1A;
240 border-top: 1px solid #1A1A1A;
241 background-color: #A41D35;
242- font-size: 10;
243+ font-size: 12;
244 color: white; }
245
246 .table_title {
247@@ -90,7 +90,7 @@
248 .table_title > tbody > tr > th,
249 .table_title > tfoot > tr > th {
250 border-bottom: 2px solid #1A1A1A;
251- font-size: 10;
252+ font-size: 12;
253 color: white; }
254
255 .table_row_border {
256@@ -233,7 +233,7 @@
257 body {
258 color: black;
259 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Bold, Helvetica-Oblique;
260- font-size: 8;
261+ font-size: 11;
262 margin: 0;
263 padding: 0;
264 height: 100%;
265@@ -263,10 +263,10 @@
266 padding-right: 2px;
267 padding-left: 2px;
268 text-align: center;
269- font-size: 7; }
270+ font-size: 10; }
271
272 strong{
273- font-size: 12;
274+ font-size: 14;
275 font-weight: bold;
276 }
277
278@@ -300,7 +300,7 @@
279 }
280
281 td{
282- font-size:7;
283+ font-size:11;
284 }
285
286 .td_without_bottom{
287@@ -332,7 +332,7 @@
288
289 td.total_td {
290 border-top: solid 1.5px #A41D35;
291-font-size: 8;
292+font-size: 10;
293 padding-right: 2px;
294 padding-left: 2px;
295 font-weight: bold;
296@@ -340,7 +340,7 @@
297
298 td.sub_total_td {
299 border-top: solid 1.5px #A41D35;
300-font-size: 8;
301+font-size: 10;
302 padding-right: 2px;
303 padding-left: 2px;
304 color: black; }
305@@ -351,21 +351,21 @@
306 .ITEMSTITLELEFT {
307 text-align: left;
308 font-family: Helvetica-Bold;
309- font-size: 8;
310+ font-size: 14;
311 color: white;
312 }
313
314 .ITEMSTITLERIGHT {
315 text-align: right;
316 font-family: Helvetica-Bold;
317- font-size: 8;
318+ font-size: 14;
319 color: white;
320 }
321
322 .ITEMSLEFT {
323 text-align: LEFT;
324 font-family: Helvetica-Bold;
325- font-size: 8;
326+ font-size: 12;
327 color: black;
328 border-color: white;
329 }
330@@ -373,7 +373,7 @@
331 .ITEMSRIGHT {
332 text-align: right;
333 font-family: Helvetica-Bold;
334- font-size: 8;
335+ font-size: 12;
336 color: black;
337 border-color: white;
338 }
339@@ -381,7 +381,7 @@
340 .CUSTOMERNAME {
341 text-align: right;
342 font-family: Helvetica-Oblique;
343- font-size: 8pt;
344+ font-size: 12;
345 color: black;
346 font-weight: bold;
347 }
348@@ -389,23 +389,24 @@
349 .CUSTOMERTEXT {
350 text-align: left;
351 font-family: Times-BoldItalic;
352- font-size: 10;
353+ font-size: 12;
354 color: black;
355 }
356
357 .CUSTOMERCENTER {
358 text-align: center;
359 font-family: Times-BoldItalic;
360- font-size: 8pt;
361+ font-size: 12;
362 color: black;
363 }
364
365 .CUSTOMEROTHER {
366 text-align: right;
367 font-family: Helvetica-Oblique;
368- font-size: 8pt;
369+ font-size: 12;
370 color: black;
371 }
372+
373 ]]> </field>
374 <field name="name">Aging Formal Report Webkit</field>
375 </record>
376
377=== modified file 'aging_due_report/data/supplier_aging_due_webkit_header.xml'
378--- aging_due_report/data/supplier_aging_due_webkit_header.xml 2014-08-07 23:54:30 +0000
379+++ aging_due_report/data/supplier_aging_due_webkit_header.xml 2014-08-21 00:10:37 +0000
380@@ -80,7 +80,7 @@
381 border-bottom: 1px solid #DFDFDE;
382 border-top: 1px solid #DFDFDE;
383 background-color: #A41D35;
384- font-size: 10;
385+ font-size: 12;
386 color: white; }
387
388 .table_title {
389@@ -90,7 +90,7 @@
390 .table_title > tbody > tr > th,
391 .table_title > tfoot > tr > th {
392 border-bottom: 2px solid #DFDFDE;
393- font-size: 3px;
394+ font-size: 12;
395 color: white; }
396
397 .table_row_border {
398@@ -182,7 +182,7 @@
399 padding: 8px 8px;
400 background: #A41D35;
401 color: white;
402- font-size: 10;
403+ font-size: 14;
404 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif; }
405
406 .panel_box_shadow {
407@@ -232,8 +232,8 @@
408
409 body {
410 color: black;
411- font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Bold, Helvetica-Oblique;
412- font-size: 3;
413+ font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Oblique;
414+ font-size: 11;
415 margin: 0;
416 padding: 0;
417 height: 100%;
418@@ -263,10 +263,10 @@
419 padding-right: 2px;
420 padding-left: 2px;
421 text-align: center;
422- font-size: 9; }
423+ font-size: 10; }
424
425 strong{
426- font-size: 12;
427+ font-size: 14;
428 font-weight: bold;
429 }
430
431@@ -300,7 +300,7 @@
432 }
433
434 td{
435- font-size:10;
436+ font-size:11;
437 }
438
439 .td_without_bottom{
440@@ -332,7 +332,7 @@
441
442 td.total_td {
443 border-top: solid 1.5px #A41D35;
444-font-size: 8;
445+font-size: 10;
446 padding-right: 2px;
447 padding-left: 2px;
448 font-weight: bold;
449@@ -340,7 +340,7 @@
450
451 td.sub_total_td {
452 border-top: solid 1.5px #A41D35;
453-font-size: 8;
454+font-size: 10;
455 padding-right: 2px;
456 padding-left: 2px;
457 color: black; }
458@@ -351,35 +351,35 @@
459 .ITEMSTITLELEFT {
460 text-align: left;
461 font-family: Helvetica-Bold;
462- font-size: 10;
463+ font-size: 14;
464 color: white;
465 }
466
467 .ITEMSTITLERIGHT {
468 text-align: right;
469 font-family: Helvetica-Bold;
470- font-size: 10;
471+ font-size: 14;
472 color: white;
473 }
474
475 .ITEMSLEFT {
476 text-align: LEFT;
477 font-family: Helvetica-Bold;
478- font-size: 9;
479+ font-size: 11;
480 color: black;
481 }
482
483 .ITEMSRIGHT {
484 text-align: right;
485 font-family: Helvetica-Bold;
486- font-size: 9;
487+ font-size: 11;
488 color: black;
489 }
490
491-.CUSTOMERNAME {
492+ .CUSTOMERNAME {
493 text-align: right;
494 font-family: Helvetica-Oblique;
495- font-size: 8;
496+ font-size: 10;
497 color: black;
498 leading: 12;
499 spaceBefore: 3;
500@@ -388,7 +388,7 @@
501 .CUSTOMERTEXT {
502 text-align: left;
503 font-family: Times-BoldItalic;
504- font-size: 8;
505+ font-size: 10;
506 color: black;
507 }
508
509
510=== modified file 'aging_due_report/data/supplier_detail_due_webkit_header.xml'
511--- aging_due_report/data/supplier_detail_due_webkit_header.xml 2014-08-16 19:03:39 +0000
512+++ aging_due_report/data/supplier_detail_due_webkit_header.xml 2014-08-21 00:10:37 +0000
513@@ -81,7 +81,7 @@
514 border-top: 1px solid #1A1A1A;*/
515 border: 0.5px solid #FFFFFF;
516 background-color: #A41D35;
517- font-size: 8;
518+ font-size: 12;
519 color: white; }
520
521 .table_title {
522@@ -91,7 +91,7 @@
523 .table_title > tbody > tr > th,
524 .table_title > tfoot > tr > th {
525 border-bottom: 2px solid #1A1A1A;
526- font-size: 8;
527+ font-size: 12;
528 color: white; }
529
530 .table_row_border {
531@@ -234,7 +234,7 @@
532 body {
533 color: black;
534 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Bold, Helvetica-Oblique;
535- font-size: 8;
536+ font-size: 11;
537 margin: 0;
538 padding: 0;
539 height: 100%;
540@@ -264,10 +264,10 @@
541 padding-right: 2px;
542 padding-left: 2px;
543 text-align: center;
544- font-size: 7; }
545+ font-size: 10; }
546
547 strong{
548- font-size: 12;
549+ font-size: 14;
550 font-weight: bold;
551 }
552
553@@ -301,7 +301,7 @@
554 }
555
556 td{
557- font-size:7;
558+ font-size:11;
559 }
560
561 .td_without_bottom{
562@@ -352,21 +352,21 @@
563 .ITEMSTITLELEFT {
564 text-align: left;
565 font-family: Helvetica-Bold;
566- font-size: 9;
567+ font-size: 14;
568 color: white;
569 }
570
571 .ITEMSTITLERIGHT {
572 text-align: right;
573 font-family: Helvetica-Bold;
574- font-size: 9;
575+ font-size: 14;
576 color: white;
577 }
578
579 .ITEMSLEFT {
580 text-align: LEFT;
581 font-family: Helvetica-Bold;
582- font-size: 8;
583+ font-size: 11;
584 color: black;
585 border-color: white;
586 }
587@@ -374,7 +374,7 @@
588 .ITEMSRIGHT {
589 text-align: right;
590 font-family: Helvetica-Bold;
591- font-size: 8;
592+ font-size: 11;
593 color: black;
594 border-color: white;
595 }
596@@ -396,13 +396,14 @@
597 .CUSTOMERCENTER {
598 text-align: center;
599 font-family: Times-BoldItalic;
600- font-size: 10;
601+ font-size: 12;
602 color: black;
603 }
604-
605-.ITEMBOLD{
606+
607+ .ITEMBOLD{
608 background-color: lightgrey;
609 font-weight: bold;
610+ font-size: 12;
611 }
612
613 ]]> </field>
614
615=== modified file 'aging_due_report/data/supplier_formal_due_webkit_header.xml'
616--- aging_due_report/data/supplier_formal_due_webkit_header.xml 2014-08-07 23:54:30 +0000
617+++ aging_due_report/data/supplier_formal_due_webkit_header.xml 2014-08-21 00:10:37 +0000
618@@ -80,7 +80,7 @@
619 border-bottom: 1px solid #1A1A1A;
620 border-top: 1px solid #1A1A1A;
621 background-color: #A41D35;
622- font-size: 10;
623+ font-size: 12;
624 color: white; }
625
626 .table_title {
627@@ -90,7 +90,7 @@
628 .table_title > tbody > tr > th,
629 .table_title > tfoot > tr > th {
630 border-bottom: 2px solid #1A1A1A;
631- font-size: 10;
632+ font-size: 12;
633 color: white; }
634
635 .table_row_border {
636@@ -233,7 +233,7 @@
637 body {
638 color: black;
639 font-family: "Helvetica Neue", Helvetica, Arial, sans_serif, Times-BoldItalic, Helvetica-Bold, Helvetica-Oblique;
640- font-size: 8;
641+ font-size: 11;
642 margin: 0;
643 padding: 0;
644 height: 100%;
645@@ -263,10 +263,10 @@
646 padding-right: 2px;
647 padding-left: 2px;
648 text-align: center;
649- font-size: 7; }
650+ font-size: 10; }
651
652 strong{
653- font-size: 12;
654+ font-size: 14;
655 font-weight: bold;
656 }
657
658@@ -300,7 +300,7 @@
659 }
660
661 td{
662- font-size:7;
663+ font-size:11;
664 }
665
666 .td_without_bottom{
667@@ -332,7 +332,7 @@
668
669 td.total_td {
670 border-top: solid 1.5px #A41D35;
671-font-size: 8;
672+font-size: 10;
673 padding-right: 2px;
674 padding-left: 2px;
675 font-weight: bold;
676@@ -340,7 +340,7 @@
677
678 td.sub_total_td {
679 border-top: solid 1.5px #A41D35;
680-font-size: 8;
681+font-size: 10;
682 padding-right: 2px;
683 padding-left: 2px;
684 color: black; }
685@@ -351,21 +351,21 @@
686 .ITEMSTITLELEFT {
687 text-align: left;
688 font-family: Helvetica-Bold;
689- font-size: 8;
690+ font-size: 14;
691 color: white;
692 }
693
694 .ITEMSTITLERIGHT {
695 text-align: right;
696 font-family: Helvetica-Bold;
697- font-size: 8;
698+ font-size: 14;
699 color: white;
700 }
701
702 .ITEMSLEFT {
703 text-align: LEFT;
704 font-family: Helvetica-Bold;
705- font-size: 8;
706+ font-size: 12;
707 color: black;
708 border-color: white;
709 }
710@@ -373,7 +373,7 @@
711 .ITEMSRIGHT {
712 text-align: right;
713 font-family: Helvetica-Bold;
714- font-size: 8;
715+ font-size: 12;
716 color: black;
717 border-color: white;
718 }
719@@ -381,7 +381,7 @@
720 .CUSTOMERNAME {
721 text-align: right;
722 font-family: Helvetica-Oblique;
723- font-size: 8pt;
724+ font-size: 12;
725 color: black;
726 font-weight: bold;
727 }
728@@ -389,23 +389,24 @@
729 .CUSTOMERTEXT {
730 text-align: left;
731 font-family: Times-BoldItalic;
732- font-size: 10;
733+ font-size: 12;
734 color: black;
735 }
736
737 .CUSTOMERCENTER {
738 text-align: center;
739 font-family: Times-BoldItalic;
740- font-size: 8pt;
741+ font-size: 12;
742 color: black;
743 }
744
745 .CUSTOMEROTHER {
746 text-align: right;
747 font-family: Helvetica-Oblique;
748- font-size: 8pt;
749+ font-size: 12;
750 color: black;
751 }
752+
753 ]]> </field>
754 <field name="name">Supplier Formal Report Webkit</field>
755 </record>
756
757=== modified file 'aging_due_report/report/aging_due_report_html.mako'
758--- aging_due_report/report/aging_due_report_html.mako 2014-08-07 23:54:30 +0000
759+++ aging_due_report/report/aging_due_report_html.mako 2014-08-21 00:10:37 +0000
760@@ -14,7 +14,7 @@
761 ${helper.embed_image('jpeg',str(company.logo),180, auto)}
762 </div>
763 </td>
764- <td style="text-align: right;">
765+ <td style="text-align: left;">
766 <strong>${_('Customer Aging Report of Debts') |entity}</strong>
767 </td>
768 </tr>
769
770=== modified file 'aging_due_report/report/detail_due_report_html.mako'
771--- aging_due_report/report/detail_due_report_html.mako 2014-08-16 19:04:13 +0000
772+++ aging_due_report/report/detail_due_report_html.mako 2014-08-21 00:10:37 +0000
773@@ -6,6 +6,7 @@
774 </style>
775 </head>
776 <body>
777+ <% from datetime import datetime %>
778 <% setLang(user.lang) %>
779 <table class="basic_table" width="100%">
780 <tr>
781@@ -25,11 +26,11 @@
782 %for o in cur_group:
783 <table class="table_column_border table_alter_color_row table_title_bg_color" width="100%">
784 <tr style="border-top: 1px solid #000000;">
785- <td class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ (o.get('rp_brw').vat and '%s-%s-%s'%( o.get('rp_brw').vat [2], o.get('rp_brw').vat[3:-1], o.get('rp_brw').vat[-1]) or '').upper() }</td>
786- <td colspan="5" class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ o.get('rp_brw').name or ''} (${ o.get('cur_brw').name or '' })</td>
787- <td colspan="1" class="ITEMSLEFT" style="background-color:
788- lightgrey; font-size: 10;">${ o.get('rp_brw').ref or ''} ${ o.get('rp_brw').user_id.name or '' }</td>
789- <td colspan="2" class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ _('Amounts expressed in') + ' ('+o.get('cur_brw').name+')' }</td>
790+ <td class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ (o.get('rp_brw').vat and '%s-%s-%s'%( o.get('rp_brw').vat [2], o.get('rp_brw').vat[3:-1], o.get('rp_brw').vat[-1]) or '').upper() }</td>
791+ <td colspan="4" class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ o.get('rp_brw').name or ''} (${ o.get('cur_brw').name or '' })</td>
792+ <td colspan="1" class="ITEMSLEFT ITEMBOLD" style="background-color:
793+ lightgrey;">${ o.get('rp_brw').ref or ''} ${ o.get('rp_brw').user_id.name or '' }</td>
794+ <td colspan="3" class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ _('Amounts expressed in') + ' ('+o.get('cur_brw').name+')' }</td>
795 </tr>
796 <tr>
797 <th width="14%" class="ITEMSTITLELEFT">${_('INVOICE') |entity}</th>
798@@ -45,8 +46,8 @@
799 %for inv in o['inv_ids']:
800 <tr>
801 <td class="ITEMSLEFT">${inv['inv_brw'].number}</td>
802- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_invoice,date=True)}</td>
803- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_due,date=True)}</td>
804+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_invoice and datetime.strptime(inv.get('inv_brw', False).date_invoice.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
805+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_due and datetime.strptime(inv.get('inv_brw', False).date_due.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity}</td>
806 <td class="ITEMSLEFT">${ inv.get('due_days') and _('%s DAYS')%inv.get('due_days') or _('0 DAYS') }</td>
807 <td class="ITEMSRIGHT">${formatLang(inv['inv_brw'].amount_untaxed) or '0.00' }</td>
808 <td class="ITEMSRIGHT">${formatLang(inv['inv_brw'].amount_tax) or '0.00'}</td>
809@@ -56,10 +57,10 @@
810 </tr>
811 %endfor
812 <tr>
813- <td class="ITEMSRIGHT ITEMBOLD" colspan="6" style="background-color: lightgrey;font-size: 8;">${ _('TOTAL') }</td>
814- <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;font-size: 8;">${ formatLang(o.get('inv_total')) or '0.00' }</td>
815- <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;font-size: 8;">${ formatLang(o.get('pay_left_total')) or '0.00'}</td>
816- <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;font-size: 8;">${ formatLang(o.get('due_total')) or '0.00'}</td>
817+ <td class="ITEMSRIGHT ITEMBOLD" colspan="6" style="background-color: lightgrey;">${ _('TOTAL') }</td>
818+ <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;">${ formatLang(o.get('inv_total')) or '0.00' }</td>
819+ <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;">${ formatLang(o.get('pay_left_total')) or '0.00'}</td>
820+ <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;">${ formatLang(o.get('due_total')) or '0.00'}</td>
821 </tr>
822 </table>
823 </br>
824@@ -68,8 +69,8 @@
825 <table style="border: 1px solid #A41D35; border-collapse: collapse;" width="100%">
826 %for p in list:
827 <tr>
828- <td width="92%" class="ITEMSRIGHT" style="background-color: lightgrey;border: 1px solid #A41D35; font-size: 8;">${_('TOTAL IN')} ${ p['currency']}</td>
829- <td width="8%" class="ITEMSRIGHT" style="background-color: lightgrey;border: 1px solid #A41D35; font-size: 8;">${ formatLang(p['total']) or '0.00' }</td>
830+ <td width="80%" class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;border: 1px solid #A41D35;">${_('TOTAL IN')} ${ p['currency']}</td>
831+ <td width="20%" class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;border: 1px solid #A41D35;">${ formatLang(p['total']) or '0.00' }</td>
832 </tr>
833 %endfor
834 </table>
835
836=== modified file 'aging_due_report/report/formal_due_report_html.mako'
837--- aging_due_report/report/formal_due_report_html.mako 2014-08-13 14:54:09 +0000
838+++ aging_due_report/report/formal_due_report_html.mako 2014-08-21 00:10:37 +0000
839@@ -6,6 +6,7 @@
840 </style>
841 </head>
842 <body>
843+ <% from datetime import datetime %>
844 <% setLang(user.lang) %>
845 <% datas = get_invoice_by_partner_group(objects, inv_type='out_invoice') %>
846 %for data in datas:
847@@ -53,8 +54,8 @@
848 %for inv in line['inv_ids']:
849 <tr>
850 <td class="ITEMSLEFT">${_('I:')} ${inv['inv_brw'].number or 0}</td>
851- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_invoice, date=True) }</td>
852- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_due, date=True) }</td>
853+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_invoice and datetime.strptime(inv.get('inv_brw', False).date_invoice.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
854+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_due and datetime.strptime(inv.get('inv_brw', False).date_due.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
855 <td class="ITEMSLEFT">${ inv.get('due_days') and _('%s DAYS')%inv.get('due_days') or _('0 DAYS') }</td>
856 <td class="ITEMSRIGHT">${ formatLang(inv['inv_brw'].amount_untaxed) or '0.00' }</td>
857 <td class="ITEMSRIGHT">${ formatLang(inv['inv_brw'].amount_tax) or '0.00' }</td>
858
859=== modified file 'aging_due_report/report/supplier_aging_due_report_html.mako'
860--- aging_due_report/report/supplier_aging_due_report_html.mako 2014-08-06 22:57:56 +0000
861+++ aging_due_report/report/supplier_aging_due_report_html.mako 2014-08-21 00:10:37 +0000
862@@ -14,7 +14,7 @@
863 ${helper.embed_image('jpeg',str(company.logo),180, auto)}
864 </div>
865 </td>
866- <td style="text-align: right;">
867+ <td style="text-align: left;">
868 <strong>${_('Supplier Aging Report of Debts') |entity}</strong>
869 </td>
870 </tr>
871
872=== modified file 'aging_due_report/report/supplier_detail_due_report_html.mako'
873--- aging_due_report/report/supplier_detail_due_report_html.mako 2014-08-16 20:00:03 +0000
874+++ aging_due_report/report/supplier_detail_due_report_html.mako 2014-08-21 00:10:37 +0000
875@@ -6,6 +6,7 @@
876 </style>
877 </head>
878 <body>
879+ <% from datetime import datetime %>
880 <% setLang(user.lang) %>
881 <table class="basic_table" width="100%">
882 <tr>
883@@ -25,10 +26,10 @@
884 %for o in cur_group:
885 <table class="table_column_border table_alter_color_row table_title_bg_color" width="100%">
886 <tr style=" border-top: 1px solid #000000;">
887- <td class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ (o.get('rp_brw').vat and '%s-%s-%s'%( o.get('rp_brw').vat [2], o.get('rp_brw').vat[3:-1], o.get('rp_brw').vat[-1]) or '').upper() }</td>
888- <td colspan="5" class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ o.get('rp_brw').name or ''} (${ o.get('cur_brw').name or '' })</td>
889- <td colspan="1" class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ o.get('rp_brw').ref or ''} ${ o.get('rp_brw').user_id.name or '' }</td>
890- <td colspan="2" class="ITEMSLEFT" style="background-color: lightgrey; font-size: 10;">${ _('Amounts expressed in') + ' ('+o.get('cur_brw').name+')' }</td>
891+ <td class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ (o.get('rp_brw').vat and '%s-%s-%s'%( o.get('rp_brw').vat [2], o.get('rp_brw').vat[3:-1], o.get('rp_brw').vat[-1]) or '').upper() }</td>
892+ <td colspan="4" class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ o.get('rp_brw').name or ''} (${ o.get('cur_brw').name or '' })</td>
893+ <td colspan="1" class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ o.get('rp_brw').ref or ''} ${ o.get('rp_brw').user_id.name or '' }</td>
894+ <td colspan="3" class="ITEMSLEFT ITEMBOLD" style="background-color: lightgrey;">${ _('Amounts expressed in') + ' ('+o.get('cur_brw').name+')' }</td>
895 </tr>
896 <tr>
897 <th width="14%" class="ITEMSTITLELEFT">${_('INVOICE') |entity}</th>
898@@ -44,8 +45,8 @@
899 %for inv in o['inv_ids']:
900 <tr>
901 <td class="ITEMSLEFT">${ inv['inv_brw'].number }</td>
902- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_invoice,date=True) }</td>
903- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_due,date=True) }</td>
904+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_invoice and datetime.strptime(inv.get('inv_brw', False).date_invoice.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
905+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_due and datetime.strptime(inv.get('inv_brw', False).date_due.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
906 <td class="ITEMSLEFT">${ inv.get('due_days') and _('%s DAYS')%inv.get('due_days') or _('0 DAYS') }</td>
907 <td class="ITEMSRIGHT">${ formatLang(inv['inv_brw'].amount_untaxed) or '0.00'}</td>
908 <td class="ITEMSRIGHT">${ formatLang(inv['inv_brw'].amount_tax) or '0.00'}</td>
909@@ -56,9 +57,9 @@
910 %endfor
911 <tr style=" border-top: 1px solid #000000;">
912 <td class="ITEMSRIGHT ITEMBOLD" colspan="6" style="background-color: lightgrey;" >TOTAL</td>
913- <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;" >${ formatLang(o.get('inv_total')) or '0.00'}</td>
914- <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;" >${ formatLang(o.get('pay_left_total')) or '0.00'}</td>
915- <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;" >${ formatLang(o.get('due_total')) or '0.00'}</td>
916+ <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;">${ formatLang(o.get('inv_total')) or '0.00'}</td>
917+ <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;">${ formatLang(o.get('pay_left_total')) or '0.00'}</td>
918+ <td class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;">${ formatLang(o.get('due_total')) or '0.00'}</td>
919 </tr>
920 </table>
921 </br>
922@@ -67,8 +68,8 @@
923 <table style="border: 1px solid #A41D35; border-collapse: collapse;" width="100%">
924 %for p in list:
925 <tr>
926- <td width="92%" class="ITEMSRIGHT" style="background-color: lightgrey;border: 1px solid #A41D35; font-size: 8;">${_('TOTAL IN')} ${ p['currency']}</td>
927- <td width="8%" class="ITEMSRIGHT" style="background-color: lightgrey;border: 1px solid #A41D35; font-size: 8;">${ formatLang(p['total']) or '0.00' }</td>
928+ <td width="80%" class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;border: 1px solid #A41D35;">${_('TOTAL IN')} ${ p['currency']}</td>
929+ <td width="20%" class="ITEMSRIGHT ITEMBOLD" style="background-color: lightgrey;border: 1px solid #A41D35;">${ formatLang(p['total']) or '0.00' }</td>
930 </tr>
931 %endfor
932 </table>
933
934=== modified file 'aging_due_report/report/supplier_formal_due_report_html.mako'
935--- aging_due_report/report/supplier_formal_due_report_html.mako 2014-08-08 23:39:02 +0000
936+++ aging_due_report/report/supplier_formal_due_report_html.mako 2014-08-21 00:10:37 +0000
937@@ -6,6 +6,7 @@
938 </style>
939 </head>
940 <body>
941+ <% from datetime import datetime %>
942 <% setLang(user.lang) %>
943 <% datas = get_invoice_by_partner_group(objects, inv_type='in_invoice') %>
944 %for data in datas:
945@@ -40,23 +41,23 @@
946 %for line in data:
947 <table class="table_column_border table_alter_color_row table_title_bg_color" width="100%">
948 <tr>
949- <th width="15%" class="ITEMSTITLELEFT">${_('DOCUMENT') |entity}</th>
950- <th width="15%" class="ITEMSTITLELEFT">${_('EMIS DATE') |entity}</th>
951+ <th width="21%" class="ITEMSTITLELEFT">${_('DOCUMENT') |entity}</th>
952+ <th width="10%" class="ITEMSTITLELEFT">${_('EMIS DATE') |entity}</th>
953 <th width="10%" class="ITEMSTITLELEFT">${_('DUE DATE') |entity}</th>
954- <th width="10%" class="ITEMSTITLELEFT">${_('DUE DAYS') |entity}</th>
955+ <th width="4%" class="ITEMSTITLELEFT">${_('DUE DAYS') |entity}</th>
956 <th width="10%" class="ITEMSTITLERIGHT">${_('BASE') |entity}</th>
957 <th width="10%" class="ITEMSTITLERIGHT">${_('TAX') |entity}</th>
958- <th width="10%" class="ITEMSTITLERIGHT">${_('TOTAL/DOC.') |entity}</th>
959+ <th width="12%" class="ITEMSTITLERIGHT">${_('TOTAL/DOC.') |entity}</th>
960 <th width="10%" class="ITEMSTITLERIGHT">${_('PAYMENTS') |entity}</th>
961- <th width="10%" class="ITEMSTITLERIGHT">${_('BALANCE') |entity}</th>
962+ <th width="12%" class="ITEMSTITLERIGHT">${_('BALANCE') |entity}</th>
963 </tr>
964
965 <!-- TABLA CENTRAL DEL REPORTE -->
966 %for inv in line['inv_ids']:
967 <tr>
968 <td class="ITEMSLEFT">${_('I:')} ${inv['inv_brw'].number or 0}</td>
969- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_invoice, date=True) }</td>
970- <td class="ITEMSLEFT">${ formatLang(inv['inv_brw'].date_due, date=True) }</td>
971+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_invoice and datetime.strptime(inv.get('inv_brw', False).date_invoice.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
972+ <td class="ITEMSLEFT">${ inv.get('inv_brw', False).date_due and datetime.strptime(inv.get('inv_brw', False).date_due.encode('ascii','replace'), '%Y-%m-%d').strftime('%d/%m/%Y') or ''|entity }</td>
973 <td class="ITEMSLEFT">${ inv.get('due_days') and '%s DAYS'%inv.get('due_days') or _('0 DAYS') }</td>
974 <td class="ITEMSRIGHT">${ formatLang(inv['inv_brw'].amount_untaxed) or '0.00' }</td>
975 <td class="ITEMSRIGHT">${ formatLang(inv['inv_brw'].amount_tax) or '0.00' }</td>