Merge lp:~camptocamp/hr-timesheet/7.0-port-hr_timesheet_fulfill into lp:~hr-core-editors/hr-timesheet/7.0

[Yannick Vaucher @ Camptocamp]

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

=== modified file 'hr_timesheet_fulfill/__init__.py'
--- hr_timesheet_fulfill/__init__.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_fulfill/__init__.py	2013-05-02 15:51:48 +0000
@@ -1,32 +1,25 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier (Camptocamp)
+#    Author: Vincent Renaville
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_timesheet_fulfill/__openerp__.py'
--- hr_timesheet_fulfill/__openerp__.py	2012-12-13 12:20:12 +0000
+++ hr_timesheet_fulfill/__openerp__.py	2013-05-02 15:51:48 +0000
@@ -1,57 +1,46 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-# Author : Vincent Renaville
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier (Camptocamp)
+#    Author: Vincent Renaville
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-
-{
-	"name" : "Timesheet fullfill wizard",
-	"version" : "1.0",
-	"author" : "Camptocamp",
-	"category" : "Generic Modules/Human Resources",
-	"description":
-"""
-Add a wizard into timesheet allowing people to complete a long period of time with the given values.
-This is mainly useful to handle a long period of time like holidays.
-Known limitation:
-  - Will complete all day between dates
-""",
-	"website": "http://camptocamp.com",
-	"depends" : [
-                "hr_timesheet_sheet",
-                ],
-	"init_xml" : [],
-	"demo_xml" : [],
-	"update_xml" : [
-		            'wizard/timesheet_fulfill_view.xml',
-	],
-	"active": False,
-	'installable': False
+{'name' : 'Timesheet Fullfill Wizard',
+ 'version' : '1.0',
+ 'category' : 'Generic Modules/Human Resources',
+ 'description':
+    '''
+    Add a wizard into timesheet allowing people to complete a long period of time with the given values.
+    This is mainly useful to handle a long period of time like holidays.
+    Known limitation:
+      - Will complete all day between dates
+    ''',
+ 'author' : 'Camptocamp',
+ 'website': 'http://camptocamp.com',
+ 'depends' : ['hr_timesheet_sheet',],
+ 'data' : [
+     'wizard/timesheet_fulfill_view.xml',
+     ],
+ 'demo' : [],
+ 'test' : [],
+ 'installable': True,
+ 'auto_install' : False,
+ 'application' : False,
 }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_timesheet_fulfill/wizard/__init__.py'
--- hr_timesheet_fulfill/wizard/__init__.py	2011-08-12 12:53:16 +0000
+++ hr_timesheet_fulfill/wizard/__init__.py	2013-05-02 15:51:48 +0000
@@ -1,1 +1,4 @@
+
 import timesheet_fulfill
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'hr_timesheet_fulfill/wizard/timesheet_fulfill.py'
--- hr_timesheet_fulfill/wizard/timesheet_fulfill.py	2011-09-01 13:44:19 +0000
+++ hr_timesheet_fulfill/wizard/timesheet_fulfill.py	2013-05-02 15:51:48 +0000
@@ -1,41 +1,29 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-# Author : Vincent Renaville
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier (Camptocamp)
+#    Author: Vincent Renaville
+#    Copyright 2012 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-
-from osv import fields, osv
+from openerp.osv import fields, osv, orm
 from tools.translate import _
 from datetime import datetime, timedelta
 
-
 def get_number_days_between_dates(date_from, date_to):
     datetime_from = datetime.strptime(date_from, '%Y-%m-%d')
     datetime_to = datetime.strptime(date_to, '%Y-%m-%d')
@@ -44,7 +32,7 @@
     return difference.days + 1
 
 
-class FulfillTimesheet(osv.osv_memory):
+class HrTimesheetFulfill(orm.TransientModel):
     _name = 'hr.timesheet.fulfill'
     _description = "Wizard to fill-in timesheet for many days"
 
@@ -52,16 +40,19 @@
         'date_from': fields.date('Date From', required=True),
         'date_to': fields.date('Date To', required=True),
         'description': fields.char('Description', size=100, required=True),
-        'nb_hours': fields.float('Hours per day', digits=(2, 2), required=True),
+        'nb_hours': fields.float('Hours per Day', digits=(2, 2), required=True),
         'analytic_account_id': fields.many2one('account.analytic.account',
                                'Analytic Account', required=True,
                                domain="[('type', '=', 'normal'),"
                                       "('state', '!=', 'pending'),"
                                       "('state', '!=', 'close')]"),
-        'task_id':fields.many2one('project.task','Task', required=False)
-    }
-
-    def fulfill_timesheet(self, cr, uid, ids, context):
+        'task_id':fields.many2one('project.task', 'Task', required=False)
+        }
+
+    def fulfill_timesheet(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+
         employee_obj = self.pool.get('hr.employee')
         timesheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
         al_ts_obj = self.pool.get('hr.analytic.timesheet')
@@ -117,23 +108,23 @@
                 'sheet_id': timesheet.id,
                 'journal_id': journal_id,
             }
-
             on_change_values = al_ts_obj.\
                 on_change_unit_amount(cr, uid, False, product_id,
                                       wizard.nb_hours, employee.company_id.id,
-                                      task_id=wizard.task_id.id,
+#                                      task_id=wizard.task_id.id,
                                       unit=unit_id, journal_id=journal_id,
                                       context=context)
             if on_change_values:
                 res.update(on_change_values['value'])
             al_ts_obj.create(cr, uid, res, context)
-
             # If there is no other attendances, create it
             # create the attendances:
-            existing_attendances = attendance_obj\
-                .search(cr, uid, [('name', '=', datetime_current),
-                                  ('employee_id', '=', employee_id)])
-
+#            print attendance_obj.read(cr,uid,['name'])
+            existing_attendances=0
+            att_id= attendance_obj.search(cr, uid, [('employee_id', '=', employee_id)])
+            for record in attendance_obj.read(cr,uid,att_id,['name']):
+                if record['name'].startswith( datetime_current ):
+                    existing_attendances=1
             if not existing_attendances:
                 att_date_start = datetime_current + " 00:00:00"
                 att_start = {
@@ -154,6 +145,7 @@
                 }
                 attendance_obj.create(cr, uid, att_start, context)
                 attendance_obj.create(cr, uid, att_end, context)
+
         return {'type': 'ir.actions.act_window_close'}
 
-FulfillTimesheet()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'hr_timesheet_fulfill/wizard/timesheet_fulfill_view.xml'
--- hr_timesheet_fulfill/wizard/timesheet_fulfill_view.xml	2011-08-12 12:53:16 +0000
+++ hr_timesheet_fulfill/wizard/timesheet_fulfill_view.xml	2013-05-02 15:51:48 +0000
@@ -1,43 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
-        <record id="view_hr_timesheet_fulfill_form" model="ir.ui.view">
-            <field name="name">hr.timesheet.fulfill.form</field>
-            <field name="model">hr.timesheet.fulfill</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Enter the dates : ALL days between those dates will be completed.">
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="analytic_account_id"/>
-                    <field name="task_id" domain="[('state','!=','cancel'),('state','!=','done')" context="{'account_id':analytic_account_id}"/>
-                    <field name="nb_hours" widget="float_time"/>
-                    <field name="description" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Fill in Timesheet" name="fulfill_timesheet" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_hr_timesheet_fulfill" model="ir.actions.act_window">
-            <field name="name">Fill in Timesheet</field>
-            <field name="res_model">hr.timesheet.fulfill</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_hr_timesheet_fulfill_form"/>
-            <field name="target">new</field>
-        </record>
-
-        <record id="ir_action_hr_timesheet_fulfill_wizard" model="ir.values">
-            <field name="key2">client_action_multi</field>
-            <field name="model">hr_timesheet_sheet.sheet</field>
-            <field name="name">Fill in Timesheet</field>
-            <field eval="'ir.actions.act_window,%d'%action_hr_timesheet_fulfill" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
-
-</data>
+  <data>
+
+    <record id="view_hr_timesheet_fulfill_form" model="ir.ui.view">
+      <field name="name">hr.timesheet.fulfill.form</field>
+      <field name="model">hr.timesheet.fulfill</field>
+      <field name="arch" type="xml">
+        <form string="Enter the dates : ALL days between those dates will be completed." version="7.0">
+          <group>
+            <group>
+              <field name="date_from"/>
+            </group>
+            <group>
+              <field name="date_to"/>
+            </group>
+          </group>
+          <group>
+            <group>
+              <field name="analytic_account_id"/>
+            </group>
+            <group>
+              <field name="task_id" domain="[('state','!=','cancel'),('state','!=','done')]" context="{'account_id':analytic_account_id}"/>
+            </group>
+          </group>
+          <group>
+            <field name="nb_hours" widget="float_time"/>
+          </group>
+          <group colspan="4">
+            <field name="description"/>
+          </group>
+          <footer>
+            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+            <button icon="gtk-ok" string="Fill in Timesheet" name="fulfill_timesheet" type="object"/>
+          </footer>
+        </form>
+      </field>
+    </record>
+
+    <record id="action_hr_timesheet_fulfill" model="ir.actions.act_window">
+      <field name="name">Fill in Timesheet</field>
+      <field name="res_model">hr.timesheet.fulfill</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">form</field>
+      <field name="view_id" ref="view_hr_timesheet_fulfill_form"/>
+      <field name="target">new</field>
+    </record>
+
+    <record id="ir_action_hr_timesheet_fulfill_wizard" model="ir.values">
+      <field name="key2">client_action_multi</field>
+      <field name="model">hr_timesheet_sheet.sheet</field>
+      <field name="name">Fill in Timesheet</field>
+      <field eval="'ir.actions.act_window,%d'%action_hr_timesheet_fulfill" name="value"/>
+      <field eval="True" name="object"/>
+    </record>
+
+  </data>
 </openerp>