Merge lp:~gs.clearcorp/openerp-costa-rica/7.0_l10n_cr_hr_payroll into lp:openerp-costa-rica
- 7.0_l10n_cr_hr_payroll
- Merge into 7.0
Proposed by
Glen Sojo
| 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ClearCorp drivers | Pending | ||
|
Review via email:
|
|||
Commit message
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 | 1 | <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | 1 | <!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 6 | 2 | <html xmlns="http://www.w3.org/1999/xhtml"> | 2 | <html xmlns="http://www.w3.org/1999/xhtml"> |
| 7 | 3 | <head> | 3 | <head> |
| 8 | 4 | <link rel='stylesheet' href='addons/account_webkit_report_library/webkit_headers/main.css' /> | ||
| 9 | 5 | <style> | 4 | <style> |
| 10 | 6 | ${css} | 5 | ${css} |
| 11 | 6 | .body { | ||
| 12 | 7 | width: 1650px !important; | ||
| 13 | 8 | } | ||
| 14 | 7 | </style> | 9 | </style> |
| 15 | 8 | </head> | 10 | </head> |
| 16 | 9 | <body class = "data"> | 11 | <body class = "data"> |
| 17 | @@ -50,22 +52,23 @@ | |||
| 18 | 50 | 52 | ||
| 19 | 51 | %> | 53 | %> |
| 20 | 52 | 54 | ||
| 21 | 55 | </br> | ||
| 22 | 53 | <div style="font-size: 16px; font-weight: bold; text-align: left;">${struct[0]}</div> | 56 | <div style="font-size: 16px; font-weight: bold; text-align: left;">${struct[0]}</div> |
| 23 | 54 | <div class="table list"> | 57 | <div class="table list"> |
| 24 | 55 | <div class="table-header"> | 58 | <div class="table-header"> |
| 25 | 56 | <div class="table-row ${row_even and 'even' or 'odd'}"> | 59 | <div class="table-row ${row_even and 'even' or 'odd'}"> |
| 38 | 57 | <div class="table-cell" style="width:14%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Id card')}</div> | 60 | <div class="table-cell" style="width:11%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Id card')}</div> |
| 39 | 58 | <div class="table-cell" style="width:17%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Name')}</div> | 61 | <div class="table-cell" style="width:16%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Name')}</div> |
| 40 | 59 | <div class="table-cell" style="width:13%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bank account')}</div> | 62 | <div class="table-cell" style="width:11%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bank account')}</div> |
| 41 | 60 | <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> | 63 | <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 | 61 | <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> | 64 | <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 | 62 | <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> | 65 | <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 | 63 | <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> | 66 | <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 | 64 | <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> | 67 | <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 | 65 | <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> | 68 | <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 | 66 | <div class="table-cell" style="width:6.22%; background-color:silver; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bonuses')}</div> | 69 | <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bonuses')}</div> |
| 48 | 67 | <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> | 70 | <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 | 68 | <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> | 71 | <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 | 69 | </div> | 72 | </div> |
| 51 | 70 | </div> | 73 | </div> |
| 52 | 71 | 74 | ||
| 53 | @@ -147,21 +150,36 @@ | |||
| 54 | 147 | </div> | 150 | </div> |
| 55 | 148 | </div> | 151 | </div> |
| 56 | 149 | %endfor | 152 | %endfor |
| 57 | 153 | </br> | ||
| 58 | 150 | <div class="table list"> | 154 | <div class="table list"> |
| 59 | 151 | <div class="table-header"> | 155 | <div class="table-header"> |
| 60 | 152 | <div class="table-row ${row_even and 'even' or 'odd'}"> | 156 | <div class="table-row ${row_even and 'even' or 'odd'}"> |
| 73 | 153 | <div class="table-cell" style="width:14%; text-align:left; border:silver 1px solid;">${_('TOTAL')}</div> | 157 | <div class="table-cell" style="width:27%; border:none;"></div> |
| 74 | 154 | <div class="table-cell" style="width:17%; text-align:left; border:silver 1px solid;">${total_emp} ${_('Employees')}</div> | 158 | <div class="table-cell" style="width:11%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;"></div> |
| 75 | 155 | <div class="table-cell" style="width:13%; text-align:left; border:silver 1px solid;"> </div> | 159 | <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 | 156 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${total_hn}</div> | 160 | <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 | 157 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${total_he}</div> | 161 | <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 | 158 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_basic)}</div> | 162 | <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 | 159 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_ext)}</div> | 163 | <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 | 160 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_gross)}</div> | 164 | <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 | 161 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_ccss)}</div> | 165 | <div class="table-cell" style="width:8%; background-color:white; font-weight: bold; text-align:center; border:silver 1px solid;">${_('Bonuses')}</div> |
| 82 | 162 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_bon)}</div> | 166 | <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 | 163 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_rent)}</div> | 167 | <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 | 164 | <div class="table-cell" style="width:6.22%; text-align:left; border:silver 1px solid;">${formatLang(total_net)}</div> | 168 | </div> |
| 85 | 169 | </div> | ||
| 86 | 170 | <div class="table-header"> | ||
| 87 | 171 | <div class="table-row ${row_even and 'even' or 'odd'}"> | ||
| 88 | 172 | <div class="table-cell" style="width:27%; border:none;"></div> | ||
| 89 | 173 | <div class="table-cell" style="width:11%; text-align:right; font-weight: bold; border:silver 1px solid;">${_('TOTAL')}</div> | ||
| 90 | 174 | <div class="table-cell" style="width:3%; text-align:left; border:silver 1px solid;">${total_hn}</div> | ||
| 91 | 175 | <div class="table-cell" style="width:3%; text-align:left; border:silver 1px solid;">${total_he}</div> | ||
| 92 | 176 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_basic)}</div> | ||
| 93 | 177 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_ext)}</div> | ||
| 94 | 178 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_gross)}</div> | ||
| 95 | 179 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_ccss)}</div> | ||
| 96 | 180 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_bon)}</div> | ||
| 97 | 181 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_rent)}</div> | ||
| 98 | 182 | <div class="table-cell" style="width:8%; text-align:left; border:silver 1px solid;">${formatLang(total_net)}</div> | ||
| 99 | 165 | </div> | 183 | </div> |
| 100 | 166 | </div> | 184 | </div> |
| 101 | 167 | </div> | 185 | </div> |
| 102 | 168 | 186 | ||
| 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 | 29 | _description = "Payroll Report for Month" | 29 | _description = "Payroll Report for Month" |
| 108 | 30 | 30 | ||
| 109 | 31 | _columns = { | 31 | _columns = { |
| 113 | 32 | 'company_id': fields.many2one('res.company', 'Company'), | 32 | 'company_id': fields.many2one('res.company', 'Company', required=True), |
| 114 | 33 | 'period_from': fields.many2one('account.period', 'Start Period'), | 33 | 'period_from': fields.many2one('account.period', 'Start Period', required=True), |
| 115 | 34 | 'period_to': fields.many2one('account.period', 'End Period'), | 34 | 'period_to': fields.many2one('account.period', 'End Period', required=True), |
| 116 | 35 | } | 35 | } |
| 117 | 36 | 36 | ||
| 118 | 37 | _defaults = { | 37 | _defaults = { |
| 119 | 38 | 38 | ||
| 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 | 7 | <field name="model">payroll.report.for.month</field> | 7 | <field name="model">payroll.report.for.month</field> |
| 125 | 8 | <field name="arch" type="xml"> | 8 | <field name="arch" type="xml"> |
| 126 | 9 | <form string="Payroll report for month" version="7.0"> | 9 | <form string="Payroll report for month" version="7.0"> |
| 134 | 10 | <separator string="Company" colspan="4"/> | 10 | <group> |
| 135 | 11 | <field name="company_id" /> | 11 | <field name="company_id" /> |
| 136 | 12 | <newline/> | 12 | </group> |
| 137 | 13 | <separator string="Periods" colspan="4" /> | 13 | <group> |
| 138 | 14 | <field name="period_from" domain="[('company_id', '=', company_id)]"/> | 14 | <field name="period_from" domain="[('company_id', '=', company_id)]"/> |
| 139 | 15 | <field name="period_to" domain="[('company_id', '=', company_id)]"/> | 15 | <field name="period_to" domain="[('company_id', '=', company_id)]"/> |
| 140 | 16 | <newline/> | 16 | </group> |
| 141 | 17 | <footer> | 17 | <footer> |
| 143 | 18 | <button name="action_validate" string="Validate" type="object"/> | 18 | <button name="action_validate" string="Validate" type="object" class="oe_highlight"/> |
| 144 | 19 | or | 19 | or |
| 145 | 20 | <button string="Cancel" class="oe_link" special="cancel" /> | 20 | <button string="Cancel" class="oe_link" special="cancel" /> |
| 146 | 21 | </footer> | 21 | </footer> |
