From 0ebf33448ba62b029a80c14b4eb949e84583ea11 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 16 Oct 2012 14:53:09 +0530
Subject: [PATCH 1/4] [IMP] purchase: made changes in warning message

bzr revid: cha@tinyerp.com-20121016092309-n08c5y39f2ifv13s
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index db6ed8b80be..f13885b1d4e 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -892,7 +892,7 @@ class purchase_order_line(osv.osv):
         if not pricelist_id:
             raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
         if not partner_id:
-            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+            raise osv.except_osv(_('No Supplier!'), _('Select a supplier in purchase order to choose a product.'))
 
         # - determine name and notes based on product in partner lang.
         lang = res_partner.browse(cr, uid, partner_id).lang

From 37e6c6f1c881a26163854900110b4f40aa960bd6 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 16 Oct 2012 15:22:25 +0530
Subject: [PATCH 2/4] [IMP] crm: set logged call instead of scheduled call on
 calls button of partner

bzr revid: cha@tinyerp.com-20121016095225-5rai940nq5dgsxx1
---
 addons/crm/crm_phonecall_menu.xml | 8 --------
 addons/crm/res_partner_view.xml   | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index c359aa461e7..496b8e79051 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -2,14 +2,6 @@
 <openerp>
 <data>
 
-    <act_window
-        id="crm_case_categ_phone_create_partner"
-        name="Schedule a Call"
-        res_model="crm.phonecall"
-        view_mode="tree,form,calendar"
-        context="{'search_default_partner_id': active_id, 'default_duration': 1.0, 'default_partner_id': active_id}"
-        groups="base.group_sale_salesman"
-        />
 
     <!-- TO CONFIRM: This is fine -->
     <!-- act_window
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index b7aa334a9c3..93abc967b8e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -115,7 +115,7 @@
                         name="%(base_calendar.action_crm_meeting)d"
                         context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
                     <button type="action" string="Calls" 
-                        name="%(crm.crm_case_categ_phone_create_partner)d" 
+                        name="%(crm.crm_case_categ_phone_incoming0)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
                         name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>

From 41cef6c67c03d5d8f264ba63cc3390ccbc957ad8 Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Thu, 18 Oct 2012 18:28:56 +0530
Subject: [PATCH 3/4] [IMP] purchase: chanded onchange method to create PO line
 without supplier & pricelist

bzr revid: cha@tinyerp.com-20121018125856-jztpc7nbmkhqr100
---
 addons/purchase/purchase.py | 47 +++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f13885b1d4e..7ba0e9750f2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -888,16 +888,7 @@ class purchase_order_line(osv.osv):
         account_fiscal_position = self.pool.get('account.fiscal.position')
         account_tax = self.pool.get('account.tax')
 
-        # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
-        if not partner_id:
-            raise osv.except_osv(_('No Supplier!'), _('Select a supplier in purchase order to choose a product.'))
-
-        # - determine name and notes based on product in partner lang.
-        lang = res_partner.browse(cr, uid, partner_id).lang
-        context_partner = {'lang': lang, 'partner_id': partner_id}
-        product = product_product.browse(cr, uid, product_id, context=context_partner)
+        product = product_product.browse(cr, uid, product_id, context=context)
         name = product.name
         if product.description_purchase:
             name += '\n' + product.description_purchase
@@ -918,11 +909,36 @@ class purchase_order_line(osv.osv):
 
         res['value'].update({'product_uom': uom_id})
 
-        # - determine product_qty and date_planned based on seller info
+        qty = qty or 1.0
+
         if not date_order:
             date_order = fields.date.context_today(self,cr,uid,context=context)
 
-        qty = qty or 1.0
+        dt = datetime.strptime(date_order, DEFAULT_SERVER_DATE_FORMAT).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
+
+        # - determine price_unit and taxes_id
+        price = product.standard_price
+
+        taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
+        fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
+        taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
+        res['value'].update({'price_unit': price, 'taxes_id': taxes_ids})
+
+        # - check for the presence of partner_id and pricelist_id
+        if not pricelist_id or not partner_id:
+            return res
+
+        # - determine name and notes based on product in partner lang.
+        lang = res_partner.browse(cr, uid, partner_id).lang
+        context_partner = {'lang': lang, 'partner_id': partner_id}
+        product = product_product.browse(cr, uid, product_id, context=context_partner)
+        name = product.name
+        if product.description_purchase:
+            name += '\n' + product.description_purchase
+        res['value'].update({'name': name})
+
+        # - determine product_qty and date_planned based on seller info
         supplierinfo = False
         for supplier in product.seller_ids:
             if supplier.name.id == partner_id:
@@ -938,14 +954,11 @@ class purchase_order_line(osv.osv):
 
         res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
 
-        # - determine price_unit and taxes_id
+        # - determine price_unit according to pricelist
         price = product_pricelist.price_get(cr, uid, [pricelist_id],
                     product.id, qty or 1.0, partner_id, {'uom': uom_id, 'date': date_order})[pricelist_id]
 
-        taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
-        fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
-        taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
-        res['value'].update({'price_unit': price, 'taxes_id': taxes_ids})
+        res['value'].update({'price_unit': price})
 
         return res
 

From 8f5814fe60d3091502d6707fabb53854b17ff42c Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)" <cha@tinyerp.com>
Date: Tue, 30 Oct 2012 14:53:24 +0530
Subject: [PATCH 4/4] [IMP] purchase: made revised code in if condition

bzr revid: cha@tinyerp.com-20121030092324-5l5x1l7l3p39z1gx
---
 addons/purchase/purchase.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 9b9082894eb..9552e617e53 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -890,10 +890,6 @@ class purchase_order_line(osv.osv):
         account_tax = self.pool.get('account.tax')
 
         product = product_product.browse(cr, uid, product_id, context=context)
-        name = product.name
-        if product.description_purchase:
-            name += '\n' + product.description_purchase
-        res['value'].update({'name': name})
 
         # - set a domain on product_uom
         res['domain'] = {'product_uom': [('category_id','=',product.uom_id.category_id.id)]}
@@ -915,19 +911,24 @@ class purchase_order_line(osv.osv):
         if not date_order:
             date_order = fields.date.context_today(self,cr,uid,context=context)
 
-        dt = datetime.strptime(date_order, DEFAULT_SERVER_DATE_FORMAT).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-        res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
-
-        # - determine price_unit and taxes_id
-        price = product.standard_price
-
+        # - determine taxes_id
         taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
         fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
         taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
-        res['value'].update({'price_unit': price, 'taxes_id': taxes_ids})
+        res['value'].update({'taxes_id': taxes_ids})
 
         # - check for the presence of partner_id and pricelist_id
         if not pricelist_id or not partner_id:
+            name = product.name
+            if product.description_purchase:
+                name += '\n' + product.description_purchase
+            res['value'].update({'name': name})
+
+            dt = datetime.strptime(date_order, DEFAULT_SERVER_DATE_FORMAT).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+            res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
+
+            price = product.standard_price
+            res['value'].update({'price_unit': price})
             return res
 
         # - determine name and notes based on product in partner lang.