Merge lp:~vauxoo/addons-vauxoo/7.0-project_task_work-onchange_date_hours-jc into lp:addons-vauxoo/7.0

[Juan Carlos Hernandez]

se agregó validación para las horas de las tareas y para la fecha de la misma ,avisando con una advertencia, pero si pueden guardar los datos.

[Juan Carlos Hernandez (openerp1)]

ademas se puso como requerido el campo project_id desde la vista

review: Needs Resubmitting

[lp:~vauxoo/addons-vauxoo/7.0-project_task_work-onchange_date_hours-jc]

1061. By Juan Carlos Hernandez on 2014-06-25

[IMP][project_task_work]change message

[Sabrina Romero - http://www.vauxoo.com (sabrina)]

@Julio @Moi,

Me da alguno su Vo. Bo. sobre esta propuesta antes de mergear?, funcionalmente hace lo indicado.

[lp:~vauxoo/addons-vauxoo/7.0-project_task_work-onchange_date_hours-jc]

1062. By Juan Carlos Hernandez on 2014-06-25

[IMP][project_task_work]remove ¿ on message

[Julio Serna-http://www.vauxoo.com (hearthebreaker)]

review: Approve

[Sabrina Romero - http://www.vauxoo.com (sabrina)]

review: Approve

=== modified file 'project_task_work/model/project_task_work.py'
--- project_task_work/model/project_task_work.py	2014-05-09 21:51:34 +0000
+++ project_task_work/model/project_task_work.py	2014-06-25 23:19:58 +0000
@@ -31,12 +31,12 @@
 class project_task(osv.Model):
     _inherit = 'project.task'
 
+
     def _get_issue(self, cr, uid, ids, fieldname, arg, context=None):
         if context is None:
             context = {}
         res = {}
         pi_obj = self.pool.get('project.issue')
-
         for id in ids:
             pi_ids = pi_obj.search(cr, uid, [('task_id', '=', id)]) or []
             res[id] = pi_ids and pi_ids[0] or None
@@ -67,6 +67,22 @@
 
 class project_task_work(osv.Model):
     _inherit = 'project.task.work'
+    
+    def onchange_hours(self, cr, uid, ids, hours=None, context=None):
+        if context is None:
+            context = {}
+        warning = {}
+        if hours < 0:
+            warning = { 'title': _('Warning!'), 'message': _('Are you sure that you want to charge hours in negative?')}
+        return { 'warning': warning}
+        
+    def onchange_date(self, cr, uid, ids, date=None, context=None):
+        if context is None:
+            context = {}
+        warning = {}
+        if date > time.strftime('%Y-%m-%d %H:%M:%S'):
+            warning = { 'title': _('Warning!'), 'message': _('Are you sure that you want to charge a future date?')}
+        return { 'warning': warning}
 
     def _get_project(self, cr, uid, ids, fieldname, arg, context=None):
         if context is None:
@@ -74,7 +90,7 @@
         res = {}.fromkeys(ids,None)
         ids = self.exists(cr, uid, ids, context=context)
         for ptw_brw in self.browse(cr, uid, ids, context=context):
-
+            
             res[ptw_brw.id] = \
                 ptw_brw.task_id and \
                 (ptw_brw.task_id.issue_id and

=== modified file 'project_task_work/view/project_view.xml'
--- project_task_work/view/project_view.xml	2013-04-26 08:14:35 +0000
+++ project_task_work/view/project_view.xml	2014-06-25 23:19:58 +0000
@@ -1,6 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <openerp>
     <data>
+        
+        <record model="ir.ui.view" id="view_project_task_form2_inherit_0">
+            <field name="name">view.project.task.form2.inherit0</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='project_id']" position="replace">
+                    <field name="project_id" domain="[('state', '!=', 'close')]" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}" required="1"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_project_task_form2_inherit_onchange">
+            <field name="name">view.project.task.form2.inherit_onchange</field>
+            <field name="model">project.task</field>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook/page[@string='Description']/field[@name='work_ids']/tree[@string='Task Work']/field[@name='hours']" position="replace">
+                    <field name="hours" widget="float_time" sum="Spent Hours" on_change="onchange_hours(hours)"/>
+                </xpath>
+                <xpath expr="//notebook/page[@string='Description']/field[@name='work_ids']/tree[@string='Task Work']/field[@name='date']" position="replace">
+                    <field name="date" on_change="onchange_date(date)"/>
+                </xpath>
+            </field>
+        </record>
 
 
         <record id="view_project_task_work_ext_tree" model="ir.ui.view">