[IMP]:removed hr dependency from project,mrp and included resource dependency in...

bzr revid: rvo@tinyerp.co.in-20100303065252-smg21yms5d9qzx7f

diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index e4ac2a9..36a2703 100644 (file)
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -4,88 +4,13 @@
 
         <!-- Example employee -->
 
-        <record id="timesheet_group1" model="resource.calendar">
-            <field name="name">38 Hours/Week</field>
-        </record>
-
         <record id="employee1" model="hr.employee">
             <field name="name">Fabien Pinckaers</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
             <!--<field name="regime">45</field>-->
             <field name="user_id" ref="base.user_root"/>
             <!--<field name="holiday_max">25</field>-->
         </record>
 
-        <record model="resource.calendar.week">
-            <field name="name">Monday morning</field>
-            <field name="dayofweek">0</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Monday evening</field>
-            <field name="dayofweek">0</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Tuesday morning</field>
-            <field name="dayofweek">1</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Tuesday evening</field>
-            <field name="dayofweek">1</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Wednesday morning</field>
-            <field name="dayofweek">2</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Wednesday evening</field>
-            <field name="dayofweek">2</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Thursday morning</field>
-            <field name="dayofweek">3</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Thursday evening</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="dayofweek">3</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Friday morning</field>
-            <field name="dayofweek">4</field>
-            <field name="hour_from">08</field>
-            <field name="hour_to">12</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-        <record model="resource.calendar.week">
-            <field name="name">Friday evening</field>
-            <field name="dayofweek">4</field>
-            <field name="hour_from">13</field>
-            <field name="hour_to">18</field>
-            <field name="calendar_id" ref="timesheet_group1"/>
-        </record>
-
     </data>
 </openerp>

diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py
index 1d5eb98..a147266 100644 (file)
--- a/addons/mrp/__terp__.py
+++ b/addons/mrp/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Production",
-    "depends" : ["stock", "hr", "purchase", "product","process"],
+    "depends" : ["stock", "resource", "purchase", "product","process"],
     "description": """
     This is the base module to manage the manufacturing process in Open ERP.
 

diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index dba0633..f0c1cfa 100644 (file)
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
+
         <!--
        Resource: mrp.workcenter
        -->
-        
+
         <record id="mrp_workcenter_0" model="mrp.workcenter">
             <field name="name">Assembly workshop</field>
-            <field name="type">hr</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
         <record id="mrp_workcenter_1" model="mrp.workcenter">
             <field name="name">Repairs workshop</field>
-            <field name="type">hr</field>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
-        
+
         <!--
        Resource: mrp.property.group
        -->
-        
+
         <record id="mrp_property_group_ram" model="mrp.property.group">
             <field name="name">RAM</field>
         </record>
@@ -52,11 +52,11 @@
         <record id="mrp_property_group_psu" model="mrp.property.group">
             <field name="name">PSU</field>
         </record>
-        
+
         <!--
        Resource: mrp.property
        -->
-        
+
         <record id="mrp_property_0" model="mrp.property">
             <field name="group_id" ref="mrp_property_group_ram"/>
             <field name="name">DDR 512MB PC400</field>
@@ -138,7 +138,7 @@
         <!--
        Resource: mrp.routing.workcenter
        -->
-        
+
         <record id="mrp_routing_workcenter_0" model="mrp.routing.workcenter">
             <field name="routing_id" ref="mrp_routing_0"/>
             <field name="workcenter_id" ref="mrp_workcenter_0"/>
@@ -158,11 +158,11 @@
             <field name="hour_nbr">3</field>
             <field name="name">assembly main + processor + fan</field>
         </record>
-        
+
         <!--
        Resource: mrp.bom
        -->
-        
+
         <record id="mrp_bom_0" model="mrp.bom">
             <field name="name">Regular processor config</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -171,7 +171,7 @@
             <field name="type">normal</field>
             <field model="product.product" name="product_id" search="[('default_code','=','CPU_GEN')]"/>
         </record>
-        
+
         <record id="mrp_bom_1" model="mrp.bom">
             <field name="name">Assembly Basic+ PC</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -247,14 +247,14 @@
             <field name="type">phantom</field>
             <field model="product.product" name="product_id" search="[('default_code','=','RAM_GEN')]"/>
         </record>
-        
+
         <record id="mrp_bom_13" model="mrp.bom">
             <field name="name">High Speed Processor + main board on demand</field>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="product_qty">1.0</field>
             <field model="product.product" name="product_id" search="[('default_code','=','CPU2')]"/>
         </record>
-        
+
         <record id="mrp_bom_kit" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Mouse</field>
@@ -484,7 +484,7 @@
             <field name="bom_id" ref="mrp_bom_9"/>
             <field model="product.product" name="product_id" search="[('default_code','=','TOW1')]"/>
         </record>
-        
+
         <record id="mrp_bom_kit2" model="mrp.bom">
             <field name="code">KIT</field>
             <field name="name">Kit Keyboard + Mouse</field>
@@ -508,6 +508,6 @@
             <field name="bom_id" ref="mrp_bom_kit2"/>
             <field model="product.product" name="product_id" search="[('default_code','=','KEYA')]"/>
         </record>
-        
+
     </data>
 </openerp>

diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 0753ee9..cedeab0 100644 (file)
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["product", "analytic", "hr", "process", "mail_gateway"],
+    "depends" : ["product", "analytic", "process", "mail_gateway"],
     "description": """Project management module that track multi-level projects, tasks,
 works done on tasks, eso. It is able to render planning, order tasks, eso.
     """,

diff --git a/addons/project/project.py b/addons/project/project.py
index 40fadc7..2267c5c 100644 (file)
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -134,8 +134,7 @@ class project(osv.osv):
         'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."),
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed."),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."),
-        'resource_calendar_id': fields.many2one('resource.calendar', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"),
-#        'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
+        #        'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
 #                                  help='The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
 #                                 \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'),

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 63584be..73249f5 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -25,8 +25,7 @@
                         <page string="Administration">
                             <group col="2" colspan="2">
                                 <separator colspan="2" string="Scheduling"/>
-                                <field name="resource_calendar_id"/>
-                                <field name="priority"/>
+                                 <field name="priority"/>
                                 <field name="active" select="2"/>
                             </group>
                             <group col="2" colspan="2">

diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py
index c03e52b..80c9a9d 100644 (file)
--- a/addons/project_long_term/__terp__.py
+++ b/addons/project_long_term/__terp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["project"],
+    "depends" : ["project","resource"],
     "description": """Long Term Project management module that track planning, scheduling, resources allocation.
     """,
     "init_xml" : [],

diff --git a/addons/project_long_term/project_demo.xml b/addons/project_long_term/project_demo.xml
index a561a95..64dcb19 100644 (file)
--- a/addons/project_long_term/project_demo.xml
+++ b/addons/project_long_term/project_demo.xml
@@ -207,7 +207,7 @@
             <field name="name">Analyst</field>
             <field name="company_id" ref="base.main_company"/>
             <field eval="1" name="active"/>
-            <field name="calendar_id" ref="hr.timesheet_group1"/>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="resource_type">user</field>
         </record>
 
@@ -217,7 +217,7 @@
             <field name="name">Programmer</field>
             <field name="company_id" ref="base.main_company"/>
             <field eval="1" name="active"/>
-            <field name="calendar_id" ref="hr.timesheet_group1"/>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="resource_type">user</field>
         </record>
 
@@ -227,7 +227,7 @@
             <field name="name">Tester</field>
             <field name="company_id" ref="base.main_company"/>
             <field eval="1" name="active"/>
-            <field name="calendar_id" ref="hr.timesheet_group1"/>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="resource_type">user</field>
         </record>
 
@@ -237,7 +237,7 @@
             <field name="name">Web Designer</field>
             <field name="company_id" ref="base.main_company"/>
             <field eval="1" name="active"/>
-            <field name="calendar_id" ref="hr.timesheet_group1"/>
+            <field name="calendar_id" ref="resource.timesheet_group1"/>
             <field name="resource_type">user</field>
         </record>
 

diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml
index 2867846..be7b8de 100644 (file)
--- a/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@ -112,6 +112,19 @@
             <field name="view_type">form</field>
         </record>
 
+        <record id="view_phase_project_form1" model="ir.ui.view">
+                       <field name="name">phase.project.form1</field>
+                       <field name="model">project.project</field>
+                       <field name="type">form</field>
+                       <field name="inherit_id" ref="project.edit_project"/>
+                       <field name="arch" type="xml">
+                               <field name="priority" position="before">
+                                       <field name="resource_calendar_id"/>
+                               </field>
+
+                       </field>
+          </record>
+
        <record id="view_project_phase_task_form1" model="ir.ui.view">
                        <field name="name">project.phase.task.form1</field>
                        <field name="model">project.task</field>

diff --git a/addons/resource/__terp__.py b/addons/resource/__terp__.py
index 4970fe2..7c92457 100755 (executable)
--- a/addons/resource/__terp__.py
+++ b/addons/resource/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    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/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@
     "description": """
     Module for resource management. You can manage:
     * Leave/Holidays or Days off of the company
-    
+
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
@@ -37,11 +37,11 @@
     'init_xml': [],
     'update_xml': [
         #'security/resource_security.xml',
-#        'security/ir.model.access.csv',        
-        'resource_view.xml',        
+#        'security/ir.model.access.csv',
+        'resource_view.xml',
+    ],
+    'demo_xml': ['resource_demo.xml'
     ],
-    'demo_xml': [#'resource_demo.xml'
-                ],
     'installable': True,
     'active': False,
     'certificate': None,

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index bce5d2f..36f1512 100755 (executable)
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -120,8 +120,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
-        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="base.menu_pm_planning" />
+        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="base.menu_pm_resources" />
 
         <record id="resource_calendar_leave_form" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form</field>
@@ -161,17 +160,5 @@
 
         <menuitem action="action_resource_calendar_leave_tree" id="menu_resource_calendar_leave_tree" parent="base.menu_pm_resources"/>
 
-               <!-- project member -->
-        <record id="view_project_member_tree" model="ir.ui.view">
-            <field name="name">project.member.tree</field>
-            <field name="model">resource.resource</field>
-            <field name="type">tree</field>
-            <field eval="99" name="priority"/>
-            <field name="arch" type="xml">
-                <tree string="Project's Members">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
     </data>
 </openerp>