Merge lp:~gs.clearcorp/openerp-costa-rica/7.0_l10n_cr_hr_payroll into lp:openerp-costa-rica

Proposed by Glen Sojo on 2014-07-01
Status: Merged
Merged at revision: 291
Proposed branch: lp:~gs.clearcorp/openerp-costa-rica/7.0_l10n_cr_hr_payroll
Merge into: lp:openerp-costa-rica
Diff against target: 146 lines (+54/-36)
3 files modified
l10n_cr_hr_payroll/report/payroll_report_for_month.mako (+43/-25)
l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py (+3/-3)
l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml (+8/-8)
To merge this branch: bzr merge lp:~gs.clearcorp/openerp-costa-rica/7.0_l10n_cr_hr_payroll
Reviewer Review Type Date Requested Status
ClearCorp drivers 2014-07-01 Pending
Review via email: mp+225211@code.launchpad.net

Description of the change

[FIX] - l10n_cr_hr_payroll: Adjusted report size and columns to fit with greater values and hold proportions.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_cr_hr_payroll/report/payroll_report_for_month.mako'
2--- l10n_cr_hr_payroll/report/payroll_report_for_month.mako 2014-05-29 19:59:48 +0000
3+++ l10n_cr_hr_payroll/report/payroll_report_for_month.mako 2014-07-01 17:36:38 +0000
4@@ -1,9 +1,11 @@
5 <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
6 <html xmlns="http://www.w3.org/1999/xhtml">
7 <head>
8- <link rel='stylesheet' href='addons/account_webkit_report_library/webkit_headers/main.css' />
9 <style>
10 ${css}
11+ .body {
12+ width: 1650px !important;
13+ }
14 </style>
15 </head>
16 <body class = "data">
17@@ -50,22 +52,23 @@
18
19 %>
20
21+ </br>
22 <div style="font-size: 16px; font-weight: bold; text-align: left;">${struct[0]}</div>
23 <div class="table list">
24 <div class="table-header">
25 <div class="table-row ${row_even and 'even' or 'odd'}">
26- <div class="table-cell" style="width:14%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Id card')}</div>
27- <div class="table-cell" style="width:17%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Name')}</div>
28- <div class="table-cell" style="width:13%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bank account')}</div>
29- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Hrs.')}<br />${_('Nor')}</div>
30- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Hrs.')}<br />${_('Ext')}</div>
31- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Ingr.')}<br />${_('Normal')}</div>
32- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Ingr.')}<br />${_('Extra')}</div>
33- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Salary')}<br />${_('Gross')}</div>
34- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Deducc.')}<br />${_('CCSS/BP')}</div>
35- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bonuses')}</div>
36- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Tax')}<br />${_('Rent')}</div>
37- <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Salary')}<br />${_('Net')}</div>
38+ <div class="table-cell" style="width:11%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Id card')}</div>
39+ <div class="table-cell" style="width:16%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Name')}</div>
40+ <div class="table-cell" style="width:11%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bank account')}</div>
41+ <div class="table-cell" style="width:3%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Hrs.')}<br />${_('Nor')}</div>
42+ <div class="table-cell" style="width:3%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Hrs.')}<br />${_('Ext')}</div>
43+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Ingr.')}<br />${_('Normal')}</div>
44+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Ingr.')}<br />${_('Extra')}</div>
45+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Salary')}<br />${_('Gross')}</div>
46+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Deducc.')}<br />${_('CCSS/BP')}</div>
47+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bonuses')}</div>
48+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Tax')}<br />${_('Rent')}</div>
49+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Salary')}<br />${_('Net')}</div>
50 </div>
51 </div>
52
53@@ -147,21 +150,36 @@
54 </div>
55 </div>
56 %endfor
57+ </br>
58 <div class="table list">
59 <div class="table-header">
60 <div class="table-row ${row_even and 'even' or 'odd'}">
61- <div class="table-cell" style="width:14%; text-align:left; border:silver 1px solid;">${_('TOTAL')}</div>
62- <div class="table-cell" style="width:17%; text-align:left; border:silver 1px solid;">${total_emp} ${_('Employees')}</div>
63- <div class="table-cell" style="width:13%; text-align:left; border:silver 1px solid;"> </div>
64- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${total_hn}</div>
65- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${total_he}</div>
66- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_basic)}</div>
67- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_ext)}</div>
68- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_gross)}</div>
69- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_ccss)}</div>
70- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_bon)}</div>
71- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_rent)}</div>
72- <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_net)}</div>
73+ <div class="table-cell" style="width:27%; border:none;"></div>
74+ <div class="table-cell" style="width:11%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;"></div>
75+ <div class="table-cell" style="width:3%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Hrs.')}<br />${_('Nor')}</div>
76+ <div class="table-cell" style="width:3%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Hrs.')}<br />${_('Ext')}</div>
77+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Ingr.')}<br />${_('Normal')}</div>
78+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Ingr.')}<br />${_('Extra')}</div>
79+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Salary')}<br />${_('Gross')}</div>
80+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Deducc.')}<br />${_('CCSS/BP')}</div>
81+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bonuses')}</div>
82+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Tax')}<br />${_('Rent')}</div>
83+ <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Salary')}<br />${_('Net')}</div>
84+ </div>
85+ </div>
86+ <div class="table-header">
87+ <div class="table-row ${row_even and 'even' or 'odd'}">
88+ <div class="table-cell" style="width:27%; border:none;"></div>
89+ <div class="table-cell" style="width:11%; text-align:right; font-weight: bold; border:silver 1px solid;">${_('TOTAL')}</div>
90+ <div class="table-cell" style="width:3%; text-align:left; border:silver 1px solid;">${total_hn}</div>
91+ <div class="table-cell" style="width:3%; text-align:left; border:silver 1px solid;">${total_he}</div>
92+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_basic)}</div>
93+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_ext)}</div>
94+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_gross)}</div>
95+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_ccss)}</div>
96+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_bon)}</div>
97+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_rent)}</div>
98+ <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_net)}</div>
99 </div>
100 </div>
101 </div>
102
103=== modified file 'l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py'
104--- l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py 2013-08-27 14:41:48 +0000
105+++ l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py 2014-07-01 17:36:38 +0000
106@@ -29,9 +29,9 @@
107 _description = "Payroll Report for Month"
108
109 _columns = {
110- 'company_id': fields.many2one('res.company', 'Company'),
111- 'period_from': fields.many2one('account.period', 'Start Period'),
112- 'period_to': fields.many2one('account.period', 'End Period'),
113+ 'company_id': fields.many2one('res.company', 'Company', required=True),
114+ 'period_from': fields.many2one('account.period', 'Start Period', required=True),
115+ 'period_to': fields.many2one('account.period', 'End Period', required=True),
116 }
117
118 _defaults = {
119
120=== modified file 'l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml'
121--- l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml 2013-03-26 17:07:24 +0000
122+++ l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml 2014-07-01 17:36:38 +0000
123@@ -7,15 +7,15 @@
124 <field name="model">payroll.report.for.month</field>
125 <field name="arch" type="xml">
126 <form string="Payroll report for month" version="7.0">
127- <separator string="Company" colspan="4"/>
128- <field name="company_id" />
129- <newline/>
130- <separator string="Periods" colspan="4" />
131- <field name="period_from" domain="[('company_id', '=', company_id)]"/>
132- <field name="period_to" domain="[('company_id', '=', company_id)]"/>
133- <newline/>
134+ <group>
135+ <field name="company_id" />
136+ </group>
137+ <group>
138+ <field name="period_from" domain="[('company_id', '=', company_id)]"/>
139+ <field name="period_to" domain="[('company_id', '=', company_id)]"/>
140+ </group>
141 <footer>
142- <button name="action_validate" string="Validate" type="object"/>
143+ <button name="action_validate" string="Validate" type="object" class="oe_highlight"/>
144 or
145 <button string="Cancel" class="oe_link" special="cancel" />
146 </footer>

Subscribers

People subscribed via source and target branches

to all changes: