Merge lp:~vauxoo/addons-vauxoo/7.0_project_domain_task_moved_code_jc into lp:addons-vauxoo/7.0

[Juan Carlos Hernandez]

se cambió el código de los cambios del campo project como requerido y los onchanges que validan las horas negativas y fechas futuras del modulo project_task_work al modulo project_task_domain

[lp:~vauxoo/addons-vauxoo/7.0_project_domain_task_moved_code_jc]

1073. By Juan Carlos Hernandez on 2014-07-04

[IMP][project_task_domain]add import time

=== modified file 'project_task_domain/__init__.py'
--- project_task_domain/__init__.py	2014-06-26 22:55:50 +0000
+++ project_task_domain/__init__.py	2014-07-04 21:38:12 +0000
@@ -23,4 +23,5 @@
 #    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/>.
 #
-#
\ No newline at end of file
+#
+import model
\ No newline at end of file

=== modified file 'project_task_domain/__openerp__.py'
--- project_task_domain/__openerp__.py	2014-06-26 22:55:50 +0000
+++ project_task_domain/__openerp__.py	2014-07-04 21:38:12 +0000
@@ -26,13 +26,14 @@
 #
 
 {
-    "name": "Project domain project_id",
+    "name": "Project Required",
     "version": "1.0",
     "author": "Vauxoo",
     "category": "Generic Modules/Project",
     "description" : """
     This module set as required the field project_id on 
     model project.task from the view by inheritance.
+    Also warns the hours and add negative future dates.
     """,
     "website": "http://www.vauxoo.com/",
     "license": "AGPL-3",

=== added directory 'project_task_domain/model'
=== added file 'project_task_domain/model/__init__.py'
--- project_task_domain/model/__init__.py	1970-01-01 00:00:00 +0000
+++ project_task_domain/model/__init__.py	2014-07-04 21:38:12 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+#
+#    Coded by: vauxoo consultores ([e-mail])
+#
+#
+#    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 project_task_work

=== added file 'project_task_domain/model/project_task_work.py'
--- project_task_domain/model/project_task_work.py	1970-01-01 00:00:00 +0000
+++ project_task_domain/model/project_task_work.py	2014-07-04 21:38:12 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#    All Rights Reserved.
+#    info Vauxoo ([e-mail])
+#
+#    Coded by: vauxoo consultores ([e-mail])
+#
+#
+#    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 openerp.osv import osv, fields
+from openerp.tools.translate import _
+import time
+
+
+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}
\ No newline at end of file

=== modified file 'project_task_domain/view/project_task_view_inherit.xml'
--- project_task_domain/view/project_task_view_inherit.xml	2014-06-26 22:55:50 +0000
+++ project_task_domain/view/project_task_view_inherit.xml	2014-07-04 21:38:12 +0000
@@ -11,5 +11,19 @@
                 </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>
     </data>
 </openerp>

=== modified file 'project_task_work/model/project_task_work.py'
--- project_task_work/model/project_task_work.py	2014-06-25 23:15:07 +0000
+++ project_task_work/model/project_task_work.py	2014-07-04 21:38:12 +0000
@@ -67,22 +67,6 @@
 
 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:
@@ -90,7 +74,6 @@
         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	2014-06-25 01:43:57 +0000
+++ project_task_work/view/project_view.xml	2014-07-04 21:38:12 +0000
@@ -1,33 +1,6 @@
 <?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">
             <field name="name">project.task.work.ext.tree</field>
             <field name="model">project.task.work</field>