From 01b074b94974b65e23672f9ca0d9bd1b0a6fef85 Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Mon, 1 Sep 2008 14:05:16 +0530
Subject: [PATCH 01/35] Added Calendar view on mrp.operation

bzr revid: nch@tinyerp.com-20080901083516-cdoofu030jidojpn
---
 addons/mrp_operations/mrp_operations.py       | 15 +++++++++++++
 addons/mrp_operations/mrp_operations_view.xml | 21 +++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index d654e337e67..ff01528d5f7 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -133,6 +133,18 @@ mrp_operations_operation_code()
 
 class mrp_operations_operation(osv.osv):
     _name="mrp_operations.operation"
+    
+    def _order_date_search_production(self,cr,uid,ids):
+        operation_ids=self.pool.get('mrp_operations.operation').search(cr,uid,[('production_id','=',ids[0])])
+        return operation_ids
+        
+    def _get_order_date(self, cr, uid, ids, field_name, arg, context):
+        res={}
+        operation_obj=self.browse(cr, uid, ids, context=context)
+        for operation in operation_obj:
+                res[operation.id]=operation.production_id.date_planned
+        return res
+    
     def create(self, cr, uid, vals, context=None):
         wf_service = netsvc.LocalService('workflow')
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
@@ -154,6 +166,9 @@ class mrp_operations_operation(osv.osv):
         'production_id':fields.many2one('mrp.production','Production',required=True),
         'workcenter_id':fields.many2one('mrp.workcenter','Workcenter',required=True),
         'code_id':fields.many2one('mrp_operations.operation.code','Code',required=True),
+        'date_start': fields.datetime('Start Date'),
+        'date_finished': fields.datetime('End Date'),
+        'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(['date_planned'],_order_date_search_production)}),
         }
 
 mrp_operations_operation()
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 9cd3ae93053..d1aade98cbb 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -145,6 +145,9 @@
 				<field name="production_id"/>
 				<field name="workcenter_id"/>
 				<field name="code_id"/>
+				<field name="date_start"/>
+				<field name="date_finished"/>
+				<field name="order_date"/>
 			</tree>
 		</field>
 	</record>
@@ -167,11 +170,25 @@
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp_operations.operation</field>
 		<field name="view_type">form</field>
+		<field name="view_mode">tree,calendar,form</field>
 		<field name="view_id" ref="mrp_production_operation_tree_view"/>
 	</record>
-
 	<menuitem name="Operations" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_operation_action" action="mrp_production_operation_action"/>
-
+	
+	<record model="ir.ui.view" id="operation_calendar_view">
+			<field name="name">mrp.perations.calendar</field>
+			<field name="model">mrp_operations.operation</field>
+			<field name="type">calendar</field>
+			<field name="priority" eval="2"/>
+			<field name="arch" type="xml">
+				<calendar string="Calendar View" date_start="order_date" color="workcenter_id">
+					<field name="code_id"/>
+					<field name="production_id"/>
+					<field name="date_start"/>
+					<field name="date_finished"/>
+				</calendar>
+			</field>
+	</record>
 
 </data>
 </terp>

From b0c241ef3b7daa08370800a2cf1734bad2de3edd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 08:00:56 +0200
Subject: [PATCH 02/35] bugfix

bzr revid: fp@tinyerp.com-20080923060056-451wx2kq2rl5rqcm
---
 addons/account/account_analytic_line.py | 8 ++++++++
 addons/account/project/project_view.xml | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 68559fd48b1..c55d49a418f 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -89,6 +89,14 @@ class account_analytic_line(osv.osv):
                 }}
         return {}
 
+    def view_header_get(self, cr, user, view_id, view_type, context):
+        if context.get('account_id', False):
+            cr.execute('select name from account_analytic_account where id=%d', (context['account_id'],))
+            res = cr.fetchone()
+            res = _('Entries: ')+ (res[0] or '')
+            return res
+        return False
+
 account_analytic_line()
 
 
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e62eeb7d3d7..5178b07eea8 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -154,11 +154,12 @@
 
 
         <record id="action_account_tree1" model="ir.actions.act_window">
-            <field name="name">action.account.tree1</field>
+            <field name="name"></field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('account_id','=', active_id)]</field>
+            <field name="context">{'account_id':active_id}</field>
         </record>
         <record id="ir_open_account_analytic_account" model="ir.values">
             <field eval="'tree_but_open'" name="key2"/>

From d5d4fbf98246d15dd5f557891ebe80c30d082c7e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 08:04:26 +0200
Subject: [PATCH 03/35] view improvement

bzr revid: fp@tinyerp.com-20080923060426-nxjtg5pb2hcptjln
---
 addons/project/project_view.xml | 58 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fad26416d78..bfb85802320 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,20 +21,20 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
-                            <field name="priority"/>
-                            <field name="planned_hours" widget="float_time"/>
-                            <field name="effective_hours" widget="float_time"/>
                             <field name="warn_manager"/>
+                            <field name="priority"/>
                             <field name="timesheet_id"/>
                             <field name="active" select="2"/>
+                            <field name="planned_hours" widget="float_time"/>
+                            <field name="effective_hours" widget="float_time"/>
                             <newline/>
                             <separator colspan="4" string="Project's members"/>
                             <field colspan="4" name="members" nolabel="1"/>
                             <group col="6" colspan="8">
-                            	<field name="state"/>
+                                <field name="state"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open"/>
-								<button name="reset_project" string="Reset as Project" type="object" states="template"/>
-								<button name="duplicate_template" string="Duplicate Template" type="object" states="template"/>
+                                <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                                <button name="duplicate_template" string="Duplicate Template" type="object" states="template"/>
                             </group>
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
@@ -90,16 +90,6 @@
         </record>
         <menuitem action="open_view_all_project" id="menu_all_project" parent="project.menu_main"/>
 
-        <record id="open_view_project" model="ir.actions.act_window">
-            <field name="name">New Project</field>
-            <field name="res_model">project.project</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree,calendar</field>
-            <field name="view_id" eval="False"/>
-        </record>
-        <menuitem action="open_view_project" id="menu_open_view_project" parent="menu_all_project"/>
-
-
         <record id="open_view_all_project_unclosed" model="ir.actions.act_window">
             <field name="name">Unclosed projects</field>
             <field name="res_model">project.project</field>
@@ -117,7 +107,7 @@
             <field name="domain">[('parent_id','=',False),('state','=','open')]</field>
             <field name="view_id" ref="view_project"/>
         </record>
-        <menuitem action="open_view_all_project_unclosed_open" id="menu_all_project_unclosed_open" parent="project.menu_all_project_unclosed"/>		
+        <menuitem action="open_view_all_project_unclosed_open" id="menu_all_project_unclosed_open" parent="project.menu_all_project_unclosed"/>        
 
         <record id="open_view_project_open" model="ir.actions.act_window">
             <field name="name">Open projects</field>
@@ -128,7 +118,7 @@
         </record>
         <menuitem id="next_id_54" name="Projects" parent="project.menu_definitions"/><menuitem action="open_view_project_open" id="menu_open_view_project_open" parent="next_id_54"/>
 
-		<record id="open_view_template_project" model="ir.actions.act_window">
+        <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Template projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
@@ -137,6 +127,14 @@
         </record>
         <menuitem action="open_view_template_project" id="menu_template_project" parent="next_id_54"/>
 
+        <record id="open_view_project" model="ir.actions.act_window">
+            <field name="name">New Project</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree,calendar</field>
+            <field name="view_id" eval="False"/>
+        </record>
+        <menuitem action="open_view_project" id="menu_open_view_project" parent="menu_all_project"/>
 
         <record id="view_task_work_form" model="ir.ui.view">
             <field name="name">project.task.work.form</field>
@@ -318,18 +316,18 @@
                 </calendar>
             </field>
         </record>
-		<record model="ir.ui.view" id="view_project_task_graph">
-			<field name="name">project.task.graph</field>
-			<field name="model">project.task</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Project Tasks" type="bar">
-					<field name="project_id"/>
-					<field name="planned_hours" operator="+"/>
-					<field name="delay_hours" operator="+"/>
-				</graph>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_project_task_graph">
+            <field name="name">project.task.graph</field>
+            <field name="model">project.task</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Project Tasks" type="bar">
+                    <field name="project_id"/>
+                    <field name="planned_hours" operator="+"/>
+                    <field name="delay_hours" operator="+"/>
+                </graph>
+            </field>
+        </record>
 
         <record id="action_view_task" model="ir.actions.act_window">
             <field name="name">All Tasks</field>

From 6b0b9d881180d45527221ce663373039ad33dedc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 08:14:43 +0200
Subject: [PATCH 04/35] betterdemodata

bzr revid: fp@tinyerp.com-20080923061443-7wnmr8kv1rjs7gtx
---
 addons/project/project.py       | 23 ++++++++++++++---------
 addons/project/project_demo.xml | 27 +++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 5f7ba9c0930..b9878b2888c 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -151,21 +151,26 @@ class project(osv.osv):
     # toggle activity of projects, their sub projects and their tasks
     def set_template(self, cr, uid, ids, context={}):
         res = self.setActive(cr, uid, ids, value=False, context=context) 
-        return res   
-       
+        return res
+
     def reset_project(self, cr, uid, ids, context={}):
         res = self.setActive(cr, uid, ids,value=True, context=context)
         return res
-    
+
+    def copy(self, cr, uid, id, default={},context={}):
+        default = default or {}
+        default['tasks'] = []
+        default['child_id'] = []
+        return super(project, self).copy(cr, uid, id, default, context)
+
     def duplicate_template(self, cr, uid, ids,context={}):
-        for proj in self.browse(cr, uid, ids):    
-            parent_id=context.get('parent_id',False)        
-            new_id=self.pool.get('project.project').copy(cr, uid, proj.id,default={'name':proj.name+'(copy)','state':'template','parent_id':parent_id})
+        for proj in self.browse(cr, uid, ids):
+            parent_id=context.get('parent_id',False)
+            new_id=self.pool.get('project.project').copy(cr, uid, proj.id,default={'name':proj.name+_(' (copy)'),'state':'open','parent_id':parent_id})
             cr.execute('select id from project_task where project_id=%d', (proj.id,))
             res = cr.fetchall()
-            tasks_ids = [x[0] for x in res]
-            for tasks_id in tasks_ids:            
-                self.pool.get('project.task').copy(cr, uid, tasks_id,default={'project_id':new_id,'active':False}, context=context)
+            for (tasks_id,) in res:
+                self.pool.get('project.task').copy(cr, uid, tasks_id,default={'project_id':new_id,'active':True}, context=context)
             cr.execute('select id from project_project where parent_id=%d', (proj.id,))
             res = cr.fetchall()
             project_ids = [x[0] for x in res]
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 903da6cdf0b..e95faefc384 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -7,13 +7,11 @@
 	-->
         
         <record id="project_project_9" model="project.project">
-            <field name="planned_hours">584.0</field>
             <field name="warn_manager">1</field>
             <field name="name">Tiny ERP Integration</field>
             <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_21" model="project.project">
-            <field name="planned_hours">216.0</field>
             <field name="warn_manager">1</field>
             <field name="priority">10</field>
             <field name="parent_id" ref="project_project_9"/>
@@ -22,7 +20,6 @@
             <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_22" model="project.project">
-            <field name="planned_hours">264.0</field>
             <field name="priority">20</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Specific Developements</field>
@@ -30,7 +27,6 @@
             <field name="manager" ref="base.user_root"/>
         </record>
         <record id="project_project_23" model="project.project">
-            <field name="planned_hours">104.0</field>
             <field name="priority">30</field>
             <field name="parent_id" ref="project_project_9"/>
             <field name="name">Install, data import, configuration</field>
@@ -40,6 +36,7 @@
         
         <record id="project_task_116" model="project.task">
             <field name="planned_hours">38.0</field>
+            <field name="remaining_hours">38.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="description">BoM, After sales returns, interventions. Tracability.</field>
@@ -47,18 +44,21 @@
         </record>
         <record id="project_task_130" model="project.task">
             <field name="planned_hours">16.0</field>
+            <field name="remaining_hours">16.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Data importation + Doc</field>
         </record>
         <record id="project_task_131" model="project.task">
             <field name="planned_hours">16.0</field>
+            <field name="remaining_hours">16.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Modifications asked by the customer.</field>
         </record>
         <record id="project_task_184" model="project.task">
             <field name="planned_hours">16.0</field>
+            <field name="remaining_hours">16.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">0</field>
             <field name="project_id" ref="project_project_21"/>
@@ -67,6 +67,7 @@
         <record id="project_task_186" model="project.task">
             <field name="sequence">15</field>
             <field name="planned_hours">8.0</field>
+            <field name="remaining_hours">8.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Internal testing + Software Install</field>
@@ -75,6 +76,7 @@
         <record id="project_task_188" model="project.task">
             <field name="sequence">17</field>
             <field name="planned_hours">16.0</field>
+            <field name="remaining_hours">16.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project_project_21"/>
@@ -83,6 +85,7 @@
         <record id="project_task_189" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">16.0</field>
+            <field name="remaining_hours">16.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Parameters</field>
@@ -90,6 +93,7 @@
         <record id="project_task_190" model="project.task">
             <field name="sequence">20</field>
             <field name="planned_hours">32.0</field>
+            <field name="remaining_hours">32.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Start of the doc redaction + MRP</field>
@@ -97,6 +101,7 @@
         <record id="project_task_192" model="project.task">
             <field name="sequence">25</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">MRP Tests</field>
@@ -104,6 +109,7 @@
         <record id="project_task_193" model="project.task">
             <field name="sequence">29</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">MRP; functionnal layer</field>
@@ -113,6 +119,7 @@
         <record id="project_task_194" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Products Adaptation</field>
@@ -120,6 +127,7 @@
         <record id="project_task_195" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">Install + Super User Training</field>
@@ -127,6 +135,7 @@
         <record id="project_task_196" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">32.0</field>
+            <field name="remaining_hours">32.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Customer docs</field>
@@ -134,6 +143,7 @@
         <record id="project_task_197" model="project.task">
             <field name="sequence">30</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Development of the presentation layer</field>
@@ -141,6 +151,7 @@
         <record id="project_task_198" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">32.0</field>
+            <field name="remaining_hours">32.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Free Time</field>
@@ -148,6 +159,7 @@
         <record id="project_task_199" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">50.0</field>
+            <field name="remaining_hours">50.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Specific tests</field>
@@ -155,6 +167,7 @@
         <record id="project_task_200" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Sale module</field>
@@ -162,6 +175,7 @@
         <record id="project_task_201" model="project.task">
             <field name="sequence">40</field>
             <field name="planned_hours">32.0</field>
+            <field name="remaining_hours">32.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_23"/>
             <field name="name">In house trainings</field>
@@ -170,6 +184,7 @@
         <record id="project_task_202" model="project.task">
             <field name="sequence">50</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Validation + latest modifications.</field>
@@ -177,6 +192,7 @@
         <record id="project_task_203" model="project.task">
             <field name="sequence">50</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Adaptations buy module</field>
@@ -184,6 +200,7 @@
         <record id="project_task_204" model="project.task">
             <field name="sequence">60</field>
             <field name="planned_hours">16.0</field>
+            <field name="remaining_hours">16.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_21"/>
             <field name="name">Presentation of the software.</field>
@@ -191,6 +208,7 @@
         <record id="project_task_205" model="project.task">
             <field name="sequence">60</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Adaptations Stock module</field>
@@ -198,6 +216,7 @@
         <record id="project_task_206" model="project.task">
             <field name="sequence">70</field>
             <field name="planned_hours">24.0</field>
+            <field name="remaining_hours">24.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
             <field name="name">Latest in house tests</field>

From 19a076e69ed046cf21d55e2eed15e9881c571c4f Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Tue, 23 Sep 2008 13:02:19 +0530
Subject: [PATCH 05/35] pass force_demo=True on calling method for restart pool
 after installing extra module on configuratuon wizard. add checkbox for
 selecting portal module on configuration wizard of manufacturing profile and
 service profile

bzr revid: hmo@tinyerp.com-20080923073219-mv7xzczs4yfh1lpp
---
 addons/profile_accounting/profile_accounting.py        | 2 +-
 addons/profile_accounting/profile_accounting.xml       | 2 +-
 addons/profile_association/profile_association.py      | 2 +-
 addons/profile_association/profile_association.xml     | 2 +-
 addons/profile_manufacturing/profile_manufacturing.py  | 6 ++++--
 addons/profile_manufacturing/profile_manufacturing.xml | 4 +++-
 addons/profile_service/profile_service.py              | 4 +++-
 addons/profile_service/profile_service.xml             | 3 ++-
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/profile_accounting/profile_accounting.py b/addons/profile_accounting/profile_accounting.py
index 74f8023bdc9..744a66dd796 100644
--- a/addons/profile_accounting/profile_accounting.py
+++ b/addons/profile_accounting/profile_accounting.py
@@ -59,7 +59,7 @@ class profile_accounting_config_install_modules_wizard(osv.osv_memory):
                     ids += mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.action_install(cr, uid, ids, context=context)           
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/profile_accounting/profile_accounting.xml b/addons/profile_accounting/profile_accounting.xml
index 62350fa0d78..d98b6d1f0d1 100644
--- a/addons/profile_accounting/profile_accounting.xml
+++ b/addons/profile_accounting/profile_accounting.xml
@@ -38,7 +38,7 @@
       <record model="ir.module.module.configuration.step"
             id="profile_accounting.config_install_wizard">
             <field name="name">Accounting Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
+            <field name="note">Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
             <field name="state">open</field>
         </record>
diff --git a/addons/profile_association/profile_association.py b/addons/profile_association/profile_association.py
index 5a5a541ebbe..3ca64f5adbb 100644
--- a/addons/profile_association/profile_association.py
+++ b/addons/profile_association/profile_association.py
@@ -58,7 +58,7 @@ class profile_association_config_install_modules_wizard(osv.osv_memory):
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.action_install(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/profile_association/profile_association.xml b/addons/profile_association/profile_association.xml
index 03b8f441803..a1a8467fe51 100644
--- a/addons/profile_association/profile_association.xml
+++ b/addons/profile_association/profile_association.xml
@@ -37,7 +37,7 @@
       <record model="ir.module.module.configuration.step"
             id="config_install_module">
             <field name="name">Association Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
+            <field name="note">Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
             <field name="state">open</field>
         </record>
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index 36bc2aa18c8..5ab575acde6 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -67,7 +67,9 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="This module allows you to manage a point of sale system. "\
             "It offers a basic form for pos operations. You must also check "\
             "our frontend point of sale for a perfect ergonomy with touchscreen "\
-            "materials and payment processing hardware.")
+            "materials and payment processing hardware."),
+        'portal': fields.boolean('Portal',
+            help="This module allows you to manage a Portal system.")
     }
     def action_cancel(self,cr,uid,ids,conect=None):
         return {
@@ -86,7 +88,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])
                     mod_obj.action_install(cr, uid, ids, context=context)
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/profile_manufacturing/profile_manufacturing.xml b/addons/profile_manufacturing/profile_manufacturing.xml
index 1abe782d8b0..2d41b6d577a 100644
--- a/addons/profile_manufacturing/profile_manufacturing.xml
+++ b/addons/profile_manufacturing/profile_manufacturing.xml
@@ -17,6 +17,8 @@
                     <field name="sale_margin"/>
                     <separator string="Relationship Management" colspan="4"/> 
                     <field name="crm_configuration"/>
+					<separator string="Portal Management" colspan="4"/> 
+                    <field name="portal"/>
                     <separator string="" colspan="4"/>
                     <label string="" colspan="2"/>
                     <group col="4" colspan="2">
@@ -39,7 +41,7 @@
       <record model="ir.module.module.configuration.step"
             id="config_install_module">
             <field name="name">Manufacturing Profile : Install Extra modules</field>
-            <field name="note">Install more modules. A few modules are proposed according to the service profile you selected. You will be able to install them based on our requirements.</field>
+            <field name="note">Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements.</field>
             <field name="action_id" ref="action_config_install_module"/>
             <field name="state">open</field>
         </record>
diff --git a/addons/profile_service/profile_service.py b/addons/profile_service/profile_service.py
index 71371f59846..4dd4d83c24a 100644
--- a/addons/profile_service/profile_service.py
+++ b/addons/profile_service/profile_service.py
@@ -43,6 +43,8 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
         'project_gtd':fields.boolean('Getting Things Done', help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
         'scrum':fields.boolean('Scrum Methodology', help="Scrum is an 'agile development methodology', mainly used in IT projects. It helps you to manage teams, long term roadmaps, sprints, and so on."),
         'base_contact':fields.boolean('Contacts Management', help="Allows you to manage partners (enterprises), addresses of partners and contacts of these partners (employee/people). Install this if you plan to manage your relationships with partners and contacts."),
+        'portal': fields.boolean('Portal',
+            help="This module allows you to manage a Portal system.")
     }
     def action_cancel(self,cr,uid,ids,conect=None):
         return {
@@ -61,7 +63,7 @@ class profile_service_config_install_modules_wizard(osv.osv_memory):
                     ids = mod_obj.search(cr, uid, [('name', '=', r)])   
                     mod_obj.action_install(cr,uid,ids,context=context)                       
         cr.commit()
-        db, pool = pooler.restart_pool(cr.dbname, update_module=True)
+        db, pool = pooler.restart_pool(cr.dbname,force_demo=True, update_module=True)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml
index ba4039d678c..50e90f4c1d1 100644
--- a/addons/profile_service/profile_service.xml
+++ b/addons/profile_service/profile_service.xml
@@ -21,7 +21,8 @@
                     <separator string="Relationship Management" colspan="4"/>
                     <field name="crm_configuration"/>
                     <field name="base_contact"/>
-
+					<separator string="Portal Management" colspan="4"/> 
+                    <field name="portal"/>
                     <separator string="" colspan="4"/>
                     <label string="" colspan="2"/>
                     <group col="4" colspan="2">

From 8f91b2b0346145907e81b42dd26084d04a626881 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Tue, 23 Sep 2008 13:45:37 +0530
Subject: [PATCH 06/35] fix crash problem after configuration wizard

bzr revid: hda@tinyerp.com-20080923081537-wqlqgiynp8mw1pwv
---
 bin/addons/base/module/module.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index fa8ce19fd57..30b154a1145 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -268,7 +268,7 @@ class module(osv.osv):
                 raise orm.except_orm(_('Error'),
                         _('You try to remove a module that is installed or will be installed'))
         return super(module, self).unlink(cr, uid, ids, context=context)
-    
+
     def state_update(self, cr, uid, ids, newstate, states_to_update, context={}, level=50):
         if level<1:
             raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !'))
@@ -471,14 +471,14 @@ class module(osv.osv):
             match = re.search('-([a-zA-Z0-9\._-]+)(\.zip)', mod.url, re.I)
             version = '0'
             if match:
-                version = match.group(1)            
+                version = match.group(1)
             if vercmp(mod.installed_version or '0', version) >= 0:
                 continue
             res.append(mod.url)
             if not download:
                 continue
             zipfile = urllib.urlopen(mod.url).read()
-            fname = addons.get_module_path(mod.name+'.zip')            
+            fname = addons.get_module_path(mod.name+'.zip')
             try:
                 fp = file(fname, 'wb')
                 fp.write(zipfile)
@@ -528,12 +528,12 @@ class module(osv.osv):
         self.write(cr, uid, [id], {'category_id': p_id})
 
     def action_install(self,cr,uid,ids,context=None):
-        self.write(cr , uid, ids ,{'state' : 'to install'})        
+        self.write(cr , uid, ids ,{'state' : 'to install'})
         self.download(cr, uid, ids, context=context)
         for id in ids:
             cr.execute("select m.id as id from ir_module_module_dependency d inner join ir_module_module m on (m.name=d.name) where d.module_id=%d and m.state='uninstalled'",(id,))
             dep_ids = map(lambda x:x[0],cr.fetchall())
-            if len(dep_ids):                    
+            if len(dep_ids):
                 self.action_install(cr,uid,dep_ids,context=context)
 
     def update_translations(self, cr, uid, ids, filter_lang=None):
@@ -550,7 +550,7 @@ class module(osv.osv):
         for mod in self.browse(cr, uid, ids):
             if mod.state != 'installed':
                 continue
-            
+
             for lang in filter_lang:
                 f = os.path.join(tools.config['addons_path'], mod.name, 'i18n', lang + '.po')
                 if os.path.exists(f):
@@ -680,6 +680,18 @@ class module_configuration(osv.osv_memory):
                   'type': item.action_id.type,
                   'target':item.action_id.target,
             }
+        user_action=self.pool.get('res.users').browse(cr,uid,uid)
+        act_obj=self.pool.get(user_action.action_id.type)
+        action_ids=act_obj.search(cr,uid,[('name','=',user_action.action_id.name)])
+        action_open=act_obj.browse(cr,uid,action_ids)[0]
+        if context.get('menu',False):
+            return{
+              'view_type': action_open.view_type,
+              'view_id':action_open.view_id and [action_open.view_id.id] or False,
+              'res_model': action_open.res_model,
+              'type': action_open.type,
+              'domain':action_open.domain
+               }
         return {'type':'ir.actions.act_window_close' }
 module_configuration()
 

From 4f488fea0fc91f18cd09e8ba3cfafae468575c54 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Tue, 23 Sep 2008 13:55:23 +0530
Subject: [PATCH 07/35] fix crash problem after configuration wizard

bzr revid: hda@tinyerp.com-20080923082523-0a3pj9fg54p8qd5k
---
 addons/base_setup/wizard/wizard_base_setup.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 98eb2b7cacf..5e4b0356668 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -82,7 +82,7 @@ view_form_update = """<?xml version="1.0"?>
         <separator string="Summary" colspan="2"/>
         <newline/>
         <field name="profile" align="0.0" readonly="1"/>
-        <newline/>        
+        <newline/>
         <field name="name" align="0.0" readonly="1"/>
     </group>
 </form>
@@ -110,7 +110,7 @@ class wizard_base_setup(wizard.interface):
         res.sort()
         return res
 
-    
+
 
     def _get_company(self, cr, uid, data, context):
         pool=pooler.get_pool(cr.dbname)
@@ -167,7 +167,7 @@ class wizard_base_setup(wizard.interface):
         if 'profile' in data['form'] and data['form']['profile'] > 0:
             module_obj=pool.get('ir.module.module')
             module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
-        
+
 
         company_obj=pool.get('res.company')
         partner_obj=pool.get('res.partner')
@@ -266,6 +266,7 @@ class wizard_base_setup(wizard.interface):
                 "view_mode": 'form',
                 'res_model': 'ir.module.module.configuration.wizard',
                 'type': 'ir.actions.act_window',
+                'context':{'menu':True},
                 'target':'new',
          }
 
@@ -277,7 +278,7 @@ class wizard_base_setup(wizard.interface):
             'default': -1,
             'required': True,
         },
-        
+
         'name':{
             'string': 'Company Name',
             'type': 'char',

From 5a76e7c0c5b4a559b43801be36fb63e2b1c4806f Mon Sep 17 00:00:00 2001
From: Naresh Choksy <nch@tinyerp.com>
Date: Tue, 23 Sep 2008 15:50:09 +0530
Subject: [PATCH 08/35] Add a graph and calendar view,changed workflow,added
 delay calculation,restricted operations,changed all 'operation' tag to 'Work
 Order' added buttons in list view,removed extra delay field

bzr revid: nch@tinyerp.com-20080923102009-tnsfvdhhnvg7qdjl
---
 addons/mrp_operations/__init__.py             |   0
 addons/mrp_operations/__terp__.py             |   0
 addons/mrp_operations/i18n/cs_CZ.po           |   0
 addons/mrp_operations/i18n/de_DE.po           |   0
 addons/mrp_operations/i18n/es_AR.po           |   0
 addons/mrp_operations/i18n/es_ES.po           |   0
 addons/mrp_operations/i18n/fr_FR.po           |   0
 addons/mrp_operations/i18n/hu_HU.po           |   0
 addons/mrp_operations/i18n/it_IT.po           |   0
 addons/mrp_operations/i18n/mrp_operations.pot |   0
 addons/mrp_operations/i18n/nl_NL.po           |   0
 addons/mrp_operations/i18n/pt_BR.po           |   0
 addons/mrp_operations/i18n/pt_PT.po           |   0
 addons/mrp_operations/i18n/ro_RO.po           |   0
 addons/mrp_operations/i18n/ru_RU.po           |   0
 addons/mrp_operations/i18n/sv_SE.po           |   0
 addons/mrp_operations/i18n/zh_CN.po           |   0
 addons/mrp_operations/i18n/zh_TW.po           |   0
 addons/mrp_operations/mrp_operation_data.xml  |  26 ++-
 addons/mrp_operations/mrp_operations.py       | 213 +++++++++++++++---
 .../mrp_operations/mrp_operations_report.xml  |   0
 addons/mrp_operations/mrp_operations_view.xml |  60 +++--
 .../mrp_operations_workflow.xml               |  30 ++-
 addons/mrp_operations/report/__init__.py      |   0
 .../mrp_operations/report/mrp_code_barcode.py |   0
 .../report/mrp_code_barcode.rml               |   0
 .../mrp_operations/report/mrp_wc_barcode.py   |   0
 .../mrp_operations/report/mrp_wc_barcode.rml  |   0
 .../security/ir.model.access.csv              |   0
 29 files changed, 264 insertions(+), 65 deletions(-)
 mode change 100644 => 100755 addons/mrp_operations/__init__.py
 mode change 100644 => 100755 addons/mrp_operations/__terp__.py
 mode change 100644 => 100755 addons/mrp_operations/i18n/cs_CZ.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/de_DE.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/es_AR.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/es_ES.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/fr_FR.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/hu_HU.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/it_IT.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/mrp_operations.pot
 mode change 100644 => 100755 addons/mrp_operations/i18n/nl_NL.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/pt_BR.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/pt_PT.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/ro_RO.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/ru_RU.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/sv_SE.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/zh_CN.po
 mode change 100644 => 100755 addons/mrp_operations/i18n/zh_TW.po
 mode change 100644 => 100755 addons/mrp_operations/mrp_operation_data.xml
 mode change 100644 => 100755 addons/mrp_operations/mrp_operations.py
 mode change 100644 => 100755 addons/mrp_operations/mrp_operations_report.xml
 mode change 100644 => 100755 addons/mrp_operations/mrp_operations_view.xml
 mode change 100644 => 100755 addons/mrp_operations/mrp_operations_workflow.xml
 mode change 100644 => 100755 addons/mrp_operations/report/__init__.py
 mode change 100644 => 100755 addons/mrp_operations/report/mrp_code_barcode.py
 mode change 100644 => 100755 addons/mrp_operations/report/mrp_code_barcode.rml
 mode change 100644 => 100755 addons/mrp_operations/report/mrp_wc_barcode.py
 mode change 100644 => 100755 addons/mrp_operations/report/mrp_wc_barcode.rml
 mode change 100644 => 100755 addons/mrp_operations/security/ir.model.access.csv

diff --git a/addons/mrp_operations/__init__.py b/addons/mrp_operations/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/cs_CZ.po b/addons/mrp_operations/i18n/cs_CZ.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/de_DE.po b/addons/mrp_operations/i18n/de_DE.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/es_ES.po b/addons/mrp_operations/i18n/es_ES.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/fr_FR.po b/addons/mrp_operations/i18n/fr_FR.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/hu_HU.po b/addons/mrp_operations/i18n/hu_HU.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/it_IT.po b/addons/mrp_operations/i18n/it_IT.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/nl_NL.po b/addons/mrp_operations/i18n/nl_NL.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/pt_PT.po b/addons/mrp_operations/i18n/pt_PT.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/ro_RO.po b/addons/mrp_operations/i18n/ro_RO.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/ru_RU.po b/addons/mrp_operations/i18n/ru_RU.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/sv_SE.po b/addons/mrp_operations/i18n/sv_SE.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/mrp_operation_data.xml b/addons/mrp_operations/mrp_operation_data.xml
old mode 100644
new mode 100755
index 0d5899c6014..7ce25b6d250
--- a/addons/mrp_operations/mrp_operation_data.xml
+++ b/addons/mrp_operations/mrp_operation_data.xml
@@ -3,21 +3,31 @@
 <data noupdate="1">
 
 	<record model="mrp_operations.operation.code" id="mrp_op_1">
-		<field name="name">Normal Start</field>
-		<field name="code">nstart</field>
+		<field name="name">Start</field>
+		<field name="code">start</field>
 		<field name="start_stop">start</field>
 	</record>
 
 	<record model="mrp_operations.operation.code" id="mrp_op_2">
-		<field name="name">Normal Stop</field>
-		<field name="code">nstop</field>
-		<field name="start_stop">stop</field>
+		<field name="name">Pause</field>
+		<field name="code">pause</field>
+		<field name="start_stop">pause</field>
 	</record>
 
 	<record model="mrp_operations.operation.code" id="mrp_op_3">
-		<field name="name">Broken Stop</field>
-		<field name="code">broken</field>
-		<field name="start_stop">stop</field>
+		<field name="name">Cancel</field>
+		<field name="code">cancel</field>
+		<field name="start_stop">cancel</field>
+	</record>
+	<record model="mrp_operations.operation.code" id="mrp_op_4">
+		<field name="name">Resume</field>
+		<field name="code">resume</field>
+		<field name="start_stop">resume</field>
+	</record>
+	<record model="mrp_operations.operation.code" id="mrp_op_5">
+		<field name="name">Finished</field>
+		<field name="code">done</field>
+		<field name="start_stop">done</field>
 	</record>
 
 </data>
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
old mode 100644
new mode 100755
index 9946713efe8..a8c62321d19
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -31,7 +31,7 @@
 from osv import fields
 from osv import osv
 import ir
-
+import datetime
 import netsvc
 import time
 from mx import DateTime
@@ -50,41 +50,58 @@ class mrp_production_workcenter_line(osv.osv):
     _inherit = 'mrp.production.workcenter.line'
     _name = 'mrp.production.workcenter.line'
     _description = 'Production workcenters used'
-
-    def _calc_delay(self, cr, uid, ids, name, arg, context={}):
-        result = {}
-        for obj in self.browse(cr, uid, ids, context):
-            if obj.date_start and obj.date_finnished:
-                diff = DateTime.strptime(obj.date_finnished, '%Y-%m-%d %H:%M:%S') - DateTime.strptime(obj.date_start, '%Y-%m-%d %H:%M:%S')
-                result[obj.id]=diff.day
-            else:
-                result[obj.id] = 0
-        return result
-
     _columns = {
-        'state': fields.selection([('draft','Draft'),('confirm', 'Confirm'),('cancel','Canceled'),('done','Done')],'Status', readonly=True),
-        'date_start': fields.datetime('Start Date'),
-        'date_finnished': fields.datetime('End Date'),
-        'delay': fields.function(_calc_delay, method=True, string='Delay', help="This is delay between operation start and stop in this workcenter"),
-        'delay': fields.float('delay', required=True),
+       'state': fields.selection([('draft','Draft'),('startworking', 'In Progress'),('pause','Pause'),('cancel','Canceled'),('done','Finished')],'Status', readonly=True),
+       'date_start': fields.datetime('Start Date'),
+       'date_finnished': fields.datetime('End Date'),
+       'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True),
+       'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'),
+       'qty':fields.related('production_id','product_qty',type='float',string='Qty'),
+       'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'),
+       
+
     }
     _defaults = {
         'state': lambda *a: 'draft',
-        'delay': lambda *a: 0.0
+        'delay': lambda *a: '0 Days 00 hrs and 00 mins'
     }
 
+    def modify_production_order_state(self,cr,uid,ids,action):
+        wf_service = netsvc.LocalService("workflow")
+        oper_obj=self.browse(cr,uid,ids)[0]
+        prod_obj=self.pool.get('mrp.production').browse(cr,uid,[oper_obj.production_id.id])[0]
+        if action=='start': 
+               if prod_obj.state =='ready': 
+                   wf_service.trg_validate(uid, 'mrp.production', prod_obj.id, 'button_produce', cr)
+               elif prod_obj.state =='in_production':
+                   return
+               else:
+                   raise osv.except_osv(_('Error!'),_('Production Order Cannot start in [%s] state')%(prod_obj.state,))
+        else:
+            oper_ids=self.search(cr,uid,[('production_id','=',prod_obj.id)])
+            obj=self.browse(cr,uid,oper_ids)
+            flag=True
+            for line in obj:
+                if line.state!='done':
+                     flag=False
+            if flag:
+                wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
+        return
+    
     def action_draft(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state':'draft'})
 #       self.write(cr, uid, ids, {'state':'draft','date_start':None})
         return True
 
-    def action_confirm(self, cr, uid, ids):
-        self.write(cr, uid, ids, {'state':'confirm'})
+    def action_start_working(self, cr, uid, ids):
+        self.modify_production_order_state(cr,uid,ids,'start')
+        self.write(cr, uid, ids, {'state':'startworking'})
 #       self.write(cr, uid, ids, {'state':'confirm','date_start':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_done(self, cr, uid, ids):
         self.write(cr, uid, ids, {'state':'done'})
+        self.modify_production_order_state(cr,uid,ids,'done')
 #       self.write(cr, uid, ids, {'state':'done','date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
@@ -92,6 +109,16 @@ class mrp_production_workcenter_line(osv.osv):
         self.write(cr, uid, ids, {'state':'cancel'})
 #       self.write(cr, uid, ids, {'state':'cancel','date_start':None})
         return True
+    
+    def action_pause(self, cr, uid, ids):
+        print "callled THE ACTUAL PAUSE"
+        self.write(cr, uid, ids, {'state':'pause'})
+#       self.write(cr, uid, ids, {'state':'draft','date_start':None})
+        return True
+   
+    def action_resume(self, cr, uid, ids):
+        self.write(cr, uid, ids, {'state':'startworking'})
+        return True
 
 mrp_production_workcenter_line()
 
@@ -100,18 +127,18 @@ class mrp_production(osv.osv):
     _inherit = 'mrp.production'
     _description = 'Production'
 
-    def action_confirm(self, cr, uid, ids):
-        obj=self.browse(cr,uid,ids)[0]
-        for workcenter_line in obj.workcenter_lines:
-            tmp=self.pool.get('mrp.production.workcenter.line').action_confirm(cr,uid,[workcenter_line.id])
-        return super(mrp_production,self).action_confirm(cr,uid,ids)
+#    def action_confirm(self, cr, uid, ids):
+#        obj=self.browse(cr,uid,ids)[0]
+#        for workcenter_line in obj.workcenter_lines:
+#            tmp=self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,[workcenter_line.id])
+#        return super(mrp_production,self).action_confirm(cr,uid,ids)
 
     def action_production_end(self, cr, uid, ids):
         obj=self.browse(cr,uid,ids)[0]
         for workcenter_line in obj.workcenter_lines:
             tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,[workcenter_line.id])
         return super(mrp_production,self).action_production_end(cr,uid,ids)
-
+#
     def action_cancel(self, cr, uid, ids):
         obj=self.browse(cr,uid,ids)[0]
         for workcenter_line in obj.workcenter_lines:
@@ -125,7 +152,7 @@ class mrp_operations_operation_code(osv.osv):
     _columns={
         'name': fields.char('Operation Name',size=64, required=True),
         'code': fields.char('Code', size=16, required=True),
-        'start_stop': fields.selection([('start','Start'),('stop','Stop'),('done','Done')], 'Status', required=True),
+        'start_stop': fields.selection([('start','Start'),('pause','Pause'),('resume','Resume'),('cancel','Cancel'),('done','Done')], 'Status', required=True),
     }
 mrp_operations_operation_code()
 
@@ -143,23 +170,142 @@ class mrp_operations_operation(osv.osv):
                 res[operation.id]=operation.production_id.date_planned
         return res
     
+    def calc_delay(self,cr,uid,vals):
+        code_lst=[]
+        time_lst=[]
+        
+        code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
+        code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
+        
+        oper_ids=self.search(cr,uid,[('production_id','=',vals['production_id']),('workcenter_id','=',vals['workcenter_id'])])
+        oper_objs=self.browse(cr,uid,oper_ids)
+        
+        for oper in oper_objs:
+            code_lst.append(oper.code_id.start_stop)
+            time_lst.append(oper.date_start)
+            
+        code_lst.append(code.start_stop)
+        time_lst.append(vals['date_start'])
+        h=m=s=days=0
+        for i in range(0,len(code_lst)):
+            if code_lst[i]=='pause' or code_lst[i]=='done' or code_lst[i]=='cancel':
+                if code_lst[i]=='cancel' and code_lst[i-1]=='pause':
+                   continue
+                a=datetime.datetime(int(time_lst[i-1][0:4]),int(time_lst[i-1][5:7]),int(time_lst[i-1][8:10]),int(time_lst[i-1][11:13]),int(time_lst[i-1][14:16]),int(time_lst[i-1][17:19]))
+                b=datetime.datetime(int(time_lst[i][0:4]),int(time_lst[i][5:7]),int(time_lst[i][8:10]),int(time_lst[i][11:13]),int(time_lst[i][14:16]),int(time_lst[i][17:19]))
+                diff =b-a
+                min, sec = divmod(diff.seconds, 60)
+                hrs, min = divmod(min, 60)
+                days+=diff.days
+                h+=hrs
+                m+=min
+                s+=sec
+                if s>=60:
+                    m+=1
+                    s=0
+                if m>=60:
+                    h+=1
+                    m=0
+                if h>=24:
+                    days+=1
+                    h=0
+        delay=str(days) +" Days "+ str(h) + " hrs  and " + str(m)+ " mins"
+        return delay
+    
+    def check_operation(self,cr,uid,vals):
+        code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
+        code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
+        code_lst = []
+        oper_ids=self.search(cr,uid,[('production_id','=',vals['production_id']),('workcenter_id','=',vals['workcenter_id'])])
+        oper_objs=self.browse(cr,uid,oper_ids)
+        
+        if not oper_objs:
+            if code.start_stop!='start':
+                raise osv.except_osv(_('Sorry!'),_('Operation is not started yet !'))
+                return False
+        else:    
+            for oper in oper_objs:
+                 code_lst.append(oper.code_id.start_stop)
+            if code.start_stop=='start':
+                    if 'start' in code_lst:        
+                        raise osv.except_osv(_('Sorry!'),_('Operation has already started !' 'You  can either Pause /Finish/Cancel the operation'))
+                        return False
+            if code.start_stop=='pause':
+                    if  code_lst[len(code_lst)-1]!='resume' and code_lst[len(code_lst)-1]!='start':        
+                        raise osv.except_osv(_('Error!'),_('You cannot Pause the Operation other then Start/Resume state !'))
+                        return False
+            if code.start_stop=='resume':    
+                if code_lst[len(code_lst)-1]!='pause':        
+                   raise osv.except_osv(_('Error!'),_(' You cannot Resume the operation other then Pause state !'))
+                   return False
+   
+            if code.start_stop=='done':
+               if code_lst[len(code_lst)-1]!='start' and code_lst[len(code_lst)-1]!='resume':
+                  raise osv.except_osv(_('Sorry!'),_('You cannot finish the operation without Starting/Resuming it !'))
+                  return False
+               if 'cancel' in code_lst:
+                  raise osv.except_osv(_('Sorry!'),_('Operation is Already Cancelled  !'))
+                  return False
+            if code.start_stop=='cancel':
+               if  not 'start' in code_lst :
+                   raise osv.except_osv(_('Error!'),_('There is no Operation to be cancelled !'))
+                   return False
+               if 'done' in code_lst:
+                  raise osv.except_osv(_('Error!'),_('Operation is already finished !'))
+                  return False
+        return True
+        
+    def write(self, cr, uid, ids, vals, context=None):
+        oper_objs=self.browse(cr,uid,ids)[0]
+        vals['production_id']=oper_objs.production_id.id
+        vals['workcenter_id']=oper_objs.workcenter_id.id
+        
+        if 'code_id' in vals:
+            self.check_operation(cr, uid, vals)
+            
+        if 'date_start' in vals:
+            vals['date_start']=vals['date_start']
+            vals['code_id']=oper_objs.code_id.id
+            delay=self.calc_delay(cr, uid, vals)
+            wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
+            self.pool.get('mrp.production.workcenter.line').write(cr,uid,wc_op_id,{'delay':delay})
+            
+        return super(mrp_operations_operation, self).write(cr, uid, ids, vals, context=context)
+        
     def create(self, cr, uid, vals, context=None):
         wf_service = netsvc.LocalService('workflow')
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
         code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
-        if code.start_stop=='start' or code.start_stop=='stop' or code.start_stop=='done':
-            wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
+        wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
+        if code.start_stop in ('start','done','pause','cancel','resume'):
             if not wc_op_id:
                 production_obj=self.pool.get('mrp.production').browse(cr,uid,vals['production_id'])
                 wc_op_id.append(self.pool.get('mrp.production.workcenter.line').create(cr,uid,{'production_id':vals['production_id'],'name':production_obj.product_id.name,'workcenter_id':vals['workcenter_id']}))
+                
             if code.start_stop=='start':
-                tmp=self.pool.get('mrp.production.workcenter.line').action_confirm(cr,uid,wc_op_id[0])
+                tmp=self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,wc_op_id)
+                
             if code.start_stop=='done':
                 tmp=self.pool.get('mrp.production.workcenter.line').action_done(cr,uid,wc_op_id)
-            if code.start_stop=='stop':
                 self.pool.get('mrp.production').write(cr,uid,vals['production_id'],{'date_finnished':DateTime.now().strftime('%Y-%m-%d %H:%M:%S')})
+                                
+            if code.start_stop=='pause':
+                print "in PAUSE"
+                tmp=self.pool.get('mrp.production.workcenter.line').action_pause(cr,uid,wc_op_id)
+                
+            if code.start_stop=='resume':
+                tmp=self.pool.get('mrp.production.workcenter.line').action_resume(cr,uid,wc_op_id)
+            
+            if code.start_stop=='cancel':
+                tmp=self.pool.get('mrp.production.workcenter.line').action_cancel(cr,uid,wc_op_id)
+               
+        if not self.check_operation(cr, uid, vals):
+            return
+        delay=self.calc_delay(cr, uid, vals)
+        self.pool.get('mrp.production.workcenter.line').write(cr,uid,wc_op_id,{'delay':delay})
+        
         return super(mrp_operations_operation, self).create(cr, uid, vals,  context=context)
-
+    
     _columns={
         'production_id':fields.many2one('mrp.production','Production',required=True),
         'workcenter_id':fields.many2one('mrp.workcenter','Workcenter',required=True),
@@ -168,6 +314,9 @@ class mrp_operations_operation(osv.osv):
         'date_finished': fields.datetime('End Date'),
         'order_date': fields.function(_get_order_date,method=True,string='Order Date',type='date',store={'mrp.production':(['date_planned'],_order_date_search_production)}),
         }
+    _defaults={
+              'date_start': lambda *a:DateTime.now().strftime('%Y-%m-%d %H:%M:%S')
+              }
 
 mrp_operations_operation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_operations/mrp_operations_report.xml b/addons/mrp_operations/mrp_operations_report.xml
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
old mode 100644
new mode 100755
index 661bce2776f..d9063f6c2d1
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -9,6 +9,11 @@
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
 			<field name="hour" position="after">
+				<button name="button_done" string="Finished" states="startworking"/>
+				<button name="button_start_working" string="Start working" states="draft,pause"/>			
+				<field name="uom"/>
+				<field name="qty"/>
+				<field name="product"/>
 				<field name="production_id"/>
 				<field name="state" />
 			</field>
@@ -22,19 +27,17 @@
 		<field name="inherit_id" ref="mrp.mrp_production_workcenter_form_view"/>
 		<field name="arch" type="xml">
 				<field name="hour" position="after">
-					<group colspan="4" col="6">
+					<group colspan="8" col="8">
 							<field name="state" select="2"/>
 							<button name="button_draft" string="Set Draft" states="cancel"/>
-							<button name="button_confirm" string="Confirm" states="draft"/>
-							<button name="button_done" string="Done" states="confirm"/>
-							<button name="button_cancel" string="Cancel" states="draft,confirm"/>
+							<button name="button_start_working" string="Start working" states="draft"/>
+							<button name="button_resume" string="Resume" states="pause"/>
+							<button name="button_done" string="Finished" states="startworking"/>
+							<button name="button_pause" string="Pause" states="startworking"/>
+							<button name="button_cancel" string="Cancel" states="draft,startworking"/>
 					</group>
 					<field name="delay"/>
 					<field name="production_id"/>
-<!--					<field name="date_finnished"/>
-					<field name="date_start"/>
-					<newline/>
--->
 				</field>
 		</field>
 	</record>
@@ -42,7 +45,7 @@
 	<!-- Action for tree view of workcenter line   -->
 
 	<record model="ir.actions.act_window" id="mrp_production_wc_action_form">
-		<field name="name">Operations</field>
+		<field name="name">Work Order</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp.production.workcenter.line</field>
 		<field name="view_type">form</field>
@@ -53,45 +56,45 @@
 	<!-- Action for All Operations   -->
 
 	<record model="ir.actions.act_window" id="mrp_production_wc_action">
-		<field name="name">All Operations</field>
+		<field name="name">All Work Order</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="view_mode">tree,form</field>
+		<field name="view_mode">tree,form,graph</field>
 	</record>
 
 	<!-- Action for Confirm Operations   -->
 
 	<record model="ir.actions.act_window" id="mrp_production_wc_confirm_action">
-		<field name="name">Confirm Operations</field>
+		<field name="name">Confirm Work Order</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="view_mode">tree,form</field>
+		<field name="view_mode">tree,form,graph</field>
 		<field name="domain">[('state','=','confirm')]</field>
 	</record>
 
 	<!-- Action for Draft Operations   -->
 
 	<record model="ir.actions.act_window" id="mrp_production_wc_draft_action">
-		<field name="name">Draft Operations</field>
+		<field name="name">Draft Work Order</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="view_mode">tree,form</field>
+		<field name="view_mode">tree,form,graph</field>
 		<field name="domain">[('state','=','draft')]</field>
 	</record>
 
 	<record model="ir.values" id="mrp_production_wc_action_open">
 		<field name="key2" eval="'tree_but_open'"/>
 		<field name="model" eval="'mrp.production.workcenter.line'"/>
-		<field name="name">Operations</field>
+		<field name="name">Work Order</field>
 		<field name="value" eval="'ir.actions.act_window,'+str(mrp_production_wc_action_form)"/>
 		<field name="object" eval="True"/>
 
 	</record>
 
-	<menuitem name="All Operations" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
+	<menuitem name="All Work Order" parent="mrp.menu_mrp_root" id="menu_mrp_production_wc_action" action="mrp_production_wc_action"/>
 	<menuitem name="Production Orders to Do" parent="menu_mrp_production_wc_action" action="mrp_production_wc_confirm_action" id="menu_mrp_production_wc_confirm_action"/>
 	<menuitem name="Waiting Production Orders" parent="menu_mrp_production_wc_action" action="mrp_production_wc_draft_action" id="menu_mrp_production_wc_draft_action"/>
 
@@ -124,7 +127,7 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="mrp_production_code_action">
-		<field name="name">Operation Code</field>
+		<field name="name">Operations Code</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp_operations.operation.code</field>
 		<field name="view_type">form</field>
@@ -152,6 +155,20 @@
 		</field>
 	</record>
 
+ 	<record id="graph_in_hrs_workcenter" model="ir.ui.view">
+            <field name="name">graph.in.hrs.workcenter</field>
+            <field name="model">mrp.production.workcenter.line</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Graph view in hours by workcenter" type="bar">
+                     <field name="workcenter_id"/>
+                     <field name="hour" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        
+
 	<!--<record model="ir.ui.view" id="mrp_production_operation_form_view">
 		<field name="name">mrp.production.operation.form</field>
 		<field name="model">mrp_operations.operation</field>
@@ -166,14 +183,15 @@
 	</record>
 -->
 	<record model="ir.actions.act_window" id="mrp_production_operation_action">
-		<field name="name">Operation</field>
+		<field name="name">Operations</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">mrp_operations.operation</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,calendar,form</field>
 		<field name="view_id" ref="mrp_production_operation_tree_view"/>
 	</record>
-	<menuitem name="Operations" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_operation_action" action="mrp_production_operation_action"/>
+	<menuitem name="Operations to Manufacturing" parent="mrp.menu_mrp_configuration" id="menu_mrp_production_operation_main"/>
+	<menuitem name="Operations" parent="menu_mrp_production_operation_main" id="menu_mrp_production_operation_action" action="mrp_production_operation_action"/>
 	
 	<record model="ir.ui.view" id="operation_calendar_view">
 			<field name="name">mrp.perations.calendar</field>
@@ -182,8 +200,6 @@
 			<field name="priority" eval="2"/>
 			<field name="arch" type="xml">
 				<calendar string="Calendar View" date_start="order_date" color="workcenter_id">
-					<field name="code_id"/>
-					<field name="production_id"/>
 					<field name="date_start"/>
 					<field name="date_finished"/>
 				</calendar>
diff --git a/addons/mrp_operations/mrp_operations_workflow.xml b/addons/mrp_operations/mrp_operations_workflow.xml
old mode 100644
new mode 100755
index 5510d3b0ab0..6dea60c6514
--- a/addons/mrp_operations/mrp_operations_workflow.xml
+++ b/addons/mrp_operations/mrp_operations_workflow.xml
@@ -20,9 +20,9 @@
 		</record>
 		<record model="workflow.activity" id="prod_act_wc_start">
 			<field name="wkf_id" ref="wkf_prod_workcenter"/>
-			<field name="name">confirm</field>
+			<field name="name">startworking</field>
 			<field name="kind">function</field>
-			<field name="action">action_confirm()</field>
+			<field name="action">action_start_working()</field>
 		</record>
 		<record model="workflow.activity" id="prod_act_wc_cancel">
 			<field name="wkf_id" ref="wkf_prod_workcenter"/>
@@ -30,6 +30,18 @@
 			<field name="kind">function</field>
 			<field name="action">action_cancel()</field>
 		</record>
+		<record model="workflow.activity" id="prod_act_wc_pause">
+			<field name="wkf_id" ref="wkf_prod_workcenter"/>
+			<field name="name">pause</field>
+			<field name="kind">function</field>
+			<field name="action">action_pause()</field>
+		</record>
+		<record model="workflow.activity" id="prod_act_wc_resume">
+			<field name="wkf_id" ref="wkf_prod_workcenter"/>
+			<field name="name">resume</field>
+			<field name="kind">function</field>
+			<field name="action">action_resume()</field>
+		</record>
 		<record model="workflow.activity" id="prod_act_wc_done">
 			<field name="wkf_id" ref="wkf_prod_workcenter"/>
 			<field name="name">done</field>
@@ -37,6 +49,7 @@
 			<field name="flow_stop">True</field>
 			<field name="action">action_done()</field>
 		</record>
+		
 	# -----------------------------------------------------------
 	# Transition
 	# -----------------------------------------------------------
@@ -44,7 +57,7 @@
 		<record model="workflow.transition" id="prod_trans_wc_draft_start">
 			<field name="act_from" ref="prod_act_wc_draft"/>
 			<field name="act_to" ref="prod_act_wc_start"/>
-			<field name="signal">button_confirm</field>
+			<field name="signal">button_start_working</field>
 		</record>
 		<record model="workflow.transition" id="prod_trans_wc_start_done">
 			<field name="act_from" ref="prod_act_wc_start"/>
@@ -66,5 +79,16 @@
 			<field name="act_to" ref="prod_act_wc_cancel"/>
 			<field name="signal">button_cancel</field>
 		</record>
+		<record model="workflow.transition" id="prod_trans_wc_start_pause">
+			<field name="act_from" ref="prod_act_wc_start"/>
+			<field name="act_to" ref="prod_act_wc_pause"/>
+			<field name="signal">button_pause</field>
+		</record>
+		
+		<record model="workflow.transition" id="prod_trans_wc_pause_resume">
+			<field name="act_from" ref="prod_act_wc_pause"/>
+			<field name="act_to" ref="prod_act_wc_resume"/>
+			<field name="signal">button_resume</field>
+		</record>
 </data>
 </openerp>
diff --git a/addons/mrp_operations/report/__init__.py b/addons/mrp_operations/report/__init__.py
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/report/mrp_code_barcode.py b/addons/mrp_operations/report/mrp_code_barcode.py
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.py b/addons/mrp_operations/report/mrp_wc_barcode.py
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml
old mode 100644
new mode 100755
diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv
old mode 100644
new mode 100755

From 17eb1ec7dafa56196faff9a3df4105d59228021f Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Tue, 23 Sep 2008 15:52:28 +0530
Subject: [PATCH 09/35] bug fix

bzr revid: hda@tinyerp.com-20080923102228-npiylcw40qahdyh3
---
 bin/osv/fields.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 825420b1ec6..5079100f654 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -648,8 +648,8 @@ class related(function):
 #        return True
 
 
-    def _fnct_write(self,obj,cr, uid, ids, field_name, args, context=None):
-        raise 'Not Implemented Yet'
+#    def _fnct_write(self,obj,cr, uid, ids,values, field_name, args, context=None):
+#        raise 'Not Implemented Yet'
 
     def _fnct_read(self,obj,cr, uid, ids, field_name, args, context=None):
         if not ids: return {}
@@ -678,7 +678,7 @@ class related(function):
     def __init__(self,*arg,**args):
         print arg
         self.arg = arg
-        super(related, self).__init__(self._fnct_read, arg, fnct_inv=self._fnct_write, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
+        super(related, self).__init__(self._fnct_read, arg, fnct_inv_arg=arg,method=True, fnct_search=self._fnct_search,**args)
 
     # TODO: call field_get on the object, not in the DB
     def _field_get(self, cr, uid, obj, model_name, prop):

From 500e964ebbe6e7fa646b4bff0832beacdca8a43d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 23 Sep 2008 12:47:45 +0200
Subject: [PATCH 10/35] get_binary_size is renamed bin_size and its behavior is
 reversed (False by default)

bzr revid: christophe@tinyerp.com-20080923104745-m5osg61ukqtk0szi
---
 bin/osv/fields.py        | 4 ++--
 bin/osv/orm.py           | 4 ++--
 bin/report/report_sxw.py | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/osv/fields.py b/bin/osv/fields.py
index 5079100f654..daee0e4e40a 100644
--- a/bin/osv/fields.py
+++ b/bin/osv/fields.py
@@ -223,7 +223,7 @@ class binary(_column):
                     val = v[name]
                     break
             res.setdefault(i, val)
-            if context.get('get_binary_size', True):
+            if context.get('bin_size', False):
                 res[i] = tools.human_size(val)
 
         return res
@@ -620,7 +620,7 @@ class function(_column):
         else:
             res = self._fnct(cr, obj._table, ids, name, self._arg, context)
 
-        if self._type == 'binary' and context.get('get_binary_size', True):
+        if self._type == 'binary' and context.get('bin_size', False):
             # convert the data returned by the function with the size of that data...
             res = dict(map(lambda (x, y): (x, tools.human_size(len(y))), res.items()))
         return res
diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 00e2f30b35f..0c636acdd03 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1127,7 +1127,7 @@ class orm_memory(orm_template):
                 for f in fields_to_read:
                     if id in self.datas:
                         r[f] = self.datas[id].get(f, False)
-                        if r[f] and isinstance(self._columns[f], fields.binary) and context.get('get_binary_size', True):
+                        if r[f] and isinstance(self._columns[f], fields.binary) and context.get('bin_size', False):
                             r[f] = len(r[f])
                 result.append(r)
                 if id in self.datas:
@@ -1721,7 +1721,7 @@ class orm(orm_template):
             def convert_field(f):
                 if f in ('create_date', 'write_date'):
                     return "date_trunc('second', %s) as %s" % (f, f)
-                if isinstance(self._columns[f], fields.binary) and context.get('get_binary_size', True):
+                if isinstance(self._columns[f], fields.binary) and context.get('bin_size', False):
                     return "length(%s) as %s" % (f,f)
                 return '"%s"' % (f,)
             #fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py
index 5b9a78c630a..a5f7ee8d7ef 100644
--- a/bin/report/report_sxw.py
+++ b/bin/report/report_sxw.py
@@ -566,7 +566,6 @@ class report_sxw(report_rml):
         if not context:
             context={}
         context = context.copy()
-        context['get_binary_size'] = False
 
         pool = pooler.get_pool(cr.dbname)
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')

From bb3743070d2840750b57675f64c3f95824d948b7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 13:25:21 +0200
Subject: [PATCH 11/35] improvement

bzr revid: fp@tinyerp.com-20080923112521-gd45nckoeqq29jmx
---
 addons/product/product.py                     |  9 ++++---
 .../stock/wizard/wizard_location_product.py   | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 671433bd0fe..627bbf75c51 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -329,10 +329,11 @@ product_template()
 class product_product(osv.osv):
     def view_header_get(self, cr, uid, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, uid, view_id, view_type, context)
-        if res: return res
-        if (not context.get('categ_id', False)):
-            return False
-        return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+        if (context.get('categ_id', False)):
+            return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+        if (context.get('location', False)):
+            return _('Products: ')+self.pool.get('stock.location').browse(cr, uid, context['location'], context).name
+        return res
 
     def _product_price(self, cr, uid, ids, name, arg, context={}):
         res = {}
diff --git a/addons/stock/wizard/wizard_location_product.py b/addons/stock/wizard/wizard_location_product.py
index 0083c0e9863..f6190c023d2 100755
--- a/addons/stock/wizard/wizard_location_product.py
+++ b/addons/stock/wizard/wizard_location_product.py
@@ -34,24 +34,27 @@ import time
 
 def _action_open_window(self, cr, uid, data, context):      
     return {
-                'view_type': 'form',
-                "view_mode": 'tree,form',
-                'res_model': 'product.product',
-                'type': 'ir.actions.act_window',
-                'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
-                'domain':[('type','<>','service')]
-     }
+        'name': False,
+        'view_type': 'form',
+        "view_mode": 'tree,form',
+        'res_model': 'product.product',
+        'type': 'ir.actions.act_window',
+        'context':{'location': data['ids'][0],'from_date':data['form']['from_date'],'to_date':data['form']['to_date']},
+        'domain':[('type','<>','service')]
+    }
 
 
 class product_by_location(wizard.interface):
-    
     form1 = '''<?xml version="1.0"?>
     <form string="View Stock of Products">
+        <separator string="Stock Location Analysis" colspan="4"/>
         <field name="from_date"/>
         <newline/>
         <field name="to_date"/>
+        <newline/>
+        <label string=""/>
+        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
     </form>'''
-    
     form1_fields = {
              'from_date': {
                 'string': 'From',
@@ -66,13 +69,11 @@ class product_by_location(wizard.interface):
     states = {
       'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [ ('open', 'Open Products'),('end', 'Cancel')]}
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Products','gtk-ok')]}
         },
     'open': {
             'actions': [],
             'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
         }
     }
-    
 product_by_location('stock.location.products')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ac351807de2a1e3407b6eafb2437fc2853244e77 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 23 Sep 2008 14:51:52 +0200
Subject: [PATCH 12/35] *added equity account_account_type *changed closing
 method of income and expense account_account_type from non to unreconciled

bzr revid: qdp@tinyerp.com-20080923125152-2iol21q7i4zw3i83
---
 addons/account/demo/account_minimal.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 0138cd5e668..cee3a333e6a 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -21,15 +21,20 @@
             <field name="code">liability</field>
             <field name="close_method">balance</field>
         </record>
+        <record id="account_type_cash_equity" model="account.account.type">
+            <field name="name">Equity</field> 
+            <field name="code">equity</field>
+            <field name="close_method">balance</field>
+        </record>
         <record id="account_type_income" model="account.account.type">
             <field name="name">Income</field> 
             <field name="code">income</field>
-            <field name="close_method">none</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="account_type_expense" model="account.account.type">
             <field name="name">Expense</field> 
             <field name="code">expense</field>
-            <field name="close_method">none</field>
+            <field name="close_method">unreconciled</field>
         </record>
         <record id="account_type_cash_moves" model="account.account.type">
             <field name="name">Cash</field> 

From 004e883f9fb3f45e69e9601fb46cc4771ba18f8b Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Tue, 23 Sep 2008 15:28:07 +0200
Subject: [PATCH 13/35] *bugfixed

bzr revid: qdp@tinyerp.com-20080923132807-4gnt09yhvi7opnb2
---
 addons/account_invoice_layout/account_invoice_layout.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 33be86f2729..a7290ad01d3 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -142,10 +142,12 @@ class account_invoice_line(osv.osv):
         'sequence': fields.integer('Sequence Number'),
         'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, method=True, store=False, string="Source Account"),
     }
+
     def _default_account(self, cr, uid, context=None):
-        cr.execute("select id from account_account where code = 0 LIMIT 1")
+        cr.execute("select id from account_account where parent_id IS NULL LIMIT 1")
         res=cr.fetchone()
         return res[0]
+
     _defaults = {
         'state': lambda *a: 'article',
 #       'account_id': _default_account

From ef38343c1113c1ae877d2ac7156a4901fe9773b1 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Tue, 23 Sep 2008 18:54:11 +0530
Subject: [PATCH 14/35] Improvement on compute stock

bzr revid: hmo@tinyerp.com-20080923132411-ioz1m9wf0y76sil5
---
 addons/stock/product.py | 180 +++++++++++++++++++++++++++++++++-------
 addons/stock/stock.py   | 106 ++---------------------
 2 files changed, 157 insertions(+), 129 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index f66e41acd4a..bef5ccaedad 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -42,53 +42,171 @@ class product_product(osv.osv):
 #        j = cr.fetchone()[0]
 #        if j:
 #            return 'Products: '+j
-#        return False
-#
+#        return False    
+
+    
+        
+    def get_product_available(self,cr,uid,ids,context={}):
+        states=context.get('states',[])
+        what=context.get('what',())
+        if not ids:
+            ids = self.search(cr, uid, [])
+        res = {}.fromkeys(ids, 0.0)
+        if not ids:
+            return res          
+
+        if context.get('shop', False):
+            cr.execute('select warehouse_id from sale_shop where id=%d', (int(context['shop']),))
+            res2 = cr.fetchone()
+            if res2:
+                context['warehouse'] = res2[0]
+
+        if context.get('warehouse', False):
+            cr.execute('select lot_stock_id from stock_warehouse where id=%d', (int(context['warehouse']),))
+            res2 = cr.fetchone()
+            if res2:
+                context['location'] = res2[0]
+
+        if context.get('location', False):
+            location_ids = [context['location']]
+        else:
+            cr.execute("select lot_stock_id from stock_warehouse")
+            location_ids = [id for (id,) in cr.fetchall()]
+
+        # build the list of ids of children of the location given by id
+        location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])        
+
+        states_str = ','.join(map(lambda s: "'%s'" % s, states))           
+
+        product2uom = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            product2uom[product.id] = product.uom_id.id
+
+        prod_ids_str = ','.join(map(str, ids))
+        location_ids_str = ','.join(map(str, location_ids))
+        results = []
+        results2 = []
+        
+        from_date=context.get('from_date',False)
+        to_date=context.get('to_date',False)        
+        date_str=False
+        if from_date and to_date:
+            date_str="date>='%s' and date<=%s"%(from_date,to_date)
+        elif from_date:
+            date_str="date>='%s'"%(from_date)
+        elif to_date:
+            date_str="date<='%s'"%(to_date) 
+            
+        if 'in' in what:
+            # all moves from a location out of the set to a location in the set            
+            cr.execute(
+                'select sum(product_qty), product_id, product_uom '\
+                'from stock_move '\
+                'where location_id not in ('+location_ids_str+') '\
+                'and location_dest_id in ('+location_ids_str+') '\
+                'and product_id in ('+prod_ids_str+') '\
+                'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') +''\
+                'group by product_id,product_uom'
+            )
+            results = cr.fetchall()
+        if 'out' in what:
+            # all moves from a location in the set to a location out of the set            
+            cr.execute(
+                'select sum(product_qty), product_id, product_uom '\
+                'from stock_move '\
+                'where location_id in ('+location_ids_str+') '\
+                'and location_dest_id not in ('+location_ids_str+') '\
+                'and product_id in ('+prod_ids_str+') '\
+                'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') + ''\
+                'group by product_id,product_uom'
+            )
+            results2 = cr.fetchall()
+        uom_obj = self.pool.get('product.uom')
+        for amount, prod_id, prod_uom in results:
+            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
+                    context.get('uom', False) or product2uom[prod_id])
+            res[prod_id] += amount
+        for amount, prod_id, prod_uom in results2:
+            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
+                    context.get('uom', False) or product2uom[prod_id])
+            res[prod_id] -= amount        
+        return res                           
+
     def _get_product_available_func(states, what):
-        def _product_available(self, cr, uid, ids, name, arg, context={}):
-            if context.get('shop', False):
-                cr.execute('select warehouse_id from sale_shop where id=%d', (int(context['shop']),))
-                res2 = cr.fetchone()
-                if res2:
-                    context['warehouse'] = res2[0]
-
-            if context.get('warehouse', False):
-                cr.execute('select lot_stock_id from stock_warehouse where id=%d', (int(context['warehouse']),))
-                res2 = cr.fetchone()
-                if res2:
-                    context['location'] = res2[0]
-
-            if context.get('location', False):
-                location_ids = [context['location']]
-            else:
-                cr.execute("select lot_stock_id from stock_warehouse")
-                location_ids = [id for (id,) in cr.fetchall()]
-
-            # build the list of ids of children of the location given by id
-            location_ids = self.pool.get('stock.location').search(cr, uid, [('location_id', 'child_of', location_ids)])
-            res = self.pool.get('stock.location')._product_get_multi_location(cr, uid, location_ids, ids, context, states, what)
+        def _product_available(self, cr, uid, ids, field_names=False, arg=False, context={}):
+            context.update({
+                'states':states,
+                'what':what
+            })
+            stock=self.get_product_available(cr,uid,ids,context=context)            
+            res = {}
             for id in ids:
-                res.setdefault(id, 0.0)
+                res[id] = {}.fromkeys(field_names, 0.0)                                
+                for a in field_names:
+                    res[id][a] = stock.get(id, 0.0)
             return res
+            
         return _product_available
 
     _product_qty_available = _get_product_available_func(('done',), ('in', 'out'))
     _product_virtual_available = _get_product_available_func(('confirmed','waiting','assigned','done'), ('in', 'out'))
     _product_outgoing_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('out',))
     _product_incoming_qty = _get_product_available_func(('confirmed','waiting','assigned'), ('in',))
+
+    
     _columns = {
-        'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected."),
-        'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."),
-        'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."),
-        'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected."),
+        'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock',multi='qty_available', help="Current quantities of products in selected locations or all internal if none have been selected."),
+        'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock',multi='qty_available', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming."),
+        'incoming_qty': fields.function(_product_incoming_qty, method=True, type='float', string='Incoming',multi='qty_available', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected."),
+        'outgoing_qty': fields.function(_product_outgoing_qty, method=True, type='float', string='Outgoing',multi='qty_available', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected."),
         'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
         'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
     }
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        if ('location' in context) and context['location']:
+            location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
+            fields=res.get('fields',{})
+            if fields:
+                if location_info.usage == 'supplier':   
+                    if fields.get('virtual_available'):             
+                        res['fields']['virtual_available']['string'] = 'Futur Receptions'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Received Qty'
+                    
+                if location_info.usage == 'internal':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Stock'
+                    
+                if location_info.usage == 'customer':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Deliveries'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Delivered Qty'
+                    
+                if location_info.usage == 'inventory':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur P&L'
+                    res['fields']['qty_available']['string'] = 'P&L Qty'
+                    
+                if location_info.usage == 'procurement':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Qty'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Unplanned Qty'
+                
+                if location_info.usage == 'production':
+                    if fields.get('virtual_available'):
+                        res['fields']['virtual_available']['string'] = 'Futur Productions'
+                    if fields.get('qty_available'):
+                        res['fields']['qty_available']['string'] = 'Produced Qty'
+                
+        return res
 product_product()
 
 
-class product_product(osv.osv):
+class product_template(osv.osv):
     _name = 'product.template'
     _inherit = 'product.template'
     _columns = {
@@ -126,7 +244,7 @@ class product_product(osv.osv):
             help='This account will be used, instead of the default one, to value output stock'),
     }
 
-product_product()
+product_template()
 
 
 class product_category(osv.osv):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2d2565553e9..23d3a1ab2e5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -201,69 +201,14 @@ class stock_location(osv.osv):
                     })
         return result
 
-    def _product_get_multi_location(self, cr, uid, ids, product_ids=False, context={}, states=['done'], what=('in', 'out')):
-        
-        product_obj = self.pool.get('product.product')
-        states_str = ','.join(map(lambda s: "'%s'" % s, states))
-        if not product_ids:
-            product_ids = product_obj.search(cr, uid, [])
-        res = {}.fromkeys(product_ids, 0.0)
-        if not ids:
-            return res
-
-        product2uom = {}
-        for product in product_obj.browse(cr, uid, product_ids, context=context):
-            product2uom[product.id] = product.uom_id.id
-
-        prod_ids_str = ','.join(map(str, product_ids))
-        location_ids_str = ','.join(map(str, ids))
-        results = []
-        results2 = []
-        
-        from_date=context.get('from_date',False)
-        to_date=context.get('to_date',False)        
-        date_str=False
-        if from_date and to_date:
-           date_str="date>='%s' and date<=%s"%(from_date,to_date)
-        elif from_date:
-           date_str="date>='%s'"%(from_date)
-        elif to_date:
-           date_str="date<='%s'"%(to_date) 
-            
-        if 'in' in what:
-            # all moves from a location out of the set to a location in the set            
-            cr.execute(
-                'select sum(product_qty), product_id, product_uom '\
-                'from stock_move '\
-                'where location_id not in ('+location_ids_str+') '\
-                'and location_dest_id in ('+location_ids_str+') '\
-                'and product_id in ('+prod_ids_str+') '\
-                'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') +''\
-                'group by product_id,product_uom'
-            )
-            results = cr.fetchall()
-        if 'out' in what:
-            # all moves from a location in the set to a location out of the set            
-            cr.execute(
-                'select sum(product_qty), product_id, product_uom '\
-                'from stock_move '\
-                'where location_id in ('+location_ids_str+') '\
-                'and location_dest_id not in ('+location_ids_str+') '\
-                'and product_id in ('+prod_ids_str+') '\
-                'and state in ('+states_str+') '+ (date_str and 'and '+date_str+' ' or '') + ''\
-                'group by product_id,product_uom'
-            )
-            results2 = cr.fetchall()
-        uom_obj = self.pool.get('product.uom')
-        for amount, prod_id, prod_uom in results:
-            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
-                    context.get('uom', False) or product2uom[prod_id])
-            res[prod_id] += amount
-        for amount, prod_id, prod_uom in results2:
-            amount = uom_obj._compute_qty(cr, uid, prod_uom, amount,
-                    context.get('uom', False) or product2uom[prod_id])
-            res[prod_id] -= amount
-        return res
+    def _product_get_multi_location(self, cr, uid, ids, product_ids=False, context={}, states=['done'], what=('in', 'out')):                
+        product_obj = self.pool.get('product.product')        
+        context.update({
+            'states':states,
+            'what':what,
+            'location':ids
+        })                
+        return product_obj.get_product_available(cr,uid,product_ids,context=context)
 
     def _product_get(self, cr, uid, id, product_ids=False, context={}, states=['done']):
         ids = id and [id] or []
@@ -1383,39 +1328,4 @@ class stock_picking_move_wizard(osv.osv_memory):
         return {'type':'ir.actions.act_window_close' }
             
 stock_picking_move_wizard()        
-
-class product_product(osv.osv):
-    _inherit = 'product.product'
-    
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
-        res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
-        if ('location' in context) and context['location']:
-            location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
-            
-            if location_info.usage == 'supplier':
-                res['fields']['virtual_available']['string'] = 'Futur Receptions'
-                res['fields']['qty_available']['string'] = 'Received Qty'
-                
-            if location_info.usage == 'internal':
-                res['fields']['virtual_available']['string'] = 'Futur Stock'
-                
-            if location_info.usage == 'customer':
-                res['fields']['virtual_available']['string'] = 'Futur Deliveries'
-                res['fields']['qty_available']['string'] = 'Delivered Qty'
-                
-            if location_info.usage == 'inventory':
-                res['fields']['virtual_available']['string'] = 'Futur P&L'
-                res['fields']['qty_available']['string'] = 'P&L Qty'
-                
-            if location_info.usage == 'procurement':
-                res['fields']['virtual_available']['string'] = 'Futur Qty'
-                res['fields']['qty_available']['string'] = 'Unplanned Qty'
-            
-            if location_info.usage == 'production':
-                res['fields']['virtual_available']['string'] = 'Futur Productions'
-                res['fields']['qty_available']['string'] = 'Produced Qty'
-                
-        return res
-
-product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From b751bebc983a1d3bb637024d2428eb33fa77fc7d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Tue, 23 Sep 2008 18:24:56 +0200
Subject: [PATCH 15/35] filter menu using actions groups

bzr revid: christophe@tinyerp.com-20080923162456-3mimhd96ve8qfs4y
---
 bin/addons/base/ir/ir_ui_menu.py | 26 +++++++++++++++++---------
 bin/addons/base/res/res_user.py  | 12 +++++++++---
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index a76b8ec1e76..555a5b4b7a1 100644
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -66,16 +66,25 @@ class ir_ui_menu(osv.osv):
                 context=context)
         if uid==1:
             return ids
-        user_groups = self.pool.get('res.users').read(cr, uid, [uid])[0]['groups_id']
+        user_groups = set(self.pool.get('res.users').read(cr, uid, uid)['groups_id'])
         result = []
         for menu in self.browse(cr, uid, ids):
-            if not len(menu.groups_id):
-                result.append(menu.id)
+            restrict_to_groups = menu.groups_id
+            if not restrict_to_groups:
+                if menu.action:
+                    # if the menu itself has no restrictions, we get the groups of 
+                    # the action of the menu
+                    try:
+                        m, oid = menu.action.split(',', 1)
+                        data = self.pool.get(m).read(cr, uid, int(oid), context=context)
+                        if data and 'groups_id' in data:
+                            restrict_to_groups = data['groups_id']
+                    except:
+                        pass
+
+            if restrict_to_groups and not user_groups.intersection(restrict_to_groups):
                 continue
-            for g in menu.groups_id:
-                if g.id in user_groups:
-                    result.append(menu.id)
-                    break
+            result.append(menu.id)
         return result
 
     def _get_full_name(self, cr, uid, ids, name, args, context):
@@ -122,8 +131,7 @@ class ir_ui_menu(osv.osv):
             ('key2', '=', 'tree_but_open'), ('res_id', 'in', ids)],
             context=context)
         values_action = {}
-        for value in values_obj.browse(cursor, user, value_ids,
-                context=context):
+        for value in values_obj.browse(cursor, user, value_ids, context=context):
             values_action[value.res_id] = value.value
         for menu_id in ids:
             res[menu_id] = values_action.get(menu_id, False)
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d168a69de38..35b008806e1 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -118,12 +118,18 @@ class users(osv.osv):
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64)
     }
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        def override_password(o):
+            if 'password' in o:
+                o['password'] = '********'
+            return o
+
         result = super(users, self).read(cr, uid, ids, fields, context, load)
         canwrite = self.pool.get('ir.model.access').check(cr, uid, 'res.users', 'write', raise_exception=False)
         if not canwrite:
-            for r in result:
-                if 'password' in r:
-                    r['password'] = '********'
+            if isinstance(ids, (int, float)):
+                result = override_password(result)
+            else:
+                result = map(override_password, result)
         return result
 
     _sql_constraints = [

From 88a6b3780ce26ca3cdf98bd109162f6849754122 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 18:27:16 +0200
Subject: [PATCH 16/35] bugfix

bzr revid: fp@tinyerp.com-20080923162716-qbaxamq0btfongpw
---
 bin/osv/orm.py | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 0c636acdd03..5bc44b4fd3d 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -775,23 +775,15 @@ class orm_template(object):
             if result:
                 node.setAttribute('string', result.decode('utf-8'))
         if node.nodeType == node.ELEMENT_NODE and node.hasAttribute('groups'):
-            groups = None
-            group_str = node.getAttribute('groups')
-            if ',' in group_str:
-                groups = group_str.split(',')
+            if node.getAttribute('groups'):
+                groups = node.getAttribute('groups').split(',')
                 readonly = False
                 access_pool = self.pool.get('ir.model.access')
                 for group in groups:
-                    readonly = readonly and access_pool.check_groups(cr, user, group)
-
-                if readonly:
-                    parent = node.parentNode
-                    parent.removeChild(node)
-
-            else:
-                if not self.pool.get('ir.model.access').check_groups(cr, user, group_str):
-                    parent = node.parentNode
-                    parent.removeChild(node)
+                    readonly = readonly or access_pool.check_groups(cr, user, group)
+                if not readonly:
+                    node.setAttribute('invisible', '1')
+            node.removeAttribute('groups')
 
         if node.nodeType == node.ELEMENT_NODE:
             # translate view
@@ -837,7 +829,6 @@ class orm_template(object):
                     button.setAttribute('readonly', '0')
 
         arch = node.toxml(encoding="utf-8").replace('\t', '')
-
         fields = self.fields_get(cr, user, fields_def.keys(), context)
         for field in fields_def:
             fields[field].update(fields_def[field])

From 23c9ff49a0c59263d7bfaa24cd1c87c61ada22ad Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 22:56:51 +0200
Subject: [PATCH 17/35] Improvements

bzr revid: fp@tinyerp.com-20080923205651-fz3o7sgm704qndkt
---
 addons/account/account_invoice_view.xml       | 18 +++++++---------
 .../account_invoice_layout_report.xml         |  4 ++--
 addons/delivery/delivery_view.xml             |  9 ++++----
 addons/purchase/purchase_view.xml             |  2 +-
 addons/sale/sale.py                           | 21 +++++++++++++++----
 addons/sale/sale_view.xml                     |  8 +++++--
 addons/stock/product.py                       |  4 ++--
 addons/stock/product_view.xml                 |  2 +-
 addons/stock/stock_view.xml                   |  5 +++--
 9 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46239314c40..7483cad9aa0 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -175,15 +175,14 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <label colspan="2"/>
-                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_reset_taxes" states="draft" string="Reset taxes" type="object"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
-                                <field name="amount_total"/>
+                                <field name="amount_tax"/>
                                 <field name="reconciled"/>
-                                <field name="residual"/>
+                                <field name="amount_total"/>
                                 <field name="state" select="2"/>
+                                <field name="residual"/>
                                 <group col="3" colspan="4">
                                     <button name="invoice_open" states="draft,proforma" string="Validate"/>
                                     <button name="invoice_cancel" states="draft,proforma,sale,open" string="Cancel"/>
@@ -258,15 +257,14 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <label colspan="2"/>
-                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_reset_taxes" states="draft" string="Reset taxes" type="object"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_untaxed"/>
                                 <button colspan="2" name="button_compute" states="draft" string="Compute" type="object"/>
-                                <field name="amount_total"/>
+                                <field name="amount_tax"/>
                                 <field name="reconciled"/>
-                                <field name="residual"/>
+                                <field name="amount_total"/>
                                 <field name="state" select="2"/>
+                                <field name="residual"/>
                                 <group col="3" colspan="4">
                                     <button name="invoice_proforma" states="draft" string="PRO-FORMA"/>
                                     <button name="invoice_open" states="draft,proforma" string="Create"/>
diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index dcc5c5ed1a4..034e869d912 100644
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-	<wizard	string="Formatted Inv. + Message"
+	<wizard	string="Invoice + Message"
 			model="account.invoice"
 			name="wizard.notify_message"
 			id="wizard_notify_message"
@@ -9,7 +9,7 @@
 			/>
 
 	<report id="account_invoices_1"
-			string="Formatted Inv."
+			string="Invoice"
 			model="account.invoice"
 			name="account.invoice.layout"
 			rml="account_invoice_layout/report/report_account_invoice_layout.rml"
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 7816896f771..07dec155ddf 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -58,13 +58,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Delivery grids">
+                    <field name="name" select="1"/>
+                    <field name="active" select="1"/>
+                    <field name="carrier_id" select="1"/>
+                    <field name="sequence" select="1"/>
                     <notebook>
                         <page string="Grid definition">
-                            <field name="name" select="1"/>
-                            <field name="active" select="1"/>
-                            <field name="carrier_id" select="1"/>
-                            <field name="sequence" select="1"/>
-                            <separator colspan="4" string="Grid Lines"/>
                             <field colspan="4" name="line_ids" nolabel="1" select="1"/>
                         </page>
                         <page string="Destination">
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 8d3611f9990..48a24bee967 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -169,9 +169,9 @@
                 <form string="Purchase Order Line">
                     <notebook>
                         <page string="Order Line">
+                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field name="product_qty"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
-                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned"/>
                             <field name="price_unit"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 45783dd5978..9d6a9e113fc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -214,7 +214,8 @@ class sale_order(osv.osv):
         'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
-        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')], 'Packing Policy', required=True),
+        'picking_policy': fields.selection([('direct','Partial Delivery'),('one','Complete Delivery')],
+            'Packing Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shippings or not."""),
         'order_policy': fields.selection([
             ('prepaid','Payment before delivery'),
             ('manual','Shipping & Manual Invoice'),
@@ -928,15 +929,27 @@ class sale_config_picking_policy(osv.osv_memory):
     _name='sale.config.picking_policy'
     _columns = {
         'name':fields.char('Name', size=64),
-        'picking_policy': fields.selection([('direct','Direct Delivery'),('one','All at once')], 'Packing Policy', required=True ),
+        'picking_policy': fields.selection([
+            ('direct','Direct Delivery'),
+            ('one','All at once')
+        ], 'Packing Policy', required=True ),
+        'order_policy': fields.selection([
+            ('manual','Invoice based on Sales Orders'),
+            ('picking','Invoice based on Deliveries'),
+        ], 'Shipping Policy', required=True, readonly=True, states={'draft':[('readonly',False)]}),
     }
     _defaults={
         'picking_policy': lambda *a: 'direct',
+        'order_policy': lambda *a: 'picking'
     }
     def set_default(self, cr, uid, ids, context=None):
-        if 'name' in context:
+        print context
+        for o in self.browse(cr, uid, ids, context=context):
+            print o.picking_policy, o.order_policy
             ir_values_obj = self.pool.get('ir.values')
-            ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],context['picking_policy'])
+            ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],o.picking_policy)
+            ir_values_obj = self.pool.get('ir.values')
+            ir_values_obj.set(cr,uid,'default',False,'order_policy',['sale.order'],o.order_policy)
         return {
                 'view_type': 'form',
                 "view_mode": 'form',
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 68cf27bddf5..3dae936a054 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -39,6 +39,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.shop</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_shop_tree"/>
         </record>
         <menuitem id="menu_shop_configuration" name="Configuration" parent="sale.menu_sale_root" sequence="1"/>
@@ -221,6 +222,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
         </record>
         <menuitem action="action_order_form" id="menu_sale_order" parent="sale.menu_sale_root"/>
 
@@ -453,10 +455,12 @@
             <field name="model">sale.config.picking_policy</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Picking Policy for Sale Order">
-                    <separator col="4" colspan="4" string="Configure Picking Policy for Sale Order"/>
+                <form string="Sales Configuration">
+                    <separator colspan="4" string="Configure Sale Order Logistic"/>
                     <newline/>
                     <field name="picking_policy"/>
+                    <newline/>
+                    <field name="order_policy"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
                         <button icon="gtk-ok" name="set_default" string="Set Default" type="object"/>
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 87f4c9f8122..4861b86d380 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,7 +32,7 @@ from osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = "product.product"
-    def view_header_get(self, cr, user, view_id, view_type, context):
+    def __old_view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
         if (context.get('location', False)):
@@ -156,7 +156,7 @@ class product_product(osv.osv):
         'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
     }
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+    def __old_fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
         res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
         if ('location' in context) and context['location']:
             location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 823f8da8d4a..736659bb9b3 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -62,7 +62,7 @@
             <field name="arch" type="xml">
                 <group name="status" position="after">
                     <group colspan="2" col="2">
-                    <separator string="Stocks" colspan="4"/>
+                        <separator string="Stocks" colspan="4"/>
                         <field name="qty_available"/>
                         <field name="virtual_available"/>
                         <field name="incoming_qty"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1b149e54213..c5b01a66e8b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -773,6 +773,7 @@
                     <field name="name"/>
                     <field name="address_id"/>
                     <field name="backorder_id"/>
+                    <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
                     <field name="state"/>
@@ -940,8 +941,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
-                    <field colspan="4" name="name"/>
-                    <field name="address_id" select="1"/>
+                    <field name="name"/>
+                    <field name="address_id"/>
                     <field name="invoice_state"/>
                     <field name="origin"/>
                     <field name="backorder_id"/>

From f6d8f032aafe1300e61fb691d6b4cdc2538da986 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 23 Sep 2008 23:19:02 +0200
Subject: [PATCH 18/35] Better Views

bzr revid: fp@tinyerp.com-20080923211902-bajhm3mqqsgjecju
---
 addons/mrp/mrp_view.xml     |  2 +-
 addons/stock/stock.py       |  2 +-
 addons/stock/stock_view.xml | 14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 50cfd1881c6..a9ecc4758b0 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -439,7 +439,7 @@
                         <page string="Finnished Products">
                             <field colspan="4" name="move_created_ids" nolabel="1"/>
                         </page>
-                        <page string="Operations">
+                        <page string="Work Orders">
                             <field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
                         </page>
                         <page string="Extra Information">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 23d3a1ab2e5..952bff3bda6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -379,7 +379,7 @@ class stock_picking(osv.osv):
             ], 'Status', readonly=True, select=True),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Planned Date', select=1),
-        'date':fields.datetime('Date create'),
+        'date':fields.datetime('Date Order'),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Max. Planned Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines'),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c5b01a66e8b..65850b1afbc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -492,12 +492,12 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
-                    <field name="address_id" select="1"/>
-                    <field name="invoice_state"/>
                     <field name="origin"/>
+                    <field name="address_id" select="1"/>
                     <field name="backorder_id"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -587,8 +587,9 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
-                    <field name="address_id" select="1"/>
                     <field name="origin"/>
+                    <field name="address_id" select="1"/>
+                    <field name="backorder_id"/>
                     <field name="date" select="1"/>
                     <field name="min_date" select="1"/>
                     <field name="state" select="1"/>
@@ -771,11 +772,12 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
+                    <field name="origin"/>
                     <field name="address_id"/>
                     <field name="backorder_id"/>
-                    <field name="origin"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -942,12 +944,12 @@
             <field name="arch" type="xml">
                 <tree color="red:state=='cancel'" string="Packing list">
                     <field name="name"/>
-                    <field name="address_id"/>
-                    <field name="invoice_state"/>
                     <field name="origin"/>
+                    <field name="address_id"/>
                     <field name="backorder_id"/>
                     <field name="date"/>
                     <field name="min_date"/>
+                    <field name="invoice_state"/>
                     <field name="state"/>
                 </tree>
             </field>

From 9e83fed2509dbe4113abb42237dcaabe17fe78f7 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Wed, 24 Sep 2008 05:21:35 +0200
Subject: [PATCH 19/35] If the ids is an int or a long, convert it to array, to
 avoid an error from the orm

bzr revid: stephane@tinyerp.com-20080924032135-q52ns1968r88mdxt
---
 bin/osv/orm.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 5bc44b4fd3d..f8defece530 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -1113,6 +1113,8 @@ class orm_memory(orm_template):
             fields_to_read = self._columns.keys()
         result = []
         if self.datas:
+            if isinstance(ids, (int, long)):
+                ids = [ids]
             for id in ids:
                 r = {'id': id}
                 for f in fields_to_read:
@@ -1128,6 +1130,8 @@ class orm_memory(orm_template):
                 res2 = self._columns[f].get_memory(cr, self, ids, f, user, context=context, values=result)
                 for record in result:
                     record[f] = res2[record['id']]
+            if isinstance(ids, (int, long)):
+                return result[0]
         return result
 
     def write(self, cr, user, ids, vals, context=None):

From c82b81aa0cf4286d95562a3d449462d4e5bcf78b Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Wed, 24 Sep 2008 11:34:32 +0530
Subject: [PATCH 20/35] change user action

bzr revid: hda@tinyerp.com-20080924060432-pb1ln88r9x6k310p
---
 bin/addons/base/module/module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 30b154a1145..ca25c010ccc 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -681,8 +681,8 @@ class module_configuration(osv.osv_memory):
                   'target':item.action_id.target,
             }
         user_action=self.pool.get('res.users').browse(cr,uid,uid)
-        act_obj=self.pool.get(user_action.action_id.type)
-        action_ids=act_obj.search(cr,uid,[('name','=',user_action.action_id.name)])
+        act_obj=self.pool.get(user_action.menu_id.type)
+        action_ids=act_obj.search(cr,uid,[('name','=',user_action.menu_id.name)])
         action_open=act_obj.browse(cr,uid,action_ids)[0]
         if context.get('menu',False):
             return{

From e443b07b62cb39b50c725865a046a5a0ba90eb4a Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 12:27:49 +0530
Subject: [PATCH 21/35] Improved Process module (related resources).

bzr revid: ame@tinyerp.com-20080924065749-4dqur1irytsa07il
---
 addons/process/process.py | 88 ++++++++++++++++++++-------------------
 1 file changed, 46 insertions(+), 42 deletions(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 2f3648a86f3..99f2e512738 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -72,38 +72,7 @@ class process_process(osv.osv):
         current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0]
         
         expr_context = Env(current_object, current_user)
-
-        def get_resource_info(node):
-            ret = False
-
-            src_model = res_model
-            src_id = res_id
-            
-            if node.transition_in:
-                tr = node.transition_in[0]
-                src = nodes.get(tr.source_node_id.id)
-                if src['res']:
-                    src_model = src['res']['model']
-                    src_id = src['res']['id']
-                else:
-                    return False
-
-            fields = pool.get(src_model).fields_get(cr, uid, context=context)
-
-            for name, field in fields.items():
-                if node.model_id and field.get('relation', False) == node.model_id.model:
-                    src_obj = pool.get(src_model).browse(cr, uid, [src_id], context)[0]
-                    rel = src_obj[name]
-                    if rel:
-                        if isinstance(rel, (list, tuple)):
-                            rel = rel[0]
-                        ret = {}
-                        ret['name'] = rel.name_get(context)[0][1]
-                        ret['model'] = field['relation']
-                        ret['id'] = rel.id
-
-            return ret
-            
+        
         notes = process.note
         nodes = {}
         start = []
@@ -121,18 +90,11 @@ class process_process(osv.osv):
             data['notes'] = node.note
             data['active'] = False
             data['gray'] = False
-            data['res'] = get_resource_info(node)
 
             if node.menu_id:
                 data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
             
             if node.model_id and node.model_id.model == res_model:
-
-                data['res'] = resource = {}
-                resource['name'] = current_object.name_get(context)[0][1]
-                resource['model'] = res_model
-                resource['id'] = res_id
-
                 try:
                     data['active'] = eval(node.model_states, expr_context)
                 except Exception, e:
@@ -178,12 +140,54 @@ class process_process(osv.osv):
                     roles.append(role)
                 transitions[tr.id] = data
 
+        # now populate resource information
+        def update_relatives(nid, ref_id, ref_model):
+            relatives = []
+
+            for tid, tr in transitions.items():
+                if tr['source'] == nid:
+                    relatives.append(tr['target'])
+                if tr['target'] == nid:
+                    relatives.append(tr['source'])
+
+            if not ref_id:
+                nodes[nid]['res'] = False
+                return
+
+            nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model}
+
+            refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0]
+            fields = pool.get(ref_model).fields_get(cr, uid, context=context)
+
+            resource['name'] = refobj.name_get(context)[0][1]
+
+            for r in relatives:
+                node = nodes[r]
+                if 'res' not in node:
+                    for n, f in fields.items():
+                        if node['model'] == ref_model:
+                            update_relatives(r, ref_id, ref_model)
+
+                        elif f.get('relation') == node['model']:
+                            rel = refobj[n]
+                            if rel and isinstance(rel, list) :
+                                rel = rel[0]
+                            _id = (rel or False) and rel.id
+                            _model = node['model']
+                            update_relatives(r, _id, _model)
+
+        for nid, node in nodes.items():
+            if node['active'] or node['model'] == res_model:
+                update_relatives(nid, res_id, res_model)
+                break
+
+        # calculate graph layout
         g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values()))
-        g.process(start)
-        #g.scale(100, 100, 180, 120)
-        g.scale(*scale)
+        g.process(start)        
+        g.scale(*scale) #g.scale(100, 100, 180, 120)
         graph = g.result_get()
 
+        # fix the height problem
         miny = -1
         for k,v in nodes.items():
             x = graph[k]['y']

From 1bb7a3353179e3917bb031ca16c7b24bc0a47f15 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 13:59:04 +0530
Subject: [PATCH 22/35] * Access info.

bzr revid: ame@tinyerp.com-20080924082904-b5w1llp8bolja2o8
---
 addons/process/process.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 99f2e512738..2aedf7843f2 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -81,6 +81,8 @@ class process_process(osv.osv):
         states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {}))
         title = "%s - Resource: %s, State: %s" % (process.name, current_object.name, states.get(getattr(current_object, 'state'), 'N/A'))
 
+        perm = pool.get(res_model).perm_read(cr, uid, [res_id], context)[0]
+
         for node in process.node_ids:
             data = {}
             data['name'] = node.name
@@ -160,6 +162,7 @@ class process_process(osv.osv):
             fields = pool.get(ref_model).fields_get(cr, uid, context=context)
 
             resource['name'] = refobj.name_get(context)[0][1]
+            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
 
             for r in relatives:
                 node = nodes[r]
@@ -202,7 +205,7 @@ class process_process(osv.osv):
             y = v['y']
             v['y'] = min(y - miny + 10, y)
 
-        return dict(title=title, notes=notes, nodes=nodes, transitions=transitions)
+        return dict(title=title, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
 
 process_process()
 

From 39ae5e399bf186d0c3be8f4775abc80e842b1b71 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Sep 2008 10:46:41 +0200
Subject: [PATCH 23/35] bugfixes

bzr revid: fp@tinyerp.com-20080924084641-hlagbz0xfd8trtgs
---
 addons/account/account_bank_statement.py      |  6 ++---
 addons/hr/hr_view.xml                         |  2 +-
 addons/product/product.py                     |  1 +
 addons/project/project.py                     |  4 ++--
 addons/project_timesheet/project_timesheet.py | 23 +++++++++++--------
 addons/stock/product.py                       |  6 ++---
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index e4ad52570b9..91ee7d094b1 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -167,8 +167,8 @@ class account_bank_statement(osv.osv):
 
             if not (abs(st.balance_end - st.balance_end_real) < 0.0001):
                 raise osv.except_osv(_('Error !'),
-                        _('The statement balance is incorrect !\n'
-                        'Check that the ending balance equals the computed one.'))
+                        _('The statement balance is incorrect !\n') +
+                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
             if (not st.journal_id.default_credit_account_id) \
                     or (not st.journal_id.default_debit_account_id):
                 raise osv.except_osv(_('Configration Error !'),
@@ -177,7 +177,7 @@ class account_bank_statement(osv.osv):
             for line in st.move_line_ids:
                 if line.state <> 'valid':
                     raise osv.except_osv(_('Error !'),
-                            _('The account entries lines are not valid.'))
+                            _('The account entries lines are not in valid state.'))
 
             for move in st.line_ids:
                 move_id = account_move_obj.create(cr, uid, {
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5b58d7cf448..060b90fd86a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -144,7 +144,7 @@
             </field>
         </record>
         <record id="action2" model="ir.actions.act_window">
-            <field name="name">Hierarchical view of this employee</field>
+            <field name="name">Employee Hierarchy</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.employee</field>
             <field name="domain">[('id','in',active_ids)]</field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 7529b46d837..6e1e70d3e98 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -588,6 +588,7 @@ class product_supplierinfo(osv.osv):
     }
     _defaults = {
         'qty': lambda *a: 0.0,
+        'sequence': lambda *a: 1,
         'delay': lambda *a: 1,
     }
     _order = 'sequence'
diff --git a/addons/project/project.py b/addons/project/project.py
index b9878b2888c..55ed7b33df4 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -260,7 +260,7 @@ class task(osv.osv):
         'sequence': fields.integer('Sequence'),
         'type': fields.many2one('project.task.type', 'Type'),
         'state': fields.selection([('draft', 'Draft'),('open', 'Open'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'Status', readonly=True, required=True),
-        'date_start': fields.datetime('Date'),
+        'date_start': fields.datetime('Date Opened'),
         'date_deadline': fields.datetime('Deadline'),
         'date_close': fields.datetime('Date Closed', readonly=True),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
@@ -289,7 +289,7 @@ class task(osv.osv):
         'active': lambda *a: True,
         'date_start': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-    _order = "state, sequence, priority, date_deadline, id"
+    _order = "sequence, priority, date_deadline, id"
 
     #
     # Override view according to the company definition
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 2a22b337359..4016abedc44 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -14,10 +14,9 @@ class project_work(osv.osv):
         vals_line={}
         obj_task = self.pool.get('project.task').browse(cr, uid, vals['task_id'])
 
-        vals_line['name']=vals['name']
+        vals_line['name']=obj_task.name + ': ' + vals['name']
         vals_line['user_id']=vals['user_id']
-        c_date=datetime.date(int(vals['date'][:4]),int(vals['date'][5:7]),int(vals['date'][8:10]))
-        vals_line['date']=c_date
+        vals_line['date']=vals['date'][:10]
         vals_line['unit_amount']=vals['hours']
         vals_line['account_id']=obj_task.project_id.category_id.id
         vals_line['amount']=00.0
@@ -32,17 +31,21 @@ class project_work(osv.osv):
     def write(self, cr, uid, ids,vals,context={}):
         vals_line={}
 
-        line_id=self.pool.get('project.task.work').browse(cr,uid,ids)[0].hr_analytic_timesheet_id
+        task=self.pool.get('project.task.work').browse(cr,uid,ids)[0]
+        line_id=task.hr_analytic_timesheet_id
         # in case,if a record is deleted from timesheet,but we change it from tasks!
         list_avail_ids=self.pool.get('hr.analytic.timesheet').search(cr,uid,[])
         if line_id in list_avail_ids:
             obj = self.pool.get('hr.analytic.timesheet')
-            vals_line['name']=vals['name']
-            vals_line['user_id']=vals['user_id']
-            c_date=datetime.date(int(vals['date'][:4]),int(vals['date'][5:7]),int(vals['date'][8:10]))
-            vals_line['date']=c_date
-            vals_line['unit_amount']=vals['hours']
-            vals_line['amount']=(-1) * vals['hours'] * obj.browse(cr,uid,line_id).product_id.standard_price
+            if 'name' in vals:
+                vals_line['name']=task.name+': '+vals['name']
+            if 'user_id' in vals:
+                vals_line['user_id']=vals['user_id']
+            if 'date' in vals:
+                vals_line['date']=vals['date'][:10]
+            if 'hours' in vals:
+                vals_line['unit_amount']=vals['hours']
+                vals_line['amount']=(-1) * vals['hours'] * obj.browse(cr,uid,line_id).product_id.standard_price
             obj.write(cr, uid,[line_id],vals_line,{})
 
         return super(project_work,self).write(cr, uid, ids,vals,context)
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 4861b86d380..d03a1c9a15c 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,11 +32,11 @@ from osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = "product.product"
-    def __old_view_header_get(self, cr, user, view_id, view_type, context):
+    def view_header_get(self, cr, user, view_id, view_type, context):
         res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
         if res: return res
         if (context.get('location', False)):
-            return _('Products: ')+self.pool.get('stock.location').browse(cr, uid, context['location'], context).name
+            return _('Products: ')+self.pool.get('stock.location').browse(cr, user, context['location'], context).name
         return res
 
     def get_product_available(self,cr,uid,ids,context={}):
@@ -156,7 +156,7 @@ class product_product(osv.osv):
         'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot during receptions"),
         'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot during deliveries"),
     }
-    def __old_fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
         res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
         if ('location' in context) and context['location']:
             location_info = self.pool.get('stock.location').browse(cr, uid, context['location'])

From 1ba69c648183588647851205b456fd3ff607c03d Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 14:18:45 +0530
Subject: [PATCH 24/35] Help URL

bzr revid: ame@tinyerp.com-20080924084845-4r4y8hr3sfpvlxoy
---
 addons/process/process.py       | 4 +++-
 addons/process/process_view.xml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 2aedf7843f2..49f6c8dc83a 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -92,6 +92,7 @@ class process_process(osv.osv):
             data['notes'] = node.note
             data['active'] = False
             data['gray'] = False
+            data['url'] = node.help_url
 
             if node.menu_id:
                 data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
@@ -224,7 +225,8 @@ class process_node(osv.osv):
         'flow_start': fields.boolean('Starting Flow'),
         'transition_in': fields.one2many('process.transition', 'target_node_id', 'Starting Transitions'),
         'transition_out': fields.one2many('process.transition', 'source_node_id', 'Ending Transitions'),
-        'condition_ids': fields.one2many('process.condition', 'node_id', 'Conditions')
+        'condition_ids': fields.one2many('process.condition', 'node_id', 'Conditions'),
+        'help_url': fields.char('Help URL', size=255)
     }
     _defaults = {
         'kind': lambda *args: 'state',
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index d5ae44a2a55..1c5e9ef4944 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -30,6 +30,7 @@
                                     <field name="menu_id" select="2"/>                                    
                                     <newline/>
                                     <field name="kind" select="1"/>
+                                    <field name="help_url" widget="url"/>
                                     <field name="model_states"/>
                                     <field name="subflow_id"/>
                                 </group>
@@ -159,6 +160,7 @@
                     <field name="menu_id" select="2"/>                                    
                     <newline/>
                     <field name="kind" select="1"/>
+                    <field name="help_url" widget="url"/>
                     <field name="model_states"/>
                     <field name="subflow_id"/>
                 </group>

From e2808f44c3cf1dab3548fc70fdab7ab026fa83a5 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Sep 2008 11:18:06 +0200
Subject: [PATCH 25/35] view improvement

bzr revid: fp@tinyerp.com-20080924091806-dburg1tq736j1khp
---
 addons/project_timesheet/project_timesheet.py | 13 ++++++++++++-
 addons/sale/sale_view.xml                     |  2 +-
 addons/stock/stock.py                         |  3 ++-
 addons/stock/stock_view.xml                   |  7 +++++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 4016abedc44..0ad79129889 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -65,5 +65,16 @@ class project_work(osv.osv):
 
 
 project_work()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+class project_project(osv.osv):
+    _inherit = "project.project"
+    def name_get(self, cr, user, ids, context=None):
+        result = []
+        for project in self.browse(cr, user, ids, context):
+            if project.category_id:
+                result.append((project.id, '['+(project.category_id.code or '')+'] '+project.name))
+            else:
+                result.append((project.id, '[?] '+project.name))
+        return result
+project_project()
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 3dae936a054..3dfeb6d9872 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -94,7 +94,7 @@
                 <form string="Sales order">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="client_order_ref"/>
+                        <field name="client_order_ref" select="2"/>
                         <field name="shipped" select="2"/>
                         <field name="shop_id" on_change="onchange_shop_id(shop_id)" select="2"/>
                         <field name="date_order" select="1"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 952bff3bda6..7d5f9c3dd0a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -380,6 +380,7 @@ class stock_picking(osv.osv):
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Planned Date', select=1),
         'date':fields.datetime('Date Order'),
+        'date_done':fields.datetime('Date Done'),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True,store=True, type='datetime', string='Max. Planned Date', select=2),
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines'),
@@ -514,7 +515,7 @@ class stock_picking(osv.osv):
     # TODO: change and create a move if not parents
     #
     def action_done(self, cr, uid, ids, context=None):
-        self.write(cr,uid, ids, {'state':'done'})
+        self.write(cr,uid, ids, {'state':'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_move(self, cr, uid, ids, context={}):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 65850b1afbc..905ba361fcd 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -568,6 +568,7 @@
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
                             <field name="invoice_state" select="2"/>
+                            <field name="date_done" select="2"/>
                             <newline/>
                             <field name="move_type"/>
                         </page>
@@ -656,8 +657,9 @@
                             <field name="auto_picking"/>
                             <field name="active" select="2"/>
                             <newline/>
-                            <field name="move_type"/>
                             <field name="date" select="1"/>
+                            <field name="date_done" select="2"/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>
@@ -842,8 +844,9 @@
                             <field name="active" select="2"/>
                             <field name="auto_picking"/>
                             <newline/>
-                            <field name="move_type"/>
                             <field name="date" select="2"/>
+                            <field name="date_done" select="2"/>
+                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>

From 283f140e7c4e464b1336fd21de84eed841fa2ba6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 24 Sep 2008 11:22:17 +0200
Subject: [PATCH 26/35] improveview

bzr revid: fp@tinyerp.com-20080924092217-b80lt63ei09lq39s
---
 addons/mrp/mrp_view.xml | 47 ++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index a9ecc4758b0..f9b7fb72734 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -383,17 +383,17 @@
             </field>
         </record>
 
-		<record model="ir.ui.view" id="view_production_graph">
-			<field name="name">mrp.production.graph</field>
-			<field name="model">mrp.production</field>
-			<field name="type">graph</field>
-			<field name="arch" type="xml">
-				<graph string="Production orders" type="bar">
-					<field name="product_id"/>
-					<field name="product_qty" operator="+"/>
-				</graph>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_production_graph">
+            <field name="name">mrp.production.graph</field>
+            <field name="model">mrp.production</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Production orders" type="bar">
+                    <field name="product_id"/>
+                    <field name="product_qty" operator="+"/>
+                </graph>
+            </field>
+        </record>
         
         
         <record id="mrp_production_form_view" model="ir.ui.view">
@@ -448,7 +448,7 @@
                             <field name="picking_id"/>
                             <field name="move_prod_id"/>
                             <field name="sale_name"/>
-                        	<field name="sale_ref"/>
+                            <field name="sale_ref"/>
                         </page>
                     </notebook>
                 </form>
@@ -623,20 +623,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Procurement">
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="References"/>
+                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="origin" select="2"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator colspan="2" string="Planification"/>
+                        <field name="date_planned" select="1"/>
+                        <field name="procure_method" select="2"/>
+                        <field name="priority"/>
+                    </group>
                     <notebook>
                     <page string="Procurement Details">
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="References"/>
-                            <field name="name" select="1" string="Procurement Reason"/>
-                            <field name="origin" select="2"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator colspan="2" string="Planification"/>
-                            <field name="date_planned" select="1"/>
-                            <field name="procure_method" select="2"/>
-                            <field name="priority"/>
-                        </group>
-
                         <separator colspan="4" string="Product &amp; Location"/>
                         <field name="product_id" select="1"/>
                         <field name="location_id" select="2"/>

From e00f767a6553dd06da860c600c1138e346af3470 Mon Sep 17 00:00:00 2001
From: Amit Mendapara <ame@tinyerp.com>
Date: Wed, 24 Sep 2008 16:15:36 +0530
Subject: [PATCH 27/35] * search by model.

bzr revid: ame@tinyerp.com-20080924104536-w6sdgmueia4t9dmq
---
 addons/process/process.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/addons/process/process.py b/addons/process/process.py
index 49f6c8dc83a..1a0024af4b1 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -63,6 +63,29 @@ class process_process(osv.osv):
         'active' : lambda *a: True,
     }
 
+    def search_by_model(self, cr, uid, res_model, context):
+        pool = pooler.get_pool(cr.dbname)
+
+        model_ids = pool.get('ir.model').search(cr, uid, [('model', '=', res_model)])
+        if not model_ids:
+            return []
+
+        nodes = pool.get('process.node').search(cr, uid, [('model_id', 'in', model_ids)])
+        if not nodes:
+            return []
+
+        nodes = pool.get('process.node').browse(cr, uid, nodes, context)
+
+        unique = []
+        result = []
+        
+        for node in nodes:
+            if node.process_id.id not in unique:
+                result.append((node.process_id.id, node.process_id.name))
+                unique.append(node.process_id.id)
+
+        return result
+
     def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
         
         pool = pooler.get_pool(cr.dbname)

From 32518af10916aa8242c44fc33328f96ff0ffbc0d Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 24 Sep 2008 16:24:26 +0530
Subject: [PATCH 28/35] added wizard to open entries for analytical account by
 selecting date on Account analytical entry list view

bzr revid: hmo@tinyerp.com-20080924105426-yqf4pcm7isoezm7p
---
 addons/account/project/project_view.xml       |  6 +-
 addons/account/project/wizard/__init__.py     |  1 +
 .../wizard/wizard_account_analytic_line.py    | 86 +++++++++++++++++++
 3 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 addons/account/project/wizard/wizard_account_analytic_line.py

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 5178b07eea8..45a4307a6c9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -150,7 +150,9 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/><menuitem action="action_account_analytic_line_form" id="account_entries_analytic_entries" parent="next_id_41"/>
+		<wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries Encoding by Line"/>
+        <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
+		<menuitem type="wizard" icon="STOCK_JUSTIFY_FILL" action="action_account_analytic_line" id="account_entries_analytic_entries" parent="next_id_41"/>
 
 
         <record id="action_account_tree1" model="ir.actions.act_window">
@@ -238,7 +240,7 @@
         #
 
         <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">account.analytic.journal.open.form</field>
+            <field name="name">Entries of Open Analytic Journals</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 0e66d867caa..477e5262a00 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -34,6 +34,7 @@ import wizard_account_analytic_inverted_balance_report
 import wizard_account_analytic_cost_ledger_report
 import wizard_account_analytic_cost_ledger_for_journal_report
 import wizard_account_analytic_analytic_check
+import wizard_account_analytic_line
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/project/wizard/wizard_account_analytic_line.py b/addons/account/project/wizard/wizard_account_analytic_line.py
new file mode 100644
index 00000000000..143737ab153
--- /dev/null
+++ b/addons/account/project/wizard/wizard_account_analytic_line.py
@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+
+def _action_open_window(self, cr, uid, data, context): 
+    domain=[]
+    from_date= data['form']['from_date']
+    to_date=data['form']['to_date']
+    if from_date and to_date:
+        domain=[('date','>=',from_date),('date','<=',to_date)]
+    elif from_date:
+        domain=[('date','>=',from_date)]
+    elif to_date:
+        domain=[('date','<=',to_date)]
+    return {
+        'name': 'Analytic Entries',
+        'view_type': 'form',
+        "view_mode": 'tree,form',
+        'res_model': 'account.analytic.line',
+        'type': 'ir.actions.act_window',
+        'domain': domain}
+
+
+class account_analytic_line(wizard.interface):
+    form1 = '''<?xml version="1.0"?>
+    <form string="View Account Analytic Lines">
+        <separator string="Account Analytic Lines Analysis" colspan="4"/>
+        <field name="from_date"/>
+        <newline/>
+        <field name="to_date"/>
+        <newline/>
+        <label string=""/>
+        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
+    </form>'''
+    form1_fields = {
+             'from_date': {
+                'string': 'From',
+                'type': 'date',
+        },
+             'to_date': {
+                'string': 'To',
+                'type': 'date',
+        },
+    }
+
+    states = {
+      'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Entries','gtk-ok')]}
+        },
+    'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
+        }
+    }
+account_analytic_line('account.analytic.line')

From ae6bcc5ca57d1edb2ec35cb04dbf9d1bdd01c8d7 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 24 Sep 2008 17:16:07 +0530
Subject: [PATCH 29/35] on account_followup , delay expressed in levels are
 agains maturity date, not date. If maturity date is null, checked against
 date.

bzr revid: hmo@tinyerp.com-20080924114607-7jn3bupbyh3743fw
---
 addons/account_followup/wizard/wizard_followup_print.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 545108f578f..a1022881358 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -251,14 +251,17 @@ class followup_all_print(wizard.interface):
 
         partner_list = []
         to_update = {}
-        for partner_id, followup_line_id, date, id in move_lines:
+        for partner_id, followup_line_id, date_maturity,date, id in move_lines:
             if not partner_id:
                 continue
             if partner_id in partner_list:
                 to_update[str(id)] = fups[followup_line_id][1]
             if followup_line_id not in fups:
                 continue
-            if date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
+            if date_maturity and date_maturity <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
+                partner_list.append(partner_id)
+                to_update[str(id)] = fups[followup_line_id][1]
+            elif date and date <= fups[followup_line_id][0].strftime('%Y-%m-%d'):
                 partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
         return {'partner_ids': partner_list, 'to_update': to_update}

From 3988bb6ec299092fe03c66506d75ad2513c688b2 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Wed, 24 Sep 2008 17:32:40 +0530
Subject: [PATCH 30/35] fixed bug on account_followup

bzr revid: hmo@tinyerp.com-20080924120240-pe5wj1b0grcf36xi
---
 addons/account_followup/wizard/wizard_followup_print.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index a1022881358..aef59462735 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -212,7 +212,7 @@ class followup_all_print(wizard.interface):
     def _get_partners(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
         cr.execute(
-            "SELECT l.partner_id, l.followup_line_id, l.date, l.id "\
+            "SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
             "FROM account_move_line AS l "\
                 "LEFT JOIN account_account AS a "\
                 "ON (l.account_id=a.id) "\

From e1b9e4656fac86015836beb49722f9b7b4ef62cf Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Wed, 24 Sep 2008 17:38:14 +0530
Subject: [PATCH 31/35] Deleted unwanted file

bzr revid: jvo@tinyerp.com-20080924120814-9jzesn7fo2i2c08d
---
 .../i18n/account_budget_crossover.pot         | 310 ------------------
 1 file changed, 310 deletions(-)
 delete mode 100644 addons/account_budget/i18n/account_budget_crossover.pot

diff --git a/addons/account_budget/i18n/account_budget_crossover.pot b/addons/account_budget/i18n/account_budget_crossover.pot
deleted file mode 100644
index bdf11bb91a7..00000000000
--- a/addons/account_budget/i18n/account_budget_crossover.pot
+++ /dev/null
@@ -1,310 +0,0 @@
-# Translation of OpenERP Server.
-# This file containt the translation of the following modules:
-#	* account_budget_crossover
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 4.3.0"
-"Report-Msgid-Bugs-To: support@openerp.com"
-"POT-Creation-Date: 2008-09-10 12:47:16+0000"
-"PO-Revision-Date: 2008-09-10 12:47:16+0000"
-"Last-Translator: <>"
-"Language-Team: "
-"MIME-Version: 1.0"
-"Content-Type: text/plain; charset=UTF-8"
-"Content-Transfer-Encoding: "
-"Plural-Forms: "
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,creating_user_id:0
-msgid "Responsible User"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: account_budget_crossover
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Printed at:"
-msgstr ""
-
-#. module: account_budget_crossover
-#: view:crossovered.budget:0
-msgid "Confirm"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,validating_user_id:0
-msgid "Validate User"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,analytic_account_id:0
-msgid "Analytic Account Ref"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Currency:"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "at"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.report.xml,name:account_budget_crossover.account_analytic_account_budget
-#: model:ir.actions.report.xml,name:account_budget_crossover.report_crossovered_budget
-#: model:ir.actions.wizard,name:account_budget_crossover.account_analytic_account_budget_report
-#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu
-msgid "Print Budgets"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_button:wizard.analytic.account.budget.report,init,report:0
-#: wizard_button:wizard.crossovered.budget,init,report:0
-#: wizard_button:wizard.crossovered.budget.summary,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,percentage:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.model,name:account_budget_crossover.model_crossovered_budget_lines
-msgid "Crossovered Budget Lines"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,name:0
-msgid "Name"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,state:0
-msgid "Status"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "%"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Description"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,crossovered_budget_id:0
-msgid "Budget Ref"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "to"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-#: field:crossovered.budget.lines,planned_amount:0
-msgid "Planned Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget_entries
-msgid "Entries"
-msgstr ""
-
-#. module: account_budget_crossover
-#: view:crossovered.budget:0
-msgid "Validate"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_view:wizard.crossovered.budget,init:0
-#: wizard_view:wizard.crossovered.budget.summary,init:0
-msgid "Select Options"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-#: field:crossovered.budget.lines,practical_amount:0
-msgid "Practical Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,date_to:0
-#: field:crossovered.budget.lines,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_budget_crossover
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,theoritical_amount:0
-msgid "Theoritical Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Total:"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,general_budget_id:0
-msgid "Master Budget Ref"
-msgstr ""
-
-#. module: account_budget_crossover
-#: view:account.analytic.account:0
-msgid "Lines"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_view
-#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_view
-#: view:crossovered.budget:0
-msgid "Budget"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_view:wizard.analytic.account.budget.report,init:0
-msgid "Select Dates Period"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget.lines,paid_date:0
-msgid "Paid Date"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget
-msgid "Budgets"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_field:wizard.analytic.account.budget.report,init,date_to:0
-#: wizard_field:wizard.crossovered.budget,init,date_to:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
-msgid "End of period"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.model,name:account_budget_crossover.model_crossovered_budget
-msgid "Crossovered Budget"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_field:wizard.analytic.account.budget.report,init,date_from:0
-#: wizard_field:wizard.crossovered.budget,init,date_from:0
-#: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
-msgid "Start of period"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu_1
-msgid "Print Summary of Budgets"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,code:0
-msgid "Code"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Theoretical Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:crossovered.budget.report:0
-msgid "Budget :"
-msgstr ""
-
-#. module: account_budget_crossover
-#: selection:crossovered.budget,state:0
-#: view:crossovered.budget:0
-msgid "Done"
-msgstr ""
-
-#. module: account_budget_crossover
-#: model:ir.actions.act_window,name:account_budget_crossover.act_crossovered_budget_lines_view
-#: field:account.analytic.account,crossovered_budget_line:0
-#: field:account.budget.post,crossovered_budget_line:0
-#: field:crossovered.budget,crossovered_budget_line:0
-#: model:ir.ui.menu,name:account_budget_crossover.menu_act_crossovered_budget_lines_view
-#: view:crossovered.budget:0
-#: view:account.analytic.account:0
-#: view:crossovered.budget.lines:0
-msgid "Budget Lines"
-msgstr ""
-
-#. module: account_budget_crossover
-#: wizard_button:wizard.analytic.account.budget.report,init,end:0
-#: wizard_button:wizard.crossovered.budget,init,end:0
-#: wizard_button:wizard.crossovered.budget.summary,init,end:0
-#: view:crossovered.budget:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:account.budget.post.dotation,tot_planned:0
-msgid "Total Planned Amount"
-msgstr ""
-
-#. module: account_budget_crossover
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: account_budget_crossover
-#: rml:account.analytic.account.budget:0
-#: rml:crossovered.budget.report:0
-msgid "Analysis from"
-msgstr ""
-

From 295957b3b2e0d23424a4f8dfc35b350ea229797f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 24 Sep 2008 16:31:52 +0200
Subject: [PATCH 32/35] add restriction on menu

bzr revid: christophe@tinyerp.com-20080924143152-cusl6al1equ9smel
---
 bin/addons/base/base_security.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/base_security.xml
index d109ae05e9c..c72f31418f3 100644
--- a/bin/addons/base/base_security.xml
+++ b/bin/addons/base/base_security.xml
@@ -41,6 +41,9 @@
         <field name="menu_id" ref="action_menu_admin"/>
     </record>
 
+	<record model="ir.ui.menu" id="base.menu_administration">
+		<field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
+	</record>
 </data>
 </openerp>
 

From 520e5d36301eb5e21cb885e8f08348894e5002ed Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 24 Sep 2008 16:34:10 +0200
Subject: [PATCH 33/35] move file to a security folder

bzr revid: christophe@tinyerp.com-20080924143410-niiu77u8zqnrgpiw
---
 bin/addons/base/__terp__.py                        | 6 +++---
 bin/addons/base/{ => security}/base_security.xml   | 0
 bin/addons/base/{ => security}/ir.model.access.csv | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename bin/addons/base/{ => security}/base_security.xml (100%)
 rename bin/addons/base/{ => security}/ir.model.access.csv (100%)

diff --git a/bin/addons/base/__terp__.py b/bin/addons/base/__terp__.py
index ae83f7ea164..d90d56a3a72 100644
--- a/bin/addons/base/__terp__.py
+++ b/bin/addons/base/__terp__.py
@@ -38,7 +38,7 @@
     "init_xml" : [
         "base_data.xml",
         "base_menu.xml",
-        "base_security.xml",
+        "security/base_security.xml",
         "res/res_security.xml",
     ],
     "demo_xml" : [
@@ -66,8 +66,8 @@
         "res/partner/crm_view.xml",
         "res/partner/partner_data.xml",
         "res/ir_property_view.xml",
-        "base_security.xml",
-        "ir.model.access.csv",
+        "security/base_security.xml",
+        "security/ir.model.access.csv",
     ],
     "active": True,
     "installable": True,
diff --git a/bin/addons/base/base_security.xml b/bin/addons/base/security/base_security.xml
similarity index 100%
rename from bin/addons/base/base_security.xml
rename to bin/addons/base/security/base_security.xml
diff --git a/bin/addons/base/ir.model.access.csv b/bin/addons/base/security/ir.model.access.csv
similarity index 100%
rename from bin/addons/base/ir.model.access.csv
rename to bin/addons/base/security/ir.model.access.csv

From bb8d92c55ab6c4d28009069952f9ea2a6232ba8a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 24 Sep 2008 17:34:10 +0200
Subject: [PATCH 34/35] remove use of global variable

bzr revid: christophe@tinyerp.com-20080924153410-hdkfx2ddzg8zjje1
---
 bin/report/interface.py               | 13 +++++----
 bin/report/printscreen/ps_form.py     | 10 +++----
 bin/report/printscreen/ps_list.py     | 10 +++----
 bin/report/render/rml2pdf/trml2pdf.py | 40 ++++++++++++++-------------
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/bin/report/interface.py b/bin/report/interface.py
index fafc52367b6..95e6ec31946 100644
--- a/bin/report/interface.py
+++ b/bin/report/interface.py
@@ -64,6 +64,7 @@ class report_int(netsvc.Service):
         self.name = name
         self.id = 0
         self.name2 = '.'.join(name.split('.')[1:])
+        self.title = None
         self.joinGroup('report')
         self.exportMethod(self.create)
 
@@ -101,10 +102,10 @@ class report_rml(report_int):
         ir_actions_report_xml_obj = pool.get('ir.actions.report.xml')
         report_xml_ids = ir_actions_report_xml_obj.search(cr, uid,
         [('report_name', '=', self.name[7:])], context=context)
-        ftitle = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name
+        self.title = ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name
         report_type = datas.get('report_type', 'pdf')
         create_doc = self.generators[report_type]
-        pdf = create_doc(rml,title=ftitle)
+        pdf = create_doc(rml, title=self.title)
         return (pdf, report_type)
 
     def create_xml(self, cr, uid, ids, datas, context=None):
@@ -196,7 +197,7 @@ class report_rml(report_int):
         result.freeDoc()
         return xml
 
-    def create_pdf(self, xml, logo=None,title=None):
+    def create_pdf(self, xml, logo=None, title=None):
         if logo:
             self.bin_datas['logo'] = logo
         else:
@@ -206,15 +207,15 @@ class report_rml(report_int):
         obj.render()
         return obj.get()
 
-    def create_html(self, xml, logo=None,title=None):
+    def create_html(self, xml, logo=None, title=None):
         obj = render.rml2html(xml, self.bin_datas)
         obj.render()
         return obj.get()
 
-    def create_raw(self, xml, logo=None,title=None):
+    def create_raw(self, xml, logo=None, title=None):
         return xml
 
-    def create_sxw(self, path, logo=None,title=None):
+    def create_sxw(self, path, logo=None, title=None):
         return path
 
 from report_sxw import report_sxw
diff --git a/bin/report/printscreen/ps_form.py b/bin/report/printscreen/ps_form.py
index 6e8b2de602f..1e7757e3f17 100644
--- a/bin/report/printscreen/ps_form.py
+++ b/bin/report/printscreen/ps_form.py
@@ -39,7 +39,7 @@ import libxml2
 import libxslt
 
 import time, os
-ftitle=""
+
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
@@ -63,7 +63,6 @@ class report_printscreen_list(report_int):
         return self._parse_node(dom)
 
     def create(self, cr, uid, ids, datas, context=None):
-        global ftitle
         if not context:
             context={}
         datas['ids'] = ids
@@ -71,10 +70,10 @@ class report_printscreen_list(report_int):
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
         if model_id:
             model_desc = pool.get('ir.model').browse(cr, uid, model_id, context).name
-            ftitle=model_desc
+            self.title = model_desc
         else:
             model_desc = model._description
-            ftitle=model_desc
+            self.title = model_desc
 
         model = pool.get(datas['model'])
         result = model.fields_view_get(cr, uid, view_type='tree', context=context)
@@ -158,8 +157,7 @@ class report_printscreen_list(report_int):
         doc = libxml2.parseDoc(new_doc.toxml())
         rml_obj = style.applyStylesheet(doc, None)
         rml = style.saveResultToString(rml_obj)
-        global ftitle
-        self.obj = render.rml(rml,ftitle)
+        self.obj = render.rml(rml, self.title)
         self.obj.render()
         return True
 report_printscreen_list('report.printscreen.form')
diff --git a/bin/report/printscreen/ps_list.py b/bin/report/printscreen/ps_list.py
index 4717fe03437..29242a3119e 100644
--- a/bin/report/printscreen/ps_list.py
+++ b/bin/report/printscreen/ps_list.py
@@ -39,7 +39,7 @@ import libxml2
 import libxslt
 
 import time, os
-ftitle=""
+
 class report_printscreen_list(report_int):
     def __init__(self, name):
         report_int.__init__(self, name)
@@ -63,7 +63,6 @@ class report_printscreen_list(report_int):
         return self._parse_node(dom)
 
     def create(self, cr, uid, ids, datas, context=None):
-        global ftitle
         if not context:
             context={}
         pool = pooler.get_pool(cr.dbname)
@@ -71,10 +70,10 @@ class report_printscreen_list(report_int):
         model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
         if model_id:
             model_desc = pool.get('ir.model').browse(cr, uid, model_id[0], context).name
-            ftitle=model_desc
+            self.title = model_desc
         else:
             model_desc = model._description
-            ftitle=model_desc
+            self.title = model_desc
 
         datas['ids'] = ids
         model = pooler.get_pool(cr.dbname).get(datas['model'])
@@ -202,8 +201,7 @@ class report_printscreen_list(report_int):
         doc = libxml2.parseDoc(new_doc.toxml())
         rml_obj = style.applyStylesheet(doc, None)
         rml = style.saveResultToString(rml_obj)
-        global ftitle
-        self.obj = render.rml(rml,title=ftitle)
+        self.obj = render.rml(rml, title=self.title)
         self.obj.render()
         return True
 report_printscreen_list('report.printscreen.list')
diff --git a/bin/report/render/rml2pdf/trml2pdf.py b/bin/report/render/rml2pdf/trml2pdf.py
index aeee1220d08..e0cc3cc8220 100644
--- a/bin/report/render/rml2pdf/trml2pdf.py
+++ b/bin/report/render/rml2pdf/trml2pdf.py
@@ -60,7 +60,7 @@ from reportlab import platypus
 import utils
 import color
 import os
-ftitle=""
+
 #
 # Change this to UTF-8 if you plan tu use Reportlab's UTF-8 support
 #
@@ -180,11 +180,12 @@ class _rml_styles(object):
         return style
 
 class _rml_doc(object):
-    def __init__(self, data, images={}, path='.'):
+    def __init__(self, data, images={}, path='.', title=None):
         self.dom = xml.dom.minidom.parseString(data)
         self.filename = self.dom.documentElement.getAttribute('filename')
         self.images = images
         self.path = path
+        self.title = title
 
     def docinit(self, els):
         from reportlab.lib.fonts import addMapping
@@ -229,28 +230,28 @@ class _rml_doc(object):
 
         el = self.dom.documentElement.getElementsByTagName('template')
         if len(el):
-            pt_obj = _rml_template(out, el[0], self, images=self.images, path=self.path)
+            pt_obj = _rml_template(out, el[0], self, images=self.images, path=self.path, title=self.title)
             pt_obj.render(self.dom.documentElement.getElementsByTagName('story'))
         else:
             self.canvas = canvas.Canvas(out)
             pd = self.dom.documentElement.getElementsByTagName('pageDrawing')[0]
-            pd_obj = _rml_canvas(self.canvas, None, self, self.images, path=self.path)
+            pd_obj = _rml_canvas(self.canvas, None, self, self.images, path=self.path, title=self.title)
             pd_obj.render(pd)
 
             self.canvas.showPage()
             self.canvas.save()
 
 class _rml_canvas(object):
-    def __init__(self, canvas, doc_tmpl=None, doc=None, images={}, path='.'):
+    def __init__(self, canvas, doc_tmpl=None, doc=None, images={}, path='.', title=None):
         self.canvas = canvas
         self.styles = doc.styles
         self.doc_tmpl = doc_tmpl
         self.doc = doc
         self.images = images
         self.path = path
-        global ftitle
-        if  ftitle:
-            self.canvas.setTitle(ftitle)
+        self.title = title
+        if self.title:
+            self.canvas.setTitle(self.title)
 
     def _textual(self, node, x=0, y=0):
         rc = ''
@@ -324,7 +325,7 @@ class _rml_canvas(object):
         self.canvas.circle(x_cen=utils.unit_get(node.getAttribute('x')), y_cen=utils.unit_get(node.getAttribute('y')), r=utils.unit_get(node.getAttribute('radius')), **utils.attr_get(node, [], {'fill':'bool','stroke':'bool'}))
 
     def _place(self, node):
-        flows = _rml_flowable(self.doc, images=self.images, path=self.path).render(node)
+        flows = _rml_flowable(self.doc, images=self.images, path=self.path, title=self.title).render(node)
         infos = utils.attr_get(node, ['x','y','width','height'])
 
         infos['y']+=infos['height']
@@ -450,25 +451,27 @@ class _rml_canvas(object):
                         break
 
 class _rml_draw(object):
-    def __init__(self, node, styles, images={}, path='.'):
+    def __init__(self, node, styles, images={}, path='.', title=None):
         self.node = node
         self.styles = styles
         self.canvas = None
         self.images = images
         self.path = path
+        self.canvas_title = title
 
     def render(self, canvas, doc):
         canvas.saveState()
-        cnv = _rml_canvas(canvas, doc, self.styles, images=self.images, path=self.path)
+        cnv = _rml_canvas(canvas, doc, self.styles, images=self.images, path=self.path, title=self.canvas_title)
         cnv.render(self.node)
         canvas.restoreState()
 
 class _rml_flowable(object):
-    def __init__(self, doc, images={}, path='.'):
+    def __init__(self, doc, images={}, path='.', title=None):
         self.doc = doc
         self.styles = doc.styles
         self.images = images
         self.path = path
+        self.title = title
 
     def _textual(self, node):
         rc = ''
@@ -569,7 +572,7 @@ class _rml_flowable(object):
                 return (self.width, self.height)
             def draw(self):
                 canvas = self.canv
-                drw = _rml_draw(self.node, self.styles, images=self.self2.images, path=self.self2.path)
+                drw = _rml_draw(self.node, self.styles, images=self.self2.images, path=self.self2.path, title=self.self2.title)
                 drw.render(self.canv, None)
         return Illustration(node, self.styles, self)
 
@@ -741,9 +744,10 @@ class TinyDocTemplate(platypus.BaseDocTemplate):
             self.canv._pageNumber = 0
 
 class _rml_template(object):
-    def __init__(self, out, node, doc, images={}, path='.'):
+    def __init__(self, out, node, doc, images={}, path='.', title=None):
         self.images= images
         self.path = path
+        self.title = title
         if not node.hasAttribute('pageSize'):
             pageSize = (utils.unit_get('21cm'), utils.unit_get('29.7cm'))
         else:
@@ -764,7 +768,7 @@ class _rml_template(object):
                 frames.append( frame )
             gr = pt.getElementsByTagName('pageGraphics')
             if len(gr):
-                drw = _rml_draw(gr[0], self.doc, images=images, path=self.path)
+                drw = _rml_draw(gr[0], self.doc, images=images, path=self.path, title=self.title)
                 self.page_templates.append( platypus.PageTemplate(frames=frames, onPage=drw.render, **utils.attr_get(pt, [], {'id':'str'}) ))
             else:
                 self.page_templates.append( platypus.PageTemplate(frames=frames, **utils.attr_get(pt, [], {'id':'str'}) ))
@@ -772,7 +776,7 @@ class _rml_template(object):
 
     def render(self, node_stories):
         fis = []
-        r = _rml_flowable(self.doc,images=self.images, path=self.path)
+        r = _rml_flowable(self.doc,images=self.images, path=self.path, title=self.title)
         for node_story in node_stories:
             fis += r.render(node_story)
             if node_story==node_stories[-1]:
@@ -784,9 +788,7 @@ class _rml_template(object):
         self.doc_tmpl.build(fis)
 
 def parseString(data, fout=None, images={}, path='.',title=None):
-    r = _rml_doc(data, images, path)
-    global ftitle
-    ftitle=title
+    r = _rml_doc(data, images, path, title=title)
     if fout:
         fp = file(fout,'wb')
         r.render(fp)

From 6b589c87ad08b09fa8a01e2d9c3dcf30b911d6f2 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 25 Sep 2008 11:17:03 +0530
Subject: [PATCH 35/35] Bugfix :email sending and minor edit on constraint
 validation

bzr revid: jvo@tinyerp.com-20080925054703-0eui2prn54hw2q59
---
 bin/osv/orm.py    | 2 +-
 bin/tools/misc.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index f8defece530..0fb4fdfcbf2 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -647,7 +647,7 @@ class orm_template(object):
             if not fun(self, cr, uid, ids):
                 translated_msg = trans._get_source(cr, uid, self._name, 'constraint', lng, source=msg) or msg
                 error_msgs.append(
-                        _("Error occur when validation the fields %s: %s") % (','.join(fields), translated_msg)
+                        _("Error occured while validating the field(s) %s: %s") % (','.join(fields), translated_msg)
                 )
         if error_msgs:
             cr.rollback()
diff --git a/bin/tools/misc.py b/bin/tools/misc.py
index 0034a1e0bce..f29f1731ddb 100644
--- a/bin/tools/misc.py
+++ b/bin/tools/misc.py
@@ -327,7 +327,7 @@ def reverse_enumerate(l):
 #----------------------------------------------------------
 # Emails
 #----------------------------------------------------------
-def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, on_error=False, reply_to=False, tinycrm=False):
+def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, on_error=False, reply_to=False, tinycrm=False, ssl=False, debug=False):
     """Send an email."""
     if not email_cc:
         email_cc=[]