From 2368064757d165523f56e094c162f3135dec71a8 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Tue, 28 Sep 2010 18:37:22 +0530
Subject: [PATCH 01/16] [IMP] sale_order_dates:-added tooltip

bzr revid: mtr@mtr-20100928130722-3svmhb2dg4uwmtc2
---
 addons/sale_order_dates/sale_order_dates.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index ce82796235f..beca56b838e 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -56,9 +56,9 @@ class sale_order_dates(osv.osv):
             return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date'),
-        'requested_date': fields.date('Requested Date'),
-        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date'),
+        'commitment_date': fields.function(_get_commitment_date, method=True,store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made"),
+        'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales"),
+        'effective_date': fields.function(_get_effective_date, method=True, type='date', store=True,string='Effective Date',help="Date on which picking is created"),
     }
 
 sale_order_dates()

From 053005688ab9ea4e963f8d2dec1ab551cb3a3178 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 28 Sep 2010 18:49:37 +0530
Subject: [PATCH 02/16] [ADD]: crm: Added new group and record rule to see only
 personal lead/opportunities

bzr revid: rpa@tinyerp.com-20100928131937-0u4gd8ln2jwa497y
---
 addons/crm/security/crm_security.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 9c63e611e93..5f3863882f5 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -10,6 +10,17 @@
         <field name="name">Sales / User</field>
     </record>
 
+    <record id="base.group_sale_salesman_personal" context="{'noadmin':True}" model="res.groups">
+        <field name="name">Sales / User / See Personal Leads</field>
+    </record>
+
+    <record id="crm_rule_personal_lead" model="ir.rule">
+        <field name="name">Personal Leads</field>
+        <field ref="model_crm_lead" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_personal'))]"/>
+    </record>
+
     <record model='ir.ui.menu' id='base.menu_base_partner'>
         <field name="groups_id" eval="[(4,ref('base.group_sale_manager')),(4,ref('base.group_sale_salesman'))]"/>
     </record>

From fa85b7cfa40f6b95d81bf0d5829a5fb7a45bb98a Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Tue, 28 Sep 2010 19:11:07 +0530
Subject: [PATCH 03/16] [IMP]: crm*: Improvement in button label and icons of
 reporting

bzr revid: rpa@tinyerp.com-20100928134107-ua7cava1kxj2c7k6
---
 addons/crm/report/crm_lead_report_view.xml                  | 6 +++---
 addons/crm/report/crm_phonecall_report_view.xml             | 6 +++---
 addons/crm_claim/report/crm_claim_report_view.xml           | 4 ++--
 .../crm_fundraising/report/crm_fundraising_report_view.xml  | 4 ++--
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml     | 6 +++---
 addons/crm_partner_assign/report/crm_lead_report_view.xml   | 2 +-
 addons/sale/report/sale_report_view.xml                     | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index d35b8aea295..7b31b0bab2c 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -105,7 +105,7 @@
                                 help="My team" />
                         </field>
                         <field name="user_id" string="Salesman">
-                            <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                    </group>
                    <newline/>
@@ -125,12 +125,12 @@
                   </group>
                    <newline/>
                    <group expand="1" string="Group By...">
-                        <filter string="User" name="user" icon="terp-personal"
+                        <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
                         <separator orientation="vertical" />
                         <separator orientation="vertical" />
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 8d8ee946ae0..b687910d9cb 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -110,7 +110,7 @@
                            help="My team" />
                         </field>   
                           <field name="user_id" string="Salesman" select="1">
-                            <filter icon="terp-crm" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-crm" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                            </field>
                    </group>
                    <newline/>
@@ -128,9 +128,9 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
-                       <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}" />
+                       <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <separator orientation="vertical" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index db5973c1867..a9d7283dc74 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -119,7 +119,7 @@
                         </field>
 
                       	<field name="user_id" string="Salesman" select="1">
-	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
@@ -141,7 +141,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 68cd85674ba..e4e29c0da78 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -118,7 +118,7 @@
                         </field>
 
                       	<field name="user_id" select="1" string="Salesman">
-	            			<filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
@@ -138,7 +138,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                        <filter string="User" name="User" icon="terp-personal"
+                        <filter string="Salesman" name="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
 
                         <filter string="Sales Team" icon="terp-personal+"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 8bb5307e62b..c55b3e8cfdf 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,7 +114,7 @@
                         help="My company"/>
                         </field>
                          <field name="user_id" string="Salesman">
-                         <filter icon="terp-personal+" string="My Case" help="My Case" domain="[('user_id','=',uid)]" />
+                         <filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                          </field>
                    </group>
                    <newline/>
@@ -124,13 +124,13 @@
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">
-                        <filter string="User" icon="terp-personal"
+                        <filter string="Salesman" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}"
                             default="1" />
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                        <filter string="Partner" icon="terp-personal"
+                        <filter string="Partner" icon="terp-partnerl"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
                             
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 2d38cd8862b..71e784ca90f 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -45,7 +45,7 @@
                    </group>
                    <newline/>
                    <group  expand="1" string="Group By...">
-                       <filter string="User" name="user" icon="terp-personal"
+                       <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                        <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_assigned_id'}" />
                        <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index d796edd2d2c..a2bdb8dd8b4 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -96,7 +96,7 @@
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">
                     <filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
                     <filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>

From 4356a354e448f160f81ea1890ff93c16b0c56125 Mon Sep 17 00:00:00 2001
From: "Harry (OpenERP)" <hmo@tinyerp.com>
Date: Tue, 28 Sep 2010 19:22:54 +0530
Subject: [PATCH 04/16] [FIX] project_long_term: resolve regression on
 scheduling task

bzr revid: hmo@tinyerp.com-20100928135254-2fux2qn5lozzs2nd
---
 addons/project_long_term/project_long_term.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index dba58e1789f..9f8f5bf8d56 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -291,6 +291,9 @@ class project_phase(osv.osv):
             def Project():
                 # If project has working calendar then that
                 # else the default one would be considered
+                start = start_date
+                minimum_time_unit = 1
+                resource = phase_resource_obj
                 if calendar_id:
                     working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
                     vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))

From 704055bb8dccfa920f1b939f69f3b0376c9e3586 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 29 Sep 2010 12:23:15 +0530
Subject: [PATCH 05/16] [IMP] sale:-moved date fields of extended filter of
 Sales Analysis in new line

bzr revid: mtr@mtr-20100929065315-m0p9dp4mhm6y8v3i
---
 addons/sale/report/sale_report_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index a2bdb8dd8b4..b914e2b2d4b 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -86,12 +86,12 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                    <field name="date"/>
-                    <field name="date_confirm"/>
-                    <separator orientation="vertical"/>
                     <field name="shop_id" widget="selection"/>
                     <field name="categ_id" widget="selection"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <newline/>
+                    <field name="date"/>
+                    <field name="date_confirm"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By..." colspan="10" col="12">

From 5b109049fd77e4f8d93168164ddadb4ab1e73c61 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 14:04:26 +0530
Subject: [PATCH 06/16] [REM]: crm: Removed stage_id field from phonecall

bzr revid: rpa@tinyerp.com-20100929083426-tbyc9jz1o89imciy
---
 addons/crm/crm_phonecall.py                     | 3 ---
 addons/crm/report/crm_phonecall_report.py       | 4 ----
 addons/crm/report/crm_phonecall_report_view.xml | 2 --
 3 files changed, 9 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 0c7385532fb..96dde7139df 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -61,9 +61,6 @@ class crm_phonecall(crm_case, osv.osv):
                                   \nWhen the case is over, the state is set to \'Done\'.\
                                   \nIf the case needs to be reviewed then the state is set to \'Pending\'.'), 
         'email_from': fields.char('Email', size=128, help="These people will receive email."), 
-        'stage_id': fields.many2one('crm.case.stage', 'Stage', \
-                            domain="['|',('section_id','=',section_id),('section_id','=',False),\
-                            ('object_id.model', '=', 'crm.phonecall')]"), 
         'date_open': fields.datetime('Opened', readonly=True),
         # phonecall fields
         'duration': fields.float('Duration', help="Duration in Minutes"), 
diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py
index 259764e4170..9502c39ad06 100644
--- a/addons/crm/report/crm_phonecall_report.py
+++ b/addons/crm/report/crm_phonecall_report.py
@@ -100,9 +100,6 @@ class crm_phonecall_report(osv.osv):
                         domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
-        'stage_id': fields.many2one ('crm.case.stage', 'Stage', \
-                         domain="[('section_id','=',section_id),\
-                        ('object_id.model', '=', 'crm.phonecall')]", readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'opening_date': fields.date('Opening Date', readonly=True),
         'creation_date': fields.date('Creation Date', readonly=True),
@@ -130,7 +127,6 @@ class crm_phonecall_report(osv.osv):
                     c.section_id,
                     c.categ_id,
                     c.partner_id,
-                    c.stage_id,
                     c.duration,
                     c.company_id,
                     c.priority,
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index b687910d9cb..68a24abf40e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -14,7 +14,6 @@
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
                     <field name="priority" invisible="1"/>
-                    <field name="stage_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="company_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -117,7 +116,6 @@
                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                       <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="stage_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>

From 3dfbab52e48c5f1fda593188c2815130b3b3e864 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 15:34:49 +0530
Subject: [PATCH 07/16] [IMP]: crm*: Put proper icons for filter button of "My
 team" and "My Cases"

bzr revid: rpa@tinyerp.com-20100929100449-k35jlnpxfdrziutn
---
 addons/crm/report/crm_lead_report_view.xml                    | 4 ++--
 addons/crm/report/crm_phonecall_report_view.xml               | 2 +-
 addons/crm_claim/report/crm_claim_report_view.xml             | 4 ++--
 addons/crm_fundraising/report/crm_fundraising_report_view.xml | 2 +-
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 7b31b0bab2c..5a18e3ad380 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -99,13 +99,13 @@
                         <field name="section_id"
                             default="context.get('section_id', False)"
                             context="{'invisible_section': False}">
-                            <filter icon="terp-crm"
+                            <filter icon="terp-personal+"
                                 context="{'invisible_section': False}"
                                 domain="[('section_id.user_id','=',uid)]"
                                 help="My team" />
                         </field>
                         <field name="user_id" string="Salesman">
-                            <filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                         </field>
                    </group>
                    <newline/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index 68a24abf40e..b31f4a33e7e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -109,7 +109,7 @@
                            help="My team" />
                         </field>   
                           <field name="user_id" string="Salesman" select="1">
-                            <filter icon="terp-crm" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                            <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                            </field>
                    </group>
                    <newline/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index d964d00c161..5eeecf3d3ad 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -101,7 +101,7 @@
                             domain="[('state','=','pending')]"/>
 
                            <separator orientation="vertical" />
-                           <field name="section_id" string="Sales Team"
+                              <field name="section_id" string="Sales Team"
                                default="context.get('section_id', False)"
                                context="{'invisible_section': False}">
 
@@ -119,7 +119,7 @@
                         </field>
 
                       	<field name="user_id" string="Salesman" select="1">
-	            			<filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index e4e29c0da78..ab90f7ad0c1 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -118,7 +118,7 @@
                         </field>
 
                       	<field name="user_id" select="1" string="Salesman">
-	            			<filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+	            			<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                			</field>
                    </group>
                    <newline/>
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index c55b3e8cfdf..659b00eab2d 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -114,7 +114,7 @@
                         help="My company"/>
                         </field>
                          <field name="user_id" string="Salesman">
-                         <filter icon="terp-personal+" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
+                         <filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
                          </field>
                    </group>
                    <newline/>
@@ -130,7 +130,7 @@
                         <filter string="Sales Team" icon="terp-personal+"
                             domain="[]"
                             context="{'group_by':'section_id'}" />
-                        <filter string="Partner" icon="terp-partnerl"
+                        <filter string="Partner" icon="terp-partner"
                             domain="[]"
                             context="{'group_by':'partner_id'}" />
                             

From 4862be9f7bc5bc2242b78b645f7a193572fd2f10 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 29 Sep 2010 15:45:57 +0530
Subject: [PATCH 08/16] [IMP] sale:-reorganise form view for sale order line

bzr revid: mtr@mtr-20100929101557-labb8267ac0k1zkl
---
 addons/sale/sale_view.xml | 70 ++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1c7bf048415..d98dc7412c6 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -364,6 +364,7 @@ to your configuration: from the sales order, from the pickings, etc.
                     <field name="salesman_id"/>
                     <field name="price_subtotal"/>
                     <field name="state"/>
+                    <field name="invoiced"/>
                 </tree>
             </field>
         </record>
@@ -373,7 +374,6 @@ to your configuration: from the sales order, from the pickings, etc.
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Sales Order Lines">
-                    <separator colspan="4" string="General Information"/>
 				    <group colspan="4" col="6">
 						<field name="order_id"/>
 						<field name="product_id" readonly="1"/>
@@ -381,50 +381,36 @@ to your configuration: from the sales order, from the pickings, etc.
 						<field name="product_uom_qty" readonly="1"/>
 						<field groups="product.group_uos" name="product_uos_qty"/>
 						<field name="product_uom"/>
+						<field colspan="4" name="name" groups="base.group_extended"/>
 						<field name="company_id" groups="base.group_multi_company" readonly="1"/>
 						<field name="order_partner_id" readonly="1" invisible="1"/>
 				    </group>
-                    <notebook>
-                        <page string="Order Lines">
-                            <separator colspan="4" string="Manual Designation"/>
-                            <group colspan="4" col="6">
-                            <field name="type" groups="base.group_extended"/>
-                            <field name="delay" groups="base.group_extended"/>
-                            <field name="th_weight" groups="base.group_extended"/>
-                            <field name="price_unit"/>
-                            <field name="discount"/>
-                            <field name="price_subtotal"/>
-                            </group>
-                            <separator colspan="4" string="Description"/>
-                            <field colspan="4" name="name" groups="base.group_extended"/>
-                            <separator colspan="4" string="Taxes"/>
-                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" nolabel="1"/>
-                            <separator colspan="4"/>
-                            <field name="state"/>
-                            <group col="3" colspan="2">
-                                <button colspan="1"
-                                  name="%(action_view_sale_order_line_make_invoice)d"
-                                  string="Make Invoice"
-                                  type="action"
-                                  icon="terp-document-new"
-                                  attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>
-                                <button name="button_cancel"
-                                    string="Cancel" type="object"
-                                    icon="gtk-cancel"
-                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
-                                <button name="button_done"
-                                    string="Done" type="object"
-                                    icon="gtk-jump-to"
-                                    attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
-                            </group>
-                        </page>
-                        <page string="Invoice Lines" groups="base.group_extended">
-                            <field colspan="4" name="invoice_lines" nolabel="1"/>
-                        </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <separator colspan="4" string="Price"/>
+                    <group colspan="4" col="6">
+	                    <field name="price_unit"/>
+	                    <field name="discount"/>
+	                    <field name="price_subtotal"/>
+                    </group>
+                    <separator colspan="4" string="Notes"/>
+                    <field colspan="4" name="notes" nolabel="1"/>
+                    <separator colspan="4"/>
+                    <field name="state"/>
+                    <group col="3" colspan="2">
+                       <!-- <button colspan="1"
+                          name="%(action_view_sale_order_line_make_invoice)d"
+                          string="Make Invoice"
+                          type="action"
+                          icon="terp-document-new"
+                          attrs="{'invisible': ['|',('state', 'in', ('draft','cancel')),('invoiced', '=', 1)]}"/>-->
+                        <button name="button_cancel"
+                            string="Cancel" type="object"
+                            icon="gtk-cancel"
+                            attrs="{'invisible': ['|',('state', 'not in', ('confirmed', 'exception')),('invoiced', '=', 1)]}"/>
+                        <button name="button_done"
+                            string="Done" type="object"
+                            icon="gtk-jump-to"
+                            attrs="{'invisible': ['|',('state', 'not in', ('confirmed','exception')),('invoiced', '=', 0)]}"/>
+                    </group>
                 </form>
             </field>
         </record>

From f9711efe4200af1542438eba1e7624e90eda0a01 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 15:50:23 +0530
Subject: [PATCH 09/16] [FIX]: crm: fixed typo in phonecall report

bzr revid: rpa@tinyerp.com-20100929102023-rl7qcjwrlgq5lpic
---
 addons/crm/report/crm_phonecall_report_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index b31f4a33e7e..aa904ca049e 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -116,7 +116,8 @@
                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
                       <field name="partner_id"/>
                         <separator orientation="vertical"/>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="categ_id" widget="selection" string="Type"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]" />
                         <separator orientation="vertical"/>
                         <field name="company_id" groups="base.group_multi_company"/>
                            <newline/>

From bc5bdee5c166d3de88503664dbe8593931230ed3 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 16:40:51 +0530
Subject: [PATCH 10/16] [IMP]: crm_helpdesk: Added missing fields in extended
 search of helpdesk analysis

bzr revid: rpa@tinyerp.com-20100929111051-slvaxstspi65tjyn
---
 addons/crm_helpdesk/report/crm_helpdesk_report_view.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 659b00eab2d..9490172e3e8 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -119,8 +119,9 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Extended Filters..."  groups="base.group_extended">
-                        <filter string="Priority" icon="terp-rating-rated"
-                            domain="[]" context="{'group_by':'priority'}" />
+                         <field name="priority" string="Priority"/>
+                         <field name="categ_id"/>
+                         <field name="date_closed" string="Close Date"/>
                    </group>
                    <newline/>
                    <group expand="1" string="Group By...">

From 021bde17a06c39c6e24f363a29726cbbeb2c7586 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 17:14:27 +0530
Subject: [PATCH 11/16] [IMP]: crm: Improvement in group by sequence in search
 view of lead

bzr revid: rpa@tinyerp.com-20100929114427-0lqaq0l042sgxuq8
---
 addons/crm/crm_lead_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 40317a4b188..47da5111692 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -342,8 +342,9 @@
                 </group>
                 <newline/>
                 <group expand="0" string="Group By...">
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
+                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Category" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'categ_id'}"/>
                     <filter string="Campaign" icon="terp-stock_symbol-selection"
@@ -351,11 +352,10 @@
                     <filter string="Channel" icon="terp-stock_symbol-selection"
                         domain="[]" context="{'group_by':'channel_id'}" />
                     <separator orientation="vertical"/>
-                    <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
-                    <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                    <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
+                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Creation Month" icon="terp-go-month"
+                    <filter string="Creation" help="Create date" icon="terp-go-month"
                         domain="[]" context="{'group_by':'create_date'}" />
                 </group>
            </search>

From 509df29e39e8ee88dbe4b5257f1f4492f411b659 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 17:17:07 +0530
Subject: [PATCH 12/16] [IMP]: crm: Added tooltip for opt-in and opt-out

bzr revid: rpa@tinyerp.com-20100929114707-splmpol0pdfg61ev
---
 addons/crm/crm_lead.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ee778401e4a..e370a7dc2d2 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -127,8 +127,8 @@ class crm_lead(crm_case, osv.osv):
 
         'contact_name': fields.char('Contact Name', size=64), 
         'partner_name': fields.char("Partner Name", size=64),
-        'optin': fields.boolean('Opt-In'),
-        'optout': fields.boolean('Opt-Out'),
+        'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
+        'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),

From 010e67a374110259281621ec8b90d0af1c40b700 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 17:20:56 +0530
Subject: [PATCH 13/16] [FIX]: base_calendar: Fixed string in search view

bzr revid: rpa@tinyerp.com-20100929115056-bugajxkz72qs5mr3
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index c3292452298..2a0ed14080f 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -122,7 +122,7 @@
                        separator="1" help="Delegated Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
-                   <field name="user_id" select="1"/>
+                   <field name="user_id" select="1" string="Responsible"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>

From d1633207dd49ad5a75d42748ed16bb9d008b5068 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 17:54:44 +0530
Subject: [PATCH 14/16] [IMP]: crm, crm_claim: Corrected condition on tree view
 for correct color of pending records which have passed deadlines

bzr revid: rpa@tinyerp.com-20100929122444-bf06cxg2xzl0ys8n
---
 addons/crm/crm_opportunity_view.xml | 2 +-
 addons/crm_claim/crm_claim_view.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 34f5e542ab0..4536497d6b7 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -211,7 +211,7 @@
                 <field name="model">crm.lead</field>
                 <field name="type">tree</field>
                 <field name="arch" type="xml">
-                    <tree string="Opportunities"  colors="blue:state=='pending';grey:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                    <tree string="Opportunities" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                         <field name="date_deadline" invisible="1"/>
                         <field name="create_date"/>
                         <field name="name" string="Opportunity"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 64c917ffe4b..e7b8d65e711 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -42,7 +42,7 @@
             <field name="model">crm.claim</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Claims" colors="blue:state=='pending';black:state=='open';gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Claims" colors="blue:state=='pending' and not(date_deadline and (date_deadline &lt; current_date));gray:state in ('close', 'cancel');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" />

From 850ab16de8d92bb5c7dee73d14c4b38f4cd91908 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 29 Sep 2010 18:09:47 +0530
Subject: [PATCH 15/16] [IMP]: crm: Put proper icon for schedule oter phonecall
 button

bzr revid: rpa@tinyerp.com-20100929123947-5p9utzce0f4rz7om
---
 addons/crm/crm_phonecall_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 0832c0a16ee..4f07b549576 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -71,7 +71,7 @@
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                     <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
-                     icon="gtk-redo"
+                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
 
@@ -150,7 +150,7 @@
                         attrs="{'invisible':[('opportunity_id','!=',False)]}" />
                     <label colspan="6"  string=""/>
                     <button string="Schedule Other Call"
-                     icon="gtk-redo"
+                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
                     type="action"  />
 

From b62cd446dd54e713e1d0efbb581d45bb8579fa39 Mon Sep 17 00:00:00 2001
From: mtr <mtr@mtr>
Date: Wed, 29 Sep 2010 18:15:05 +0530
Subject: [PATCH 16/16] [IMP] sale:-made company_id field on sale.shop
 required=False

bzr revid: mtr@mtr-20100929124505-37428w3dqsqow0x9
---
 addons/sale/sale.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b1ae33d2c43..99f8eeeacc5 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -37,7 +37,10 @@ class sale_shop(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=False),
+    }
+    _defaults = {
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.shop', context=c),
     }
 
 sale_shop()