=== modified file 'l10n_cr_hr_payroll/report/payroll_report_for_month.mako' --- l10n_cr_hr_payroll/report/payroll_report_for_month.mako 2014-05-29 19:59:48 +0000 +++ l10n_cr_hr_payroll/report/payroll_report_for_month.mako 2014-07-01 17:36:38 +0000 @@ -1,9 +1,11 @@ - @@ -50,22 +52,23 @@ %> +
${struct[0]}
-
${_('Id card')}
-
${_('Name')}
-
${_('Bank account')}
-
${_('Hrs.')}
${_('Nor')}
-
${_('Hrs.')}
${_('Ext')}
-
${_('Ingr.')}
${_('Normal')}
-
${_('Ingr.')}
${_('Extra')}
-
${_('Salary')}
${_('Gross')}
-
${_('Deducc.')}
${_('CCSS/BP')}
-
${_('Bonuses')}
-
${_('Tax')}
${_('Rent')}
-
${_('Salary')}
${_('Net')}
+
${_('Id card')}
+
${_('Name')}
+
${_('Bank account')}
+
${_('Hrs.')}
${_('Nor')}
+
${_('Hrs.')}
${_('Ext')}
+
${_('Ingr.')}
${_('Normal')}
+
${_('Ingr.')}
${_('Extra')}
+
${_('Salary')}
${_('Gross')}
+
${_('Deducc.')}
${_('CCSS/BP')}
+
${_('Bonuses')}
+
${_('Tax')}
${_('Rent')}
+
${_('Salary')}
${_('Net')}
@@ -147,21 +150,36 @@
%endfor +
-
${_('TOTAL')}
-
${total_emp} ${_('Employees')}
-
-
${total_hn}
-
${total_he}
-
${formatLang(total_basic)}
-
${formatLang(total_ext)}
-
${formatLang(total_gross)}
-
${formatLang(total_ccss)}
-
${formatLang(total_bon)}
-
${formatLang(total_rent)}
-
${formatLang(total_net)}
+
+
+
${_('Hrs.')}
${_('Nor')}
+
${_('Hrs.')}
${_('Ext')}
+
${_('Ingr.')}
${_('Normal')}
+
${_('Ingr.')}
${_('Extra')}
+
${_('Salary')}
${_('Gross')}
+
${_('Deducc.')}
${_('CCSS/BP')}
+
${_('Bonuses')}
+
${_('Tax')}
${_('Rent')}
+
${_('Salary')}
${_('Net')}
+
+
+
+
+
+
${_('TOTAL')}
+
${total_hn}
+
${total_he}
+
${formatLang(total_basic)}
+
${formatLang(total_ext)}
+
${formatLang(total_gross)}
+
${formatLang(total_ccss)}
+
${formatLang(total_bon)}
+
${formatLang(total_rent)}
+
${formatLang(total_net)}
=== modified file 'l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py' --- l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py 2013-08-27 14:41:48 +0000 +++ l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard.py 2014-07-01 17:36:38 +0000 @@ -29,9 +29,9 @@ _description = "Payroll Report for Month" _columns = { - 'company_id': fields.many2one('res.company', 'Company'), - 'period_from': fields.many2one('account.period', 'Start Period'), - 'period_to': fields.many2one('account.period', 'End Period'), + 'company_id': fields.many2one('res.company', 'Company', required=True), + 'period_from': fields.many2one('account.period', 'Start Period', required=True), + 'period_to': fields.many2one('account.period', 'End Period', required=True), } _defaults = { === modified file 'l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml' --- l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml 2013-03-26 17:07:24 +0000 +++ l10n_cr_hr_payroll/wizard/payroll_report_for_month_wizard_view.xml 2014-07-01 17:36:38 +0000 @@ -7,15 +7,15 @@ payroll.report.for.month
- - - - - - - + + + + + + +