[Merge]

bzr revid: vir@tinyerp.com-20101020045040-j4y2zre12tos1e9x

6 files changed, 30 insertions, 25 deletions

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index f3c2b71122f..633cb09d976 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -110,7 +110,7 @@ class account_analytic_line(osv.osv):
             amount_unit = prod.price_get('list_price', context)[prod_id]
 
         if not company_id:
-            company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
+            company_id = company_obj._company_default_get(cr, uid, 'account.analytic.line', context=context)
             flag = False
             # Compute based on pricetype
             product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context)
@@ -130,9 +130,9 @@ class account_analytic_line(osv.osv):
             result = round(amount, prec)
             if not flag:
                 result *= -1
-            return {'value': {
-                'amount': result,
-                'general_account_id': a,
+        return {'value': {
+            'amount': result,
+            'general_account_id': a,
             }
         }
 
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 2147d774762..0f58419d1e1 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -73,7 +73,7 @@ class email_server(osv.osv):
     def check_duplicate(self, cr, uid, ids):
 	# RFC *-* Why this limitation? why not in SQL constraint?
         vals = self.read(cr, uid, ids, ['user', 'password'])[0]
-        cr.execute("select count(id) from email_server where user='%s' and password='%s'", (vals['user'], vals['password']))
+        cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password']))
         res = cr.fetchone()
         if res:
             if res[0] > 1:
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 17b58d39daf..ca14a6b76c9 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -715,7 +715,7 @@ msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays.status,color_name:0
-msgid "This color will be used in the leaves summary located in Reporting\Leaves by Departement"
+msgid "This color will be used in the leaves summary located in Reporting\\Leaves by Departement"
 msgstr ""
 
 #. module: hr_holidays
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index b9d333e7c1b..adc517f1b7c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -200,16 +200,6 @@
             </field>
         </record>
 
-        <record id="mrp_workcenter_action" model="ir.actions.act_window">
-            <field name="name">Work Centers</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.workcenter</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="mrp_workcenter_tree_view"/>
-            <field name="search_view_id" ref="view_mrp_workcenter_search"/>
-            <field name="help">Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
-        </record>
-
         <!--
         Routings
         -->
@@ -314,7 +304,6 @@
             <field name="search_view_id" ref="mrp_routing_search_view"/>
             <field name="help">Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials.</field>
         </record>
-        <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" />
         <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/>
 
         <!--
@@ -923,8 +912,18 @@
 
         <!-- Menu for Resource for MRP-->
 
+        <record id="mrp_workcenter_action" model="ir.actions.act_window">
+            <field name="name">Work Centers</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.workcenter</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="mrp_workcenter_tree_view"/>
+            <field name="search_view_id" ref="view_mrp_workcenter_search"/>
+            <field name="help">Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting.</field>
+        </record>
+
         <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/>
-        <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
+        <menuitem action="mrp_workcenter_action" id="menu_view_resource_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
         <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/>
         
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 23a351ed3da..5996fe1f258 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -181,9 +181,10 @@
         <field name="model">mrp.production.workcenter.line</field>
         <field name="type">gantt</field>
         <field name="arch" type="xml">
-            <gantt color="production_id" date_stop="date_planned_end" date_start="date_planned" string="Operations">
-                <level object="mrp.workcenter" link="workcenter_id" domain="[]">
+            <gantt color="workcenter_id" date_delay="hour" date_start="date_planned" string="Operations">
+                <level object="mrp.workcenter" link="production_id" domain="[]">
                     <field name="product"/>
+                    <field name="hour"/>
                     <field name="production_id"/>
                 </level>
             </gantt>
@@ -219,22 +220,23 @@
         <field name="model">mrp.production.workcenter.line</field>
         <field name="type">gantt</field>
         <field name="arch" type="xml">
-            <gantt color="workcenter_id" date_delay="delay" date_start="date_planned" string="Resources">
+            <gantt color="production_id" date_delay="hour" date_start="date_planned">
                 <level object="mrp.workcenter" link="workcenter_id" domain="[]">
-                    <field name="delay"/>
-                    <field name="workcenter_id"/>
+                    <field name="product"/>
+                    <field name="hour"/>
+                    <field name="production_id"/>
                 </level>
             </gantt>
         </field>
     </record>
     
     <record model="ir.actions.act_window" id="mrp_production_wc_resource_planning">
-        <field name="name">Resources</field>
+        <field name="name">Work Centers</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">mrp.production.workcenter.line</field>
         <field name="view_type">form</field>
         <field name="domain">[('production_state','in',('ready','confirmed','in_production'))]</field>
-        <field name="view_mode">gantt</field>
+        <field name="view_mode">gantt,tree,form,calendar,graph</field>
         <field name="view_id" ref="workcenter_line_resource_gantt"/>
     </record>
 
@@ -279,10 +281,12 @@
         id="menu_mrp_production_wc_action_planning"
         action="mrp_production_wc_action_planning"
         sequence="2"
+        icon="STOCK_INDENT"
         groups="base.group_extended"/>
     <menuitem parent="mrp.menu_mrp_planning"
         id="menu_mrp_production_wc_resource_planning"
         action="mrp_production_wc_resource_planning"
+        icon="STOCK_INDENT"
         groups="base.group_extended"/>
 
     <!-- Operation codes -->
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 71e96543232..b0647968e84 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -372,10 +372,12 @@
             id="menu_project_phase_list" parent="project.menu_project_management" sequence="2"/>
 
         <menuitem action="act_project_phase"
+            icon="STOCK_INDENT"
             groups="base.group_extended"
             id="menu_project_phase"   parent="base.menu_project_long_term" sequence="1"/>
 
         <menuitem id="menu_resouce_allocation" action="act_resouce_allocation"
+            icon="STOCK_INDENT"
             name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
 
         <menuitem id="menu_pm_resources_project1"