From 22d2d8400d0226ef87dfee5b30d7c3529a0c5897 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:38:15 +0530
Subject: [PATCH 01/10] [IMP] board_project: rename 'Members list of project'
 in 'Project(s) Members' in board_project_form view

bzr revid: psi@tinyerp.co.in-20100323110815-upwn61leh1umsjww
---
 addons/board_project/board_project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/board_project/board_project_view.xml b/addons/board_project/board_project_view.xml
index 19cdb3a6a1b..fc79b0f9304 100644
--- a/addons/board_project/board_project_view.xml
+++ b/addons/board_project/board_project_view.xml
@@ -93,10 +93,10 @@
                         <child1>
                             <action colspan="4" height="220" name="%(action_view_task_tree)d" string="My Open Tasks" width="510"/>
                             <action colspan="4" name="%(project_issue.project_issue_categ_act0)d" string="Issues"/>
-                            
+
                          </child1>
                         <child2>
-                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Members list of project"/>
+                             <action colspan="4" height="150" name="%(action_view_project_member_tree)d" string="Project(s) Members"/>
                              <action colspan="4" name="%(action_view_project_editable_messages_tree)d" string="Messages"/>
                         </child2>
                     </hpaned>

From 48df8c6e0d11b8b56879ac9e1250e191a2e83ed9 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:49:28 +0530
Subject: [PATCH 02/10] [IMP] project: Set focus on button on all wizards of
 budget, remaining_hours on task with average instead of sum, Reporting=>tasks
 now working

bzr revid: psi@tinyerp.co.in-20100323111928-t041wuy0am8csx42
---
 addons/project/project_view.xml               | 5 ++---
 addons/project/report/project_report_view.xml | 8 +++-----
 addons/project/wizard/compute_tasks_date.py   | 6 +++---
 addons/project/wizard/task_delegate.py        | 6 +++---
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 302fee6602f..b910515c950 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -207,7 +207,7 @@
                     <field name="remaining_hours" widget="float_time"/>
                     <group col="4" colspan="4">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object"/>
+                        <button icon="gtk-refresh" name="compute_hours" string="Update" type="object" default_focus="1"/>
                     </group>
                 </form>
             </field>
@@ -334,7 +334,7 @@
                     <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
                     <field name="planned_hours" widget="float_time" />
                     <field name="total_hours" widget="float_time"/>
-                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours" invisible="context.get('set_visible',False)"/>
+                    <field name="remaining_hours" widget="float_time" avg="Remaining Hours" invisible="context.get('set_visible',False)"/>
                     <field name="date_deadline" invisible="context.get('set_visible',False)"/>
                     <field name="type" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
                     <field name="date_start" invisible="1"/>
@@ -412,7 +412,6 @@
                         <field name="name" select="1"/>
                         <field name="project_id" select="1" widget="selection" default="context.get('project_id', False)">
                              <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-project"/>
-                             <filter domain="[('project_id','=',False)]" help="Tasks not assigned to a project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
                             <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 948ed70ef80..dd271ee97da 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -32,7 +32,6 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Tasks">
-            		<group col="10" colspan="4">
 	            		<filter icon="terp-project" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Tasks performed in this year"/>
 	            		<filter icon="terp-project" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Tasks performed in this month"/>
 	            		<separator orientation="vertical"/>
@@ -41,8 +40,8 @@
                  	    <filter string="Deadline" icon="terp-project" domain="[('date_deadline','=',time.strftime('%%Y/%%m/%%d'))]"/>
                  	    <filter string="Closed" icon="terp-project" domain="[('state','=','done')]"/>
 	            		<separator orientation="vertical"/>
-	            		<field name="project_id" select="1"/>
-	                    <field name="user_id" select="1" widget="selection">
+	            		<field name="project_id"/>
+	                    <field name="user_id" widget="selection">
 	            			<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
                 		</field>
 	                    <newline/>
@@ -55,12 +54,11 @@
                     		<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
                     		<filter string="Year" icon="terp-project" context="{'group_by':'name'}"/>
                 		</group>
-	                </group>
             	</search>
             </field>
         </record>
 
-        <record id="action_project_task_user_tree" model="ir.actions.act_window">
+       <record id="action_project_task_user_tree" model="ir.actions.act_window">
             <field name="name">Tasks</field>
             <field name="res_model">report.project.task.user</field>
             <field name="view_type">form</field>
diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index 7f9965367ae..9c81aefca1e 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -133,15 +133,15 @@ class wizard_compute_tasks(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type':'form', 'arch':compute_form, 'fields':compute_fields, 'state':[
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
             ]},
         },
 
 
         'compute': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
         }
     }
 wizard_compute_tasks('wizard.compute.tasks')
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 1bb6c538593..0fe662dc3cb 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -96,7 +96,7 @@ class wizard_delegate(wizard.interface):
             'actions': [_ask_auto_complete],
             'result': {'type':'form', 'arch':ask_form, 'fields':ask_fields, 'state':[
                 ('end', 'Cancel'),
-                ('valid', 'Validate')
+                ('valid', 'Validate', '', True)
             ]},
         },
         'valid': {

From 1abdc8745180ceabd27d9818d27d5876448d0a5b Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:52:10 +0530
Subject: [PATCH 03/10] [IMP] project_gtd: Set focus on button on wizards

bzr revid: psi@tinyerp.co.in-20100323112210-5cwl0cbg4h3su05b
---
 addons/project_gtd/wizard/project_gtd_fill.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 3bbb947c5ba..ca3964d34c5 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -61,7 +61,7 @@ class wiz_timebox_fill(wizard.interface):
                 'arch':_gtd_arch,
                 'fields':_gtd_field,
                 'state':[
-                    ('end','Cancel'),
+                    ('end','Cancel', 'gtk-cancel'),
                     ('process','Add to Timebox')
                 ]
             }

From e2067637dc09b2ca8b3804b63472378d1aebae13 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 16:56:25 +0530
Subject: [PATCH 04/10] [IMP] project_long_term: Set focus and add icon on
 button on wizards

bzr revid: psi@tinyerp.co.in-20100323112625-wwpzyp2oeiyce3kb
---
 addons/project_long_term/wizard/compute_phases_date.py | 4 ++--
 addons/project_long_term/wizard/compute_tasks_date.py  | 4 ++--
 addons/project_long_term/wizard/schedule_tasks.py      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 48409bd46c5..61f3bb42251 100644
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -165,8 +165,8 @@ class wizard_compute_phases(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state':[
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
 
             ]},
         },
diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py
index f327328305e..6ef53a6c802 100644
--- a/addons/project_long_term/wizard/compute_tasks_date.py
+++ b/addons/project_long_term/wizard/compute_tasks_date.py
@@ -147,8 +147,8 @@ class wizard_compute_tasks(wizard.interface):
         'init': {
             'actions': [],
             'result': {'type': 'form', 'arch': compute_form, 'fields': compute_fields, 'state': [
-                ('end', 'Cancel'),
-                ('compute', 'Compute')
+                ('end', 'Cancel', 'gtk-cancel'),
+                ('compute', 'Compute', 'gtk-ok', True)
             ]},
         },
         'compute': {
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py
index 592f5a1dc5d..4a170859032 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/schedule_tasks.py
@@ -139,7 +139,7 @@ class wizard_schedule_task(wizard.interface):
     states = {
         'init': {
             'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
+            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
         }
     }
 wizard_schedule_task('phase.schedule.tasks')

From 0c896cd5353bd22d57b8746be21b1b5aff96a049 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 17:03:05 +0530
Subject: [PATCH 05/10] [IMP] project_planning: Clean code, remove menu Project
 Management/Planning/Long Term Planning/Resources, rename the tag of act
 window form Planning Tasks to task in act_task_of_lines

bzr revid: psi@tinyerp.co.in-20100323113305-voljv2ofmbm5vnr1
---
 addons/project_planning/project_planning.py   | 43 +++++++++++--------
 .../project_planning_view.xml                 |  3 +-
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 359fdd6887f..bfd2af5566c 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -70,7 +70,7 @@ class report_account_analytic_planning(osv.osv):
         return result
 
     def _check_planning_responsible(self, cr, uid, ids, context={}):
-        for obj_plan in self.browse(cr,uid,ids):
+        for obj_plan in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT id FROM report_account_analytic_planning plan
                 WHERE (   (%(date_from)s BETWEEN date_from AND date_to)
@@ -117,19 +117,19 @@ class report_account_analytic_planning(osv.osv):
     ]
 
     def action_open(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'open'})
+        self.write(cr, uid, id, {'state' : 'open'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'cancel'})
+        self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
         return True
 
     def action_draft(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'draft'})
+        self.write(cr, uid, id, {'state' : 'draft'}, context=context)
         return True
 
     def action_done(self, cr, uid, id, context={}):
-        self.write(cr, uid, id, {'state' : 'done'})
+        self.write(cr, uid, id, {'state' : 'done'}, context=context)
         return True
 
 report_account_analytic_planning()
@@ -156,8 +156,9 @@ class report_account_analytic_planning_line(osv.osv):
         return res
 
     def _amount_base_uom(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
@@ -220,13 +221,14 @@ class report_account_analytic_planning_user(osv.osv):
 
 
     def _get_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -252,8 +254,9 @@ class report_account_analytic_planning_user(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -313,8 +316,8 @@ Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holi
                 FROM hr_holidays holidays
                 WHERE holidays.employee_id IN
                     (
-                    SELECT emp.id 
-                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id 
+                    SELECT emp.id
+                    FROM hr_employee emp, resource_resource res WHERE emp.resource_id = res.id and res.user_id = users.id
                     )
                 AND holidays.state IN ('validate')
                 AND holidays.type = 'remove'
@@ -360,13 +363,14 @@ class report_account_analytic_planning_account(osv.osv):
     _auto = False
 
     def _get_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -384,8 +388,9 @@ class report_account_analytic_planning_account(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -456,8 +461,9 @@ class report_account_analytic_planning_stat(osv.osv):
     _order = 'planning_id,user_id'
 
     def _sum_amount_real(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
@@ -473,13 +479,14 @@ where user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         return result
 
     def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
+        users_obj = self.pool.get('res.users')
         result = {}
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index c9c746fbd79..7d0031c4177 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -223,7 +223,6 @@
 
 		<menuitem action="action_account_analytic_planning_form"
 			id="menu_report_account_analytic_planning" parent="planning_main" />
-		<menuitem action="resource.action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="planning_main" />
 
 		<!--
 			Planning statistics
@@ -357,7 +356,7 @@
 
 <!--Added link to open the list of all tasks planned on all lines of this planning.-->
 		<act_window context="{'planning': active_id}"
-			id="act_task_of_lines" name="Planning tasks" res_model="project.task"
+			id="act_task_of_lines" name="Tasks" res_model="project.task"
 			src_model="report_account_analytic.planning"
 		/>
 

From 4fddb6bc4b175a4477eb39cb879ea64b915be55e Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Tue, 23 Mar 2010 17:06:37 +0530
Subject: [PATCH 06/10] [IMP] resource: rename Resource Calender to Working
 Period in views

bzr revid: psi@tinyerp.co.in-20100323113637-y2hppy0en8e1qsfl
---
 addons/resource/resource_view.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index aacac7cef42..f08b03600f8 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -35,9 +35,10 @@
             <field name="model">resource.calendar</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Resource Calendar">
+                <search string="Search Working Period">
                    <group col='15' colspan='4'>
-                       <field name="name" string="Working Calendar"/>
+                   	   <field name="name" string="Name"/>
+               <!--     <field name="name" string="Working Calendar"/> -->
                        <field name="manager" string="Workgroup Manager" widget="selection"/>
                        <field name="company_id" string="Company" widget="selection"/>
                    </group>
@@ -50,7 +51,7 @@
             <field name="model">resource.calendar.leaves</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Resource Calendar Leaves">
+                <search string="Search Working Period Leaves">
                    <group col='15' colspan='4'>
                        <field name="name" string="Name"/>
                        <field name="company_id" string="Company" widget="selection"/>
@@ -70,7 +71,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Resource Calendar">
+            	<form string="Working Period">
                     <field name="name" select="1"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -85,7 +86,7 @@
             <field name="model">resource.calendar</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Resource Calendar">
+            	<tree string="Working Period">
                     <field name="name"/>
                     <field name="manager" select="1"/>
                     <field name="company_id" select="1"/>
@@ -94,7 +95,7 @@
         </record>
 
         <record id="action_resource_calendar_form" model="ir.actions.act_window">
-            <field name="name">Resource Calendar</field>
+            <field name="name">Working Period</field>
             <field name="res_model">resource.calendar</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -181,10 +182,10 @@
                 <tree string="Resources">
                     <field name="name" />
                     <field name="company_id" />
-                    <field name="calendar_id" />
                     <field name="resource_type" />
-                    <field name="user_id" />
+                    <field name="calendar_id" />
                     <field name="time_efficiency" />
+                    <field name="user_id" />
                 </tree>
             </field>
         </record>

From d91fa1c56eb25cd2a9afde75186428effd9a08ed Mon Sep 17 00:00:00 2001
From: "kum (Open ERP)" <kum@tinyerp.co.in>
Date: Tue, 23 Mar 2010 19:31:06 +0530
Subject: [PATCH 07/10] [FIX] document: changes made in create method

bzr revid: kum@tinyerp.co.in-20100323140106-z2qld0a827n2olqr
---
 addons/document/document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document/document.py b/addons/document/document.py
index f3ffd2f6f6c..af2517c7cbb 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -165,7 +165,7 @@ class document_file(osv.osv):
             vals['res_model'] = context.get('default_res_model', False)
         if vals.get('res_id', False) and vals.get('res_model', False):
             obj_model = self.pool.get(vals['res_model'])
-            result = obj_model.read(cr, uid, [vals['res_id']], context=context)
+            result = obj_model.read(cr, uid, [vals['res_id']], ['name', 'partner_id', 'address_id'], context=context)
             if len(result):
                 obj = result[0]
                 if obj.get('name', False):

From 3c61bb73b8593630114ec9d1e656342f29ba5f24 Mon Sep 17 00:00:00 2001
From: "mra (Open ERP)" <mra@tinyerp.com>
Date: Thu, 25 Mar 2010 12:23:08 +0530
Subject: [PATCH 08/10] [IMP] l10n_BE: Clean the code

bzr revid: mra@tinyerp.com-20100325065308-o5smw265l26nu0y1
---
 addons/l10n_be/__terp__.py                    | 26 +++++------
 addons/l10n_be/company.py                     |  8 ++--
 .../l10n_be/wizard/account_vat_declaration.py | 45 ++++++++++---------
 3 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index 43d5a189247..c6580e79563 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -39,20 +39,20 @@
 
     """,
     'author': 'Tiny',
-    'depends': [ 
-                    'account', 
-                    'account_report', 
-                    'base_vat', 
-                    'base_iban', 
-                    'account_chart'
+    'depends': [
+                'account',
+                'account_report',
+                'base_vat',
+                'base_iban',
+                'account_chart'
                 ],
     'init_xml': [],
     'update_xml': [
-                    'account_pcmn_belgium.xml', 
-                    'l10n_be_wizard.xml',
-                    'l10n_be_sequence.xml', 
-                    'fiscal_templates.xml',
-                    'security/ir.model.access.csv'
+                'account_pcmn_belgium.xml',
+                'l10n_be_wizard.xml',
+                'l10n_be_sequence.xml',
+                'fiscal_templates.xml',
+                'security/ir.model.access.csv'
                    ],
     'demo_xml': [
                     'account.report.report.csv'
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
index 8d6633b0d88..4395f13380e 100644
--- a/addons/l10n_be/company.py
+++ b/addons/l10n_be/company.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,17 +15,15 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from osv import osv
 
 class res_company(osv.osv):
     _inherit = "res.company"
     _description = 'res.company'
 
-
     def _get_default_ad(self, addresses):
         city = post_code = address = ""
         for ads in addresses:
@@ -39,4 +37,4 @@ class res_company(osv.osv):
         return city, post_code, address
 res_company()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/account_vat_declaration.py
index 6533493ce23..404b9406c69 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/account_vat_declaration.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,16 +15,15 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import wizard
 import time
 import datetime
-import pooler
 import base64
 
+import wizard
+import pooler
 from tools.translate import _
 
 form_fyear = """<?xml version="1.0"?>
@@ -54,30 +53,32 @@ fields = {
 class wizard_vat_declaration(wizard.interface):
 
     def _create_xml(self, cr, uid, data, context):
-        list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
         pool_obj = pooler.get_pool(cr.dbname)
-        #obj_company = pool_obj.get('res.company').browse(cr,uid,1)
-        obj_company = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid).company_id
+        obj_fyear = pool_obj.get('account.fiscalyear')
+        obj_tax_code = pool_obj.get('account.tax.code')
+        obj_user = pool_obj.get('res.users')
+        list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
+        obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
         vat_no=obj_company.partner_id.vat
         if not vat_no:
             raise wizard.except_wizard(_('Data Insufficient'),_('No VAT Number Associated with Main Company!'))
 
-        tax_ids = pool_obj.get('account.tax.code').search(cr,uid,[])
+        tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
         ctx['period_id'] = data['form']['period'] #added context here
-        tax_info = pool_obj.get('account.tax.code').read(cr,uid,tax_ids,['code','sum_period'],context=ctx)
+        tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        address=post_code=city=''
+        address = post_code = city = ''
         if not obj_company.partner_id.address:
-                address=post_code=city=''
+            address = post_code = city = ''
+
+        city, post_code, address = pool_obj.get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        city, post_code, address = pooler.get_pool(cr.dbname).get('res.company')._get_default_ad(obj_company.partner_id.address)
 
-        obj_fyear = pool_obj.get('account.fiscalyear')
         year_id = obj_fyear.find(cr, uid)
-        
-        account_period=pool_obj.get('account.period').browse(cr, uid, data['form']['period'])
+
+        account_period = pool_obj.get('account.period').browse(cr, uid, data['form']['period'], context=context)
         current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
@@ -93,7 +94,7 @@ class wizard_vat_declaration(wizard.interface):
         starting_month = account_period.date_start[5:7]
         ending_month = account_period.date_stop[5:7]
         if starting_month != ending_month:
-            #starting month and ending month of selected period are not the same 
+            #starting month and ending month of selected period are not the same
             #it means that the accounting isn't based on periods of 1 month but on quarters
             quarter = str(((int(starting_month) - 1) / 3) + 1)
             data_of_file += '<QUARTER>'+quarter+'</QUARTER>\n\t\t\t'
@@ -111,20 +112,20 @@ class wizard_vat_declaration(wizard.interface):
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
         data['form']['msg']='Save the File with '".xml"' extension.'
-        data['form']['file_save']=base64.encodestring(data_of_file)
+        data['form']['file_save'] = base64.encodestring(data_of_file)
         return data['form']
 
-
     states = {
         'init': {
             'actions': [],
-            'result': {'type':'form', 'arch':form_fyear, 'fields':fields_fyear, 'state':[('end','Cancel'),('go','Create XML')]},
+            'result': {'type': 'form', 'arch': form_fyear, 'fields':fields_fyear, 'state':[('end', 'Cancel'),('go', 'Create XML')]},
         },
         'go': {
             'actions': [_create_xml],
-            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Ok')]},
+            'result': {'type':'form', 'arch': form, 'fields': fields, 'state': [('end', 'Ok')]},
         }
     }
 
 wizard_vat_declaration('wizard.account.xml.vat.declaration')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

From 5653f51a43724eaacc1fff4464501803d6b4d59f Mon Sep 17 00:00:00 2001
From: "kum (Open ERP)" <kum@tinyerp.co.in>
Date: Fri, 26 Mar 2010 15:34:20 +0530
Subject: [PATCH 09/10] [FIX] project_long_term: If resource has no calendar_id
 leaves not be considered for that resource now

bzr revid: kum@tinyerp.co.in-20100326100420-d8gfh5kib18y78t0
---
 addons/project_long_term/wizard/compute_tasks_date.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/wizard/compute_tasks_date.py b/addons/project_long_term/wizard/compute_tasks_date.py
index 6ef53a6c802..77e7bbd6512 100644
--- a/addons/project_long_term/wizard/compute_tasks_date.py
+++ b/addons/project_long_term/wizard/compute_tasks_date.py
@@ -76,7 +76,8 @@ class wizard_compute_tasks(wizard.interface):
                 if resource_id:
 #                    resource = resource_obj.browse(cr, uid, resource_id, context=context)[0]
                     resource = resource_obj.read(cr, uid, resource_id, ['calendar_id','time_efficiency'], context=context)[0]
-                    leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource.get('calendar_id')[0])
+                    if resource.get('calendar_id', False):
+                       leaves = wkcal.compute_leaves(cr, uid, calendar_id , resource_id[0], resource['calendar_id'] and resource['calendar_id'][0] or False)
                     time_efficiency = resource.get('time_efficiency')
                 resources.append(classobj((user.name.encode('utf8')), (Resource,), {'__doc__': user.name,
                                                                         '__name__': user.name,

From 9593ee3015ef8f06bd901e676456c22fc4045ffc Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 26 Mar 2010 19:43:52 +0530
Subject: [PATCH 10/10] [ADD] l10n_be: convert account_vat_declaration wizard
 to osv_memory wizard

bzr revid: psi@tinyerp.co.in-20100326141352-bolnvlc15ky0um3p
---
 addons/l10n_be/__terp__.py                    |  1 +
 addons/l10n_be/l10n_be_wizard.xml             |  4 +-
 addons/l10n_be/wizard/__init__.py             |  5 +-
 ....py => l10n_be_account_vat_declaration.py} | 75 +++++++------------
 .../l10n_be_account_vat_declaration_view.xml  | 47 ++++++++++++
 5 files changed, 81 insertions(+), 51 deletions(-)
 rename addons/l10n_be/wizard/{account_vat_declaration.py => l10n_be_account_vat_declaration.py} (68%)
 create mode 100644 addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml

diff --git a/addons/l10n_be/__terp__.py b/addons/l10n_be/__terp__.py
index c6580e79563..618367dfef7 100644
--- a/addons/l10n_be/__terp__.py
+++ b/addons/l10n_be/__terp__.py
@@ -50,6 +50,7 @@
     'update_xml': [
                 'account_pcmn_belgium.xml',
                 'l10n_be_wizard.xml',
+                'wizard/l10n_be_account_vat_declaration_view.xml',
                 'l10n_be_sequence.xml',
                 'fiscal_templates.xml',
                 'security/ir.model.access.csv'
diff --git a/addons/l10n_be/l10n_be_wizard.xml b/addons/l10n_be/l10n_be_wizard.xml
index c20f1c62420..86c4d828b70 100644
--- a/addons/l10n_be/l10n_be_wizard.xml
+++ b/addons/l10n_be/l10n_be_wizard.xml
@@ -21,7 +21,7 @@
         type="wizard"
         id="partner_wizard_vat_menu"/>
 
-    <wizard
+<!--    <wizard
         string="Periodical VAT Declaration"
         name="wizard.account.xml.vat.declaration"
         menu="False"
@@ -32,7 +32,7 @@
         parent="menu_finance_belgian_statement"
         action="wizard_xml_vat_declaration"
         type="wizard"
-        id="account_wizard_vat_declaration"/>
+        id="account_wizard_vat_declaration"/> -->
 
    	<wizard
         string="Partner VAT intra"
diff --git a/addons/l10n_be/wizard/__init__.py b/addons/l10n_be/wizard/__init__.py
index 1050e8e2ee9..b811c54a6e4 100644
--- a/addons/l10n_be/wizard/__init__.py
+++ b/addons/l10n_be/wizard/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,13 +15,14 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
 import account_vat_declaration
 import partner_vat_listing
 import wizard_vat_intra
+import l10n_be_account_vat_declaration
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/wizard/account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
similarity index 68%
rename from addons/l10n_be/wizard/account_vat_declaration.py
rename to addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 404b9406c69..490709b15ec 100644
--- a/addons/l10n_be/wizard/account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -18,45 +18,36 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import time
 import datetime
 import base64
-
-import wizard
-import pooler
+from osv import osv, fields
 from tools.translate import _
 
-form_fyear = """<?xml version="1.0"?>
-<form string="Select Period">
-    <field name="period" />
-</form>"""
+class l10n_be_vat_declaration(osv.osv_memory):
+    """ Vat Declaration """
+    _name = "l1on_be.vat.declaration"
+    _description = "Vat Declaration"
 
-fields_fyear = {
-    'period': {'string': 'Period', 'type': 'many2one', 'relation': 'account.period', 'required': True,},
-}
+    _columns = {
+        'period_id': fields.many2one('account.period','Period', required=True),
+        'msg': fields.text('File created', size=64, readonly=True),
+        'file_save' : fields.binary('Save File'),
+    }
 
-form = """<?xml version="1.0"?>
-<form string="Notification">
-     <separator string="XML Flie has been Created."  colspan="4"/>
-     <field name="msg" colspan="4" nolabel="1"/>
-     <field name="file_save" />
-</form>"""
+    _defaults = {
+        'msg': lambda *a:'''Save the File with '".xml"' extension.''',
+    }
 
-fields = {
-    'msg': {'string':'File created', 'type':'text', 'size':'100','readonly':True},
-    'file_save':{'string': 'Save File',
-        'type': 'binary',
-        'readonly': True,},
-}
+    def create_xml(self, cr, uid, ids, context={}):
+        obj_fyear = self.pool.get('account.fiscalyear')
+        obj_tax_code = self.pool.get('account.tax.code')
+        obj_acc_period = self.pool.get('account.period')
+        obj_user = self.pool.get('res.users')
+        obj_comp = self.pool.get('res.company')
+        obj_data = self.pool.get('ir.model.data')
 
-
-class wizard_vat_declaration(wizard.interface):
-
-    def _create_xml(self, cr, uid, data, context):
-        pool_obj = pooler.get_pool(cr.dbname)
-        obj_fyear = pool_obj.get('account.fiscalyear')
-        obj_tax_code = pool_obj.get('account.tax.code')
-        obj_user = pool_obj.get('res.users')
         list_of_tags=['00','01','02','03','45','46','47','48','49','54','55','56','57','59','61','62','63','64','71','81','82','83','84','85','86','87','91']
         obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         user_cmpny = obj_company.name
@@ -66,19 +57,20 @@ class wizard_vat_declaration(wizard.interface):
 
         tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
-        ctx['period_id'] = data['form']['period'] #added context here
+        data  = self.read(cr, uid, ids)[0]
+        ctx['period_id'] = data['period_id'] #added context here
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
         address = post_code = city = ''
         if not obj_company.partner_id.address:
             address = post_code = city = ''
 
-        city, post_code, address = pool_obj.get('res.company')._get_default_ad(obj_company.partner_id.address)
+        city, post_code, address = obj_comp._get_default_ad(obj_company.partner_id.address)
 
 
         year_id = obj_fyear.find(cr, uid)
 
-        account_period = pool_obj.get('account.period').browse(cr, uid, data['form']['period'], context=context)
+        account_period = obj_acc_period.browse(cr, uid, data['period_id'], context=context)
         current_year = account_period.fiscalyear_id.name
         period_code = account_period.code
 
@@ -111,21 +103,10 @@ class wizard_vat_declaration(wizard.interface):
                     data_of_file +='\n\t\t\t\t<D'+str(int(item['code'])) +'>' + str(int(item['sum_period']*100)) +  '</D'+str(int(item['code'])) +'>'
 
         data_of_file +='\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
-        data['form']['msg']='Save the File with '".xml"' extension.'
-        data['form']['file_save'] = base64.encodestring(data_of_file)
-        return data['form']
+        data['file_save'] = base64.encodestring(data_of_file)
+        self.write(cr, uid, ids, {'file_save':data['file_save']}, context=context)
 
-    states = {
-        'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch': form_fyear, 'fields':fields_fyear, 'state':[('end', 'Cancel'),('go', 'Create XML')]},
-        },
-        'go': {
-            'actions': [_create_xml],
-            'result': {'type':'form', 'arch': form, 'fields': fields, 'state': [('end', 'Ok')]},
-        }
-    }
 
-wizard_vat_declaration('wizard.account.xml.vat.declaration')
+l10n_be_vat_declaration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
new file mode 100644
index 00000000000..f0c19198bf3
--- /dev/null
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration_view.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<menuitem
+        id="menu_finance_belgian_statement"
+        name="Belgium Statements"
+        parent="account.menu_finance_legal_statement"/>
+
+    	<record id="view_vat_declaration" model="ir.ui.view">
+            <field name="name">Select Period</field>
+            <field name="model">l1on_be.vat.declaration</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+			<form string="Select Period">
+               	<group  colspan="4" >
+					<field name="period_id" select="1"/>
+              		<button colspan="1" name="create_xml" string="Create XML" type="object" default_focus="1"/>
+              	 </group>
+              	 <separator string="XML Flie has been Created." colspan="4"/>
+              	 <group colspan="4" >
+					<field name="msg" nolabel="1" colspan="4"/>
+			    	<field name="file_save" readonly="True"/>
+			     </group>
+              		<button special="cancel" string="Cancel" icon="gtk-cancel"/>
+			</form>
+            </field>
+		</record>
+
+		<record id="action_vat_declaration" model="ir.actions.act_window">
+            <field name="name">Vat Declaraion</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">l1on_be.vat.declaration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_vat_declaration"/>
+            <field name="target">new</field>
+    	</record>
+
+	    <menuitem
+	        name="Periodical VAT Declaration"
+	        parent="menu_finance_belgian_statement"
+	        action="action_vat_declaration"
+	        id="l10_be_vat_declaration"/>
+
+    </data>
+</openerp>
\ No newline at end of file