From 55cd652fe7e6d6f950ea77273cc606143be38503 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 24 Feb 2011 15:24:01 +0530 Subject: [PATCH 1/4] [FIX]Purchase Requisition:Quotes tab allows identical rfqs from same supplier lp bug: https://launchpad.net/bugs/721595 fixed bzr revid: ron@tinyerp.com-20110224095401-06uw9y9i01uhwb40 --- addons/purchase_requisition/i18n/purchase_requisition.pot | 6 ++++++ .../wizard/purchase_requisition_partner.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index fa93c4cad79..fe84e799c67 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -394,3 +394,9 @@ msgstr "" msgid "Purchase Orders" msgstr "" +#. module: purchase_requisition +#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90 +#, python-format +msgid "You cannot create Quotation for %s which has already one quotation for this Requisition." +msgstr "" + diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index 8dba2ab2eae..d7d8dc7694f 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -85,6 +85,9 @@ class purchase_requisition_partner(osv.osv_memory): list_line=[] purchase_order_line={} for tender in tender_obj.browse(cr, uid, record_ids, context=context): + for supp_record in tender.purchase_ids: + if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel': + raise osv.except_osv(_('Warning'), _('You cannot create Quotation for %s which has already one quotation for this Requisition.') %supp_record.partner_id.name) for line in tender.line_ids: partner_list = sorted([(partner.sequence, partner) for partner in line.product_id.seller_ids if partner]) partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False From faf349adf937c3891435591d7fb463de66778894 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Thu, 24 Feb 2011 16:10:36 +0530 Subject: [PATCH 2/4] [IMP]Purchase Requisition:Quotes tab allows identical rfqs from same supplier bzr revid: ron@tinyerp.com-20110224104036-uepef8frgbsswgzq --- addons/purchase_requisition/i18n/purchase_requisition.pot | 2 +- .../purchase_requisition/wizard/purchase_requisition_partner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index fe84e799c67..1db4372669b 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -397,6 +397,6 @@ msgstr "" #. module: purchase_requisition #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90 #, python-format -msgid "You cannot create Quotation for %s which has already one quotation for this Requisition." +msgid "You cannot create Quotation for %s which has already one quotation for this Requisition,Quotation should be cancel first." msgstr "" diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index d7d8dc7694f..95deab87e22 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -87,7 +87,7 @@ class purchase_requisition_partner(osv.osv_memory): for tender in tender_obj.browse(cr, uid, record_ids, context=context): for supp_record in tender.purchase_ids: if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel': - raise osv.except_osv(_('Warning'), _('You cannot create Quotation for %s which has already one quotation for this Requisition.') %supp_record.partner_id.name) + raise osv.except_osv(_('Warning'), _('You cannot create Quotation for %s which has already one quotation for this Requisition,Quotation should be cancel first.') %supp_record.partner_id.name) for line in tender.line_ids: partner_list = sorted([(partner.sequence, partner) for partner in line.product_id.seller_ids if partner]) partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False From 3ee1e7c94ad2201b968a7196ef4e1293078664bc Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 1 Mar 2011 15:38:18 +0530 Subject: [PATCH 3/4] [IMP]Purchase Requisition:change the warning string bzr revid: ron@tinyerp.com-20110301100818-s42hkxpkes8mrdif --- addons/purchase_requisition/i18n/purchase_requisition.pot | 2 +- .../purchase_requisition/wizard/purchase_requisition_partner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index 1db4372669b..ab4685563b7 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -397,6 +397,6 @@ msgstr "" #. module: purchase_requisition #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90 #, python-format -msgid "You cannot create Quotation for %s which has already one quotation for this Requisition,Quotation should be cancel first." +msgid "You have already one %s quotation for this partner, you must cancel this quotation to create a new quotation." msgstr "" diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index 95deab87e22..8e11eed3773 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -87,7 +87,7 @@ class purchase_requisition_partner(osv.osv_memory): for tender in tender_obj.browse(cr, uid, record_ids, context=context): for supp_record in tender.purchase_ids: if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel': - raise osv.except_osv(_('Warning'), _('You cannot create Quotation for %s which has already one quotation for this Requisition,Quotation should be cancel first.') %supp_record.partner_id.name) + raise osv.except_osv(_('Warning'), _('You have already one %s quotation for this partner, you must cancel this quotation to create a new quotation.') % supp_record.state) for line in tender.line_ids: partner_list = sorted([(partner.sequence, partner) for partner in line.product_id.seller_ids if partner]) partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False From 33800b2e8fcce9487a5a772e319a3f65e158c51c Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 1 Mar 2011 16:15:22 +0530 Subject: [PATCH 4/4] [IMP]Purchase Requisition:Improve string bzr revid: ron@tinyerp.com-20110301104522-jii69dd9w7eubpex --- addons/purchase_requisition/i18n/purchase_requisition.pot | 2 +- .../purchase_requisition/wizard/purchase_requisition_partner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot index ab4685563b7..635e4ce4741 100644 --- a/addons/purchase_requisition/i18n/purchase_requisition.pot +++ b/addons/purchase_requisition/i18n/purchase_requisition.pot @@ -397,6 +397,6 @@ msgstr "" #. module: purchase_requisition #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90 #, python-format -msgid "You have already one %s quotation for this partner, you must cancel this quotation to create a new quotation." +msgid "You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation." msgstr "" diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py index 8e11eed3773..7cc8525b5bd 100644 --- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py +++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py @@ -87,7 +87,7 @@ class purchase_requisition_partner(osv.osv_memory): for tender in tender_obj.browse(cr, uid, record_ids, context=context): for supp_record in tender.purchase_ids: if supp_record.partner_id.id == partner_id and supp_record.state <> 'cancel': - raise osv.except_osv(_('Warning'), _('You have already one %s quotation for this partner, you must cancel this quotation to create a new quotation.') % supp_record.state) + raise osv.except_osv(_('Warning'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % supp_record.state) for line in tender.line_ids: partner_list = sorted([(partner.sequence, partner) for partner in line.product_id.seller_ids if partner]) partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False