Merge lp:~gs.clearcorp/openerp-ccorp-addons/hr_contract_extended into lp:openerp-ccorp-addons/7.0

[Glen Sojo]

[ADD] Calculations of time worked in years, months and days

[lp:~gs.clearcorp/openerp-ccorp-addons/hr_contract_extended]

760. By Glen Sojo on 2013-09-13

[ADD] New es_CR translation

761. By Glen Sojo on 2013-09-13

[Fix] Changed view. Switched normal text for label tags.

=== modified file 'hr_contract_extended/hr_contract_extended.py'
--- hr_contract_extended/hr_contract_extended.py	2013-08-27 17:42:04 +0000
+++ hr_contract_extended/hr_contract_extended.py	2013-09-13 19:58:54 +0000
@@ -19,7 +19,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
+from dateutil.relativedelta import relativedelta
+from datetime import datetime
+
 
 class HrContractAcademicAchievement(osv.osv):
     _name = 'hr.contract.academic.achievement'
@@ -64,11 +67,43 @@
         return res
 
 class HrContract(osv.osv):
+    
+    def _days_between(self, start_date, end_date):
+        start_date = datetime.strptime(start_date, "%Y-%m-%d")
+        end_date = datetime.strptime(end_date, "%Y-%m-%d")
+        return relativedelta(end_date, start_date).days
+    
+    def _months_between(self, start_date, end_date):
+        start_date = datetime.strptime(start_date, "%Y-%m-%d")
+        end_date = datetime.strptime(end_date, "%Y-%m-%d")
+        return relativedelta(end_date, start_date).months
+    
+    def _years_between(self, start_date, end_date):
+        start_date = datetime.strptime(start_date, "%Y-%m-%d")
+        end_date = datetime.strptime(end_date, "%Y-%m-%d")
+        return relativedelta(end_date, start_date).years
+    
+    
+    def _compute_duration(self, cr, uid, ids, field_name, arg, context={}):
+        res = {}
+        contracts = self.browse(cr, uid, ids, context=context)
+        for contract in contracts:
+            
+            res[contract.id] = {
+                'duration_years': self._years_between(contract.date_start, contract.date_end),
+                'duration_months': self._months_between(contract.date_start, contract.date_end),
+                'duration_days': self._days_between(contract.date_start, contract.date_end),
+            }
+        return res
+    
     _inherit = 'hr.contract'
     
     _columns = {
         'hr_salary_rule_ids':fields.one2many('hr.salary.rule', 'contract_id', 'Salary Rules'),
         'academic_achievement':fields.one2many('hr.contract.academic.achievement', 'contract_academic_achievement', 'Academic Achievements'),
+        'duration_years': fields.function(_compute_duration, type="integer", string="Years", multi="sums"),
+        'duration_months': fields.function(_compute_duration, type="integer", string="Months", multi="sums"),
+        'duration_days': fields.function(_compute_duration, type="integer", string="Days", multi="sums"),
     }
     
     def unlink(self, cr, uid, ids, context=None):
 
=== modified file 'hr_contract_extended/hr_contract_extended_view.xml'
--- hr_contract_extended/hr_contract_extended_view.xml	2013-08-27 17:42:04 +0000
+++ hr_contract_extended/hr_contract_extended_view.xml	2013-09-13 19:58:54 +0000
@@ -5,9 +5,21 @@
         <record id="hr_contract_salary_rule_form" model="ir.ui.view">
             <field name="name">hr.contract.salary.rule.form</field>
             <field name="model">hr.contract</field>
+            <field name="priority" eval="16"/>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
+                <xpath expr="//field[@name='working_hours']" position="before">
+                    <label for="duration_years" string="Time Worked"/>
+                    <div>
+                        <field name="duration_years" class="oe_inline" nolabel="1"/>
+                        <label string="year(s) - "/>
+                        <field name="duration_months" class="oe_inline" nolabel="1"/>
+                        <label string="month(s) - "/>
+                        <field name="duration_days" class="oe_inline" nolabel="1"/>
+                        <label string="day(s)"/>
+                    </div>
+                </xpath>
                  <xpath expr="//page[@string='Information']" position="after">
                     <page string="Salary Rules">
                         <field name="hr_salary_rule_ids"/>
 
=== modified file 'hr_contract_extended/i18n/es_CR.po'
--- hr_contract_extended/i18n/es_CR.po	2013-08-27 17:38:35 +0000
+++ hr_contract_extended/i18n/es_CR.po	2013-09-13 19:58:54 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-27 17:31+0000\n"
-"PO-Revision-Date: 2013-08-27 17:31+0000\n"
+"POT-Creation-Date: 2013-09-13 19:54+0000\n"
+"PO-Revision-Date: 2013-09-13 19:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,16 +16,36 @@
 "Plural-Forms: \n"
 
 #. module: hr_contract_extended
+#: view:hr.contract:0
+msgid "day(s)"
+msgstr "día(s)"
+
+#. module: hr_contract_extended
 #: model:ir.model,name:hr_contract_extended.model_hr_contract_academic_achievement
 msgid "Hr Contract Academic Achievement"
 msgstr "Hr Contrat Logros Académicos"
 
 #. module: hr_contract_extended
+#: view:hr.contract:0
+msgid "Time Worked"
+msgstr "Tiempo Laborado"
+
+#. module: hr_contract_extended
 #: field:hr.contract.academic.achievement,degree_obtained:0
 msgid "Degree Obtained"
 msgstr "Título Obtenido"
 
 #. module: hr_contract_extended
+#: field:hr.contract,duration_months:0
+msgid "Months"
+msgstr "Meses"
+
+#. module: hr_contract_extended
+#: field:hr.contract,duration_days:0
+msgid "Days"
+msgstr "Días"
+
+#. module: hr_contract_extended
 #: field:hr.salary.rule,contract_id:0
 #: model:ir.model,name:hr_contract_extended.model_hr_contract
 msgid "Contract"
@@ -53,6 +73,11 @@
 msgstr "Logros Académicos"
 
 #. module: hr_contract_extended
+#: view:hr.contract:0
+msgid "year(s) - "
+msgstr "año(s) - "
+
+#. module: hr_contract_extended
 #: field:hr.contract.academic.achievement,date_obtained:0
 msgid "Date Obtained"
 msgstr "Fecha de Obtención"
@@ -67,3 +92,14 @@
 #: field:hr.contract.academic.achievement,institution:0
 msgid "Institution"
 msgstr "Institución"
+
+#. module: hr_contract_extended
+#: view:hr.contract:0
+msgid "month(s) - "
+msgstr "mes(es) - "
+
+#. module: hr_contract_extended
+#: field:hr.contract,duration_years:0
+msgid "Years"
+msgstr "Años"
+