Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-usability-improvements-bde
into
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-usability-improvements-bde/+merge/111223
Hello Sir,
I have improved the functionality for purchase_requisition,
added group on destination field and improved view
and added functionality which display mail in open chatter of
purchase_requisition view when RFQ is asked for particular quotation
and also applied class on Request a Quotation button for changing color to blue.
as mentioned on pad.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-usability-improvements-bde/+merge/111223
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-usability-improvements-bde
into
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp.
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2012-06-09 19:49:46 +0000
+++ purchase/purchase.py 2012-06-20 13:31:21 +0000
@@ -1072,8 +1072,9 @@
'company_id': procurement.company_id.id,
'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
}
- res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=context)
- self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
+ if not procurement.product_id.purchase_requisition:
+ res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=context)
+ self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
self.running_send_note(cr, uid, [procurement.id], context=context)
return res
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2012-06-08 08:33:05 +0000
+++ purchase_requisition/purchase_requisition.py 2012-06-20 13:31:21 +0000
@@ -206,6 +206,28 @@
purchase_requisition()
+class mail_message(osv.osv):
+ _inherit = 'mail.message'
+
+ def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
+ email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
+ res_id=False, subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
+ context=None):
+ purchase_order_obj = self.pool.get('purchase.order')
+ result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
+ email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+ res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+ context=context)
+ requisition_id = purchase_order_obj.browse(cr, uid, res_id, context=context).requisition_id.id
+ if requisition_id:
+ model = "purchase.requisition"
+ res_id = requisition_id
+ val = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model, email_cc=email_cc,
+ email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
+ res_id=res_id, subtype='plain', headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
+ context=context)
+ return result
+
class purchase_requisition_line(osv.osv):
_name = "purchase.requisition.line"
@@ -280,11 +302,12 @@
def make_po(self, cr, uid, ids, context=None):
sequence_obj = self.pool.get('ir.sequence')
res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
- for proc_id, po_id in res.items():
- procurement = self.browse(cr, uid, proc_id, context=context)
- requisition_id=False
- if procurement.product_id.purchase_requisition:
- requisition_id=self.pool.get('purchase.requisition').create(cr, uid, {
+ sequence_obj = self.pool.get('ir.sequence')
+ requisition_obj = self.pool.get('purchase.requisition')
+ procurement = self.browse(cr, uid, ids, context=context)[0]
+ if procurement.product_id.purchase_requisition:
+ requisition_id = requisition_obj.create(cr, uid,
+ {
'name': sequence_obj.get(cr, uid, 'purchase.order.requisition'),
'origin': procurement.origin,
'date_end': procurement.date_planned,
@@ -296,9 +319,9 @@
'product_qty': procurement.product_qty
})],
- 'purchase_ids': [(6,0,[po_id])]
})
- self.write(cr,uid,[proc_id],{'requisition_id':requisition_id},context=context)
+ self.write(cr, uid, ids, {'requisition_id':requisition_id}, context=context)
+ return {}
return res
procurement_order()
=== modified file 'purchase_requisition/purchase_requisition_view.xml'
--- purchase_requisition/purchase_requisition_view.xml 2012-06-12 09:03:50 +0000
+++ purchase_requisition/purchase_requisition_view.xml 2012-06-20 13:31:21 +0000
@@ -74,6 +74,8 @@
</group>
</form>
</field>
+ <button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
+ attrs="{'invisible': [('line_ids','=',False),('state', 'not in', ('in_progress'))]}" class="oe_mail_button_mouseout"/>
<separator colspan="4" string="Quotations"/>
<field name="purchase_ids" readonly="1">
<tree string="Purchase Order">
@@ -81,7 +83,7 @@
<field name="date_order" string="Order Date"/>
<field name="partner_id"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
- <field name="location_id"/>
+ <field name="location_id" groups="stock.group_locations"/>
<field name="minimum_planned_date"/>
<field name="origin"/>
<field name="state"/>
@@ -91,8 +93,6 @@
</tree>
</field>
<group colspan="4" col="4">
- <button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
- attrs="{'invisible': [('line_ids','=',False),('state', 'not in', ('in_progress'))]}"/>
<group cosplan="4" col="4">
<label string="" />
</group>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
