From d802ed107b1f80b36897faa9cda66c175ce5d5c9 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 5 Feb 2010 18:03:21 +0530
Subject: [PATCH 01/30] [IMP] Set sequence for Financial Management menu and
 Project Management menu

bzr revid: vir@tinyerp.com-20100205123321-73a02663xixrt8rc
---
 addons/account/account_menuitem.xml                   | 2 +-
 addons/account_budget/crossovered_budget_view.xml     | 2 +-
 addons/base_contact/base_contact_view.xml             | 3 +--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +-
 addons/project/project_view.xml                       | 2 +-
 addons/report_timesheet/report_timesheet_view.xml     | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index f1dda334830..260d14e38e8 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem icon="terp-account" id="menu_finance" name="Financial Management"/>
+        <menuitem icon="terp-account" id="menu_finance" name="Financial Management" sequence="5"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="8"/>
         <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>
         <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index bdb8bfd4c8f..063594553e3 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -295,7 +295,7 @@
             menu="False"/>-->
 
 		<!--Menu for project management-->
-		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+		<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
 		<menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
         <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
         <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index d4b99e11a85..bbc251d4b5f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -115,8 +115,6 @@
         <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
-    <menuitem name="Addresses" id="base.menu_partner_address_form" parent = "base.menu_address_book" sequence="3"/>
-
 
     <!-- Views for Partners -->
 
@@ -353,6 +351,7 @@
         </field>
     </record>
 
+
     <!-- Views for res.partner.job -->
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c9cfc6caeaf..e47662152c2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -220,7 +220,7 @@
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
         <!--Time Tracking menu in project Management-->
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
           <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7703142e4d9..995fdcfbe51 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
 
          <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 087dda92817..79086640262 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -370,7 +370,7 @@
             <field name="view_id" ref="view_random_timesheet_lines_tree"/>
         </record>
          <!--Time Tracking menu in project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"

From 9d3f892cf9e0d16a5628c973824406795cad698c Mon Sep 17 00:00:00 2001
From: "Rvo (Open ERP)" <rvo@tinyerp.co.in>
Date: Fri, 5 Feb 2010 18:47:54 +0530
Subject: [PATCH 02/30] Improved Tasks Scheduling with automatic resource
 allocation

bzr revid: rvo@tinyerp.co.in-20100205131754-nvvat791orv6ru9k
---
 addons/project/wizard/compute_tasks_date.py | 216 +++++++++++---------
 addons/resource/faces/task.py               |  76 ++++---
 2 files changed, 160 insertions(+), 132 deletions(-)

diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py
index db3c52ba7f2..4dbd1c4495b 100644
--- a/addons/project/wizard/compute_tasks_date.py
+++ b/addons/project/wizard/compute_tasks_date.py
@@ -24,6 +24,8 @@ import pooler
 from tools.translate import _
 import datetime
 from resource.faces import *
+from new import classobj
+import operator
 
 compute_form = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
@@ -32,7 +34,7 @@ compute_form = """<?xml version="1.0" ?>
 
 success_msg = """<?xml version="1.0" ?>
 <form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed scccessfully."/>
+    <label string="Task Scheduling completed successfully."/>
 </form>"""
 
 compute_fields = {
@@ -40,18 +42,18 @@ compute_fields = {
 
 }
 def timeformat_convert(cr, uid, time_string, context={}):
+#    Function to convert input time string:: 8.5 to output time string 8:30
+
         strg = str(time_string)[-2:]
         last_strg = str(time_string)[0:-2]
         if strg != '.0':
             if '.' not in strg:
                 strg = '.' + strg
                 last_strg = str(time_string)[:-3]
-
             new_strg = round(float(strg) / 0.016666667)
             converted_strg = last_strg + ':' + str(new_strg)[:-2]
         else:
             converted_strg = last_strg + ':00'
-
         return converted_strg
 
 class wizard_compute_tasks(wizard.interface):
@@ -63,115 +65,145 @@ class wizard_compute_tasks(wizard.interface):
         resource_pool = pool.get('resource.resource')
         resource_leaves_pool = pool.get('resource.calendar.leaves')
         resource_week_pool = pool.get('resource.calendar.week')
-        
+        user_pool = pool.get('res.users')
+
         project_id = data['form']['project_id']
         project = project_pool.browse(cr,uid,project_id)
         task_ids = task_pool.search(cr,uid,[('project_id','=',project_id)])
         if task_ids:
+            wktime_cal = []
+            leaves = []
+            task_ids.sort()
             task_obj = task_pool.browse(cr,uid,task_ids)
             task_1 = task_obj[0]
-            if task_1.date_start:
-                date_dt = datetime.datetime.strptime(task_1.date_start,"%Y-%m-%d %H:%M:%S")
-            else:
-                date_dt = datetime.datetime.strptime(project.date_start,"%Y-%m-%d")
-            dt = datetime.datetime.strftime(date_dt,"%Y-%m-%d %H:%M")
+            dt_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
+            calendar_id = project.resource_calendar_id.id
 
-            for i in range(len(task_obj)):
-                final_lst = []
-                leaves = []
-                if task_obj[i].user_id.id:
-                    resource_id = resource_pool.search(cr,uid,[('user_id','=',task_obj[i].user_id.id)])
-                    if resource_id :
-                        resource_obj = resource_pool.browse(cr,uid,resource_id)[0]
-                        if resource_obj.calendar_id:
-                            calendar_id = resource_obj.calendar_id.id
-                            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',resource_id)])
-                        else:
-                            calendar_id = project.resource_calendar_id.id
-                            resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
+#     If project has a working calendar then that would be used otherwise
+#     the default faces calendar would  be used
+            if calendar_id:
+                resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',project.resource_calendar_id.id)])
+                time_range = "8:00-8:00"
+                non_working = ""
+                wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
+                wk_days = {}
+                wk_time = {}
+                wktime_list = []
+                week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+                week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
 
-                        time_range = "8:00-8:00"
-                        non_working = ""
-                        wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
-                        wk_days = {}
-                        wk_time = {}
-                        tlist = []
-                        week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
-                        week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
+#     Converting time formats into appropriate format required
+#     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
+                for week in week_obj:
+                    res_str = ""
+                    if wk.has_key(week['dayofweek']):
+                        day = wk[week['dayofweek']]
+                        wk_days[week['dayofweek']] = wk[week['dayofweek']]
 
-                        for week in week_obj:
-                            res_str = ""
-                            if wk.has_key(week['dayofweek']):
-                                day = wk[week['dayofweek']]
-                                wk_days[week['dayofweek']] = wk[week['dayofweek']]
+                    hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
+                    hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
+                    res_str = hour_from_str + '-' + hour_to_str
+                    wktime_list.append((day,res_str))
 
-                            hour_from_str = timeformat_convert(cr,uid,week['hour_from'])
-                            hour_to_str = timeformat_convert(cr,uid,week['hour_to'])
-                            res_str = hour_from_str + '-' + hour_to_str
-                            tlist.append((day,res_str))
+#     Converting it to format like [('mon', '8:00-12:00', '13:00-18:00')]
+                for item in wktime_list:
+                    if wk_time.has_key(item[0]):
+                        wk_time[item[0]].append(item[1])
+                    else:
+                        wk_time[item[0]] = [item[0]]
+                        wk_time[item[0]].append(item[1])
 
-                        for item in tlist:
-                            if wk_time.has_key(item[0]):
-                                wk_time[item[0]].append(item[1])
-                            else:
-                                wk_time[item[0]] = [item[0]]
-                                wk_time[item[0]].append(item[1])
+                for k,v in wk_time.items():
+                    wktime_cal.append(tuple(v))
 
-                        for k,v in wk_time.items():
-                            final_lst.append(tuple(v))
+#     For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')]
+                for k,v in wk_days.items():
+                    if wk.has_key(k):
+                        wk.pop(k)
+                for v in wk.itervalues():
+                    non_working += v + ','
+                if non_working:
+                    wktime_cal.append((non_working[:-1],time_range))
 
-                        for k,v in wk_days.items():
-                            if wk.has_key(k):
-                                wk.pop(k)
-                        for v in wk.itervalues():
-                            non_working += v + ','
-                        if non_working:
-                            final_lst.append((non_working[:-1],time_range))
+#     If project working calendar has any leaves
+                if resource_leave_ids:
+                    res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
+                    for leave in range(len(res_leaves)):
+                        dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
+                        dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
+                        no = dt_end - dt_start
+                        leave_days = no.days + 1
+                    [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
+                    leaves.sort()
 
-                        if resource_leave_ids:
-                            res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to'])
-                            for leave in range(len(res_leaves)):
-                                dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S')
-                                dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S')
-                                no = dt_end - dt_start
-                                leave_days = no.days + 1
-                            [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))]
-                            leaves.sort()
+#    To create resources which are the Project Members
+            resource = project.members
+            resource_objs = []
+            for no in range(len(resource)):
+                resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)])
+                resource_objs.append(classobj(str(resource[no].name),(Resource,),{'__doc__':resource[no].name,'__name__':resource[no].name}))
 
+#     To create dynamic no of tasks
+            def tasks(j,eff):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
 
-                hours = task_obj[i].remaining_hours / task_obj[i].occupation_rate
-                hours = str(hours)[:-2] + 'H'
+#     To create dynamic no of tasks with the resource specified
+            def tasks_resource(j,eff,obj):
+                def task():
+                    """
+                    task is a dynamic method!
+                    """
+                    effort = eff
+                    resource = obj
+                task.__doc__ = "TaskNO%d" %j
+                task.__name__ = "task%d" %j
+                return task
 
-                class user(Resource):
-                 pass
+#    Creating the project with all the tasks and resources
+            def Project():
+                resource = reduce(operator.or_,resource_objs)
+                title = project.name
+                start = dt_start
 
-                if i == 0:
-                    new_dt = dt
-                else:
-                    data = task_pool.read(cr,uid,[task_obj[i-1].id],['date_end'])[0]
-                    new_dt = data['date_end'][0:16]
-
-                def Project_1():
-                    resource = user
-                    title = project.name
-                    start = new_dt
-                    effort = hours
-
-                    if final_lst or leaves:
-                        working_days = final_lst
+#    If project has calendar
+                if wktime_cal or leaves:
+                        working_days = wktime_cal
                         vacation = tuple(leaves)
 
-                    def task1():
-                        start = new_dt
-                        effort = hours
-                        title = task_obj[i].name
-
-                project_1 = BalancedProject(Project_1)
-                s_date = project_1.calendar.WorkingDate(project_1.task1.start).to_datetime()
-                e_date = project_1.calendar.WorkingDate(project_1.task1.end).to_datetime()
-                task_pool.write(cr,uid,[task_obj[i].id],{'date_start':s_date,'date_end':e_date})
+#    Dynamic Creation of tasks
+                for i in range(len(task_obj)):
+                    hours = str(task_obj[i].planned_hours / task_obj[i].occupation_rate)[:-2] + 'H'
+                    if task_obj[i].user_id:
+                        for resource_object in resource_objs:
+                            if resource_object.__name__ == task_obj[i].user_id.name:
+                               task = tasks_resource(i,hours,resource_object)
+                    else:
+                        task = tasks(i,hours)
 
+            project = BalancedProject(Project)
+            task_no = len(task_obj)
+            loop_no = 0
+            for t in project:
+                no2 = loop_no
+                while loop_no <= task_no:
+                    s_date = t.start.to_datetime()
+                    e_date = t.end.to_datetime()
+                    print 'Start Date And End Date:::',s_date,e_date,t.name,t.booked_resource
+                    if loop_no != 0:
+                        user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)])
+                        task_pool.write(cr,uid,[task_obj[loop_no - 1].id],{'date_start':s_date,'date_end':e_date,'user_id':user_id[0]})
+                    loop_no = task_no + 1
+                loop_no = no2
+                loop_no +=1
         return {}
+
     states = {
         'init': {
             'actions': [],
@@ -180,7 +212,8 @@ class wizard_compute_tasks(wizard.interface):
                 ('compute', 'Compute')
             ]},
         },
-        
+
+
         'compute': {
             'actions': [_compute_date],
             'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]},
@@ -190,4 +223,3 @@ wizard_compute_tasks('wizard.compute.tasks')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 6fdb28db3f6..52614b654c3 100755
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -60,7 +60,7 @@ SMART = 1
 #@+node:Exceptions
 #@+node:class AttributeError
 class AttributeError(AttributeError):
-    #@	<< class AttributeError declarations >>
+    #@    << class AttributeError declarations >>
     #@+node:<< class AttributeError declarations >>
     is_frozen = False
 
@@ -72,7 +72,7 @@ class AttributeError(AttributeError):
 class RecursionError(Exception):
     """This exception is raised in cas of cirular dependencies
     within an project"""
-    #@	<< class RecursionError declarations >>
+    #@    << class RecursionError declarations >>
     #@+node:<< class RecursionError declarations >>
     pass
 
@@ -84,7 +84,7 @@ class RecursionError(Exception):
 class _IncompleteError(Exception):
     """This exception is raised, when there is not enough
     data specified to calculate as task"""
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, *args):
         if isinstance(args[0], (basestring)):
@@ -104,13 +104,13 @@ class _MeProxy(object):
     """
     A Proxy class for the me attribute of tasks in the compile case
     """
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     __slots__ = "task"
 
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task):
         object.__setattr__(self, "task", task)
@@ -153,6 +153,7 @@ class _MeProxy(object):
     #@-node:__setattr__
     #@+node:__iter__
     def __iter__(self):
+
         return iter(self.task)
     #@nonl
     #@-node:__iter__
@@ -172,25 +173,26 @@ class _MeProxyRecalc(_MeProxy):
     """
     A Proxy class for the me attribute of tasks in the recalc case
     """
-    #@	@+others
+    #@    @+others
     #@+node:__setattr__
     def __setattr__(self, name, value):
-        if self.task._properties.has_key(name):
+       if self.task._properties.has_key(name):
             self.task._set_attrib(name, value)
     #@-node:__setattr__
     #@-others
 #@-node:class _MeProxyRecalc
 #@+node:class _MeProxyError
 class _MeProxyError(_MeProxy):
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     __slots__ = ("task", "attrib", "exc")
 
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task, attrib, exc):
+
         _MeProxy.__init__(self, task)
         object.__setattr__(self, "attrib", attrib)
         object.__setattr__(self, "exc", exc)
@@ -204,13 +206,13 @@ class _MeProxyError(_MeProxy):
 #@-node:class _MeProxyError
 #@+node:class _MeProxyWarn
 class _MeProxyWarn(_MeProxy):
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     __slots__ = ("task", "attrib", "message")
 
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task, attrib, message):
         _MeProxy.__init__(self, task)
@@ -474,7 +476,7 @@ class _Path(object):
     find out the source attribute (task and attribute name)
     of the value.
     """
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, task, path_str):
         self._task = task
@@ -537,7 +539,7 @@ class _ValueWrapper(object):
     a return value of a task method. It contains the value,
     and the supplier of that value
     """
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, value, ref):
         self._value = value
@@ -718,7 +720,7 @@ class _NEVER_USED_:
 class _StringConverter(object):
     """This class is a helper for the to_string mechanism
     of tasks"""
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, source, format=None):
         self.source = source
@@ -1011,7 +1013,7 @@ def _calc_maxload(task, resource):
 #@+node:class AllocationAlgorithm
 class AllocationAlgorithm(object):
     """This class is a base for resource allocation algorithms"""
-    #@	@+others
+    #@    @+others
     #@+node:test_allocation
     def test_allocation(self, task, resource):
         """This method simulates the allocation of a specific resource.
@@ -1032,7 +1034,7 @@ class AllocationAlgorithm(object):
 #@+node:class StrictAllocator
 class StrictAllocator(AllocationAlgorithm):
     """This class implements the STRICT resource allocation"""
-    #@	@+others
+    #@    @+others
     #@+node:_distribute_len_loads
     def _distribute_len_loads(self, task, resource, effort, length):
         # A special load calculation, if effort and length are given.
@@ -1172,6 +1174,7 @@ class StrictAllocator(AllocationAlgorithm):
             effort = to_delta(length * factor\
                               + task.performed_effort).round()
 
+
         return (end, book_load), resource, calc_load, start, effort
     #@-node:test_allocation
     #@+node:allocate
@@ -1225,7 +1228,7 @@ class StrictAllocator(AllocationAlgorithm):
 
 
 class SmartAllocator(StrictAllocator):
-    #@	@+others
+    #@    @+others
     #@+node:balance
     def balance(self, task, start, delta, adjust_date,
                 calc_load, resource):
@@ -1262,7 +1265,7 @@ class SmartAllocator(StrictAllocator):
 
 
 class SloppyAllocator(AllocationAlgorithm):
-    #@	@+others
+    #@    @+others
     #@+node:test_allocation
     def test_allocation(self, task, resource):
         if task.__dict__.has_key("effort"):
@@ -1559,7 +1562,7 @@ def DailyMax(value):
 #@+node:Task
 #@+node:class _TaskProperty
 class _TaskProperty(object):
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, method):
         self.method = method
@@ -1575,7 +1578,7 @@ class _TaskProperty(object):
 #@-node:class _TaskProperty
 #@+node:class _RoundingTaskProperty
 class _RoundingTaskProperty(object):
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, method, name):
         self.method = method
@@ -1810,7 +1813,7 @@ class Task(object):
     #@nonl
     #@-node:<< description >>
     #@nl
-    #@	<< declarations >>
+    #@    << declarations >>
     #@+node:<< declarations >>
     # Variables for the gui interface
     _date_completion = { "Date": 'Date("|")',
@@ -1924,14 +1927,13 @@ class Task(object):
     #@nonl
     #@-node:<< declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, func, name, parent=None, index=1):
 
         assert(type(func) == types.FunctionType)
 
         func_key = (func.func_code, func.func_closure and id(func.func_closure))
-
         try:
             instrumented = instrumentation_cache[func_key]
         except KeyError:
@@ -1941,7 +1943,7 @@ class Task(object):
 
         func.task_func = instrumented # will be used in the gui
         self._function = instrumented
-        self.name = name
+        self.name = func.func_name
         self.up = parent
         self.children = []
         self._sources = {} # all tasks, I am linked to
@@ -2187,7 +2189,6 @@ class Task(object):
     def formatter(self, attrib_name, arg=None, format=None):
         """returns a function which is able
         to convert the value of the given attrib_name to a string"""
-
         formats = self.formats
         format = format or formats.get(attrib_name)
 
@@ -2548,7 +2549,6 @@ class Task(object):
     #@+node:Setting methods
     #@+node:_set_attrib
     def _set_attrib(self, name, value):
-
         if value is _NEVER_USED_: return
 
         try:
@@ -2715,7 +2715,6 @@ class Task(object):
             value = reduce(lambda a, b: a & b, value)
 
         self.resource = value()
-
     #@-node:_set_resource
     #@+node:_set_copy_src
     def _set_copy_src(self, value):
@@ -2796,7 +2795,6 @@ class Task(object):
     def __renew_dates(self):
         for attrib in ("effort", "start", "end", "length", "todo"):
             try:
-
                 self._set_attrib(attrib, self._original_values[attrib])
             except KeyError:
                 pass
@@ -2829,7 +2827,6 @@ class Task(object):
     #@-node:_set_extra_work
     #@+node:_set_working_days
     def _set_working_days(self, value):
-
         if type(value[0]) is str:
             value = (value, )
 
@@ -2859,7 +2856,6 @@ class Task(object):
     #@-node:_get_minimum_time_unit
     #@+node:_set_working_days_per_week
     def _set_working_days_per_week(self, value):
-
         self.__make_calendar()
         self.calendar.working_days_per_week = value
         self._properties["working_days_per_week"] = True
@@ -3349,7 +3345,7 @@ class _ProjectBase(Task):
     """
     Base class for all projects.
     """
-    #@	<< class _ProjectBase declarations >>
+    #@    << class _ProjectBase declarations >>
     #@+node:<< class _ProjectBase declarations >>
     __attrib_completions__ = { }
     __attrib_completions__.update(Task.__attrib_completions__)
@@ -3366,7 +3362,7 @@ class _ProjectBase(Task):
 
     #@-node:<< class _ProjectBase declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, top_task, scenario="_default", id=""):
         self.calendar = pcalendar.Calendar()
@@ -3450,13 +3446,13 @@ class Project(_ProjectBase):
     other projects in the resource database. The default value for id
     is the name of top_task.
     """
-    #@	<< class Project declarations >>
+    #@    << class Project declarations >>
     #@+node:<< class Project declarations >>
     __call_completion__ = 'Project(|top_task, scenario="_default", id=None)'
 
     #@-node:<< class Project declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, top_task, scenario="_default", id=None):
         _ProjectBase.__init__(self, top_task, scenario, id)
@@ -3474,7 +3470,7 @@ class Project(_ProjectBase):
 #@-node:class Project
 #@+node:class _AllocationPoject
 class _AllocationPoject(_ProjectBase):
-    #@	@+others
+    #@    @+others
     #@+node:unfreeze_parents
     def unfreeze_parents(self):
         if self.has_actual_data:
@@ -3490,14 +3486,14 @@ class BalancedProject(_AllocationPoject):
     Generates a project with allocated resources. The tasks are balanced
     to fit the resources load conditions.
     """
-    #@	<< class BalancedProject declarations >>
+    #@    << class BalancedProject declarations >>
     #@+node:<< class BalancedProject declarations >>
     __call_completion__ = """BalancedProject(|top_task, scenario="_default",
     id=None, balance=SMART, performed=None)"""
 
     #@-node:<< class BalancedProject declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, top_task, scenario="_default",
                  id=None, balance=SMART, performed=None):
@@ -3650,13 +3646,13 @@ class AdjustedProject(_AllocationPoject):
     adjusted to the actual tracking data and balanced to fit the
     resources load conditions.
     """
-    #@	<< class AdjustedProject declarations >>
+    #@    << class AdjustedProject declarations >>
     #@+node:<< class AdjustedProject declarations >>
     __call_completion__ = 'AdjustedProject(|base_project)'
 
     #@-node:<< class AdjustedProject declarations >>
     #@nl
-    #@	@+others
+    #@    @+others
     #@+node:__init__
     def __init__(self, base_project):
         _AllocationPoject.__init__(self, base_project._function,
@@ -3852,4 +3848,4 @@ class AdjustedProject(_AllocationPoject):
 
 """
 #@-node:@file task.py
-#@-leo
+#@-leo
\ No newline at end of file

From 8c10c350129ae53f4f3fdd43b3897ca0e5c5ffb3 Mon Sep 17 00:00:00 2001
From: "RCH(OpenERP)" <>
Date: Fri, 5 Feb 2010 19:19:07 +0530
Subject: [PATCH 03/30] [IMP] Set sequence for all main menus

bzr revid: vir@tinyerp.com-20100205134907-3aczul2ggfqo0h7a
---
 .../account_analytic_analysis_menu.xml         |  2 +-
 addons/base_contact/base_contact_view.xml      |  2 +-
 .../base_report_designer_wizard.xml            |  2 +-
 addons/board/board_view.xml                    |  2 +-
 .../report_crm_project_bug_view.xml            |  2 +-
 addons/document/document_view.xml              |  2 +-
 addons/event/event_view.xml                    |  2 +-
 addons/hr/hr_view.xml                          |  2 +-
 addons/hr_attendance/hr_attendance_wizard.xml  |  2 +-
 addons/idea/idea_view.xml                      |  2 +-
 addons/lunch/lunch_view.xml                    |  2 +-
 addons/mrp/mrp_view.xml                        |  8 ++++----
 addons/olap/data/olap_view.xml                 |  2 +-
 addons/point_of_sale/pos_view.xml              |  2 +-
 addons/purchase/purchase_view.xml              |  4 ++--
 addons/resource/hr_view.xml                    |  2 +-
 addons/resource/resource_view.xml              |  2 +-
 addons/stock/stock_view.xml                    | 18 +++++++++---------
 addons/subscription/subscription_view.xml      |  2 +-
 addons/wiki/wiki_view.xml                      |  2 +-
 20 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 2862f7b7657..f9ea49e3b03 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
         <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
 
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index bbc251d4b5f..74c31c4203f 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -427,7 +427,7 @@
         src_model="res.partner.address"
         />
 
-    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"/>
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management" sequence="7"/>
     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
             parent="base.menu_purchase_root" sequence="3"/>
     <menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
diff --git a/addons/base_report_designer/base_report_designer_wizard.xml b/addons/base_report_designer/base_report_designer_wizard.xml
index 3485428fbf5..8882d2de9e9 100644
--- a/addons/base_report_designer/base_report_designer_wizard.xml
+++ b/addons/base_report_designer/base_report_designer_wizard.xml
@@ -8,7 +8,7 @@
 			name="base_report_designer.modify"
 			id="wizard_report_designer_modify"/>
 
-		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+		<menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
     	<menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml
index 2b9341decd3..4b55e43c4dd 100644
--- a/addons/board/board_view.xml
+++ b/addons/board/board_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+        <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
 <!--		<menuitem icon="terp-graph" id="dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>-->
         <record id="view_board_note_tree" model="ir.ui.view">
             <field name="name">board.note.tree</field>
diff --git a/addons/crm_project/report_crm_project_bug_view.xml b/addons/crm_project/report_crm_project_bug_view.xml
index 75f9818e7af..4c6ea353ec7 100644
--- a/addons/crm_project/report_crm_project_bug_view.xml
+++ b/addons/crm_project/report_crm_project_bug_view.xml
@@ -68,7 +68,7 @@
             <field name="view_id" ref="view_crm_project_bug_user_graph"/>
             <field name="search_view_id" ref="view_crm_project_bug_user_filter"/>
         </record>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
         <menuitem name="Project Bug" id="menu_crm_project_bug_tree" parent="base.menu_project_report" sequence="1"/>
         <menuitem action="action_report_crm_project_bug_user_tree" id="menu_crm_project_bug_user_tree" parent="menu_crm_project_bug_tree"/>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 3fa805388c0..658dfc3630e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,7 +3,7 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
     <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
     <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 03110015779..58a1c4ea997 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" />
+		<menuitem name="Marketing" id="menu_marketing_event_main" icon="terp-calendar" sequence="9"/>
 		<menuitem name="Events Organisation" id="menu_event_main" parent="menu_marketing_event_main" />
 	<!-- EVENTS  -->
 		<!--<menuitem name="Events Organisation" id="menu_event_main" icon="terp-calendar" />-->
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b93e7f658cd..66d9ee88dce 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
       <!--  <menuitem
             id="menu_hr_reporting"
diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index d95c9d86d50..a1ea01ea764 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -12,7 +12,7 @@
         <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
             groups="group_hr_attendance"/>
         <!--Time Tracking menu for Project Management-->
-         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index fb705f820ca..177792966d5 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="30"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 61844e099cb..2011586c9b6 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
         <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 8d84a8c01fd..29d2ad7afc6 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
-            groups="group_mrp_user,group_mrp_manager"/>
+            groups="group_mrp_user,group_mrp_manager" sequence="3"/>
         <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 		<menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="menu_mrp_root" sequence="1"/>
 
@@ -544,7 +544,7 @@
                         <filter string="By Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-					</group>                         
+					</group>
                </search>
             </field>
         </record>
@@ -762,7 +762,7 @@
                         <filter string="By Product" icon="terp-mrp" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By State" icon="terp-mrp" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Scheduled Date" icon="terp-mrp" domain="[]" context="{'group_by':'date_planned'}"/>
-					</group>  
+					</group>
                 </search>
             </field>
         </record>
@@ -782,7 +782,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>            
+            <field name="view_mode">tree,form</field>
         </record>
 
       <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
diff --git a/addons/olap/data/olap_view.xml b/addons/olap/data/olap_view.xml
index 306f9a29084..ac6b50711e6 100755
--- a/addons/olap/data/olap_view.xml
+++ b/addons/olap/data/olap_view.xml
@@ -8,7 +8,7 @@
 <!--        id="menu_bi"-->
 <!--        icon="terp-account" parent="base.next_id_50"/>-->
 
-    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting"/>
+    <menuitem icon="terp-graph" id="base.reporting_menu" name="Reporting" sequence="8"/>
     <menuitem
             id="base.next_id_50"
             name="Configuration"
diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index f0afcd1aac1..c05df176d56 100644
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -165,7 +165,7 @@
                 </tree>
             </field>
         </record>
-        <menuitem name="Point of Sale" id="menu_point_root" />
+        <menuitem name="Point of Sale" id="menu_point_root" sequence="10"/>
         <menuitem name="Point of Sale" id="menu_point_of_sale" parent="menu_point_root" sequence="1" />
         <menuitem name="New Sale" parent="menu_point_of_sale" id="menu_point_ofsale" action="action_pos_pos_form" sequence="1"/>
 		<menuitem action="product.product_normal_action" id="menu_pos_products" parent="menu_point_of_sale" sequence="2" name="Products"/>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 215add767d2..283192b2162 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -4,7 +4,7 @@
         <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
        <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
-            groups="group_purchase_user"/>
+            groups="group_purchase_user" sequence="7"/>
 	   <menuitem id="menu_procurement_management" name="Procurement Management"
             parent="base.menu_purchase_root" sequence="1"/>
 
@@ -165,7 +165,7 @@
 					<filter string="By Supplier" icon="terp-purchase" domain="[]" context="{'group_by':'partner_id'}"/>
 					<filter string="By State" icon="terp-purchase" domain="[]"  context="{'group_by':'state'}"/>
 					<filter string="By Order Date" icon="terp-purchase" domain="[]" context="{'group_by':'date_order'}"/>
-				</group>                   
+				</group>
               </search>
             </field>
         </record>
diff --git a/addons/resource/hr_view.xml b/addons/resource/hr_view.xml
index abf3c5f023f..c0fc3c54ffd 100755
--- a/addons/resource/hr_view.xml
+++ b/addons/resource/hr_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
+        <menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources" sequence="6"/>
         <menuitem
             id="menu_hr_reporting"
             name="Reporting"
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5892b78fe5b..783f9c28bf2 100755
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
+        <menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
         <menuitem id="base.menu_pm_resources" name="Resources" parent="base.menu_main" sequence="2"/>
 
         <record id="resource_calendar_form" model="ir.ui.view">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e071ced7ae2..6aa2044ff2d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse"/>
+        <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/>
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="3"/>
    		<menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/>
@@ -669,7 +669,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                   
+					</group>
               </search>
             </field>
         </record>
@@ -794,8 +794,8 @@
                     <group expand="1" string="Group By..." colspan="4" col="10">
                         <filter string="By Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-						<filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>                        
-					</group>                  
+						<filter string="By Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
+					</group>
               </search>
             </field>
         </record>
@@ -953,7 +953,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1113,7 +1113,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1166,7 +1166,7 @@
                         <filter string="By Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
-					</group>                      
+					</group>
                 </search>
             </field>
         </record>
@@ -1285,7 +1285,7 @@
 						<filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Destion Location" icon="terp-stock" domain="[]" context="{'group_by':'location_dest_id'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>                       
+					</group>
             	</search>
             </field>
         </record>
@@ -1409,7 +1409,7 @@
 						<filter string="By Product" icon="terp-stock" domain="[]" context="{'group_by':'product_id'}"/>
 						<filter string="By State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
 						<filter string="By Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
-					</group>                        
+					</group>
             	</search>
             </field>
         </record>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 0466d4501cf..67e641b54df 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
        <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 2188accd668..d2fa06d4fd5 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document" sequence="4"/>
         <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
         <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
         <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>

From 8b33e20c8a9d609ced4e21b2c5f43832d4808cde Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 8 Feb 2010 10:13:31 +0530
Subject: [PATCH 04/30] [IMP] Changed the sequence for the Tools menus

bzr revid: vir@tinyerp.com-20100208044331-2ltdza8onybywva1
---
 addons/idea/idea_view.xml                 | 2 +-
 addons/lunch/lunch_view.xml               | 2 +-
 addons/subscription/subscription_view.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 177792966d5..f80e7156f04 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="30"/>
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" sequence="15"/>
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 2011586c9b6..449c0400905 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
+          <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
         <!--<menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 67e641b54df..699896e3040 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="30"/>
+        <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="15"/>
        <!-- <menuitem icon="STOCK_PREFERENCES" id="menu_tools" name="Tools"/>-->
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="2"/>
 <!--        <menuitem id="menu_subscription_config" name="Configuration" parent="next_id_45"/>-->

From 327397bc66051bc3d1147d862536c306a8360516 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 8 Feb 2010 04:45:26 +0000
Subject: [PATCH 05/30] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100207043804-n115daf1n8djwt9i
bzr revid: codehost@crowberry-20100208044526-qjpa68ye1agz7c4a
---
 addons/account/i18n/ru.po                  |  14 +-
 addons/account_analytic_default/i18n/ar.po |   8 +-
 addons/board/i18n/tr.po                    |  14 +-
 addons/membership/i18n/bs.po               |  72 ++---
 addons/mrp_jit/i18n/pt.po                  |   8 +-
 addons/mrp_repair/i18n/pt_BR.po            |  10 +-
 addons/product/i18n/ar.po                  |   8 +-
 addons/project/i18n/pt.po                  | 286 +++++++++-------
 addons/project/i18n/tr.po                  | 360 +++++++++++----------
 addons/report_document/i18n/ru.po          |  54 ++--
 addons/report_mrp/i18n/ru.po               |  14 +-
 addons/sale/i18n/tr.po                     |  94 +++---
 addons/sale_crm/i18n/tr.po                 |   8 +-
 addons/stock/i18n/pt.po                    | 360 +++++++++++----------
 14 files changed, 683 insertions(+), 627 deletions(-)

diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 020c123a932..2a98f3b7c9a 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-15 22:28+0000\n"
-"Last-Translator: Alex Mr.Brightside Demurine <extrimall90@mail.ru>\n"
+"PO-Revision-Date: 2010-02-06 19:29+0000\n"
+"Last-Translator: Santjaga <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-16 04:35+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -97,7 +97,7 @@ msgstr "Несогласованные проводки"
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr ""
+msgstr "Базовый Код"
 
 #. module: account
 #: view:account.account:0
@@ -157,7 +157,7 @@ msgstr "Проводки"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Централизация Дебета"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
@@ -343,7 +343,7 @@ msgstr "Номер счета"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Delta Debit"
-msgstr ""
+msgstr "Дебетовое сальдо"
 
 #. module: account
 #: rml:account.invoice:0
@@ -369,7 +369,7 @@ msgstr "Счет аналитического учета"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Налог на детей"
 
 #. module: account
 #: rml:account.central.journal:0
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index c27e4e2f3bb..943a3f94d31 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/i18n/ar.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:23+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-02-06 17:39+0000\n"
+"Last-Translator: omar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -77,7 +77,7 @@ msgstr ""
 #. module: account_analytic_default
 #: field:account.analytic.default,user_id:0
 msgid "User"
-msgstr ""
+msgstr "المستخدم"
 
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index b99dbf0dd4c..36b59330d9d 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2008-11-21 16:19+0000\n"
-"Last-Translator: Tugrulbey <Unknown>\n"
+"PO-Revision-Date: 2010-02-07 02:18+0000\n"
+"Last-Translator: Oktay Altunergil <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr ""
+msgstr "board.board"
 
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr "Yazar"
+msgstr "Yazan"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
@@ -51,7 +51,7 @@ msgstr "Genişlik"
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "İşlem tanımlamasında geçersiz model adı."
 
 #. module: board
 #: field:board.board.line,name:0
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index c5a7685b6db..8741571d5ac 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/i18n/bs.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:46+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-07 22:30+0000\n"
+"Last-Translator: Selma <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "Račun za saradnika"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
@@ -35,7 +35,7 @@ msgstr "Plaćeni član"
 #. module: membership
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravan naziv modela u definiciji zadatka."
 
 #. module: membership
 #: field:report.partner_member.year,currency:0
@@ -61,7 +61,7 @@ msgstr "Definiraj članski proizvod"
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "Datum do"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
@@ -71,7 +71,7 @@ msgstr "Čekanje za fakturiranje"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Proizvod za člana"
 
 #. module: membership
 #: field:res.partner,associate_member:0
@@ -101,7 +101,7 @@ msgstr ""
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "Datum od"
 
 #. module: membership
 #: field:membership.membership_line,partner:0
@@ -117,7 +117,7 @@ msgstr "Slobodni članovi"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "Račun za platiti"
 
 #. module: membership
 #: view:res.partner:0
@@ -162,7 +162,7 @@ msgstr "Stanje"
 #. module: membership
 #: field:res.partner,membership_start:0
 msgid "Start membership date"
-msgstr ""
+msgstr "Datum učlanjenja"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -174,7 +174,7 @@ msgstr "Plaćeni član"
 #: model:ir.ui.menu,name:membership.menu_report_partner_member_year
 #: view:report.partner_member.year:0
 msgid "Membership by Years"
-msgstr ""
+msgstr "Članstvo po godinama"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_reporting
@@ -190,7 +190,7 @@ msgstr "Članovi"
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
-msgstr ""
+msgstr "Nije član"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
@@ -205,7 +205,7 @@ msgstr "Konfiguracija"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "Definiraj proizvod za članstvo"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
@@ -226,7 +226,7 @@ msgstr ""
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_members_waiting
 msgid "Future members (invoice not confirmed)"
-msgstr ""
+msgstr "Budući članovi (račun nije potvrđen)"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
@@ -254,7 +254,7 @@ msgstr "Poništeno"
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "Članski cjenovnik"
 
 #. module: membership
 #: field:report.partner_member.year,invoiced_amount:0
@@ -284,7 +284,7 @@ msgstr ""
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negociated by the partner"
-msgstr ""
+msgstr "Cijena ugovorena sa partnerom"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
@@ -299,17 +299,17 @@ msgstr ""
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr ""
+msgstr "Otkaži datum članstva"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
 msgid "Membership Products"
-msgstr ""
+msgstr "Proizvodi članstva"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "Račun za članstvo je uplaćen."
 
 #. module: membership
 #: field:report.partner_member.year,paid_amount:0
@@ -323,7 +323,7 @@ msgstr "Plaćeno"
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Invoiced Member"
-msgstr ""
+msgstr "Fakturisani član"
 
 #. module: membership
 #: model:ir.module.module,shortdesc:membership.module_meta_information
@@ -344,7 +344,7 @@ msgstr ""
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr ""
+msgstr "Član na čekanju"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
@@ -360,7 +360,7 @@ msgstr "Fakturisani članovi"
 #. module: membership
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Nije moguće imati dva cjenovnika koja se preklapaju!"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_old
@@ -376,7 +376,7 @@ msgstr "Iznos članarine"
 #. module: membership
 #: wizard_view:wizard_invoice_membership,init:0
 msgid "Choose invoice details"
-msgstr ""
+msgstr "Odaberite detalje računa"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -387,7 +387,7 @@ msgstr "Stari Član"
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "Za"
 
 #. module: membership
 #: field:report.partner_member.year,waiting_amount:0
@@ -400,7 +400,7 @@ msgstr "Čekanje"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
 msgid "Draft invoice is now open."
-msgstr ""
+msgstr "Nacrt računa je otvoren."
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members_waiting
@@ -444,13 +444,13 @@ msgstr ""
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr ""
+msgstr "Nacrt računa za članstvo."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:res.partner,membership_state:0
 msgid "Canceled Member"
-msgstr ""
+msgstr "Otkazani član"
 
 #. module: membership
 #: model:product.price.type,name:membership.product_price_type_memberprice
@@ -461,12 +461,12 @@ msgstr ""
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr ""
+msgstr "Besplatni član"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "Datum prestanka članstva"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -479,22 +479,22 @@ msgstr "Aktivni članovi"
 #: model:ir.ui.menu,name:membership.menu_report_partner_member_year_new
 #: view:report.partner_member.year_new:0
 msgid "New Membership by Years"
-msgstr ""
+msgstr "Novo članstvo po godinama"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "Fakturisani član"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "Datum otkazivanja"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "Član na čekanju"
 
 #. module: membership
 #: model:ir.actions.wizard,name:membership.wizard_invoice_membership
@@ -505,12 +505,12 @@ msgstr ""
 #: model:process.node,name:membership.process_node_membershipproduct0
 #: wizard_field:wizard_invoice_membership,init,product:0
 msgid "Membership product"
-msgstr ""
+msgstr "Proizvod članstva"
 
 #. module: membership
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: nevažeći EAN kod"
 
 #. module: membership
 #: field:report.partner_member.year,year:0
@@ -521,4 +521,4 @@ msgstr "Godina"
 #. module: membership
 #: field:res.partner,membership_state:0
 msgid "Current membership state"
-msgstr ""
+msgstr "Trenutno stanje članstva"
diff --git a/addons/mrp_jit/i18n/pt.po b/addons/mrp_jit/i18n/pt.po
index 86dda823aab..0dc973a8eb6 100644
--- a/addons/mrp_jit/i18n/pt.po
+++ b/addons/mrp_jit/i18n/pt.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:23+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2010-02-06 16:44+0000\n"
+"Last-Translator: Paulino <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
-msgstr ""
+msgstr "MRP JIT"
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 75db18baa0c..5653dca32a8 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-05 00:18+0000\n"
+"PO-Revision-Date: 2010-02-06 20:43+0000\n"
 "Last-Translator: Guilherme Santos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-06 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -124,7 +124,7 @@ msgstr ""
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
 msgid "Repair Orders"
-msgstr ""
+msgstr "Ordens de Serviços"
 
 #. module: mrp_repair
 #: model:ir.actions.report.xml,name:mrp_repair.report_mrp_repair
@@ -145,7 +145,7 @@ msgstr "Parceiro"
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_quotation_tree
 #: model:ir.ui.menu,name:mrp_repair.menu_repair_quotation
 msgid "Repairs in quotation"
-msgstr ""
+msgstr "Ordens de Serviços em Orçamento"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -289,7 +289,7 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,repaired:0
 msgid "Repaired"
-msgstr ""
+msgstr "Consertado"
 
 #. module: mrp_repair
 #: wizard_field:mrp.repair.make_invoice,init,group:0
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 81a145e28f8..683fb857bc1 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-24 13:48+0000\n"
-"Last-Translator: Hend Awad <Unknown>\n"
+"PO-Revision-Date: 2010-02-06 15:59+0000\n"
+"Last-Translator: omar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-25 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -1644,7 +1644,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.cat2
 msgid "Private"
-msgstr ""
+msgstr "خاص"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 5f109c85408..c60ad9c9756 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -7,34 +7,34 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-06 19:21+0000\n"
+"Last-Translator: Paulino <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr "Tarefas designadas"
+msgstr "Tarefas atribuidas"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Processo de tarefas"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr ""
+msgstr "Novo título da tarefa delegada no utilizador."
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Mudar as  horas restantes"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
@@ -44,17 +44,17 @@ msgstr "Fechar a Tarefa"
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Tarefas do projecto"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Abrir tarefa concluída"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -73,6 +73,8 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"O tempo restante, pode ser re-estimado periodicamente pelo responsável pela "
+"tarefa"
 
 #. module: project
 #: field:project.project,child_id:0
@@ -82,23 +84,23 @@ msgstr "Sub-projecto"
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Membros do projecto"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Tarefas por delegado"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_my_run
 msgid "My Running Projects"
-msgstr ""
+msgstr "Meus projectos em curso"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr "Tarefas apagadas"
+msgstr "Tarefas delegadas"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -106,6 +108,8 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Cabeçalho adicionado no início do email para a mensagem de aviso enviada "
+"para o cliente quando uma tarefa é concluída."
 
 #. module: project
 #: field:project.task,priority:0
@@ -115,17 +119,17 @@ msgstr "Importância"
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Actualizar"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr ""
+msgstr "Utilizador a quem pretende delegar esta tarefa."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Todos oa anexos"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -135,7 +139,7 @@ msgstr "Definir como pendente"
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "Definir as exigências e fixar as horas planeadas."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
@@ -146,7 +150,7 @@ msgstr "Tipos de tarefas"
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Novo projecto baseado num modelo"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -170,22 +174,26 @@ msgid ""
 "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
 "    "
 msgstr ""
+"Modulo de Gestão de Projectos que gere projectos multi-nível, tarefas, \n"
+"trabalhos concluídos das tarefas, etc. Apresenta o planeamento, atribui "
+"tarefas, etc.\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr "Minhas tarefas em progesso"
+msgstr "Minhas tarefas em curso"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Definir como modelo"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Tarefa rascunho"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
@@ -199,6 +207,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
 msgstr ""
+"Tempo estimado para validar o trabalho realizado pelo utilizador a quem "
+"delegou esta tarefa."
 
 #. module: project
 #: view:project.project:0
@@ -211,12 +221,12 @@ msgstr "Notas"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Dias"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
 msgid "Analysis"
-msgstr ""
+msgstr "Análise"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -229,19 +239,21 @@ msgstr "Projecto"
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Iniciar Tarefa"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr ""
+msgstr "Minhas tarefas rascunho"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Variáveis automáticas para cabeçalhos e rodapés. Use exactamente a mesma "
+"notação."
 
 #. module: project
 #: selection:project.project,state:0
@@ -253,27 +265,27 @@ msgstr "Cancelado"
 #: view:project.project:0
 #: field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "Cabeçalho da mensagem"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Tarefas concluídas"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Tarefa está concluída"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Delega tarefas ao outro utilizador"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Calculado usando a soma das tarefas realizadas."
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -281,16 +293,18 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Se assinalar aqui, irá aparecer ao utilizador uma janela ao terminar uma "
+"tarefa, a propor o envio de uma mensagem ao cliente."
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user."
-msgstr ""
+msgstr "Re-incluir a descrição da tarefa na tarefa do utilizador."
 
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr "Conta da contabilidade analítica"
+msgstr "Conta analítica"
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -307,7 +321,7 @@ msgstr "Todas as tarefas"
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planeamento"
 
 #. module: project
 #: view:project.task:0
@@ -318,7 +332,7 @@ msgstr "Informação extra"
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Parceiro"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -329,12 +343,12 @@ msgstr "Horas planeadas"
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr "Tarefa: %(nome)s"
+msgstr "Tarefa: %(name)s"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Redefinir como Projecto"
 
 #. module: project
 #: view:project.task:0
@@ -346,6 +360,7 @@ msgstr "Delegações"
 msgid ""
 "Project's member. Not used in any computation, just for information purpose."
 msgstr ""
+"Membros do projecto. Não utilizado em nenhum cálculo, apenas para informação."
 
 #. module: project
 #: view:project.project:0
@@ -356,22 +371,23 @@ msgstr "Meus projectos"
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Todos os projectos"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
 msgid "From draft state, it will come into the open state."
-msgstr ""
+msgstr "De estado \"Rascunho\", vai passar ao estado \"Aberto\"."
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr "Tarefas atribuída"
+msgstr "Tarefa delegada"
 
 #. module: project
 #: help:project.project,progress_rate:0
 msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
+"Percentagem de tarefas fechadas em relação ao total de tarefas a fazer."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
@@ -381,17 +397,17 @@ msgstr "Descrição da nova tarefa"
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Descrição interna do projecto."
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Projecto-pai"
 
 #. module: project
 #: help:project.task,total_hours:0
 msgid "Computed as: Time Spent + Remaining Time."
-msgstr ""
+msgstr "Calculado como: Tempo dispendido + tempo restante"
 
 #. module: project
 #: field:project.task,type:0
@@ -402,31 +418,31 @@ msgstr "Tipo"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Semanas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Minhas tarefas actuais"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Novo projecto"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr "Médio"
+msgstr "Meio"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Horas restantes"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
@@ -436,7 +452,7 @@ msgstr "Tipo de tarefa do projecto"
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Tempo planeado"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -448,7 +464,7 @@ msgstr "Trabalho da tarefa"
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
@@ -461,7 +477,7 @@ msgstr "Minhas tarefas pendentes"
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr "Tarefas em progressos"
+msgstr "Tarefas em curso"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
@@ -472,23 +488,23 @@ msgstr "Tarefas não atribuídas"
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Título delegado"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Meus projectos"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr ""
+msgstr "Tempo estimado para fechar esta tarefa pelo utilizador delegado."
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Modelo"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -500,7 +516,7 @@ msgstr "Configuração"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data Inicial"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
@@ -511,7 +527,7 @@ msgstr "Projectos"
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Datas"
 
 #. module: project
 #: field:project.task,history:0
@@ -521,22 +537,22 @@ msgstr "Detalhes da tarefa"
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Despoletar factura"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Rascunho da tarefa em aberto"
 
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr "Utilizador: %(id_de_utilizador)s"
+msgstr "Utilizador: %(user_id)s"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Horas de demora"
 
 #. module: project
 #: field:project.project,contact_id:0
@@ -547,25 +563,25 @@ msgstr "Contacto"
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr "Delegar"
+msgstr "Delegado"
 
 #. module: project
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+msgstr "XML inválido para a arquitectura da vista"
 
 #. module: project
 #: model:ir.module.module,shortdesc:project.module_meta_information
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr "Gestão de projectos"
+msgstr "Gestão de Projectos"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Tempo despendido"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
@@ -582,12 +598,12 @@ msgstr "Tipo de tarefa"
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr "Nova Tarefa"
+msgstr "Nova tarefa"
 
 #. module: project
 #: help:project.project,timesheet_id:0
 msgid "Timetable working hours to adjust the gantt diagram report"
-msgstr ""
+msgstr "Horário de trabalho para ajustar o relatório de diagrama de Gantt"
 
 #. module: project
 #: view:project.project:0
@@ -597,12 +613,12 @@ msgstr "Membros do projecto"
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Após a conclusão da tarefa, crie a factura."
 
 #. module: project
 #: help:project.task,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculado como: Tempo despendido / tempo total"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task4
@@ -613,22 +629,22 @@ msgstr "Minhas tarefas"
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr "Estado: %(estado)s"
+msgstr "Estado: %(state)s"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planeado"
 
 #. module: project
 #: help:project.project,total_hours:0
 msgid "Sum of total hours of all tasks related to this project."
-msgstr ""
+msgstr "Soma do total de horas das tarefas relacionadas com este projecto."
 
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr "Tarefas atribuídas"
+msgstr "Tarefas delegadas"
 
 #. module: project
 #: view:project.task:0
@@ -638,7 +654,7 @@ msgstr "Informação"
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Rever"
 
 #. module: project
 #: view:project.project:0
@@ -653,7 +669,7 @@ msgstr "E-Mails"
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Despoletar facturas desde as linhas da ordem de venda"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -670,7 +686,7 @@ msgstr "Baixo"
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Gestor do projecto"
 
 #. module: project
 #: view:project.project:0
@@ -692,17 +708,19 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
 msgstr ""
+"Novo estado da sua tarefa. As pendentes serão reabertas automaticamente "
+"assim que as tarefas delegadas sejam fechadas."
 
 #. module: project
 #: field:res.company,project_time_mode:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Unidade de tempo do projecto"
 
 #. module: project
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Nome do projecto"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
@@ -712,7 +730,7 @@ msgstr "Enviar mensagem"
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Tempo total"
 
 #. module: project
 #: field:project.task,active:0
@@ -722,12 +740,12 @@ msgstr "Activo"
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Erro"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Cotação"
 
 #. module: project
 #: view:project.task:0
@@ -740,6 +758,8 @@ msgid ""
 "Computed as: Total Time - Estimated Time. It gives the difference of the "
 "time estimated by the project manager and the real time to close the task."
 msgstr ""
+"Calculado como: Tempo total - Tempo estimado. Da a diferença entre o tempo "
+"estimado pelo gestor do projecto e o tempo real para fechar a tarefa."
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -749,17 +769,17 @@ msgstr "Abrir tarefa"
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Tempo de trabalho"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Meses"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
 msgid "When task is completed, it will come into the done state."
-msgstr ""
+msgstr "Quando a tarefa estiver completa, aparecerá no estado de concluído."
 
 #. module: project
 #: field:project.task.work,date:0
@@ -772,7 +792,7 @@ msgid ""
 "This will set the unit of measure used in projects and tasks.\n"
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
-msgstr ""
+msgstr "Isto define a unidade de medida usada nos projectos e tarefas."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
@@ -782,7 +802,7 @@ msgstr "Projectos do utilizador"
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "Reactivar projecto"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -797,7 +817,7 @@ msgstr "Delegar esta tarefa a um utilizador"
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr "Delegar a"
+msgstr "Delegado a"
 
 #. module: project
 #: field:project.task,date_close:0
@@ -815,11 +835,14 @@ msgid ""
 "Estimated time to do the task, usually set by the project manager when the "
 "task is in draft state."
 msgstr ""
+"Tempo estimado para executar esta tarefa, normalmente definido pelo gestor "
+"do projecto quando a tarefa encontra-se em  rascunho."
 
 #. module: project
 #: help:project.project,effective_hours:0
 msgid "Sum of spent hours of all tasks related to this project."
 msgstr ""
+"Soma das horas despendido em todas as tarefas relacionadas com este projecto."
 
 #. module: project
 #: help:project.task,project_id:0
@@ -827,11 +850,14 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Se o nome do projecto contiver \"?\", isso significa que não há conta "
+"analítica ligada a este projecto."
 
 #. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr ""
+"Soma das horas planeadas de todas as tarefas relacionadas com este projecto."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
@@ -842,17 +868,17 @@ msgstr "Trabalhos do mês"
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr "Garantir representação"
+msgstr "Representação Gantt"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Alertar Parceiro"
 
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: project
 #: field:project.task,name:0
@@ -862,7 +888,7 @@ msgstr "Sumário da tarefa"
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr "Data de inicio: %(data_inicio)s"
+msgstr "Data de inicio: %(date_start)s"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -871,6 +897,9 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Ligue este projecto a uma conta analítica caso precisar de gestão financeira "
+"nos projectos. Permite-lhe ligar projectos a orçamentos, planeamento, "
+"análise de custos e de receitas, calendário de projectos, etc."
 
 #. module: project
 #: view:project.project:0
@@ -895,64 +924,65 @@ msgstr "Cancelar"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Criar uma tarefa"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr "Abrir"
+msgstr "Em aberto"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr "Id: %(id_tarefa)s"
+msgstr "Id: %(task_id)s"
 
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em curso"
 
 #. module: project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Reactivar"
 
 #. module: project
 #: field:project.task,parent_id:0
 msgid "Parent Task"
-msgstr "Tarefas ascendente"
+msgstr "Tarefa-pai"
 
 #. module: project
 #: view:project.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Demora"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very Low"
-msgstr "Muito baixa"
+msgstr "Muito baixo"
 
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr "Enviar correspondencia ao cliente"
+msgstr "Enviar correio ao cliente"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Alertar o gestor"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
 msgid "config.compute.remaining"
-msgstr ""
+msgstr "config.compute.remaining"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
@@ -962,12 +992,12 @@ msgstr "Fecho silencioso"
 #. module: project
 #: help:project.task.delegate,init,prefix:0
 msgid "New title of your own task to validate the work done."
-msgstr ""
+msgstr "Novo título da sua própria tarefa para validar o trabalho feito."
 
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "Progresso (%)"
 
 #. module: project
 #: field:project.task,description:0
@@ -979,13 +1009,13 @@ msgstr "Descrição"
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Factura da tarefa"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_open
 msgid "Projects Structure"
-msgstr ""
+msgstr "Estrutura do projecto"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
@@ -995,12 +1025,12 @@ msgstr "Validação da tarefa"
 #. module: project
 #: field:project.task,work_ids:0
 msgid "Work done"
-msgstr "Trabalho concluído"
+msgstr "Trabalho feito"
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "Em execução"
 
 #. module: project
 #: help:project.project,parent_id:0
@@ -1008,11 +1038,13 @@ msgid ""
 "If you have [?] in the name, it means there are no analytic account linked "
 "to project."
 msgstr ""
+"Se o nome contiver [?], significa que não há nenhuma conta analítica ligada "
+"a este projecto."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
-msgstr "Tarefas delegadas"
+msgstr "Delegar tarefa"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -1025,42 +1057,44 @@ msgid ""
 "If you check this field, the project manager will receive a request each "
 "time a task is completed by his team."
 msgstr ""
+"Se assinalar este campo, o gestor do projecto recebe uma notificação sempre "
+"que uma tarefa é concluída pela sua equipa."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Nova característica"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
-msgstr ""
+msgstr "Registe as suas horas de trabalho."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "O título da sua tarefa"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr "Tarefas do projecto"
+msgstr "Tarefa do projecto"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Horas despendidas"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Horas totais"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: model:ir.ui.menu,name:project.menu_template_project
 msgid "Template of Projects"
-msgstr ""
+msgstr "Modelo de projectos"
 
 #. module: project
 #: field:project.project,priority:0
@@ -1074,6 +1108,8 @@ msgid ""
 "Footer added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Rodapé adicionado no início do email para a mensagem de aviso enviada ao "
+"cliente quando uma tarefa é fechada."
 
 #. module: project
 #: view:project.project:0
@@ -1083,7 +1119,7 @@ msgstr "Informação do parceiro"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr ""
+msgstr "Calcular as restantes horas"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
@@ -1093,7 +1129,7 @@ msgstr "Estado de validação"
 #. module: project
 #: constraint:project.project:0
 msgid "Error ! You can not create recursive projects."
-msgstr ""
+msgstr "Erro! não pode criar projectos recursivamente."
 
 #. module: project
 #: field:project.task,date_deadline:0
@@ -1103,7 +1139,7 @@ msgstr "Prazo limite"
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr "Designar para"
+msgstr "Atribuir a"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1113,26 +1149,26 @@ msgstr "Sumário do trabalho"
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr "Data de paragem: %(data_de_paragem)s"
+msgstr "Data do fim: %(date_stop)s"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "Fim esperado"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Delegue a sua tarefa ao outro utilizador"
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "Rodapé do mensagem"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Projectos em curso"
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index b89c3613f8e..fc41855912a 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -7,64 +7,64 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 12:27+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-08 01:47+0000\n"
+"Last-Translator: Oktay Altunergil <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
 msgid "Assigned tasks"
-msgstr ""
+msgstr "Atanmış Görevler"
 
 #. module: project
 #: model:process.process,name:project.process_process_tasksprocess0
 msgid "Tasks Process"
-msgstr ""
+msgstr "Görevler İşlemi"
 
 #. module: project
 #: help:project.task.delegate,init,name:0
 msgid "New title of the task delegated to the user."
-msgstr ""
+msgstr "Kullanıcıya aktarılan görevin yeni başlığı"
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Change Remaining Hours"
-msgstr ""
+msgstr "Kalan Saatleri Değiştir"
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_close_task
 msgid "Close Task"
-msgstr ""
+msgstr "Görevi Kapat"
 
 #. module: project
 #: view:project.task:0
 msgid "Project Tasks"
-msgstr ""
+msgstr "Proje Görevleri"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_opendonetask0
 msgid "Open Done Task"
-msgstr ""
+msgstr "Tamamlanan Görevi Aç"
 
 #. module: project
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "İşlem tanımlamasında geçersiz model adı."
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
 msgid "Hours to Validate"
-msgstr ""
+msgstr "Doğrulanacak Saatler"
 
 #. module: project
 #: field:project.project,progress_rate:0
 msgid "Progress"
-msgstr ""
+msgstr "İlerleme"
 
 #. module: project
 #: help:config.compute.remaining,remaining_hours:0
@@ -73,32 +73,34 @@ msgid ""
 "Total remaining time, can be re-estimated periodically by the assignee of "
 "the task."
 msgstr ""
+"Toplam kalan zaman. Belirli aralıklarla görevin atandığı kullanıcı "
+"tarafından yeniden tahmin edilebilir."
 
 #. module: project
 #: field:project.project,child_id:0
 msgid "Subproject"
-msgstr ""
+msgstr "Alt Proje"
 
 #. module: project
 #: field:project.project,members:0
 msgid "Project Members"
-msgstr ""
+msgstr "Proje Üyeleri"
 
 #. module: project
 #: model:process.node,name:project.process_node_taskbydelegate0
 msgid "Task by delegate"
-msgstr ""
+msgstr "Aktarılmaya Göre Görevler"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_my_run
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_my_run
 msgid "My Running Projects"
-msgstr ""
+msgstr "Faal Projelerim"
 
 #. module: project
 #: field:project.task,child_ids:0
 msgid "Delegated Tasks"
-msgstr ""
+msgstr "Aktarılmış Görevler"
 
 #. module: project
 #: help:project.project,warn_header:0
@@ -106,62 +108,64 @@ msgid ""
 "Header added at the beginning of the email for the warning message sent to "
 "the customer when a task is closed."
 msgstr ""
+"Müşteriye görevin kapatıldığı uyarısını vermek için gönderilen E-Posta'nın "
+"başına eklenen başlık."
 
 #. module: project
 #: field:project.task,priority:0
 msgid "Importance"
-msgstr ""
+msgstr "Önem"
 
 #. module: project
 #: view:config.compute.remaining:0
 msgid "Update"
-msgstr ""
+msgstr "Güncelle"
 
 #. module: project
 #: help:project.task.delegate,init,user_id:0
 msgid "User you want to delegate this task to."
-msgstr ""
+msgstr "Bu görevi aktarmak istediğiniz kullanıcı."
 
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_attachment_task
 msgid "All Attachments"
-msgstr ""
+msgstr "Bütün Ekler"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
 msgid "Set pending"
-msgstr ""
+msgstr "Askıya Al"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
 msgid "Define the Requirements and Set Planned Hours."
-msgstr ""
+msgstr "Şartları belirleyip Planlanan Saatleri giriniz."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types
 msgid "Task Types"
-msgstr ""
+msgstr "Görev Türleri"
 
 #. module: project
 #: view:project.project:0
 msgid "New Project Based on Template"
-msgstr ""
+msgstr "Şablondan Yeni Proje"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
 msgid "Project's tasks"
-msgstr ""
+msgstr "Proje'deki görevler"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very urgent"
-msgstr ""
+msgstr "Çok Acil"
 
 #. module: project
 #: wizard_button:project.task.delegate,init,valid:0
 msgid "Validate"
-msgstr ""
+msgstr "Doğrula"
 
 #. module: project
 #: model:ir.module.module,description:project.module_meta_information
@@ -170,28 +174,32 @@ msgid ""
 "works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
 "    "
 msgstr ""
+"Proje yönetimi modülü; çok kademeli projeleri, görevleri, görevlerde "
+"tamamlanmış işleri vs. takip etmeye yarar.\n"
+"Görevleri sıralamak, planları görüntülemek gibi özellikleri vardı.\n"
+"    "
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
-msgstr ""
+msgstr "İlerlemekte Olan Görevlerim"
 
 #. module: project
 #: view:project.project:0
 msgid "Set as Template"
-msgstr ""
+msgstr "Şablon Yap"
 
 #. module: project
 #: model:process.node,name:project.process_node_drafttask0
 msgid "Draft task"
-msgstr ""
+msgstr "Taslak Görev"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task
 #: field:project.task.work,task_id:0
 msgid "Task"
-msgstr ""
+msgstr "Görev"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours_me:0
@@ -199,6 +207,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task."
 msgstr ""
+"Aktarmayı yaptığınız kullanıcının yapacağı işleri doğrulamak için "
+"ihtiyacınız olan tahmini süre."
 
 #. module: project
 #: view:project.project:0
@@ -206,17 +216,17 @@ msgstr ""
 #: view:project.task:0
 #: field:project.task,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Days"
-msgstr ""
+msgstr "Gün"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_analysis
 msgid "Analysis"
-msgstr ""
+msgstr "Tahlil"
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -224,56 +234,58 @@ msgstr ""
 #: field:project.task,project_id:0
 #: model:res.request.link,name:project.req_link_project
 msgid "Project"
-msgstr ""
+msgstr "Proje"
 
 #. module: project
 #: view:project.task:0
 msgid "Start Task"
-msgstr ""
+msgstr "Görevi Başlat"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_draft
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_draft
 msgid "My Draft Tasks"
-msgstr ""
+msgstr "Taslak Görevlerim"
 
 #. module: project
 #: view:project.project:0
 msgid ""
 "Automatic variables for headers and footer. Use exactly the same notation."
 msgstr ""
+"Sayfa üstü ve altı bilgileri için otomatik değişkenler. Aynı gösterim "
+"biçimini kullanın."
 
 #. module: project
 #: selection:project.project,state:0
 #: selection:project.task,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal Edilmiş"
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,warn_header:0
 msgid "Mail Header"
-msgstr ""
+msgstr "E-Posta Başlığı"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
-msgstr ""
+msgstr "Tamamlanmış Görev"
 
 #. module: project
 #: model:process.node,note:project.process_node_donetask0
 msgid "Task is Completed"
-msgstr ""
+msgstr "Görev Tamamlandı"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
 msgid "Delegates tasks to the other user"
-msgstr ""
+msgstr "Görevi diğer kullanıcıya aktarır"
 
 #. module: project
 #: help:project.task,effective_hours:0
 msgid "Computed using the sum of the task work done."
-msgstr ""
+msgstr "Görevin tamamlanmış iş toplamına göre hesaplanır."
 
 #. module: project
 #: help:project.project,warn_customer:0
@@ -281,6 +293,8 @@ msgid ""
 "If you check this, the user will have a popup when closing a task that "
 "propose a message to send by email to the customer."
 msgstr ""
+"Bu kutuyu işaretlerseniz, kullanıcı görevi tamamlarken müsteriye bir E-Posta "
+"göndermeyi önerecek bir pencere gösterilecektir."
 
 #. module: project
 #: help:project.task.delegate,init,new_task_description:0
@@ -290,56 +304,56 @@ msgstr ""
 #. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: project
 #: field:project.task.work,user_id:0
 msgid "Done by"
-msgstr ""
+msgstr "Tamamlayan Kişi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
 #: model:ir.actions.act_window,name:project.action_view_task
 #: model:ir.ui.menu,name:project.menu_action_view_task
 msgid "All Tasks"
-msgstr ""
+msgstr "Bütün Görevler"
 
 #. module: project
 #: view:project.task:0
 msgid "Planning"
-msgstr ""
+msgstr "Planlama Aşamasında"
 
 #. module: project
 #: view:project.task:0
 msgid "Extra Info"
-msgstr ""
+msgstr "İlave Bilgi"
 
 #. module: project
 #: field:project.project,partner_id:0
 #: field:project.task,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Ortak"
 
 #. module: project
 #: field:project.task,planned_hours:0
 #: wizard_field:project.task.delegate,init,planned_hours:0
 msgid "Planned Hours"
-msgstr ""
+msgstr "Planlanan Süre"
 
 #. module: project
 #: view:project.project:0
 msgid "Task: %(name)s"
-msgstr ""
+msgstr "Görev: %(name)"
 
 #. module: project
 #: view:project.project:0
 msgid "Reset as Project"
-msgstr ""
+msgstr "Proje olarak Yenile"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegations"
-msgstr ""
+msgstr "Atamalar"
 
 #. module: project
 #: help:project.project,members:0
@@ -350,13 +364,13 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "My projects"
-msgstr ""
+msgstr "Projelerim"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 msgid "All projects"
-msgstr ""
+msgstr "Bütün Projeler"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_draftopentask0
@@ -366,7 +380,7 @@ msgstr ""
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegated Task"
-msgstr ""
+msgstr "Aktarılmış Görevler"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -376,17 +390,17 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,new_task_description:0
 msgid "New Task Description"
-msgstr ""
+msgstr "Yeni Görev Tanımı"
 
 #. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
-msgstr ""
+msgstr "Projenin dahili tanımı."
 
 #. module: project
 #: field:project.project,parent_id:0
 msgid "Parent Project"
-msgstr ""
+msgstr "Ana Proje"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -397,98 +411,98 @@ msgstr ""
 #: field:project.task,type:0
 #: field:project.task.type,name:0
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Weeks"
-msgstr ""
+msgstr "Hafta"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog
 msgid "My Current Tasks"
-msgstr ""
+msgstr "Şu Anki Görevlerim"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project
 #: model:ir.ui.menu,name:project.menu_open_view_project
 msgid "New Project"
-msgstr ""
+msgstr "Yeni Proje"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Medium"
-msgstr ""
+msgstr "Orta"
 
 #. module: project
 #: view:config.compute.remaining:0
 #: field:config.compute.remaining,remaining_hours:0
 #: field:project.task,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Kalan Saatler"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_type
 msgid "Project task type"
-msgstr ""
+msgstr "Proje Görev Türü"
 
 #. module: project
 #: field:project.project,planned_hours:0
 msgid "Planned Time"
-msgstr ""
+msgstr "Planlanan Süre"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 #: view:project.task:0
 #: view:project.task.work:0
 msgid "Task Work"
-msgstr ""
+msgstr "Görev İşi"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Hours"
-msgstr ""
+msgstr "Saat"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_pending
 #: model:ir.ui.menu,name:project.menu_tasks_yours_pending
 msgid "My Pending Tasks"
-msgstr ""
+msgstr "Askıdaki İşlerim"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_opened
 #: model:ir.actions.act_window,name:project.action_view_task6_prog
 #: model:ir.ui.menu,name:project.menu_action_view_task6_prog
 msgid "Tasks in Progress"
-msgstr ""
+msgstr "İlerlemekte Olan Görevler"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task7
 #: model:ir.ui.menu,name:project.menu_action_view_task7
 msgid "Unassigned Tasks"
-msgstr ""
+msgstr "Atanmamış Görevler"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,name:0
 msgid "Delegated Title"
-msgstr ""
+msgstr "Aktarılan Başlık"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project
 #: model:ir.ui.menu,name:project.menu_open_view_my_project
 msgid "My Projects"
-msgstr ""
+msgstr "Projelerim"
 
 #. module: project
 #: help:project.task.delegate,init,planned_hours:0
 msgid "Estimated time to close this task by the delegated user."
-msgstr ""
+msgstr "Bu görevin aktarıldığı kişi tarafından tahmini tamamlanma süresi."
 
 #. module: project
 #: selection:project.project,state:0
 msgid "Template"
-msgstr ""
+msgstr "Şablon"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
@@ -500,54 +514,54 @@ msgstr "Ayarlar"
 #: field:project.project,date_start:0
 #: field:project.task,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_all_project
 #: view:project.project:0
 msgid "Projects"
-msgstr ""
+msgstr "Projeler"
 
 #. module: project
 #: view:project.task:0
 msgid "Dates"
-msgstr ""
+msgstr "Tarihler"
 
 #. module: project
 #: field:project.task,history:0
 msgid "Task Details"
-msgstr ""
+msgstr "Görev Ayrıntıları"
 
 #. module: project
 #: model:process.node,name:project.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Fatura Tetikle"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_draftopentask0
 msgid "Draft Open task"
-msgstr ""
+msgstr "Taslak Açık Görev"
 
 #. module: project
 #: view:project.project:0
 msgid "User: %(user_id)s"
-msgstr ""
+msgstr "Kullanıcı: %(user_id)"
 
 #. module: project
 #: field:project.task,delay_hours:0
 msgid "Delay Hours"
-msgstr ""
+msgstr "Gecikme Saatleri"
 
 #. module: project
 #: field:project.project,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Bağlantı"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_delegate0
 #: view:project.task:0
 msgid "Delegate"
-msgstr ""
+msgstr "Aktar"
 
 #. module: project
 #: constraint:ir.ui.view:0
@@ -559,30 +573,30 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 #: model:ir.ui.menu,name:project.menu_main
 #: view:res.company:0
 msgid "Project Management"
-msgstr ""
+msgstr "Proje Yönetimi"
 
 #. module: project
 #: field:project.project,effective_hours:0
 #: field:project.task.work,hours:0
 msgid "Time Spent"
-msgstr ""
+msgstr "Harcanan Zaman"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks
 #: view:project.task:0
 msgid "Tasks"
-msgstr ""
+msgstr "Görevler"
 
 #. module: project
 #: view:project.task.type:0
 msgid "Task type"
-msgstr ""
+msgstr "Görev Türü"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_view_task_new
 #: model:ir.ui.menu,name:project.menu_action_view_task_new
 msgid "New Task"
-msgstr ""
+msgstr "Yeni Görev"
 
 #. module: project
 #: help:project.project,timesheet_id:0
@@ -592,7 +606,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Project's members"
-msgstr ""
+msgstr "Proje'nin Üyeleri"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_taskinvoice0
@@ -608,17 +622,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_view_task4
 #: model:ir.ui.menu,name:project.menu_action_view_task4
 msgid "My Tasks"
-msgstr ""
+msgstr "Görevlerim"
 
 #. module: project
 #: view:project.project:0
 msgid "Status: %(state)s"
-msgstr ""
+msgstr "Durum: %(state)"
 
 #. module: project
 #: view:project.task:0
 msgid "Planned"
-msgstr ""
+msgstr "Planlanmış"
 
 #. module: project
 #: help:project.project,total_hours:0
@@ -628,27 +642,27 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Delegated tasks"
-msgstr ""
+msgstr "Aktarılmış Görevler"
 
 #. module: project
 #: view:project.task:0
 msgid "Information"
-msgstr ""
+msgstr "Bilgi"
 
 #. module: project
 #: view:project.task:0
 msgid "Review"
-msgstr ""
+msgstr "Gözden Geçir"
 
 #. module: project
 #: view:project.project:0
 msgid "Administration"
-msgstr ""
+msgstr "Yönetim"
 
 #. module: project
 #: wizard_field:project.task.close,mail_ask,email:0
 msgid "E-Mails"
-msgstr ""
+msgstr "E-Postalar"
 
 #. module: project
 #: model:process.node,note:project.process_node_triggerinvoice0
@@ -660,17 +674,17 @@ msgstr ""
 #: view:project.task:0
 #: selection:project.task,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Taslak"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Düşük"
 
 #. module: project
 #: field:project.project,manager:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Proje Yöneticisi"
 
 #. module: project
 #: view:project.project:0
@@ -679,12 +693,12 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Askıda"
 
 #. module: project
 #: field:project.task,state:0
 msgid "Status"
-msgstr ""
+msgstr "Durum"
 
 #. module: project
 #: help:project.task.delegate,init,state:0
@@ -692,42 +706,44 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed."
 msgstr ""
+"Görevinizin yeni durumu. Askıda olanlar aktarılan görev tamamlandığında "
+"kendiliğınden yeniden açılacaktır."
 
 #. module: project
 #: field:res.company,project_time_mode:0
 msgid "Project Time Unit"
-msgstr ""
+msgstr "Proje Zaman Birimi"
 
 #. module: project
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr ""
+msgstr "Proje Adı"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,mail_send:0
 msgid "Send Message"
-msgstr ""
+msgstr "İleti Gönder"
 
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
-msgstr ""
+msgstr "Toplam Süre"
 
 #. module: project
 #: field:project.task,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_bug
 msgid "Bug"
-msgstr ""
+msgstr "Yazılım Hatası"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_quote
 msgid "Quotation"
-msgstr ""
+msgstr "Teklif"
 
 #. module: project
 #: view:project.task:0
@@ -744,17 +760,17 @@ msgstr ""
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
 msgid "Open task"
-msgstr ""
+msgstr "Görev Aç"
 
 #. module: project
 #: field:project.project,timesheet_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Çalışılan Süresi"
 
 #. module: project
 #: selection:res.company,project_time_mode:0
 msgid "Months"
-msgstr ""
+msgstr "Ay"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -764,7 +780,7 @@ msgstr ""
 #. module: project
 #: field:project.task.work,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: project
 #: help:res.company,project_time_mode:0
@@ -777,37 +793,37 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_project
 msgid "User's projects"
-msgstr ""
+msgstr "Kullanıcının Projeleri"
 
 #. module: project
 #: view:project.project:0
 msgid "Reactivate Project"
-msgstr ""
+msgstr "Projeyi Canlandır"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Urgent"
-msgstr ""
+msgstr "Acil"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Delegate this task to a user"
-msgstr ""
+msgstr "Bu görevi bir kullanıcıya aktar."
 
 #. module: project
 #: field:project.task,delegated_user_id:0
 msgid "Delegated To"
-msgstr ""
+msgstr "Aktarılan"
 
 #. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Kapatılma Tarihi"
 
 #. module: project
 #: field:project.task,user_id:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Atanan"
 
 #. module: project
 #: help:project.task,planned_hours:0
@@ -836,33 +852,33 @@ msgstr ""
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_work_month
 msgid "Month works"
-msgstr ""
+msgstr "Aylık İşler"
 
 #. module: project
 #: model:ir.actions.report.xml,name:project.report_project_project_gantt
 #: model:ir.actions.report.xml,name:project.report_project_task_gantt
 msgid "Gantt Representation"
-msgstr ""
+msgstr "Gannt Görünümü"
 
 #. module: project
 #: field:project.project,warn_customer:0
 msgid "Warn Partner"
-msgstr ""
+msgstr "Ortağı Uyar"
 
 #. module: project
 #: field:project.project,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: project
 #: field:project.task,name:0
 msgid "Task summary"
-msgstr ""
+msgstr "Görev Özeti"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Start: %(date_start)s"
-msgstr ""
+msgstr "Başlangıç Tarihi: %(date_start)"
 
 #. module: project
 #: help:project.project,category_id:0
@@ -879,7 +895,7 @@ msgstr ""
 #: selection:project.task,state:0
 #: selection:project.task.delegate,init,state:0
 msgid "Done"
-msgstr ""
+msgstr "Tamamlandı"
 
 #. module: project
 #: view:config.compute.remaining:0
@@ -890,73 +906,73 @@ msgstr ""
 #: wizard_button:project.task.close,mail_ask,end:0
 #: wizard_button:project.task.delegate,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new
 msgid "Create a Task"
-msgstr ""
+msgstr "Görev Oluştur"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
 msgid "Open"
-msgstr ""
+msgstr "Açık"
 
 #. module: project
 #: view:project.project:0
 msgid "ID: %(task_id)s"
-msgstr ""
+msgstr "Belirteç: %(task_id)"
 
 #. module: project
 #: selection:project.task,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "İlerlemede"
 
 #. module: project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
 #. module: project
 #: view:project.task:0
 msgid "Reactivate"
-msgstr ""
+msgstr "Canlandır"
 
 #. module: project
 #: field:project.task,parent_id:0
 msgid "Parent Task"
-msgstr ""
+msgstr "Ana Görev"
 
 #. module: project
 #: view:project.task:0
 msgid "Delay"
-msgstr ""
+msgstr "Gecikme"
 
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very Low"
-msgstr ""
+msgstr "Çok Düşük"
 
 #. module: project
 #: wizard_view:project.task.close,mail_ask:0
 msgid "Send mail to customer"
-msgstr ""
+msgstr "Müşteriye E-Posta gönder"
 
 #. module: project
 #: field:project.project,warn_manager:0
 msgid "Warn Manager"
-msgstr ""
+msgstr "Yöneticiyi Uyar"
 
 #. module: project
 #: model:ir.model,name:project.model_config_compute_remaining
 msgid "config.compute.remaining"
-msgstr ""
+msgstr "config.compute.remaining"
 
 #. module: project
 #: wizard_button:project.task.close,mail_ask,close:0
 msgid "Quiet close"
-msgstr ""
+msgstr "Sessizce Kapat"
 
 #. module: project
 #: help:project.task.delegate,init,prefix:0
@@ -966,30 +982,30 @@ msgstr ""
 #. module: project
 #: field:project.task,progress:0
 msgid "Progress (%)"
-msgstr ""
+msgstr "İlerleme (%)"
 
 #. module: project
 #: field:project.task,description:0
 #: wizard_field:project.task.close,mail_ask,description:0
 #: field:project.task.type,description:0
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: project
 #: model:process.transition,name:project.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Görev Faturası"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_my_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_my_project_open
 msgid "Projects Structure"
-msgstr ""
+msgstr "Projeler Yapısı"
 
 #. module: project
 #: wizard_view:project.task.delegate,init:0
 msgid "Validation Task"
-msgstr ""
+msgstr "Onaylama Görevi"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -999,7 +1015,7 @@ msgstr ""
 #. module: project
 #: selection:project.project,state:0
 msgid "Running"
-msgstr ""
+msgstr "Süren"
 
 #. module: project
 #: help:project.project,parent_id:0
@@ -1011,12 +1027,12 @@ msgstr ""
 #. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
-msgstr ""
+msgstr "Göveri Aktar"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Proje Görevleri"
 
 #. module: project
 #: help:project.project,warn_manager:0
@@ -1028,7 +1044,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_feature
 msgid "New Feature"
-msgstr ""
+msgstr "Yeni Özellik"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -1038,34 +1054,34 @@ msgstr ""
 #. module: project
 #: wizard_field:project.task.delegate,init,prefix:0
 msgid "Your Task Title"
-msgstr ""
+msgstr "Görev Başlığınız"
 
 #. module: project
 #: model:res.request.link,name:project.req_link_task
 msgid "Project task"
-msgstr ""
+msgstr "Proje Görevi"
 
 #. module: project
 #: field:project.task,effective_hours:0
 msgid "Hours Spent"
-msgstr ""
+msgstr "Harcanan Saatler"
 
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Toplam Saatler"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_template_project
 #: model:ir.ui.menu,name:project.menu_template_project
 msgid "Template of Projects"
-msgstr ""
+msgstr "Projeler Şablonu"
 
 #. module: project
 #: field:project.project,priority:0
 #: field:project.task,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Silsile"
 
 #. module: project
 #: help:project.project,warn_footer:0
@@ -1077,17 +1093,17 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Partner Info"
-msgstr ""
+msgstr "Ortak Bilgisi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_config_compute_remaining
 msgid "Compute Remaining Hours"
-msgstr ""
+msgstr "Kalan Saatleri Hesapla"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,state:0
 msgid "Validation State"
-msgstr ""
+msgstr "Onay Durumu"
 
 #. module: project
 #: constraint:project.project:0
@@ -1097,41 +1113,41 @@ msgstr ""
 #. module: project
 #: field:project.task,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: project
 #: wizard_field:project.task.delegate,init,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Atanacak"
 
 #. module: project
 #: field:project.task.work,name:0
 msgid "Work summary"
-msgstr ""
+msgstr "İş Özeti"
 
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date_stop)s"
-msgstr ""
+msgstr "Durma Tarihi: %(date_stop)"
 
 #. module: project
 #: field:project.project,date_end:0
 msgid "Expected End"
-msgstr ""
+msgstr "Beklenen Son"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
 msgid "Delegate your task to the other user"
-msgstr ""
+msgstr "Görevinizi başka bir kullanıcıya aktarın."
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,warn_footer:0
 msgid "Mail Footer"
-msgstr ""
+msgstr "E-Posta Alt Bilgisi"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_view_project_open
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
-msgstr ""
+msgstr "Süren Projeler"
diff --git a/addons/report_document/i18n/ru.po b/addons/report_document/i18n/ru.po
index bb0a8acd1bc..96adea022ff 100644
--- a/addons/report_document/i18n/ru.po
+++ b/addons/report_document/i18n/ru.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 11:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-06 19:27+0000\n"
+"Last-Translator: Santjaga <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
 #: field:report.files.partner,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_partner
 msgid "Files Per Month"
-msgstr ""
+msgstr "Файлов в месяц"
 
 #. module: report_document
 #: constraint:ir.model:0
@@ -40,7 +40,7 @@ msgstr ""
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Доска позора"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_files_partner
@@ -52,12 +52,12 @@ msgstr ""
 #: field:report.document.user,file_size:0
 #: field:report.files.partner,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Размер файла"
 
 #. module: report_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Недопустимое имя модели в определении действия"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all
@@ -68,7 +68,7 @@ msgstr "Все месяцы"
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_myfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_myfile
 msgid "My files"
-msgstr ""
+msgstr "Мои файлы"
 
 #. module: report_document
 #: view:report.document.user:0
@@ -78,17 +78,17 @@ msgstr ""
 #. module: report_document
 #: view:report.document.user:0
 msgid "Files"
-msgstr ""
+msgstr "Файлы"
 
 #. module: report_document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "Файлов в месяц"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree1
 msgid "My files (All months)"
-msgstr ""
+msgstr "Мои файлы (Все месяцы)"
 
 #. module: report_document
 #: field:report.document.wall,file_name:0
@@ -103,18 +103,18 @@ msgstr "Отчетность"
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
-msgstr ""
+msgstr "Пользователи, не вставляшие документов месяц"
 
 #. module: report_document
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document
 msgid "Document Management"
-msgstr ""
+msgstr "Управление Документами"
 
 #. module: report_document
 #: field:report.document.user,type:0
 #: field:report.files.partner,type:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Тип папкм"
 
 #. module: report_document
 #: view:report.files.partner:0
@@ -130,7 +130,7 @@ msgstr "Данный месяц"
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: report_document
 #: constraint:ir.ui.view:0
@@ -141,12 +141,12 @@ msgstr "Неправильный XML для просмотра архитект
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_all_userfile
 #: model:ir.ui.menu,name:report_document.menu_action_view_my_document_report_this_userfile
 msgid "All Users files"
-msgstr ""
+msgstr "Файлы всех пользователей"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_my_document_tree
 msgid "My files (This months)"
-msgstr ""
+msgstr "Мои файлы (Текущий месяц)"
 
 #. module: report_document
 #: model:ir.model,name:report_document.model_report_document_user
@@ -157,7 +157,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Владелец"
 
 #. module: report_document
 #: field:report.document.file,nbr:0
@@ -170,7 +170,7 @@ msgstr ""
 #: field:report.document.user,directory:0
 #: field:report.files.partner,directory:0
 msgid "Directory"
-msgstr ""
+msgstr "Папка"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_user_graph
@@ -196,7 +196,7 @@ msgstr ""
 #: field:report.document.user,change_date:0
 #: field:report.files.partner,change_date:0
 msgid "Modified Date"
-msgstr ""
+msgstr "Изменённая дата"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_size_month
@@ -208,7 +208,7 @@ msgstr ""
 #: field:report.document.user,file_title:0
 #: field:report.files.partner,file_title:0
 msgid "File Name"
-msgstr ""
+msgstr "Имя файла"
 
 #. module: report_document
 #: field:report.document.file,month:0
@@ -218,24 +218,24 @@ msgstr ""
 #: field:report.document.wall,name:0
 #: field:report.files.partner,name:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_files_by_month_graph
 #: view:report.document.user:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Файлы по месяцам"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Файлы по типам ресурсов"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_all_document_tree
 msgid "All Users files (This month)"
-msgstr ""
+msgstr "Файлы всех пользователей (Текущий месяц)"
 
 #. module: report_document
 #: field:report.document.wall,last:0
@@ -246,4 +246,4 @@ msgstr ""
 #: field:report.document.user,partner:0
 #: field:report.files.partner,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"
diff --git a/addons/report_mrp/i18n/ru.po b/addons/report_mrp/i18n/ru.po
index 3e833c211ac..883d6c159e1 100644
--- a/addons/report_mrp/i18n/ru.po
+++ b/addons/report_mrp/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2008-11-03 05:19+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
+"PO-Revision-Date: 2010-02-08 02:31+0000\n"
+"Last-Translator: Feelipok <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
@@ -43,12 +43,12 @@ msgstr ""
 #. module: report_mrp
 #: view:report.workcenter.load:0
 msgid "Workcenters load"
-msgstr ""
+msgstr "Загрузка рабочей области"
 
 #. module: report_mrp
 #: model:ir.model,name:report_mrp.model_report_workcenter_load
 msgid "Workcenter Load"
-msgstr ""
+msgstr "Загрузка рабочей области"
 
 #. module: report_mrp
 #: model:ir.module.module,shortdesc:report_mrp.module_meta_information
@@ -73,13 +73,13 @@ msgstr "Кол-во часов"
 #. module: report_mrp
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Workcenter"
-msgstr ""
+msgstr "Рабочая область"
 
 #. module: report_mrp
 #: model:ir.actions.act_window,name:report_mrp.action_report_workcenter_load_tree
 #: model:ir.ui.menu,name:report_mrp.menu_report_workcenter_load
 msgid "Workcenter Loads"
-msgstr ""
+msgstr "Загрузка рабочих областей"
 
 #. module: report_mrp
 #: model:ir.actions.act_window,name:report_mrp.action_report_in_out_picking_tree
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 2309ec89212..db6011d5214 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,34 +7,34 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 05:50+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-02-07 02:16+0000\n"
+"Last-Translator: Oktay Altunergil <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Kısmi Teslimat"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Procurement"
-msgstr ""
+msgstr "Yeniden Satınalma Oluştur"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr ""
+msgstr "Teklifi Onayla"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Teslimat Emri"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -44,12 +44,12 @@ msgstr ""
 #. module: sale
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "İşlem tanımlamasında geçersiz model adı."
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr ""
+msgstr "Bekleme Takvimi"
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -57,33 +57,35 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
+"Bütün ürünleri bir kerede gönderecek kadar stok ürününüz yoksa kısmi "
+"teslimatların kabul edilip edilmediği."
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr ""
+msgstr "Stoktan"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr ""
+msgstr "Satış Emri Teslimat Adımları"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
 #: rml:sale.order:0
 msgid "Quantity"
-msgstr ""
+msgstr "Adet"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "You invoice has been successfully created !"
-msgstr ""
+msgstr "Fatura başarıyla oluşturuldu !"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Automatic Declaration"
-msgstr ""
+msgstr "Otomatik Bildiri"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -99,7 +101,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Invoice Exception"
-msgstr ""
+msgstr "Kuraldışı Fatura"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -120,7 +122,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
 msgid "Validate"
-msgstr ""
+msgstr "Doğrula"
 
 #. module: sale
 #: view:sale.order:0
@@ -130,7 +132,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Ara Toplam"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -143,17 +145,17 @@ msgstr ""
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Sipariş İptal"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr ""
+msgstr "Stok Hareketleri"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Manual Designation"
-msgstr ""
+msgstr "Elle Adlandırma"
 
 #. module: sale
 #: view:sale.order:0
@@ -161,7 +163,7 @@ msgstr ""
 #: view:sale.order.line:0
 #: field:sale.order.line,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
@@ -172,12 +174,12 @@ msgstr ""
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
-msgstr ""
+msgstr "Vergiler"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Net Toplam :"
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -188,42 +190,42 @@ msgstr ""
 #: selection:sale.order,state:0
 #: selection:sale.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal edildi"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Shipping Exception"
-msgstr ""
+msgstr "Hatalı Gönderim"
 
 #. module: sale
 #: field:sale.order,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Toplam"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Menşe"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr ""
+msgstr "Fatura Adresi"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Gönderilecek Ürünler"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Reference"
-msgstr ""
+msgstr "Referans"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "All at Once"
-msgstr ""
+msgstr "Tek Seferde"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -234,7 +236,7 @@ msgstr ""
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: sale
 #: rml:sale.order:0
@@ -244,22 +246,22 @@ msgstr ""
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr ""
+msgstr "Tedarik Yöntemi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "İlave Bilgi"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: sale
 #: field:sale.order.line,price_net:0
 msgid "Net Price"
-msgstr ""
+msgstr "Net Fiyat"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree9
@@ -284,33 +286,33 @@ msgstr ""
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Teyitli"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr ""
+msgstr "Öntanımlı Ödeme Şartları"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
 #: model:ir.ui.menu,name:sale.menu_action_order_tree_all
 msgid "All Sales Order"
-msgstr ""
+msgstr "Tüm Satış Emirleri"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr ""
+msgstr "Doğrula"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
-msgstr ""
+msgstr "Teslimat Adresi"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr ""
+msgstr "Gönderilen Miktar"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
@@ -321,23 +323,23 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sale Shop"
-msgstr ""
+msgstr "Satış Mağazası"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Depo"
 
 #. module: sale
 #: rml:sale.order:0
 msgid "Order N°"
-msgstr ""
+msgstr "Sipariş N°"
 
 #. module: sale
 #: field:sale.order,order_line:0
 #: view:sale.order.line:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Sipariş Satırları"
 
 #. module: sale
 #: rml:sale.order:0
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index b852191caf6..16c355c2022 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-24 18:09+0000\n"
-"Last-Translator: Oktay Altunergil <oktaya@gmail.com>\n"
+"PO-Revision-Date: 2010-02-07 02:09+0000\n"
+"Last-Translator: Oktay Altunergil <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -64,7 +64,7 @@ msgstr "Fırsatı teklife dönüştür"
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
 msgid "Your action"
-msgstr "Eyleminiz"
+msgstr "İşleminiz"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index d12588ec13e..f4098df5044 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-22 00:53+0000\n"
+"PO-Revision-Date: 2010-02-06 16:43+0000\n"
 "Last-Translator: Paulino <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-02-07 04:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -449,7 +449,7 @@ msgstr "Propriedades do stock"
 #. module: stock
 #: wizard_button:stock.partial_picking,init,split:0
 msgid "Make Picking"
-msgstr "Fazer empacotamento"
+msgstr "Fazer recolha"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -490,7 +490,7 @@ msgstr "Localização do inventario"
 #. module: stock
 #: help:product.product,track_production:0
 msgid "Force to use a Production Lot during production order"
-msgstr ""
+msgstr "Forçar o uso de um lote de produção durante a Ordem de Produção"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -550,7 +550,7 @@ msgstr "STOCK_SAVE_AS"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr ""
+msgstr "Relatório de stock por lotes de produção"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -575,7 +575,7 @@ msgstr ""
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
 msgid "Latest Date of Inventory"
-msgstr ""
+msgstr "Última Data de Inventário"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -614,7 +614,7 @@ msgstr "Localização da produção"
 #. module: stock
 #: field:stock.move,tracking_id:0
 msgid "Tracking Lot"
-msgstr ""
+msgstr "Rastrear lote"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -659,7 +659,7 @@ msgstr "Data esperada de envio"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "Endereço de de entrega"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -707,37 +707,37 @@ msgstr "Stock-terp"
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Packing List:"
-msgstr ""
+msgstr "Lista de empacotamento"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_RECORD"
-msgstr ""
+msgstr "STOCK_MEDIA_RECORD"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr ""
+msgstr "Vista de calendário"
 
 #. module: stock
 #: wizard_field:stock.location.products,init,from_date:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "weight"
-msgstr ""
+msgstr "peso"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Non Assigned Products:"
-msgstr ""
+msgstr "Artigos não atribuídos:"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Invoice Control"
-msgstr ""
+msgstr "Contolo de facturas"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -747,7 +747,7 @@ msgstr "Revisões do lote de produção"
 #. module: stock
 #: view:stock.picking:0
 msgid "Packing Done"
-msgstr ""
+msgstr "Empacotamento terminado"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -761,7 +761,7 @@ msgstr "Em espera"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr ""
+msgstr "Empacotamento disponível"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -772,7 +772,7 @@ msgstr "Armazem"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-report"
-msgstr ""
+msgstr "terp-report"
 
 #. module: stock
 #: wizard_field:stock.invoice_onshipping,init,type:0
@@ -782,44 +782,44 @@ msgstr "Tipo"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "Fornecedores de IT  genéricos"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr ""
+msgstr "Conteudo da localização (com dependentes)"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FILE"
-msgstr ""
+msgstr "STOCK_FILE"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr ""
+msgstr "ID da Linha de Inventário"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_EDIT"
-msgstr ""
+msgstr "STOCK_EDIT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONNECT"
-msgstr ""
+msgstr "STOCK_CONNECT"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_all
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr ""
+msgstr "Empacotamento"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_DOWN"
-msgstr ""
+msgstr "STOCK_GO_DOWN"
 
 #. module: stock
 #: field:res.partner,property_stock_customer:0
@@ -830,13 +830,13 @@ msgstr "Localização do cliente"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OK"
-msgstr ""
+msgstr "STOCK_OK"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr ""
+msgstr "Novo empacotamento interno"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -858,7 +858,7 @@ msgstr "Traceabilidade da capacidade de entrada"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Finished products"
-msgstr ""
+msgstr "Produtos acabados"
 
 #. module: stock
 #: field:stock.location,location_id:0
@@ -873,12 +873,12 @@ msgstr "Data criação"
 #. module: stock
 #: wizard_button:inventory.merge.stock.zero,init,merge:0
 msgid "Set to Zero"
-msgstr ""
+msgstr "Pôr a zero"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "All Stock Moves"
-msgstr ""
+msgstr "Todos os movimentos de stock"
 
 #. module: stock
 #: constraint:ir.ui.view:0
@@ -894,7 +894,7 @@ msgstr "Localização do fornecedor"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HELP"
-msgstr ""
+msgstr "STOCK_HELP"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -909,7 +909,7 @@ msgstr "Este módulo será usado para validar o stock de entrada"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_INFO"
-msgstr ""
+msgstr "STOCK_DIALOG_INFO"
 
 #. module: stock
 #: field:stock.move,date:0
@@ -925,7 +925,7 @@ msgstr "Enviando bens"
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr ""
+msgstr "Cancelar dispnibilidade"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -935,12 +935,12 @@ msgstr "Movimentos criados"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_BACK"
-msgstr ""
+msgstr "STOCK_GO_BACK"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr ""
+msgstr "A facturar"
 
 #. module: stock
 #: view:product.product:0
@@ -951,13 +951,13 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_FILL"
-msgstr ""
+msgstr "STOCK_JUSTIFY_FILL"
 
 #. module: stock
 #: view:stock.move:0
 #: field:stock.move,date_planned:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: stock
 #: view:product.product:0
@@ -972,7 +972,7 @@ msgstr "Metodo de atribuição"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-administration"
-msgstr ""
+msgstr "terp-administration"
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -982,12 +982,12 @@ msgstr "Locslização do stock"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_APPLY"
-msgstr ""
+msgstr "STOCK_APPLY"
 
 #. module: stock
 #: wizard_view:stock.partial_picking,end2:0
 msgid "The packing has been successfully made !"
-msgstr ""
+msgstr "A empacotamento terminado com sucesso!"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -999,17 +999,17 @@ msgstr "Endereço de destino"
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Periodical Inventory"
-msgstr ""
+msgstr "Inventário periódico"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-crm"
-msgstr ""
+msgstr "terp-crm"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STRIKETHROUGH"
-msgstr ""
+msgstr "STOCK_STRIKETHROUGH"
 
 #. module: stock
 #: rml:lot.stock.overview_all:0
@@ -1020,13 +1020,13 @@ msgstr "Código"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-partner"
-msgstr ""
+msgstr "terp-partner"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_draft
 msgid "Draft Periodical Inventories"
-msgstr ""
+msgstr "Inventários periódicos rascunho"
 
 #. module: stock
 #: wizard_button:inventory.merge,init,end:0
@@ -1067,12 +1067,12 @@ msgstr "Informação"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MISSING_IMAGE"
-msgstr ""
+msgstr "STOCK_MISSING_IMAGE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SPELL_CHECK"
-msgstr ""
+msgstr "STOCK_SPELL_CHECK"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_tracking
@@ -1089,7 +1089,7 @@ msgstr "Preço Unitário"
 #. module: stock
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr ""
+msgstr "Processar depois"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1113,23 +1113,23 @@ msgstr ""
 #. module: stock
 #: field:stock.picking,origin:0
 msgid "Origin Reference"
-msgstr ""
+msgstr "Referência original"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form4
 #: model:ir.ui.menu,name:stock.menu_action_move_form4
 msgid "Available Moves"
-msgstr ""
+msgstr "Movimentos disponíves"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HARDDISK"
-msgstr ""
+msgstr "STOCK_HARDDISK"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr ""
+msgstr "Recolha relacionada"
 
 #. module: stock
 #: field:stock.incoterms,name:0
@@ -1147,12 +1147,12 @@ msgstr "Linhas de inventario do stock"
 #. module: stock
 #: wizard_button:stock.location.products,init,open:0
 msgid "Open Products"
-msgstr ""
+msgstr "Produtos em aberto"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1163,17 +1163,17 @@ msgstr "Lista de entrada de embalagens"
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr ""
+msgstr "Lista de empacotamento"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COPY"
-msgstr ""
+msgstr "STOCK_COPY"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Nota de crédito do fornecedor"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1194,12 +1194,12 @@ msgstr ""
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "Stock Location Analysis"
-msgstr ""
+msgstr "Análise de stock por localização"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CDROM"
-msgstr ""
+msgstr "STOCK_CDROM"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -1219,17 +1219,17 @@ msgstr "Perdas de inventario"
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Ref"
-msgstr ""
+msgstr "Ref. Interna"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REFRESH"
-msgstr ""
+msgstr "STOCK_REFRESH"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_STOP"
-msgstr ""
+msgstr "STOCK_STOP"
 
 #. module: stock
 #: wizard_view:stock.move.track,init:0
@@ -1239,7 +1239,7 @@ msgstr "Rastreando um movimento"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
+msgstr "STOCK_FIND_AND_REPLACE"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1249,17 +1249,17 @@ msgstr "Validar"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_WARNING"
-msgstr ""
+msgstr "STOCK_DIALOG_WARNING"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_IN"
-msgstr ""
+msgstr "STOCK_ZOOM_IN"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CONVERT"
-msgstr ""
+msgstr "STOCK_CONVERT"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -1278,7 +1278,7 @@ msgstr "Linhas de mudança"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 #. module: stock
 #: field:stock.picking,type:0
@@ -1288,7 +1288,7 @@ msgstr "Tipo de envio"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
 msgid "Products"
-msgstr "Produtos"
+msgstr "Artigos"
 
 #. module: stock
 #: field:stock.picking,move_type:0
@@ -1298,27 +1298,27 @@ msgstr "Método de entrega"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.partial_picking
 msgid "Partial packing"
-msgstr ""
+msgstr "Empacotamento parcial"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-calendar"
-msgstr ""
+msgstr "terp-calendar"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ITALIC"
-msgstr ""
+msgstr "STOCK_ITALIC"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_YES"
-msgstr ""
+msgstr "STOCK_YES"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
 msgid "Fill From Unreceived Products"
-msgstr "Preencher de produtos não recebidos"
+msgstr "Preencher de artigos não recebidos"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -1329,7 +1329,7 @@ msgstr "Movimentação do destino"
 #: model:ir.actions.act_window,name:stock.action_inventory_form_new
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form_new
 msgid "New Periodical Inventory"
-msgstr ""
+msgstr "Novo inventário periódico"
 
 #. module: stock
 #: field:stock.production.lot,revisions:0
@@ -1374,12 +1374,12 @@ msgstr "Estado da factura"
 #. module: stock
 #: rml:lot.location:0
 msgid "Units"
-msgstr ""
+msgstr "Unidades"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_LEFT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_LEFT"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1389,7 +1389,7 @@ msgstr "Cancelar inventario"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Future Stock Forecast"
-msgstr ""
+msgstr "Previsão de stock"
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
@@ -1424,18 +1424,18 @@ msgstr ""
 #. module: stock
 #: field:stock.picking,min_date:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Data planeada"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Artigos de saida"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_COLOR_PICKER"
-msgstr ""
+msgstr "STOCK_COLOR_PICKER"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_lot_location
@@ -1445,63 +1445,63 @@ msgstr "Lotes por localização"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DELETE"
-msgstr ""
+msgstr "STOCK_DELETE"
 
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr ""
+msgstr "Diário de stock"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLEAR"
-msgstr ""
+msgstr "STOCK_CLEAR"
 
 #. module: stock
 #: field:stock.production.lot,date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Data de criação"
 
 #. module: stock
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "Aquisição"
+msgstr "Aprovisionamento"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Fornecedores Maxtor"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Forçar disponibilidade"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
 msgid "View Stock of Products"
-msgstr ""
+msgstr "Ver o stock dos artigos"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mrp"
-msgstr ""
+msgstr "terp-mrp"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr ""
+msgstr "Ordens de expedição futuras"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GO_UP"
-msgstr ""
+msgstr "STOCK_GO_UP"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_DESCENDING"
-msgstr ""
+msgstr "STOCK_SORT_DESCENDING"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -1512,7 +1512,7 @@ msgstr "rastreando lotes"
 #. module: stock
 #: wizard_button:inventory.merge,init,merge:0
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
@@ -1522,24 +1522,24 @@ msgstr "Inventario"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_HOME"
-msgstr ""
+msgstr "STOCK_HOME"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PROPERTIES"
-msgstr ""
+msgstr "STOCK_PROPERTIES"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Stock Real"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_fill_inventory
 #: wizard_view:stock.fill_inventory,init:0
 #: wizard_button:stock.fill_inventory,init,fill_inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Preencher inventário"
 
 #. module: stock
 #: wizard_view:stock.invoice_onshipping,init:0
@@ -1549,17 +1549,17 @@ msgstr "Criar facturas"
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr ""
+msgstr "Data de Revisão"
 
 #. module: stock
 #: rml:stock.picking.list:0
 msgid "Lot"
-msgstr ""
+msgstr "Lote"
 
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stock to Zero"
-msgstr ""
+msgstr "Pôr stock a zero"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -1570,17 +1570,17 @@ msgstr "Quantidade (UdS)"
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr ""
+msgstr "Empacotamentos a processar"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_STOP"
-msgstr ""
+msgstr "STOCK_MEDIA_STOP"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr ""
+msgstr "Definir como disponível"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.make_picking
@@ -1596,12 +1596,12 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DND_MULTIPLE"
-msgstr ""
+msgstr "STOCK_DND_MULTIPLE"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REMOVE"
-msgstr ""
+msgstr "STOCK_REMOVE"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -1628,17 +1628,17 @@ msgstr "Incoterms"
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr ""
+msgstr "STOCK_DIALOG_AUTHENTICATION"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_OUT"
-msgstr ""
+msgstr "STOCK_ZOOM_OUT"
 
 #. module: stock
 #: wizard_field:stock.move.track,init,tracking_prefix:0
@@ -1653,17 +1653,17 @@ msgstr "Mais próximo"
 #. module: stock
 #: wizard_field:stock.location.products,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr ""
+msgstr "Nome da revisão"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SELECT_COLOR"
-msgstr ""
+msgstr "STOCK_SELECT_COLOR"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1678,12 +1678,12 @@ msgstr "Propriedades do stock da contabilidade"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NO"
-msgstr ""
+msgstr "STOCK_NO"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_workshop
 msgid "Workshop"
-msgstr ""
+msgstr "Oficina"
 
 #. module: stock
 #: selection:stock.inventory,state:0
@@ -1700,7 +1700,7 @@ msgstr "Localizações virtuais"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REDO"
-msgstr ""
+msgstr "STOCK_REDO"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -1720,7 +1720,7 @@ msgstr "Não urgente"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CLOSE"
-msgstr ""
+msgstr "STOCK_CLOSE"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -1731,7 +1731,7 @@ msgstr "Armazéns"
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid "Force to use a Production Lot during deliveries"
-msgstr ""
+msgstr "Forçar o uso de lotes nas entregas"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1758,7 +1758,7 @@ msgstr "Stock"
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
 msgid "Product"
-msgstr "Produto"
+msgstr "Artigo"
 
 #. module: stock
 #: wizard_button:stock.return.picking,init,return:0
@@ -1773,7 +1773,7 @@ msgstr "Auto-embalagem"
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "UdM do Produto"
+msgstr "UdV do artigo"
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -1784,13 +1784,13 @@ msgstr "Altura (Z)"
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move,product_uom:0
 msgid "Product UOM"
-msgstr "UdM do Produto"
+msgstr "UdM do artigo"
 
 #. module: stock
 #: rml:lot.stock.overview:0
 #: rml:lot.stock.overview_all:0
 msgid "Variants"
-msgstr ""
+msgstr "Variantes"
 
 #. module: stock
 #: field:stock.location,posx:0
@@ -1805,12 +1805,12 @@ msgstr "Fornecedores"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUMP_TO"
-msgstr ""
+msgstr "STOCK_JUMP_TO"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-tools"
-msgstr ""
+msgstr "terp-tools"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
@@ -1820,12 +1820,12 @@ msgstr "Visão geral da localização"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.location_product
 msgid "Products by Location"
-msgstr ""
+msgstr "Artigos por localização"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDO"
-msgstr ""
+msgstr "STOCK_UNDO"
 
 #. module: stock
 #: model:ir.actions.wizard,name:stock.move_split
@@ -1835,7 +1835,7 @@ msgstr "Dividir linhas de movimento"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-sale"
-msgstr ""
+msgstr "terp-sale"
 
 #. module: stock
 #: field:stock.production.lot,name:0
@@ -1845,7 +1845,7 @@ msgstr "Serial"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ADD"
-msgstr ""
+msgstr "STOCK_ADD"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1865,12 +1865,12 @@ msgstr "Entradas da contabilidade"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
-msgstr ""
+msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: stock
 #: view:product.product:0
 msgid "Lots"
-msgstr ""
+msgstr "Lotes"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -1880,7 +1880,7 @@ msgstr "Todos de uma vez"
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outging Lots"
-msgstr ""
+msgstr "Rastrear lotes de saída"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
@@ -1888,17 +1888,17 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr ""
+msgstr "Datas dos inventários"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr ""
+msgstr "STOCK_PRINT_PREVIEW"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND"
-msgstr ""
+msgstr "STOCK_FIND"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1918,7 +1918,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Ícone"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -1941,22 +1941,22 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr ""
+msgstr "Clientes não europeus"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Components"
-msgstr ""
+msgstr "Componentes"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 msgid "Do you want to merge theses inventories ?"
-msgstr ""
+msgstr "Quer fundir estes inventários"
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Planned Date"
-msgstr ""
+msgstr "Max. Data planeada"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1971,12 +1971,12 @@ msgstr "Adquirido bens"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr ""
+msgstr "Localização do stock"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr ""
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -1987,7 +1987,7 @@ msgstr "Ordens de entrega"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr ""
+msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -2007,7 +2007,7 @@ msgstr "Confirmado"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr ""
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
 #: view:stock.move:0
@@ -2017,24 +2017,24 @@ msgstr "Confirmar"
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr ""
+msgstr "Verificar a Disponibilidade"
 
 #. module: stock
 #: wizard_view:inventory.merge,init:0
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory
 msgid "Merge inventories"
-msgstr ""
+msgstr "Fundir inventários"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Stock Locations Structure"
-msgstr ""
+msgstr "Estrutura das localizações de stocks"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr ""
+msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2046,12 +2046,12 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr ""
+msgstr "Confirma (não processar)"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves Tracked"
-msgstr ""
+msgstr "Movimentos rastreados"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -2067,7 +2067,7 @@ msgstr "Criar facturas"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr ""
+msgstr "STOCK_NETWORK"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -2077,7 +2077,7 @@ msgstr "Configuração"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr ""
+msgstr "terp-project"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_product_2_stock_report_prodlots
@@ -2086,7 +2086,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_stock_report_prodlots
 #: view:stock.report.prodlots:0
 msgid "Stock by Lots"
-msgstr ""
+msgstr "Stock por lotes"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -2097,23 +2097,23 @@ msgstr "Auto validar"
 #: field:stock.location,chained_auto_packing:0
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
-msgstr ""
+msgstr "Movimento automático"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr ""
+msgstr "Valor do stock virtual"
 
 #. module: stock
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr ""
+msgstr "STOCK_GOTO_LAST"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -2123,7 +2123,7 @@ msgstr "Facturado"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr ""
+msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2132,9 +2132,9 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by production orders"
 msgstr ""
-"Para o actual produto (modelo), esta localização do stock será utilizado, em "
-"vez do padrão, como o local de origem para os movimentos do stock gerados "
-"pelas ordens de produção"
+"Para o artigo (modelo) actual, esta localização do stock será utilizada, em "
+"vez da pre-definida, como o local de origem para os movimentos do stock "
+"gerados pelas ordens de produção"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
@@ -2156,7 +2156,7 @@ msgstr "Rascunho"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr ""
+msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree3
@@ -2164,7 +2164,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr ""
+msgstr "Empacotamento confirmado, agurda disponibilidade"
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2174,7 +2174,7 @@ msgstr "Prateleiras (Y)"
 #. module: stock
 #: model:ir.actions.wizard,name:stock.wizard_merge_inventory_zero
 msgid "Set Stock to 0"
-msgstr ""
+msgstr "Colocar stocks a zero"
 
 #. module: stock
 #: view:stock.location:0
@@ -2184,7 +2184,7 @@ msgstr "Localização"
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Do you want to set stocks to zero ?"
-msgstr ""
+msgstr "Quer colocar stocks a zero?"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -2194,12 +2194,12 @@ msgstr "Entrega directa"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr ""
+msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Production Lots"
-msgstr ""
+msgstr "Rastrear lotes de produção"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2209,7 +2209,7 @@ msgstr "Dividir em dois"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr ""
+msgstr "Movimentos de stock futuros"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -2218,14 +2218,14 @@ msgid ""
 "instead of the default one, as the source location for stock moves generated "
 "by procurements"
 msgstr ""
-"Para o actual produto (modelo), esta localização do stock será utilizado, em "
-"vez do padrão, como o local de origem para o movimentos de stock gerados por "
-"aquisições"
+"Para o artigo (modelo) actual, esta localização do stock será utilizada, em "
+"vez da pré-definida, como o local de origem para o movimentos de stock "
+"gerados por aprovisionamentos."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
 msgid "stock.picking.move.wizard"
-msgstr ""
+msgstr "stock.picking.move.wizard"
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -2243,12 +2243,12 @@ msgstr "Traceabilidade"
 #. module: stock
 #: field:stock.picking,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Data da ordem"
 
 #. module: stock
 #: selection:stock.invoice_onshipping,init,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Factura do fornecedor"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -2262,6 +2262,8 @@ msgid ""
 "Scheduled date for the movement of the products or real date if the move is "
 "done."
 msgstr ""
+"Data agendada para o movimentos dos artigos ou data real se o movimento já "
+"aconteceu."
 
 #. module: stock
 #: view:stock.picking:0
@@ -2271,12 +2273,12 @@ msgstr "Informação geral"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr ""
+msgstr "terp-product"
 
 #. module: stock
 #: wizard_button:stock.partial_picking,end2,end:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -2307,7 +2309,7 @@ msgstr "Inventario da conta"
 #. module: stock
 #: wizard_view:inventory.merge.stock.zero,init:0
 msgid "Set Stocks to Zero"
-msgstr ""
+msgstr "Colocar stock a zero"
 
 #. module: stock
 #: model:stock.location,name:stock.location_production
@@ -2329,7 +2331,7 @@ msgstr "Descrição"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr ""
+msgstr "STOCK_INDENT"
 
 #. module: stock
 #: selection:stock.picking,type:0
@@ -2363,7 +2365,7 @@ msgstr "Cliente"
 #: model:ir.actions.act_window,name:stock.action_location_tree_3
 #: model:ir.ui.menu,name:stock.menu_action_location_tree_3
 msgid "Locations' Values"
-msgstr ""
+msgstr "Valores das localizações"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -2373,7 +2375,7 @@ msgstr "Saída"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
@@ -2388,7 +2390,7 @@ msgstr "Outras informações"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr ""
+msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
 #: view:stock.move:0

From c6ea87b47ba7a54647d9c6ad0802b6b2909e698c Mon Sep 17 00:00:00 2001
From: "nch@tinyerp.com" <>
Date: Mon, 8 Feb 2010 10:53:55 +0530
Subject: [PATCH 06/30] [IMP]:added
 invisible=context.get('show_delegated',True) to delegated task wizard

bzr revid: nch@tinyerp.com-20100208052355-u0jqjir0yubatejt
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 788a44c9344..77927cf4172 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -364,7 +364,7 @@
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
                     <field name="state" invisible="context.get('set_visible',False)"/>
                     <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
-                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state" />
+                    <button groups="base.group_extended" name="%(wizard_delegate_task)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-execute" help="For changing to delegate state" invisible="context.get('show_delegated',True)" />
                     <button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action" icon="gtk-jump-to" help="For changing to done state"/>
                     <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
                 </tree>

From 070d0a433825000baf8a84c6c5cea0b5498eaee2 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 11:00:00 +0530
Subject: [PATCH 07/30] [FIX]: crm: typo

lp bug: https://launchpad.net/bugs/518657 fixed

bzr revid: rpa@openerp.co.in-20100208053000-oadjf8w578f9nuev
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index faf829e5e51..5cb39d37119 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -44,7 +44,7 @@
                     <field name="planned_revenue" required="1"/>
                     <field name="planned_cost"/>
                     <field name="probability"/>
-                    <field name="date_deadline" string="Excepted Close Date" required="1"/>
+                    <field name="date_deadline" string="Expected Close Date" required="1"/>
                     <group colspan="4" col="5">
                     <label string="" colspan="2"/>
                     <button string="Schedule Meeting"

From 8615415e4f751f3851b2966cc927d2cad3bfbaf5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 11:35:22 +0530
Subject: [PATCH 08/30] [FIX] base: missing import pkg

bzr revid: hmo@tinyerp.com-20100208060522-gk6f6pzrqnumttgr
---
 bin/addons/base/res/res_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index 83b0827a98e..b8c6ff54251 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -26,6 +26,7 @@ import pytz
 import pooler
 from tools.translate import _
 from service import security
+import netsvc
 
 class groups(osv.osv):
     _name = "res.groups"

From f6af6edc3b738a5a5ab12c825a4ce22a017979b5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:02:25 +0530
Subject: [PATCH 09/30] [IMP] quality_integration_server: Improve create db
 command after remove base_setup wizard

bzr revid: hmo@tinyerp.com-20100208063225-vf92p12wlran6yej
---
 .../base_quality_interrogation.py             | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/bin/addons/quality_integration_server/base_quality_interrogation.py b/bin/addons/quality_integration_server/base_quality_interrogation.py
index 96c04e72ca6..afb8ecd0def 100755
--- a/bin/addons/quality_integration_server/base_quality_interrogation.py
+++ b/bin/addons/quality_integration_server/base_quality_interrogation.py
@@ -174,28 +174,7 @@ def create_db(uri, dbname, user='admin', pwd='admin', lang='en_US'):
     if dbname in db_list:
         drop_db(uri, dbname)
     id = execute(conn,'create',admin_passwd, dbname, True, lang)
-    wait(id,uri)
-    uid = login_conn.login(dbname, user, pwd)
-
-    wiz_id = execute(wiz_conn,'create', dbname, uid, user, 'base_setup.base_setup')
-
-    state = 'init'
-    datas = {'form':{}}
-
-    while state!='config':
-        res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
-        if state=='init':
-            datas['form'].update( res['datas'] )
-        if res['type']=='form':
-            for field in res['fields'].keys():
-                datas['form'][field] = datas['form'].get(field,False)
-            state = res['state'][-1][0]
-            datas['form'].update({
-                'profile': -1
-            })
-        elif res['type']=='state':
-            state = res['state']
-    res = execute(wiz_conn, 'execute', dbname, uid, pwd, wiz_id, datas, state, {})
+    wait(id,uri)    
     install_module(uri, dbname, ['base_module_quality'],user=user,pwd=pwd)
     return True
 

From f86e18f3fd76d60cc369e35b78f47f72f913a8c9 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 12:25:26 +0530
Subject: [PATCH 10/30] [IMP] sale: add field in reporting and set default in
 search view

bzr revid: sbh@tinyerp.com-20100208065526-j30p0d711o1yuouo
---
 addons/sale/report_sale_view.xml | 20 +++++++++++---------
 addons/sale/sale_view.xml        |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/sale/report_sale_view.xml b/addons/sale/report_sale_view.xml
index 6bb33ad754b..1dc69f63bd3 100644
--- a/addons/sale/report_sale_view.xml
+++ b/addons/sale/report_sale_view.xml
@@ -7,33 +7,34 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sale Orders">
-                	<field name="partner_id"/>
+                	<field name="partner_id" invisible="True"/>
                     <field name="date_order"/>
                     <field name="invoiced_rate"/>
                     <field name="picked_rate"/>
                     <field name="amount_untaxed"/>
                     <field name="amount_tax"/>
-                    <field name="amount_total"/>
+                    <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
         </record>
 
         <record id="action_sale_order_report_all" model="ir.actions.act_window">
-            <field name="name">Sale Orders By Month </field>
+            <field name="name">Sale Orders By Customer </field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="context">{'report':True}</field>
+            <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
         </record>        
-	    <record model="ir.actions.act_window.view" id="action_crm_tag_tree_claim01">
+	    <record model="ir.actions.act_window.view" id="action_sale_order_01">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">tree</field>
 	        <field name="view_id" ref="sale.view_sale_order_report_tree"/>
 	        <field name="act_window_id" ref="action_sale_order_report_all"/>
 	    </record>        
-		<record model="ir.actions.act_window.view" id="action_order_product02">
+		<record model="ir.actions.act_window.view" id="action_sale_order_02">
 	        <field name="sequence" eval="1"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_sale_order_graph"/>
@@ -51,10 +52,11 @@
                     <field name="name"/>
                     <field name="order_id" invisible="True"/>
                     <field name="product_uom_qty" />
-                    <field name="product_uom"/>
+                    <field name="product_uos_qty"/>
+                    <field name="product_uos"/>
                     <field name="product_id"/>
                     <field name="price_unit" />
-                    <field name="discount"/>
+                    <field name="price_net"/>
                     <field name="price_subtotal" sum="Total"/>
                     <field name="state"/>
                 </tree>
@@ -77,7 +79,7 @@
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
 	    </record>   
 	    <record model="ir.actions.act_window.view" id="action_order_product02">
-	        <field name="sequence" eval="1"/>
+	        <field name="sequence" eval="2"/>
 	        <field name="view_mode">graph</field>
 	        <field name="view_id" ref="sale.view_order_line_graph"/>
 	        <field name="act_window_id" ref="action_order_report_tree_all"/>
@@ -86,7 +88,7 @@
 	<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
     <menuitem action="action_sale_order_report_all" id="menu_report_sale_order_all" parent="base.next_id_64" sequence="3"/>
     
-    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="3"/>
+    <menuitem action="action_order_report_tree_all" id="menu_report_order_product_all1" parent="base.next_id_64" sequence="4"/>
      
       </data>
     </openerp>    
\ No newline at end of file
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index ec7d9d0a081..9eee62b95d7 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
 					</group>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Parnter" icon="terp-sale" domain="[]" context="{'group_by':'partner_id'}"/>
+						<filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 					</group>                        
@@ -412,7 +412,7 @@
                             <filter icon="terp-sale" domain="[('salesman_id','child_of',[uid])]" help="My Departments Sale Order Lines"/>
                         </field>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Product" icon="terp-sale" domain="[]" context="{'group_by':'product_id'}"/>
+						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
 					</group>                        

From e0bdc8480658370cd6a02e32330ffad135d70374 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:46:56 +0530
Subject: [PATCH 11/30] [FIX] project: when delegrated user close task, parent
 task should reopen if pending

bzr revid: hmo@tinyerp.com-20100208071656-o2omd39a55oycx8p
---
 addons/project/project.py              | 15 ++++++++-------
 addons/project/wizard/task_delegate.py |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 9625db08fc1..9cd0dc65647 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -371,13 +371,14 @@ class task(osv.osv):
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
             self.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
-            if task.parent_ids and task.parent_ids.state in ('pending','draft'):
-                reopen = True
-                for child in task.parent_ids.child_ids:
-                    if child.id != task.id and child.state not in ('done','cancelled'):
-                        reopen = False
-                if reopen:
-                    self.do_reopen(cr, uid, [task.parent_ids.id])
+            for parent_id in task.parent_ids:
+                if parent_id.state in ('pending','draft'):
+                    reopen = True
+                    for child in parent_id.child_ids:
+                        if child.id != task.id and child.state not in ('done','cancelled'):
+                            reopen = False
+                    if reopen:
+                        self.do_reopen(cr, uid, [parent_id.id])
         return True
 
     def do_reopen(self, cr, uid, ids, *args):
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 35fe2019ea6..7716b90929c 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -52,12 +52,12 @@ class wizard_delegate(wizard.interface):
         task_obj = pooler.get_pool(cr.dbname).get('project.task')
         task = task_obj.browse(cr, uid, data['id'], context)
         newname = data['form']['prefix'] or ''
-        task_obj.copy(cr, uid, data['id'], {
+        new_task_id = task_obj.copy(cr, uid, data['id'], {
             'name': data['form']['name'],
             'user_id': data['form']['user_id'],
             'planned_hours': data['form']['planned_hours'],
             'remaining_hours': data['form']['planned_hours'],
-            'parent_id': data['id'],
+            'parent_ids': [(6, 0, [data['id']])],
             'state': 'open',
             'description': data['form']['new_task_description'] or '',
             'child_ids': [],
@@ -65,7 +65,8 @@ class wizard_delegate(wizard.interface):
         })
         task_obj.write(cr, uid, [data['id']], {
             'remaining_hours': data['form']['planned_hours_me'],
-            'name': newname
+            'name': newname,
+            'child_ids': [(6, 0, [new_task_id])]
         })
         if data['form']['state']=='pending':
             task_obj.do_pending(cr, uid, [data['id']])

From b183ca84b9b53bb13a7cca35ac7063f836aac4c4 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 12:54:32 +0530
Subject: [PATCH 12/30] [IMP] crm: lead list view

bzr revid: hmo@tinyerp.com-20100208072432-7x484pqg86qn4yyt
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ede549d7c9f..b865bb5a1d0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -123,7 +123,7 @@
             <tree string="Leads Tree"  colors="red:state=='open';black:state in ('draft', 'pending');grey: state in ('cancel','done')">                
                 <field name="partner_name" string="Lead Name"/>
                 <field name="stage_id" string="Status"/>
-                <field name="create_date"/>
+                <field name="date" string="Create Date"/>
                 <field name="categ_id" string="Lead Source"/>
                 <field name="email_from" string="Email"/>
                 <field name="user_id"/>

From 4a02735efcf5a7cda425daaabeaeb0aeb01bc9e6 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 14:14:04 +0530
Subject: [PATCH 13/30] [IMP]: crm: Improvement in views

bzr revid: rpa@openerp.co.in-20100208084404-xsxa7zo5cslmflx5
---
 addons/crm/crm_claims_view.xml      |  63 ++++++++++-------
 addons/crm/crm_fund_view.xml        |  33 +++++----
 addons/crm/crm_helpdesk_view.xml    |   5 +-
 addons/crm/crm_lead_view.xml        |  18 ++---
 addons/crm/crm_meeting_view.xml     |   6 +-
 addons/crm/crm_opportunity_view.xml |   4 +-
 addons/crm/crm_phonecall_view.xml   | 105 +++++++++++++++-------------
 addons/crm/crm_view.xml             |   4 +-
 8 files changed, 135 insertions(+), 103 deletions(-)

diff --git a/addons/crm/crm_claims_view.xml b/addons/crm/crm_claims_view.xml
index 86387ec015d..fecf8ae8ee3 100644
--- a/addons/crm/crm_claims_view.xml
+++ b/addons/crm/crm_claims_view.xml
@@ -50,37 +50,49 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Claims">
-                <group colspan="4" col="6">
+                <group colspan="4" col="4">
                     <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="user_id" string="Responsible" select="2"/>
-                    <newline/>
-                    <field name="section_id" widget="selection"/>
                     <field name="date" string="Date of Claim"/>
-                    <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <label string="Stage: " align="1.0"/>
-                    <group colspan="1" col="2">
-                        <field name="stage_id" select="1" nolabel="1"/>
-                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
-                    </group>
+                    <field name="planned_cost" string="Claim Cost"/>
                 </group>
+                <group colspan="4" col="4">
                 <notebook>
                 <page string="Claims Info">
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <field name="email_from"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="planned_cost" string="Claim Cost"/>
-                    <field name="probability"/>
-                    <newline/>
-                    <field name="priority"/>
-                    <field name="type_id" string="Type of Action" select="1"/>
-                    <field name="ref"/>
-                    <field name="ref2"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+                		<field name="partner_id" string="Partner"
+                        	on_change="onchange_partner_id(partner_id)" />
+	                    <field name="partner_address_id" string="Contact"
+	                    	on_change="onchange_partner_address_id(partner_address_id, email_from)" />
+	                    <field name="partner_phone"/>
+	                    <field name="partner_mobile"/>
+	                    <field name="email_from"/>
+	                </group>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" string="Responsible" select="2"/>
+                    	<field name="section_id" widget="selection"/>
+                    	<field name="probability"/>
+                    	<label string="Stage: " align="1.0"/>
+                    	<group colspan="1" col="2">
+	                        <field name="stage_id" select="1" nolabel="1"/>
+	                        <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
+	                    </group>
+                    	<field name="categ_id" select="1" widget="selection"
+                    		on_change="onchange_categ_id(categ_id)"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="type_id" string="Type of Action" select="1"
+                    		domain="[('object_id.model', '=', 'crm.claim')]" />
+                    	<field name="priority"/>
+                    </group>
+                    <separator colspan="4" string="References"/>
+                    <group colspan="4" col="4">
+	                    <field name="ref"/>
+	                    <field name="ref2"/>
+                    </group>
                     <separator colspan="4" string="Claim/Action Description"/>
                     <field name="description" colspan="4" nolabel="1"/>
-                    <separator colspan="4" string="Status"/>
+                    <separator colspan="4" string=""/>
                     <group col="8" colspan="4">
                         <field name="state" select="1"/>
                         <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
@@ -90,7 +102,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="canal_id"/>
@@ -139,6 +151,7 @@
                     <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
                  </page>
                 </notebook>
+                </group>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index 077b45af6ff..b172add3df0 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -60,25 +60,32 @@
         <field name="arch" type="xml">
             <form string="Funds Form">
                 <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="2"/>
+                    <field name="name" select="1" string="Name" colspan="4"/>
                     <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)"/>
-                    <newline/>
-                    <field name="date" string="Next Meeting"/>
-                    <field name="duration"/>
-                    <field name="type_id" select="1" string="Payment Mode"/>
+                    <field name="type_id" string="Payment Mode" select="1" widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
                 <notebook colspan="4">
                 <page string="Funds">
-                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
-                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
-                    <newline/>
-                    <field name="email_from" colspan="2"/>
-                    <field name="user_id" select="2" string="Responsible"/>
+                	<separator colspan="4" string="Communication"/>
+                	<group colspan="4" col="4">
+	                    <field name="partner_id" select="1" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+	                    <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="1"/>
+	                    <field name="email_from" colspan="2"/>
+                    </group>
                     <separator colspan="4" string="Estimates"/>
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
+                    <separator colspan="4" string="Status and Categarization"/>
+                    <group colspan="4" col="6">
+                    	<field name="user_id" select="2" string="Responsible"/>
+                    	<field name="categ_id" select="1"
+                    		on_change="onchange_categ_id(categ_id)"  widget="selection"
+                    		domain="[('object_id.model', '=', 'crm.fundraising')]" />
+                    	<field name="date"/>
+	                    <field name="duration"/>
+                    </group>
                     <separator colspan="4" string="Description Information"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
@@ -92,7 +99,7 @@
                         <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object"  icon="gtk-convert"/>
                     </group>
                 </page>
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="id" select="1"/>
                     <field name="active"/>
                     <field name="priority" string="Priority"/>
@@ -119,7 +126,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 71274822f9c..6773bb160c6 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -35,6 +35,7 @@
                 </group>
                 <notebook colspan="4">
                     <page string="General">
+                    	<separator colspan="4" string="Communication"/>
                         <group col="8" colspan="4">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
                             <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
@@ -58,7 +59,7 @@
                             <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                         </group>
                     </page>
-                    <page string="History">
+                    <page string="History" groups="base.group_extended">
                         <field name="id" select="1"/>
                         <field name="active" select="2"/>
                         <field name="categ_id" on_change="onchange_categ_id(categ_id)" select="2"/>
@@ -86,7 +87,7 @@
                             </form>
                         </field>
                     </page>
-                    <page string="Emails">
+                    <page string="Emails" groups="base.group_extended">
                        <group colspan="4">
                            <field colspan="4" name="email_cc" string="CC"/>
                        </group>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index b865bb5a1d0..a8e8c2cd3bb 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -46,7 +46,7 @@
                     <group colspan="4" col="4">
                     <notebook>
                     <page string="Leads">
-                        <separator colspan="4" string="Communication"/>                                                                        
+                        <separator colspan="4" string="Communication"/>
                         <field name="partner_id" string="Partner"
                         	on_change="onchange_partner_id(partner_id)" />
                         <field name="partner_address_id"
@@ -58,17 +58,17 @@
                         <group colspan="4" col="6">
                             <field name="user_id" select="2"/>                                                        
                             <field name="stage_id" select="1" string="Status" widget="selection" domain="[('object_id.model', '=', 'crm.lead')]"/>                                
-                            <field name="categ_id" select="1" on_change="onchange_categ_id(categ_id)" string="Lead Source" widget="selection" domain="[('object_id.model', '=', 'crm.opportunity')]"/>
-                       
+                            <field name="categ_id" select="1"
+                            	on_change="onchange_categ_id(categ_id)"
+                            	string="Lead Source" widget="selection"
+                            	domain="[('object_id.model', '=', 'crm.opportunity')]" />
                             <field name="type_id" string="Campaign" select="1"/>
                             <field name="section_id" colspan="1" widget="selection"/>
                             <field name="priority" string="Priority"/>
-            
                             <field name="date" string="Create Date"/>
 	                    </group>
                         <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
-
                         <separator colspan="4"/>
                         <group col="8" colspan="4">
                             <field name="state" select="2"/>
@@ -105,13 +105,13 @@
                                 <field name="date"/>
                             </tree>
                         </field>
-                        <button colspan="4" string="Send New Email" name="%(crm.wizard_crm_new_send_mail)d" context="{'mail':'new'}" icon="gtk-go-forward" type="action"/>
+                        <button colspan="4" string="Send New Email"
+                        	name="%(crm.wizard_crm_new_send_mail)d"
+                        	context="{'mail':'new'}" icon="gtk-go-forward"
+                        	type="action" />
                      </page>
                     </notebook>
                     </group>
-
-                
-
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 07bdd9438cd..08f55ade474 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -115,8 +115,8 @@
             <tree string="Meetings Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                 <field name="id" widget="char"/>
                 <field name="name" string="Title"/>
-                <field name="date" string="Next Meeting"/>
-                <field name="section_id" widget="selection"/>
+                <field name="date" string="Meeting Date"/>
+                <field name="section_id" />
                 <field name="priority"/>
                 <field name="categ_id"/>
                 <field name="user_id"/>
@@ -162,7 +162,7 @@
             	<search string="Search Meetings">
                		<group col="12" colspan="4">
                			<filter icon="terp-crm" string="My Meetings" domain="[('user_id','=',uid)]" help="My Meetings"/>
-	               		<filter icon="terp-crm" string="Draft" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
+	               		<filter icon="terp-crm" string="Current" domain="[('state','in',('draft', 'open'))]" default="1" help="Current Meetings"/>
 	                    <filter icon="terp-crm" string="Confirmed" domain="[('state','=','done')]" help="Confirmed Meetings"/>
 	               		<separator orientation="vertical"/>
 	               		<field name="name" select="1" string="Subject"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 5cb39d37119..4916fbe174a 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -91,7 +91,7 @@
                     </group>
                 </page>
 
-                <page string="History">
+                <page string="History" groups="base.group_extended">
                     <field name="active"/>
                     <field name="canal_id"/>
                     <field name="som"/>
@@ -116,7 +116,7 @@
                         </form>
                     </field>
                 </page>
-                 <page string="Emails">
+                 <page string="Emails" groups="base.group_extended">
                    <group colspan="4">
                        <field colspan="4" name="email_cc" string="CC"/>
                    </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index f64cf5fda54..9ae2533c85c 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -77,53 +77,64 @@
         <field name="model">crm.phonecall</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Phone Call">
-                <group colspan="4" col="4">
-                    <field name="name" string="Subject"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="user_id" string="Assigned to" select="2"/>
-                    <field name="date" string="Planned Date"/>
-                    <field name="duration"/>
-                    <field name="opportunity_id" on_change="onchange_case_id(case_id, name, partner_id)"
-                    context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
-                           'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
-	                          'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}"/>
-					<newline/>
-					<group col="5" colspan="4">
-						<label string="" colspan="2"/>
-						<button string="Schedule a Meeting"
-	                        name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo" type="action" />
-	                    <button string="Convert to Opportunity" name="%(wizard_crm_phonecall_opportunity_set)d" icon="gtk-index" type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
-                	</group>
-                <notebook colspan="4">
-                <page string="General">
-                    <field name="categ_id" string="Direction" select="1" on_change="onchange_categ_id(categ_id)" required="1" readonly="1"/>
-                    <field name="active" string="Reminder"/>
-                    <group colspan="2" col="3">
-                        <field name="partner_id" string="Partner"/>
-                        <button string="Convert to Partner" icon="terp-crm" name="%(wizard_crm_phonecall_partner_create)d" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"  />
-                    </group>
-                    <field name="partner_address_id" string="Contact"/>
-                    <field name="partner_phone"/>
-                    <field name="partner_mobile"/>
-                    <newline/>
-                    <field name="som"/>
-                    <field name="priority" string="Relevant"/>
-                    <separator string= "Description" colspan="4"/>
-                    <field name="description" nolabel="1" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group col="8" colspan="4">
-                        <field name="state" select="1"/>
-                        <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
-                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
-                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
-                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
-                    </group>
-                </page>
-               </notebook>
-               </group>
-           </form>
+        	<form string="Phone Call">
+        		<group colspan="4" col="4">
+        			<field name="name" string="Subject" />
+        			<field name="date" string="Planned Date" />
+        			<field name="partner_phone" />
+        			<field name="duration" />
+        			<newline />
+        			<group col="7" colspan="4">
+        				<label string="" colspan="2" />
+        				<button string="Schedule a Meeting"
+        					name="%(wizard_crm_phonecall_meeting_set)d" icon="gtk-redo"
+        					type="action" />
+        				<button string="Convert to Opportunity"
+        					name="%(wizard_crm_phonecall_opportunity_set)d"
+        					icon="gtk-index" type="action"
+        					attrs="{'invisible':[('opportunity_id','!=',False)]}" />
+        				<button string="Convert to Partner"
+        					icon="terp-crm"
+        					name="%(wizard_crm_phonecall_partner_create)d"
+        					type="action"
+        					attrs="{'invisible':[('partner_id','!=',False)]}" />
+        			</group>
+        			<group colspan="4" col="4">
+        				<notebook colspan="4">
+        					<page string="General">
+        						<separator colspan="4" string="Communication" />
+        						<field name="partner_id" />
+        						<field name="partner_address_id" string="Contact" />
+        						<field name="partner_mobile" />
+        						<separator colspan="4" string="Status and Categarization" />
+        						<group colspan="4" col="6">
+	        						<field name="user_id" string="Assigned to" select="2" />
+	        						<field name="section_id" colspan="1" widget="selection" />
+	        						<field name="opportunity_id"
+	        							on_change="onchange_case_id(case_id, name, partner_id)"
+	        							context="{'default_name':name,'default_section_id':section_id,'default_user_id':user_id,'default_duration':duration,
+                           					'default_partner_id':partner_id,'default_partner_address_id':partner_address_id,'default_partner_phone':partner_phone,
+	                          				'default_partner_mobile':partner_mobile,'default_categ_id':categ_id}" />
+	        						<field name="som" />
+	        						<field name="priority" />
+	        						<field name="active" string="Reminder" />
+	        					</group>
+	        					<separator string="Description" colspan="4" />
+	        					<field name="description" nolabel="1" colspan="4" />
+        						<separator colspan="4" />
+        						<group col="8" colspan="4">
+        							<field name="state" select="1" />
+        							<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+			                        <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
+			                        <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-undo"/>
+			                        <button name="case_close" string="Held" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+			                        <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+        						</group>
+        					</page>
+        				</notebook>
+        			</group>
+        		</group>
+        	</form>
         </field>
     </record>
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index fe29f3125d8..9996ed372ad 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -372,7 +372,7 @@
                                 <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
-                        <page string="History">
+                        <page string="History" groups="base.group_extended">
                             <field name="id" select="1"/>
                             <field name="active" select="2"/>
                             <separator colspan="4" string="Dates"/>
@@ -390,7 +390,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Emails">
+                        <page string="Emails" groups="base.group_extended">
                            <group colspan="4">
                                <field colspan="4" name="email_cc" string="CC"/>
                            </group>

From a783606193b715ba65442f738703d3f0b03cb166 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 14:35:03 +0530
Subject: [PATCH 14/30] [IMP] caldav: invite attendee with delegration

bzr revid: hmo@tinyerp.com-20100208090503-hct2lgekj5cofunm
---
 addons/caldav/caldav.py         | 253 +++++++++++++++++---------------
 addons/caldav/caldav_view.xml   |   6 +-
 addons/crm/crm_meeting_view.xml |   2 +-
 3 files changed, 141 insertions(+), 120 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index d440902f9e2..96c2179dc50 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -172,6 +172,96 @@ html_invitation = """
 </html>
 """
 
+class invite_attendee_wizard(osv.osv_memory):
+    _name = "caldav.invite.attendee"
+    _description = "Invite Attendees"
+
+    _columns = {
+        'type': fields.selection([('internal', 'Internal User'), \
+              ('external', 'External Email'), \
+              ('partner', 'Partner Contacts')], 'Type', required=True), 
+        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
+                                  'invite_id', 'user_id', 'Users'), 
+        'partner_id': fields.many2one('res.partner', 'Partner'), 
+        'email': fields.char('Email', size=124), 
+        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
+                                  'invite_id', 'contact_id', 'Contacts'), 
+              }
+
+    
+
+    def do_invite(self, cr, uid, ids, context={}):            
+        datas = self.read(cr, uid, ids)[0]
+        model = False
+        model_field = False
+        if not context or not context.get('model'):
+            return {}
+        else:
+            model = context.get('model')
+        model_field = context.get('attendee_field', False)
+        obj = self.pool.get(model)
+        res_obj = obj.browse(cr, uid, context['active_id'])
+        type = datas.get('type')
+        att_obj = self.pool.get('calendar.attendee')
+        vals = {}
+        mail_to = []
+        if not model == 'calendar.attendee':
+            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
+
+        if type == 'internal':
+            user_obj = self.pool.get('res.users')
+            for user_id in datas.get('user_ids', []):
+                user = user_obj.browse(cr, uid, user_id)
+                if not user.address_id.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("User does not have an email Address"))
+                vals.update({'user_id': user_id, 
+                                     'email': user.address_id.email})
+                mail_to.append(user.address_id.email)
+                
+        elif  type == 'external' and datas.get('email'):
+            vals.update({'email': datas['email']})
+            mail_to.append(datas['email'])
+        elif  type == 'partner':
+            add_obj = self.pool.get('res.partner.address')
+            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
+                if not contact.email:
+                    raise osv.except_osv(_('Error!'), \
+                                    ("Partner does not have an email Address"))
+                vals.update({
+                             'partner_address_id': contact.id, 
+                             'email': contact.email})
+                mail_to.append(contact.email)
+
+        if model == 'calendar.attendee':
+            att = att_obj.browse(cr, uid, context['active_id'])
+            vals.update({
+                'parent_ids' : [(4, att.id)],
+                'ref': att.ref
+            })
+        att_id = att_obj.create(cr, uid, vals)
+        if model_field:
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
+
+        att_obj._send_mail(cr, uid, [att_id], mail_to, email_from=tools.config.get('email_from', False))
+                
+        return {}
+
+
+    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
+        if not partner_id:
+            return {'value': {'contact_ids': []}}
+        cr.execute('select id from res_partner_address \
+                         where partner_id=%s' % (partner_id))
+        contacts = map(lambda x: x[0], cr.fetchall())
+        if not contacts:
+            raise osv.except_osv(_('Error!'), \
+                                ("Partner does not have any Contacts"))
+
+        return {'value': {'contact_ids': contacts}}
+
+invite_attendee_wizard()
+
 class calendar_attendee(osv.osv):
     _name = 'calendar.attendee'
     _description = 'Attendee information'
@@ -206,10 +296,14 @@ class calendar_attendee(osv.osv):
                 else:
                     result[id][name] = self._get_address(None, attdata.email)
             if name == 'delegated_to':
-                todata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_to_user_ids)
+                todata = []
+                for parent in attdata.parent_ids:
+                    todata.append('MAILTO:' + parent.email)
                 result[id][name] = ', '.join(todata)
             if name == 'delegated_from':
-                fromdata = map(lambda x:('MAILTO:' + x.email) or '', attdata.del_from_user_ids)
+                fromdata = []
+                for child in attdata.child_ids:
+                    fromdata.append('MAILTO:' + child.email)
                 result[id][name] = ', '.join(fromdata)
             if name == 'event_date':
                 if attdata.ref:
@@ -277,13 +371,11 @@ class calendar_attendee(osv.osv):
         'delegated_to': fields.function(_compute_data, method=True, \
                 string='Delegated To', type="char", size=124, store=True, \
                 multi='delegated_to', help="The users that the original \
-request was delegated to"), 
-        'del_to_user_ids': fields.many2many('calendar.attendee', 'att_del_to_user_rel', 
-                                  'attendee_id', 'user_id', 'Users'), 
+request was delegated to"),         
         'delegated_from': fields.function(_compute_data, method=True, string=\
-            'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 
-        'del_from_user_ids': fields.many2many('calendar.attendee', 'att_del_from_user_rel', \
-                                      'attendee_id', 'user_id', 'Users'), 
+            'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated To'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated From'),  
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -326,6 +418,43 @@ request was delegated to"),
                 self.write(cr, uid, ids, {'state': status})
         return True
 
+    def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context={}):
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
+        for att in self.browse(cr, uid, ids, context=context):
+            sign = att.sent_by_uid and att.sent_by_uid.signature or ''
+            sign = '<br>'.join(sign and sign.split('\n') or [])
+            model, res_id = tuple(att.ref.split(','))            
+            res_obj = self.pool.get(model).browse(cr, uid, res_id)
+            if res_obj and len(res_obj):
+                res_obj = res_obj[0]
+            sub = '[%s Invitation][%d] %s'  % (company, att.id, res_obj.name)
+            att_infos = []
+            other_invitaion_ids = self.search(cr, uid, [('ref','=',att.ref)])
+            for att2 in self.browse(cr, uid, other_invitaion_ids):
+                att_infos.append(((att2.user_id and att2.user_id.name) or \
+                             (att2.partner_id and att2.partner_id.name) or \
+                                att2.email) +  ' - Status: ' + att2.state.title())
+            body_vals = {'name': res_obj.name, 
+                        'start_date': res_obj.date, 
+                        'end_date': res_obj.date_deadline or None, 
+                        'description': res_obj.description or '-', 
+                        'location': res_obj.location or '-', 
+                        'attendees': '<br>'.join(att_infos), 
+                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
+                        'sign': sign, 
+                        'company': company
+            }
+            body = html_invitation % body_vals
+            if mail_to and email_from:
+                tools.email_send(
+                        email_from, 
+                        mail_to, 
+                        sub, 
+                        body, 
+                        subtype='html', 
+                        reply_to=email_from
+                    ) 
+            return True
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         if not user_id:
             return {'value': {'email': ''}}
@@ -1140,112 +1269,4 @@ class res_users(osv.osv):
                     string='Free/Busy', method=True), 
     }
 res_users()
-
-class invite_attendee_wizard(osv.osv_memory):
-    _name = "caldav.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True), 
-        'user_ids': fields.many2many('res.users', 'invite_user_rel', 
-                                  'invite_id', 'user_id', 'Users'), 
-        'partner_id': fields.many2one('res.partner', 'Partner'), 
-        'email': fields.char('Email', size=124), 
-        'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
-                                  'invite_id', 'contact_id', 'Contacts'), 
-              }
-
-    def do_invite(self, cr, uid, ids, context={}):
-        model2field = {
-                       'calendar.attendee': 'del_to_user_ids', 
-                       'crm.meeting': 'attendee_ids'}
-        datas = self.read(cr, uid, ids)[0]
-        if not context or not context.get('model'):
-            return {}
-        else:
-            model = context.get('model')
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context['active_id'])
-        type = datas.get('type')
-        att_obj = self.pool.get('calendar.attendee')
-        vals = {}
-        if not model == 'calendar.attendee':
-            vals = {'ref': '%s,%s' % (model, caldav_id2real_id(context['active_id']))}
-        if type == 'internal':
-            user_obj = self.pool.get('res.users')
-            for user_id in datas.get('user_ids', []):
-                user = user_obj.browse(cr, uid, user_id)
-                if not user.address_id.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("User does not have an email Address"))
-                vals.update({'user_id': user_id, 
-                                     'email': user.address_id.email})
-                att_id = att_obj.create(cr, uid, vals)
-                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-
-        elif  type == 'external' and datas.get('email'):
-            vals.update({'email': datas['email']})
-            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-            att_infos = []
-            for att in res_obj.attendee_ids:
-                att_infos.append(((att.user_id and att.user_id.name) or \
-                             (att.partner_id and att.partner_id.name) or \
-                                att.email) +  ' - Status: ' + att.state.title())
-            att_id = att_obj.create(cr, uid, vals)
-            obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-            sign = res_obj.user_id and res_obj.user_id.signature or ''
-            sign = '<br>'.join(sign and sign.split('\n') or [])
-            sub = '[%s Invitation][%d] %s'  % (company, att_id, res_obj.name)
-            body_vals = {'name': res_obj.name, 
-                        'start_date': res_obj.date, 
-                        'end_date': res_obj.date_deadline or None, 
-                        'description': res_obj.description or '-', 
-                        'location': res_obj.location or '-', 
-                        'attendees': '<br>'.join(att_infos), 
-                        'user': res_obj.user_id and res_obj.user_id.name or 'OpenERP User', 
-                        'sign': sign, 
-                        'company': company
-            }
-            body = html_invitation % body_vals
-            mail_to = [datas['email']]
-            tools.email_send(
-                    tools.config.get('email_from', False), 
-                    mail_to, 
-                    sub, 
-                    body, 
-                    subtype='html', 
-                    reply_to=tools.config.get('email_from', False)
-                )
-
-        elif  type == 'partner':
-            add_obj = self.pool.get('res.partner.address')
-            for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                if not contact.email:
-                    raise osv.except_osv(_('Error!'), \
-                                    ("Partner does not have an email Address"))
-                vals.update({
-                             'partner_address_id': contact.id, 
-                             'email': contact.email})
-                att_id = att_obj.create(cr, uid, vals)
-                obj.write(cr, uid, res_obj.id, {model2field[model]: [(4, att_id)]})
-        return {}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('select id from res_partner_address \
-                         where partner_id=%s' % (partner_id))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        if not contacts:
-            raise osv.except_osv(_('Error!'), \
-                                ("Partner does not have any Contacts"))
-
-        return {'value': {'contact_ids': contacts}}
-
-invite_attendee_wizard()
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 2d3a59892c7..a21d6a0366b 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -85,10 +85,10 @@
             			</page>
             			<page string="Delegation Info">
             				<separator string="Delegated to" colspan="4" />
-            				<field name="del_to_user_ids" nolabel="1"
+            				<field name="parent_ids" nolabel="1"
             					colspan="4" readonly="1" />
             				<separator string="Delegated from" colspan="4" />
-            				<field name="del_from_user_ids" nolabel="1"
+            				<field name="child_ids" nolabel="1"
             					colspan="4" readonly="1" />
             			</page>
             		</notebook>
@@ -105,7 +105,7 @@
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
 	                        	icon="gtk-sort-descending"
-	                        	context="{'model' : 'calendar.attendee', 'state' : 'delegated'}" />
+	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>
             </field>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 08f55ade474..76e462cffc7 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -58,7 +58,7 @@
             			<button string="Invite People"
             				name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
             				icon="terp-partner" type="action"
-            				context="{'model' : 'crm.meeting'}" colspan="2"/>
+            				context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
             			<field name="attendee_ids" colspan="4"
             				nolabel="1" widget="one2many" mode="tree,form">
             				<tree string="Atendee details" editable="top">

From 1a823ab32da5763a5df3467de16dcabb72aa1fa2 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 14:51:58 +0530
Subject: [PATCH 15/30] [IMP] crm: fundrising and helpdisk support view

bzr revid: hmo@tinyerp.com-20100208092158-1pfuuevh6olss9tx
---
 addons/crm/crm_fund_view.xml     | 10 +++++-----
 addons/crm/crm_helpdesk_view.xml | 27 +++++++++++++++------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/crm/crm_fund_view.xml b/addons/crm/crm_fund_view.xml
index b172add3df0..7260ed1e513 100644
--- a/addons/crm/crm_fund_view.xml
+++ b/addons/crm/crm_fund_view.xml
@@ -59,9 +59,8 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Funds Form">
-                <group colspan="4" col="6">
-                    <field name="name" select="1" string="Name" colspan="4"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
+                <group colspan="4" col="4">
+                    <field name="name" select="1" string="Name"/>                    
                     <field name="type_id" string="Payment Mode" select="1" widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                 </group>
@@ -77,16 +76,17 @@
                     <field name="planned_cost"/>
                     <field name="planned_revenue"/>
                     <field name="probability"/>
-                    <separator colspan="4" string="Status and Categarization"/>
+                    <separator colspan="4" string="Categarization"/>
                     <group colspan="4" col="6">
                     	<field name="user_id" select="2" string="Responsible"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
                     	<field name="categ_id" select="1"
                     		on_change="onchange_categ_id(categ_id)"  widget="selection"
                     		domain="[('object_id.model', '=', 'crm.fundraising')]" />
                     	<field name="date"/>
 	                    <field name="duration"/>
                     </group>
-                    <separator colspan="4" string="Description Information"/>
+                    <separator colspan="4" string="Details"/>
                         <field name="description" nolabel="1" colspan="4"/>
                     <separator colspan="4"/>
                     <group col="8" colspan="4">
diff --git a/addons/crm/crm_helpdesk_view.xml b/addons/crm/crm_helpdesk_view.xml
index 6773bb160c6..9c9045c5f87 100644
--- a/addons/crm/crm_helpdesk_view.xml
+++ b/addons/crm/crm_helpdesk_view.xml
@@ -25,28 +25,31 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Helpdesk Support">
-                <group colspan="4" col="7">
-                    <field colspan="4" name="name" select="1"/>
-                    <field name="section_id" widget="selection"/>
-					<newline/>
+                <group colspan="4" col="4">
+                    <field colspan="4" name="name" select="1"/>                    					
                     <field name="date" select="1"/>
-                    <field name="date_deadline" select="2"/>
-                    <field name="priority"/>
+                    <field name="date_deadline" select="2"/>                    
                 </group>
                 <notebook colspan="4">
                     <page string="General">
                     	<separator colspan="4" string="Communication"/>
-                        <group col="8" colspan="4">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
-                            <field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
-                            <newline/>
-                            <field colspan="3" name="email_from" select="2"/>
+                        <group col="7" colspan="4">
+                            <field  name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
+                            <field  name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
+                            
+                            <field  name="email_from" select="2"/>
                             <button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
+                            
+                        </group>
+                        <separator colspan="4" string="Categarization"/>
+                        <group col="7" colspan="4">
+                            <field name="priority"/>
+                            <field name="section_id" widget="selection"/>
                             <field name="user_id" select="1"/>
                             <button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
                         </group>
 
-                        <separator colspan="4" string="Description"/>
+                        <separator colspan="4" string="Details"/>
                         <field name="description" colspan="4" nolabel="1"/>
                         <separator colspan="4"/>
                         <group col="8" colspan="4">

From 9165d7aa7029eb6b10e2871902841d27b9d981c5 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 15:05:14 +0530
Subject: [PATCH 16/30] [IMP] mail_gate: improve view of mail_gate history

bzr revid: hmo@tinyerp.com-20100208093514-r7zajo46by9qfksj
---
 addons/mail_gateway/mail_gateway.py       | 1 +
 addons/mail_gateway/mail_gateway_view.xml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 314168c4b03..c047c3840b4 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -388,6 +388,7 @@ class mail_gateway_history(osv.osv):
         'name': fields.char('Message Id', size=64, help="Message Id in Email Server."),
         'res_id': fields.integer("Resource ID"),        
         'gateway_id': fields.many2one('mail.gateway',"Mail Gateway", required=True),
+        'model_id':fields.related('gateway_id', 'object_id', type='many2one', relation='ir.model', string='Model'), 
         'note': fields.text('Notes'),
     }
     _order = 'id desc'
diff --git a/addons/mail_gateway/mail_gateway_view.xml b/addons/mail_gateway/mail_gateway_view.xml
index 465eea92b44..fa4f1146311 100644
--- a/addons/mail_gateway/mail_gateway_view.xml
+++ b/addons/mail_gateway/mail_gateway_view.xml
@@ -8,6 +8,8 @@
             <field name="arch" type="xml">
                 <form string="Gateway History">
                     <field name="name"/>
+                    <field name="gateway_id"/>
+                    <field name="model_id"/>
                     <field name="res_id"/>
                     <separator string="Note" colspan="4"/>
                     <field name="note" nolabel="1" colspan="4"/>
@@ -22,6 +24,7 @@
             <field name="arch" type="xml">
                 <tree string="Gateway History">
                     <field name="name" select="1"/>
+                    <field name="model_id"/>
                     <field name="res_id"/>
                     <field name="gateway_id"/>
                 </tree>

From e6213959fa6f143c0192061fd50423a2a640de2c Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 15:27:04 +0530
Subject: [PATCH 17/30] [IMP]: caldav: Improvement in Invite Attendee

bzr revid: rpa@openerp.co.in-20100208095704-zvgmjs8pnkw6zyix
---
 addons/caldav/caldav.py       | 19 +++++++++++--------
 addons/caldav/caldav_view.xml | 13 +++++++------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 96c2179dc50..05e108cf4e5 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -186,10 +186,10 @@ class invite_attendee_wizard(osv.osv_memory):
         'email': fields.char('Email', size=124), 
         'contact_ids': fields.many2many('res.partner.address', 'invite_contact_rel', 
                                   'invite_id', 'contact_id', 'Contacts'), 
+        'send_mail': fields.boolean('Send mail?', help='Check this if you want\
+ to send an Email to Invited Person')
               }
 
-    
-
     def do_invite(self, cr, uid, ids, context={}):            
         datas = self.read(cr, uid, ids)[0]
         model = False
@@ -241,9 +241,12 @@ class invite_attendee_wizard(osv.osv_memory):
             })
         att_id = att_obj.create(cr, uid, vals)
         if model_field:
-            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)]})
-
-        att_obj._send_mail(cr, uid, [att_id], mail_to, email_from=tools.config.get('email_from', False))
+            obj.write(cr, uid, res_obj.id, {model_field: [(4, att_id)], 
+                                            'state': 'delegated'})
+        
+        if datas.get('send_mail'):
+            att_obj._send_mail(cr, uid, [att_id], mail_to, \
+                   email_from=tools.config.get('email_from', False))
                 
         return {}
 
@@ -374,8 +377,8 @@ class calendar_attendee(osv.osv):
 request was delegated to"),         
         'delegated_from': fields.function(_compute_data, method=True, string=\
             'Delegated From', type="char", store=True, size=124, multi='delegated_from'),        
-        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated To'),
-        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated From'),  
+        'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', 'attendee_id', 'parent_id', 'Delegrated From'),
+        'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', 'attendee_id', 'child_id', 'Delegrated To'),  
         'sent_by': fields.function(_compute_data, method=True, string='Sent By', type="char", multi='sent_by', store=True, size=124, help="Specify the user that is acting on behalf of the calendar user"), 
         'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', type="many2one", relation="res.users", multi='sent_by_uid'), 
         'cn': fields.function(_compute_data, method=True, string='Common name', type="char", size=124, multi='cn', store=True), 
@@ -394,7 +397,7 @@ request was delegated to"),
         'state':  lambda *x: 'needs-action', 
     }
     
-    response_re = response_re = re.compile("Are you coming\?.*(YES|NO|MAYBE).*", re.UNICODE)
+    response_re = response_re = re.compile("Are you coming\?.*\n*.*(YES|NO|MAYBE).*", re.UNICODE)
     
     def msg_new(self, cr, uid, msg):        
         return False
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index a21d6a0366b..32038d3e3ee 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -11,6 +11,7 @@
             <field name="arch" type="xml">
                 <form string="Invite People">
                 	<field name="type" />
+                	<field name="send_mail" />
                 	<newline/>
                 	<group col="1" colspan="4"
                 		attrs="{'invisible': [('type', '!=', 'external')]}">
@@ -84,27 +85,27 @@
             				<field name="ref" colspan="4" readonly="1"/>
             			</page>
             			<page string="Delegation Info">
-            				<separator string="Delegated to" colspan="4" />
+            				<separator string="Delegated From" colspan="4" />
             				<field name="parent_ids" nolabel="1"
             					colspan="4" readonly="1" />
-            				<separator string="Delegated from" colspan="4" />
+            				<separator string="Delegated To" colspan="4" />
             				<field name="child_ids" nolabel="1"
             					colspan="4" readonly="1" />
             			</page>
             		</notebook>
             		<group col="6" colspan="4">
 	                        <field name="state" select="2" />
-	                        <button name="do_tentative"
+	                        <button name="do_tentative" states="needs-action,declined,accepted"
 	                        	string="Uncertain" type="object"
 	                        	icon="terp-crm" />
-	                        <button name="do_accept" string="Accept"
+	                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined"
 	                        	type="object" icon="gtk-apply" />
-	                        <button name="do_decline" string="Decline"
+	                        <button name="do_decline" string="Decline"  states="needs-action,tentative,accepted"
 	                        	type="object" icon="gtk-cancel" />
 	                        <button
 	                        	name="%(caldav.action_view_calendar_invite_attendee_wizard)d"
 	                        	string="Delegate" type="action"
-	                        	icon="gtk-sort-descending"
+	                        	icon="gtk-sort-descending" states="needs-action,tentative,declined,accepted"
 	                        	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
             		</group>
             	</form>

From e2203a41c0dc0a9563643ed0432ccd54f7912a30 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 15:34:34 +0530
Subject: [PATCH 18/30] [IMP]:survey:Improved.(small changes).

bzr revid: apa@tinyerp.com-20100208100434-lwxit6u5h1gihmm2
---
 addons/survey/report/survey_browse_response.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 7192a6faeb3..986fb0ccb2f 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -158,7 +158,7 @@ class survey_browse_response(report_rml):
                               <para style="terp_tblheader_General_Centre">Response Create Date </para>
                             </td>
                             <td>
-                              <para style="terp_tblheader_General_Centre">Respose By </para>
+                              <para style="terp_tblheader_General_Centre">Response By </para>
                             </td>
                             <td>
                               <para style="terp_tblheader_General_Centre">Status</para>
@@ -243,17 +243,17 @@ class survey_browse_response(report_rml):
                                 ans_list = []
                                 for ans in answer[0].response_answer_ids:
                                     ans_list.append(to_xml(tools.ustr(ans.answer_id.answer)))
-                        
+
                                 answer_choice=[]
                                 _divide_columns_for_matrix = 20
                                 _display_ans_in_rows = 5
                                 _tbl_widths = 500
                                 for ans in que['answer_choice_ids']:
                                     answer_choice.append(to_xml(tools.ustr((ans.answer))))
-        
+
                                 def divide_list(lst, n):
                                     return [lst[i::n] for i in range(n)]
-        
+
                                 divide_list = divide_list(answer_choice,_display_ans_in_rows)
                                 for lst in divide_list:
                                     if que.type == 'multiple_choice_multiple_ans':

From 6012e8fb7051dc5465bf7019e491d6fd31b7353e Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 15:38:53 +0530
Subject: [PATCH 19/30] [IMP] sale: change the name of filter string in serach
 view

bzr revid: sbh@tinyerp.com-20100208100853-2adsv054n1sp2aso
---
 addons/sale/sale_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9eee62b95d7..272117a132b 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,7 +244,7 @@
                         <field name="date_order" select="1"/>
 					</group>
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
-						<filter string="By Parnter" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
+						<filter string="By Customer" icon="terp-sale" domain="[]" default="1" context="{'group_by':'partner_id'}"/>
                         <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="By Order Date" icon="terp-sale" domain="[]" context="{'group_by':'date_order'}"/>
 					</group>                        
@@ -414,7 +414,7 @@
 					<group expand="context.get('report',False)" string="Group By..." colspan="4" col="8">
 						<filter string="By Product" icon="terp-sale"  default="1" domain="[]" context="{'group_by':'product_id'}"/>
                         <filter string="By Order" icon="terp-sale" domain="[]" context="{'group_by':'order_id'}"/>
-                        <filter string="By State" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="By Scheduled" icon="terp-sale" domain="[]" context="{'group_by':'state'}"/>
 					</group>                        
                         
                     </group>

From 10be0d9f33c6a09169b741a437b20b523dcfa721 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 8 Feb 2010 16:00:26 +0530
Subject: [PATCH 20/30] [Fix] sale_crm: change the name of model_id

bzr revid: sbh@tinyerp.com-20100208103026-8f8268mr7b6qcv45
---
 addons/sale_crm/process/sale_crm_process.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml
index e3a81b3cd7e..1b469b32d46 100755
--- a/addons/sale_crm/process/sale_crm_process.xml
+++ b/addons/sale_crm/process/sale_crm_process.xml
@@ -30,7 +30,7 @@
 
         <record id="process_node_contractanalytic0" model="process.node">
             <field name="menu_id" ref="account.account_analytic_def_account"/>
-            <field name="model_id" ref="account.model_account_analytic_account"/>
+            <field name="model_id" ref="analytic.model_account_analytic_account"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>

From 94b515475e1ffe9db0af3b395b0c801b45982bf7 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 16:06:04 +0530
Subject: [PATCH 21/30] [IMP] crm: meeting view

bzr revid: hmo@tinyerp.com-20100208103604-f64f42x8ut4madbt
---
 addons/crm/crm_meeting_view.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 76e462cffc7..7df73a7210b 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -24,19 +24,17 @@
         <field name="model">crm.meeting</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Meetings Form">
-            	<group col="4" colspan="6">
-            		<field name="name" select="1" string="Summary"
-            			colspan="3" />
-            		<field name="section_id" widget="selection"
-            			colspan="1" />
-            	</group>
-            	<group col="6" colspan="6">
+            <form string="Meetings Form">            	
+            	<group col="6" colspan="4">
+                    <field name="name" select="1" string="Summary"
+            			colspan="4" />
+                    <field name="location" />
             		<field name="date" string="Start Date" required="1" />
             		<field name="duration" widget="float_time" />
             		<field name="date_deadline" string="End Date" required="1" />
-            		<field name="location" />
+            		
             		<field name="categ_id"/>
+                    <field name="alarm_id" string="Reminder" widget="selection" />
             		<group colspan="2" col="3" attrs="{'readonly':[('recurrent_uid','!=',False)]}">
                             <field name="rrule_type" string="Recurrency"
                             	on_change="onchange_rrule_type(rrule_type)"
@@ -87,10 +85,11 @@
             		</page>
             		<page string="Other Information">
             			<field name="priority"/>
-            			<field name="show_as"/>
-            			<field name="alarm_id" string="Reminder" widget="selection" />
+            			<field name="show_as"/>            			
             			<field name="class"/>
             			<field name="user_id"/>
+                        <field name="section_id" widget="selection"
+            			/>
             			<field name="vtimezone"/>
             			<field name="recurrent_id" invisible="1" />
             			<field name="recurrent_uid" invisible="1" />

From a59e83e73e9926ffdc78e92ac5813b172e93d280 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 16:43:06 +0530
Subject: [PATCH 22/30] [IMP]: caldav: Changed timezone on Changing user

bzr revid: rpa@openerp.co.in-20100208111306-pf9gvg1pd41ed2fo
---
 addons/caldav/caldav.py         | 14 ++++++++++++--
 addons/crm/crm_meeting_view.xml |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 05e108cf4e5..f8c30e10478 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -190,7 +190,7 @@ class invite_attendee_wizard(osv.osv_memory):
  to send an Email to Invited Person')
               }
 
-    def do_invite(self, cr, uid, ids, context={}):            
+    def do_invite(self, cr, uid, ids, context={}):
         datas = self.read(cr, uid, ids)[0]
         model = False
         model_field = False
@@ -386,7 +386,7 @@ request was delegated to"),
         'language':  fields.function(_compute_data, method=True, string='Language', type="selection", selection=_lang_get, multi='language', store=True, help="To specify the language for text values in a property or property parameter."), 
         'user_id': fields.many2one('res.users', 'User'), 
         'partner_address_id': fields.many2one('res.partner.address', 'Contact'), 
-        'partner_id':fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
+        'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 
         'email': fields.char('Email', size=124, required=True), 
         'event_date': fields.function(_compute_data, method=True, string='Event Date', type="datetime", multi='event_date'), 
         'event_end_date': fields.function(_compute_data, method=True, string='Event End Date', type="datetime", multi='event_end_date'), 
@@ -753,6 +753,16 @@ rule or repeating pattern for anexception to a recurrence set"),
          'class': lambda *a: 'public', 
          'show_as': lambda *a: 'busy', 
     }
+    
+    def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
+        if not user_id:
+            return {'value': {'vtimezone': ''}}
+        value = {}
+        cr.execute('select context_tz from res_users where id=%s' % (user_id))
+        timezone = cr.fetchone()
+        if timezone:
+            value.update({'vtimezone': timezone[0].lower()})
+        return {'value': value}
 
     def export_cal(self, cr, uid, ids, context={}):
         ids = map(lambda x: caldav_id2real_id(x), ids)
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 7df73a7210b..78a0fc6e776 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -87,7 +87,7 @@
             			<field name="priority"/>
             			<field name="show_as"/>            			
             			<field name="class"/>
-            			<field name="user_id"/>
+            			<field name="user_id" on_change="onchange_user_id(user_id)"/>
                         <field name="section_id" widget="selection"
             			/>
             			<field name="vtimezone"/>

From 7cee90359f08a2b59ba0b1f1233903b0e9efde52 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 16:49:05 +0530
Subject: [PATCH 23/30] [IMP] crm: lead+Opp

bzr revid: hmo@tinyerp.com-20100208111905-i0m9e2dxl99218so
---
 addons/crm/crm_lead_view.xml        |  7 +++++++
 addons/crm/crm_opportunity_view.xml | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index a8e8c2cd3bb..856e1098c96 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -187,6 +187,13 @@
                            />
 					</field>
                </group>
+               <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="By Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
+                        <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
+                        
+                </group> 
            </search>
         </field>
     </record>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4916fbe174a..64b3d430d31 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -158,8 +158,8 @@
                 <field name="name" string="Opportunities"/>
                 <field name="stage_id"  string="Sales Stage"/>
                 <field name="partner_id" string="Partner"/>
-                <field name="planned_revenue"/>
-                <field name="probability"/>
+                <field name="planned_revenue" sum="Total of Planned Revenue"/>
+                <field name="probability" avg="Avg. of Probability"/>
                 <field name="date_deadline" string="Excepted Close Date"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -219,6 +219,12 @@
                                help="My section"/>
 			   		</field>
                </group>
+                <group expand="1" string="Group By..." colspan="4" col="20">
+                        <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
+                        <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
+                        <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        
+                </group>
            </search>
         </field>
     </record>

From 1413af2e652c93c72fa87d7fa088c528f9751afd Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 17:01:50 +0530
Subject: [PATCH 24/30] [IMP]:survey -improved the note in the survey form
 report. -improved the demo data of communit survey.

bzr revid: apa@tinyerp.com-20100208113150-4oqukenloo7uyra5
---
 addons/survey/report/survey_form.py |  7 +++++++
 addons/survey/survey_demo.xml       | 11 +----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 84d6de286fb..c273b7726de 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -144,6 +144,13 @@ class survey_form(report_rml):
                 <blockTable colWidths='"""+_tbl_widths+"""' style="title_tbl">
                     <tr><td><para style="title">""" + to_xml(tools.ustr(survey.title)) + """</para><para style="P2"><font></font></para></td></tr>
                 </blockTable>"""
+
+            if survey.note:
+                rml += """
+                <para style="P2"></para>
+                    <blockTable colWidths='"""+_tbl_widths+"""' style="note_table">
+                        <tr><td><para style="descriptive_text">""" + to_xml(tools.ustr(survey.note)) + """</para><para style="P2"><font></font></para></td></tr>
+                    </blockTable>"""
             seq = 0
             for page in survey.page_ids:
                 seq+=1
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 38784e23ce5..a65abbc9e96 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -2137,6 +2137,7 @@
 	<data noupdate="1">
 		<record id="survey_0_Community" model="survey">
 			<field name="title">Community Survey</field>
+			<field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
 			<field eval="1" name="response_user"/>
 			<field name="state">draft</field>
 			<field name="responsible_id" ref="base.user_root"/>
@@ -2146,7 +2147,6 @@
 	</data>
 	<data>
 		<record id="survey_page_0_Community" model="survey.page">
-			<field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
 			<field name="title">Service Characteristics</field>
 			<field name="survey_id" ref="survey_0_Community"/>
 			<field eval="1" name="sequence"/>
@@ -2805,13 +2805,4 @@
 			<field eval="8" name="sequence"/>
 		</record>
 	</data>
-
-
-
-
-
-
-
-
-
 </openerp>
\ No newline at end of file

From ab2924168e2e3e5443d604c0c406a96a4d497022 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 17:47:32 +0530
Subject: [PATCH 25/30] [IMP]:hr_evaluation -Improved demo data of Evaluation
 Form and Opinion.

bzr revid: apa@tinyerp.com-20100208121732-5sjmpz3jai2fghes
---
 addons/hr_evaluation/hr_evaluation_data.xml | 52 ++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index fdd66ca403c..cfa008964df 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -2,28 +2,28 @@
 <openerp>
 	<data>
 		<record id="survey_2" model="survey">
-			<field name="title">EMPLOYEE EVALUATION</field>
+			<field name="title">Employee Evaluation</field>
 			<field name="max_response_limit">20</field>
 			<field eval="[(6,0,[])]" name="users"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_3" model="survey">
-			<field name="title">EMPLOYEE OPINION</field>
+			<field name="title">Employee Opinion</field>
 			<field name="max_response_limit">20</field>
 			<field eval="[(6,0,[])]" name="users"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_page_1" model="survey.page">
-			<field name="title">EMPLOYEE EVALUATION FORM</field>
+			<field name="title">Employee Evaluation Form</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="1" name="sequence"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_page_2" model="survey.page">
-			<field name="title">PROCESS</field>
+			<field name="title">Process</field>
 			<field name="survey_id" ref="survey_3"/>
 			<field eval="1" name="sequence"/>
 		</record>
@@ -31,14 +31,14 @@
 
 	<data>
 		<record id="survey_page_5" model="survey.page">
-			<field name="title">WORK PLAN</field>
+			<field name="title">Work Plan</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="2" name="sequence"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_page_6" model="survey.page">
-			<field name="title">EMPLOYEE PERFORMANCE IN KEY AREAS</field>
+			<field name="title">Employee Performance In Key Areas</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="3" name="sequence"/>
 			<field name="note">The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
@@ -52,7 +52,7 @@
 
 	<data>
 		<record id="survey_page_16" model="survey.page">
-			<field name="title">PROFESSIONAL DEVELOPMENT AND PERFORMANCE PLAN (optional)</field>
+			<field name="title">Professional Development And Performance Plan (optional)</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="4" name="sequence"/>
 			<field name="note">Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. </field>
@@ -61,7 +61,7 @@
 
 	<data>
 		<record id="survey_page_26" model="survey.page">
-			<field name="title">EMPLOYEE COMMENTS</field>
+			<field name="title">Employee Comments</field>
 			<field name="survey_id" ref="survey_2"/>
 			<field eval="5" name="sequence"/>
 		</record>
@@ -69,7 +69,7 @@
 
 	<data>
 		<record id="survey_page_10" model="survey.page">
-			<field name="title">SURVEY</field>
+			<field name="title">Survey</field>
 			<field name="survey_id" ref="survey_3"/>
 			<field eval="5" name="sequence"/>
 		</record>
@@ -138,7 +138,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="1" name="sequence"/>
-			<field name="question">ENGAGEMENT</field>
+			<field name="question">Engagement</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -162,10 +162,10 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="1" name="sequence"/>
-			<field name="question">SUBJECT</field>
+			<field name="question">Subject</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field name="column_name">RECOMMENDATIONS / EVALUATIONS</field>
+			<field name="column_name">Recommendations / Evaluations</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
 			<field eval="0" name="make_comment_field"/>
 			<field eval="0" name="in_visible_menu_choice"/>
@@ -188,7 +188,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">LEADERSHIP</field>
+			<field name="question">Leadership</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field eval="0" name="in_visible_menu_choice"/>
@@ -209,7 +209,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">PROCESS</field>
+			<field name="question">Process</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -236,7 +236,7 @@
 			<field name="question">Supervisors only : </field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
-			<field name="column_name">RECOMMENDATIONS / EVALUATIONS </field>
+			<field name="column_name">Recommendations / Evaluations</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
 			<field eval="0" name="make_comment_field"/>
 			<field eval="0" name="in_visible_menu_choice"/>
@@ -259,7 +259,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="1" name="sequence"/>
-			<field name="question">WORK PLAN</field>
+			<field name="question">Work Plan</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">table</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -285,7 +285,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="3" name="sequence"/>
-			<field name="question">EFFECTIVENESS</field>
+			<field name="question">Effectiveness</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -312,7 +312,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="4" name="sequence"/>
-			<field name="question">CONTINUOUS IMPROVEMENT</field>
+			<field name="question">Continuous Improvement</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -362,7 +362,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="5" name="sequence"/>
-			<field name="question">OPENNESS</field>
+			<field name="question">Openness</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -389,7 +389,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="3" name="sequence"/>
-			<field name="question">OVERALL PERFORMANCE SUMMARY RATING</field>
+			<field name="question">Overall Performance Summary Rating</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">descriptive_text</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -415,7 +415,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">OVERALL PURPOSE OF EMPLOYEE APPRAISAL</field>
+			<field name="question">Overall Purpose Of Employee Appraisal</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">descriptive_text</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -442,7 +442,7 @@
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="6" name="sequence"/>
-			<field name="question">MISCELLANEOUS</field>
+			<field name="question">Miscellaneous</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">matrix_of_choices_only_one_ans</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -590,7 +590,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="3" name="sequence"/>
-			<field name="question">EVALUATION PROCESS</field>
+			<field name="question">Evaluation Process</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">descriptive_text</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -634,7 +634,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">PROFESSIONAL DEVELOPMENT OBJECTIVES </field>
+			<field name="question">Professional Development Objectives </field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -659,7 +659,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="2" name="sequence"/>
-			<field name="question">PERSONAL PERFORMANCE OBJECTIVES</field>
+			<field name="question">Personal Performance Objectives</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -684,7 +684,7 @@ Once the form had been filled, the employee send it to his supervisor.
 			<field eval="0" name="rating_allow_one_column_require"/>
 			<field name="req_error_msg">This question requires an answer.</field>
 			<field eval="4" name="sequence"/>
-			<field name="question">PROJECT OBJECTIVES</field>
+			<field name="question">Project Objectives</field>
 			<field eval="0" name="is_require_answer"/>
 			<field name="type">comment</field>
 			<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>

From 152fe65e7f4bfd3ae51eb474e1a706ecfaa9e015 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 8 Feb 2010 18:23:46 +0530
Subject: [PATCH 26/30] [IMP]: base_calendar: Added validation for adding
 calendar lines

bzr revid: rpa@openerp.co.in-20100208125346-32zf4yjwbuo3c9kz
---
 addons/base_calendar/base_calendar.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 9849a5b012d..689d2d08459 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -421,6 +421,16 @@ class basic_calendar_line(osv.osv):
         'domain': lambda *a: '[]', 
     }
     
+    def create(self, cr, uid, vals, context={}):
+        cr.execute("Select count(id) from basic_calendar_lines \
+                                where name='%s' and calendar_id=%s" % (vals.get('name'), vals.get('calendar_id')))
+        res = cr.fetchone()
+        if res:
+            if res[0] > 0:
+                raise osv.except_osv(_('Warning !'), _('Can not create \
+line "%s" more than once' % (vals.get('name'))))
+        return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
+
 basic_calendar_line()
 
 class basic_calendar_attribute(osv.osv):
@@ -482,7 +492,7 @@ class basic_calendar_fields(osv.osv):
         res = cr.fetchone()
         if res:
             if res[0] > 0:
-                raise osv.except_osv(_('Warning !'), _('Can not map same field more than once'))
+                raise osv.except_osv(_('Warning !'), _('Can not map the field more than once'))
         return super(basic_calendar_fields, self).create(cr, uid, vals, context=context)
     
     def write(self, cr, uid, ids, vals, context=None):

From 40920b5f49d2cedb6ae0a2e56434e3e0c454ab9a Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 18:25:48 +0530
Subject: [PATCH 27/30] [IMP] crm: Opp view

bzr revid: hmo@tinyerp.com-20100208125548-n1cc6au01ucmzjch
---
 addons/crm/crm_opportunity_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 64b3d430d31..988f07c4b64 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -71,7 +71,7 @@
                         <field name="type_id" select="1" string="Campaign"/>
                         <field name="section_id" colspan="1" widget="selection"/>
                         <field name="priority" string="Priority"/>
-                    
+                        <field name="date" string="Create Date"/>
                     </group>
                     
                     
@@ -160,6 +160,7 @@
                 <field name="partner_id" string="Partner"/>
                 <field name="planned_revenue" sum="Total of Planned Revenue"/>
                 <field name="probability" avg="Avg. of Probability"/>
+                <field name="date" string="Create Date"/>
                 <field name="date_deadline" string="Excepted Close Date"/>
                 <field name="user_id"/>
                 <field name="state"/>
@@ -223,6 +224,7 @@
                         <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
                         <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="By Create Date" icon="terp-crm" domain="[]" context="{'group_by':'date'}"/>
                         
                 </group>
            </search>

From 4b230a7a793d7904347a78ad7ccb072834430075 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 8 Feb 2010 18:41:12 +0530
Subject: [PATCH 28/30] [IMP]:survey,hr_evaluation. -improved the table
 question type in survey form view. -improved demo data of hr_evaluation.

bzr revid: apa@tinyerp.com-20100208131112-isiahykret8ydt0i
---
 addons/hr_evaluation/hr_evaluation_data.xml |  2 +-
 addons/survey/report/survey_form.py         | 42 +++++++++++++--------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index cfa008964df..b7ef9777ffd 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -269,7 +269,7 @@
 			<field name="comment_label">Other</field>
 			<field eval="0" name="in_visible_rating_weight"/>
 			<field eval="0" name="allow_comment"/>
-			<field eval="5" name="no_of_rows"/>
+			<field eval="10" name="no_of_rows"/>
 		</record>
 	</data>
 
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index c273b7726de..d06be9dc44c 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -72,6 +72,21 @@ class survey_form(report_rml):
               <blockValign value="TOP"/>
               <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
             </blockTableStyle>
+            <blockTableStyle id="tbl_white">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
+            <blockTableStyle id="tbl_gainsboro">
+              <blockAlignment value="LEFT"/>
+              <blockValign value="TOP"/>
+              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
+              <blockBackground colorName="gainsboro" start="0,0" stop="-1,-1"/>
+            </blockTableStyle>
             <blockTableStyle id="ans_tbl_white">
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
@@ -106,20 +121,13 @@ class survey_form(report_rml):
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
             </blockTableStyle>
-            <blockTableStyle id="Table4">
+            <blockTableStyle id="tbl">
               <blockAlignment value="LEFT"/>
               <blockValign value="TOP"/>
               <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,-1"/>
               <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
               <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
             </blockTableStyle>
-            <blockTableStyle id="Table5">
-              <blockAlignment value="LEFT"/>
-              <blockValign value="TOP"/>
-              <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
-              <lineStyle kind="LINEBEFORE" colorName="#777777" start="0,0" stop="-1,-1"/>
-              <lineStyle kind="LINEAFTER" colorName="#777777" start="0,0" stop="-1,-1"/>
-            </blockTableStyle>
             <initialize>
               <paraStyle name="all" alignment="justify"/>
             </initialize>
@@ -144,7 +152,6 @@ class survey_form(report_rml):
                 <blockTable colWidths='"""+_tbl_widths+"""' style="title_tbl">
                     <tr><td><para style="title">""" + to_xml(tools.ustr(survey.title)) + """</para><para style="P2"><font></font></para></td></tr>
                 </blockTable>"""
-
             if survey.note:
                 rml += """
                 <para style="P2"></para>
@@ -280,7 +287,6 @@ class survey_form(report_rml):
                                     <rect x="-0.1cm" y="-0.45cm" width='""" + tools.ustr(cols_widhts[-1] - 0.5) +"cm" + """' height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/>"""
                             elif que.type in ['matrix_of_choices_only_one_ans','rating_scale']:
                                 value = """ <fill color="white"/>
-                                    <!--rect x="0.25cm" y="-0.5cm" width="0.8 cm" height="0.5cm" fill="yes" stroke="yes" round="0.1cm"/-->
                                     <circle x="0.35cm" y="-0.18cm" radius="0.25 cm" fill="yes" stroke="yes"/>"""
                             else:
                                 value = """ <fill color="white"/>
@@ -343,18 +349,22 @@ class survey_form(report_rml):
                             cols_widhts.append(tbl_width/float(len(que.column_heading_ids)))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = colWidths+'cm'
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table4"><tr>"""
+                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="tbl"><tr>"""
                         for col in que.column_heading_ids:
                             rml+="""<td><para style="terp_tblheader_Details">""" + to_xml(tools.ustr(col.title)) + """</para></td>"""
-                        rml+="""</tr></blockTable>
-                        <blockTable colWidths=" """ + colWidths + """ " style="Table5">"""
+                        rml+="""</tr></blockTable>"""
+                        i=0
                         for r in range(0,que.no_of_rows):
-                            rml+="""<tr>"""
+                            if i%2!=0:
+                                style='tbl_white'
+                            else:
+                                style='tbl_gainsboro'
+                            i+=1
+                            rml+="""<blockTable colWidths=" """ + colWidths + """ " style='"""+style+"""'><tr>"""
                             for c in que.column_heading_ids:
                                rml+="""
                                 <td><para style="terp_default_9"><font color="white"> </font></para></td>"""
-                            rml+="""</tr>"""
-                        rml+="""</blockTable>"""
+                            rml+="""</tr></blockTable>"""
                 if datas.has_key('form') and not datas['form']['without_pagebreak']:
                     rml+="""<pageBreak/>"""
                 elif not datas.has_key('form'):

From f18ed41f4f360424b5ca0e693e0c1fea5ced48f0 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 18:46:07 +0530
Subject: [PATCH 29/30] [IMP] crm: search view of lead+Opp.

bzr revid: hmo@tinyerp.com-20100208131607-w3l61f3kc47cc3lo
---
 addons/crm/crm_lead_view.xml        | 65 +++++++++++++++--------------
 addons/crm/crm_opportunity_view.xml | 65 +++++++++++++++--------------
 2 files changed, 68 insertions(+), 62 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 856e1098c96..0a70799be46 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -156,37 +156,40 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Leads">
-               <group col="3" colspan="1">
-                <filter icon="gtk-home" string="   Today   "
-                    separator="1"
-                    domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                    help="Todays's Leads"
-                />
-                <filter icon="gtk-media-rewind" string="    7 Days    "
-                    separator="1" help="Leads during last 7 days"
-                    domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                />
-               </group>
-               <separator orientation="vertical"/>
-               <group col="6" colspan="2">
-                   <field name="name" select="1"/>
-                   <field name="user_id" select="1" widget="selection">
-                           <filter icon="terp-partner"
-                               domain="[('user_id','=',uid)]" help="My Leads"
-                               default="1"
-                           />
-                   </field>
-                   <field name="state" select="1">
-                       <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
-                       <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
-                   </field>
-					<field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
- 						<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"
-                           />
-					</field>
-               </group>
+                <group colspan="4">
+                   <group col="3" colspan="1">
+                    <filter icon="gtk-home" string="   Today   "
+                        separator="1"
+                        domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                        help="Todays's Leads"
+                    />
+                    <filter icon="gtk-media-rewind" string="    7 Days    "
+                        separator="1" help="Leads during last 7 days"
+                        domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                    />
+                   </group>
+                    <separator orientation="vertical"/>
+                   <group col="6" colspan="2">
+                       <field name="name" select="1"/>
+                       <field name="user_id" select="1" widget="selection">
+                               <filter icon="terp-partner"
+                                   domain="[('user_id','=',uid)]" help="My Leads"
+                                   default="1"
+                               />
+                       </field>
+                       <field name="state" select="1">
+                           <filter icon="gtk-new" domain="[('state','in',('draft', 'open'))]" help="Current Leads" default="1"/>
+                           <filter icon="gtk-yes" domain="[('state','=','open')]" help="Open Leads"/>
+                       </field>
+					    <field name="section_id" select="1" default="context.get('section_id', False)" widget="selection" string="Section">
+     						<filter icon="terp-crm"
+                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   help="My section"
+                               />
+					    </field>
+                   </group>
+                </group>
+                <newline/>
                <group expand="1" string="Group By..." colspan="4" col="20">
                         <filter string="By Status" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
                         <filter string="By Lead Source" icon="terp-crm" domain="[]"  context="{'group_by':'categ_id'}"/>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 988f07c4b64..4a74b9c970c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -190,37 +190,40 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="Search Opportunities">
-           		<group col="3" colspan="1">
-                <filter icon="gtk-home" string="   Today   "
-                	separator="1"
-                	domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
-                	help="Todays's Opportunities"
-                />
-                <filter icon="gtk-media-rewind" string="    7 Days    "
-                	separator="1" help="Opportunities during last 7 days"
-                	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
-                />
-           		</group>
-               <separator orientation="vertical"/>
-               <group col="6" colspan="2">
-                   <field name="name" select="1" string="Opportunity"/>
-                   <field name="user_id" select="1" widget="selection">
-                   	<filter icon="terp-partner"
-                   		domain="[('user_id','=',uid)]"
-                   		help="My Opportunities" default="1"
-                   	/>
-                   </field>
-                   <field name="partner_id" select="1"/>
-                   <field name="state" select="1">
-                       <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current " default="1"/>
-                   </field>
-					<field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
-						<filter icon="terp-crm"
-                               domain="[('section_id','=',context.get('section_id',False))]"
-                               help="My section"/>
-			   		</field>
-               </group>
-                <group expand="1" string="Group By..." colspan="4" col="20">
+                <group colspan="4">
+               		<group col="3" colspan="1">
+                        <filter icon="gtk-home" string="   Today   "
+                        	separator="1"
+                        	domain="[('date::date','=',time.strftime('%%Y-%%m-%%d'))]"
+                        	help="Todays's Opportunities"
+                        />
+                        <filter icon="gtk-media-rewind" string="    7 Days    "
+                        	separator="1" help="Opportunities during last 7 days"
+                        	domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        />
+               		</group>
+                    <separator orientation="vertical"/>
+                   <group col="6" colspan="2">
+                       <field name="name" select="1" string="Opportunity"/>
+                       <field name="user_id" select="1" widget="selection">
+                       	<filter icon="terp-partner"
+                       		domain="[('user_id','=',uid)]"
+                       		help="My Opportunities" default="1"
+                       	/>
+                       </field>
+                       <field name="partner_id" select="1"/>
+                       <field name="state" select="1">
+                           <filter icon="gtk-index" domain="[('state','in',('open','draft'))]" help="Current " default="1"/>
+                       </field>
+				        <field name="section_id" default="context.get('section_id', False)" select="1" widget="selection" string="Section">
+					        <filter icon="terp-crm"
+                                   domain="[('section_id','=',context.get('section_id',False))]"
+                                   help="My section"/>
+		           		</field>
+                   </group>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By..." colspan="4">
                         <filter string="By Stage" icon="terp-crm" domain="[]" context="{'group_by':'stage_id'}"/>                        
                         <filter string="By Partner" icon="terp-crm" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="By Responsible" icon="terp-crm" domain="[]" context="{'group_by':'user_id'}"/>

From 8898d430e200bec46aa1dbbda4974fd74ca1bd4f Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 8 Feb 2010 19:20:03 +0530
Subject: [PATCH 30/30] [FIX] tools: In convert, return false if record is not
 found

bzr revid: hmo@tinyerp.com-20100208135003-6fv2rcxedcv9wuyh
---
 bin/tools/convert.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index eaf41a7845b..4314651d084 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -740,7 +740,10 @@ form: module.record_id""" % (xml_id,)
         if '.' in id_str:
             mod,id_str = id_str.split('.')
         result = self.pool.get('ir.model.data')._get_id(cr, self.uid, mod, id_str)
-        return int(self.pool.get('ir.model.data').read(cr, self.uid, [result], ['res_id'])[0]['res_id'])
+        res = self.pool.get('ir.model.data').read(cr, self.uid, [result], ['res_id'])
+        if res and res[0] and res[0]['res_id']:
+            return int(res[0]['res_id'])
+        return False
 
     def parse(self, de):
         if not de.tag in ['terp', 'openerp']: