clearcorp team mailing list archive

[Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>]

Ronald Rubi has proposed merging lp:~rr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll_report into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll_report/+merge/143953

[FIX] Fix module hr_payroll_report, add option appears on report
-- 
https://code.launchpad.net/~rr.clearcorp/openerp-ccorp-addons/6.1-hr_payroll_report/+merge/143953
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'hr_payroll_report/__openerp__.py'
--- hr_payroll_report/__openerp__.py	2012-10-26 21:07:11 +0000
+++ hr_payroll_report/__openerp__.py	2013-01-18 21:51:23 +0000
@@ -34,7 +34,10 @@
     ],
     'init_xml': [],
     'demo_xml': [],
-    'update_xml': ['hr_payroll_report_report.xml',],
+    'update_xml': [
+                    'hr_payroll_report_report.xml',
+                    'hr_payroll_report_view.xml',
+                ],
     'license': 'AGPL-3',
     'installable': True,
     'active': False,

=== modified file 'hr_payroll_report/hr_payroll_report.py'
--- hr_payroll_report/hr_payroll_report.py	2012-11-07 15:17:20 +0000
+++ hr_payroll_report/hr_payroll_report.py	2013-01-18 21:51:23 +0000
@@ -30,6 +30,14 @@
             'payslip_footer':fields.text('Payslip footer'),
     }
 res_company()
-    
-    
-    
\ No newline at end of file
+
+class HrSalaryRule(osv.osv):
+    _inherit = 'hr.salary.rule'
+    _columns = {
+        'appears_on_report': fields.boolean('Appears on Report', help="Used for the display of rule on payslip reports"),
+    }
+    
+    _defaults = {
+        'appears_on_report': True,
+    }
+

=== modified file 'hr_payroll_report/hr_payroll_report_report.xml'
--- hr_payroll_report/hr_payroll_report_report.xml	2012-11-07 17:21:58 +0000
+++ hr_payroll_report/hr_payroll_report_report.xml	2013-01-18 21:51:23 +0000
@@ -9,22 +9,6 @@
         file="hr_payroll_report/report/hr_payroll_report.mako"
         string="Employee PaySlip"
         report_type="webkit" />
-              
-       <record id="view_company_form_inherit" model="ir.ui.view">
-            <field name="name">res.company.form.inherit</field>
-            <field name="model">res.company</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="arch" type="xml">
-                <data>                
-                    <page string="Internal Header/Footer" position="after">
-                        <page string="Configuration Report" groups="base.group_extended">
-                            <field colspan="2" name="payslip_footer"/>
-                        </page>
-                    </page>
-                </data>
-            </field>
-        </record>  
         
         <report auto="False"
         id="hr_payroll.payslip_details_report"

=== added file 'hr_payroll_report/hr_payroll_report_view.xml'
--- hr_payroll_report/hr_payroll_report_view.xml	1970-01-01 00:00:00 +0000
+++ hr_payroll_report/hr_payroll_report_view.xml	2013-01-18 21:51:23 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+              
+       <record id="view_company_form_inherit" model="ir.ui.view">
+            <field name="name">res.company.form.inherit</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <data>                
+                    <page string="Internal Header/Footer" position="after">
+                        <page string="Configuration Report" groups="base.group_extended">
+                            <field colspan="2" name="payslip_footer"/>
+                        </page>
+                    </page>
+                </data>
+            </field>
+        </record>
+        
+        <record id="hr_salary_rule_form_inherit" model="ir.ui.view">
+            <field name="name">hr.salary.rule.form.inherit</field>
+            <field name="model">hr.salary.rule</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr_payroll.hr_salary_rule_form"/>
+            <field name="arch" type="xml">
+                <field name="appears_on_payslip" position="after">
+                    <field name="appears_on_report"/>
+                </field>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
+

=== modified file 'hr_payroll_report/i18n/es_CR.po'
--- hr_payroll_report/i18n/es_CR.po	2012-12-11 21:24:42 +0000
+++ hr_payroll_report/i18n/es_CR.po	2013-01-18 21:51:23 +0000
@@ -1,19 +1,20 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* hr_payroll_report
+# 	* hr_payroll_report
+# Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-11 21:08+0000\n"
-"PO-Revision-Date: 2012-12-11 21:08+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2013-01-18 20:51+0000\n"
+"PO-Revision-Date: 2013-01-18 15:04-0600\n"
+"Last-Translator: Ronald Rubi <ronald.rubi@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Inglés <ronald.rubi@xxxxxxxxxxxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. module: hr_payroll_report
 #: report:addons/hr_payroll_report/report/hr_payroll_details_report.mako:133
@@ -62,6 +63,16 @@
 msgstr "Cabecera / Pie de página interna"
 
 #. module: hr_payroll_report
+#: help:hr.salary.rule,appears_on_report:0
+msgid "Used for the display of rule on payslip reports"
+msgstr "Utilizado para mostrar la regla de nómina en el reporte"
+
+#. module: hr_payroll_report
+#: model:ir.model,name:hr_payroll_report.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr "hr.salary.rule"
+
+#. module: hr_payroll_report
 #: report:addons/hr_payroll_report/report/hr_payroll_details_report.mako:57
 #: report:addons/hr_payroll_report/report/hr_payroll_report.mako:57
 msgid "Bank account"
@@ -98,6 +109,11 @@
 msgstr "Recibido y conforme: "
 
 #. module: hr_payroll_report
+#: field:hr.salary.rule,appears_on_report:0
+msgid "Appears on Report"
+msgstr "Aparece en reporte"
+
+#. module: hr_payroll_report
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
 msgstr "¡El nombre de la compañía debe ser único!"
@@ -176,4 +192,3 @@
 #: report:addons/hr_payroll_report/report/hr_payroll_report.mako:136
 msgid "Total"
 msgstr "Total"
-

=== modified file 'hr_payroll_report/report/hr_payroll_report.py'
--- hr_payroll_report/report/hr_payroll_report.py	2012-10-29 17:41:24 +0000
+++ hr_payroll_report/report/hr_payroll_report.py	2013-01-18 21:51:23 +0000
@@ -65,7 +65,7 @@
     
     def get_payslip_lines (self,cr,uid,payslip_id,context=None):
         payslip_line = self.pool.get('hr.payslip.line')
-        payslip_lines_ids = payslip_line.search(cr,uid,[('slip_id','=',payslip_id),('salary_rule_id.appears_on_payslip','=',True)],context)
+        payslip_lines_ids = payslip_line.search(cr,uid,[('slip_id','=',payslip_id),('salary_rule_id.appears_on_report','=',True)],context)
         payslip_lines_object = payslip_line.browse(cr,uid,payslip_lines_ids,context=context)
         payslip_lines_list = []
         base = 0