Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-po-related-functionality-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-po-related-functionality-bde/+merge/108333
Hello Sir,
I have added functionality of counting records which are in draft state
in purchase requisition menu and also changed string of partner_id in wizard.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp-po-related-functionality-bde/+merge/108333
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-po-related-functionality-bde
into
lp:~openerp-dev/openobject-addons/trunk-improve-purchase-requisition-view-atp.
=== modified file 'purchase_requisition/purchase_requisition.py'
--- purchase_requisition/purchase_requisition.py 2012-06-01 12:13:44 +0000
+++ purchase_requisition/purchase_requisition.py 2012-06-01 12:44:27 +0000
@@ -31,7 +31,11 @@
class purchase_requisition(osv.osv):
_name = "purchase.requisition"
_description="Purchase Requisition"
+<<<<<<< TREE
_inherit = "mail.thread"
+=======
+ _inherit = ['ir.needaction_mixin']
+>>>>>>> MERGE-SOURCE
_columns = {
'name': fields.char('Requisition Reference', size=32,required=True),
'origin': fields.char('Source', size=32),
@@ -54,7 +58,7 @@
'user_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).id ,
'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
}
-
+
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
@@ -165,6 +169,13 @@
}, context=context)
return res
+
+ def get_needaction_user_ids(self, cr, uid, ids, context=None):
+ result = dict.fromkeys(ids, [])
+ for obj in self.browse(cr, uid, ids, context=context):
+ if (obj.state == 'draft'):
+ result[obj.id] = [obj.user_id.id]
+ return result
purchase_requisition()
@@ -204,6 +215,7 @@
_columns = {
'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
}
+<<<<<<< TREE
def default_get(self, cr, uid, fields, context=None):
if not context:
context = {}
@@ -226,6 +238,9 @@
res.update({'order_line': val_list})
return res
+=======
+
+>>>>>>> MERGE-SOURCE
def wkf_confirm_order(self, cr, uid, ids, context=None):
res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context=context)
proc_obj = self.pool.get('procurement.order')
=== modified file 'purchase_requisition/wizard/purchase_requisition_partner.py'
--- purchase_requisition/wizard/purchase_requisition_partner.py 2012-03-06 12:05:25 +0000
+++ purchase_requisition/wizard/purchase_requisition_partner.py 2012-06-01 12:44:27 +0000
@@ -28,7 +28,7 @@
_name = "purchase.requisition.partner"
_description = "Purchase Requisition Partner"
_columns = {
- 'partner_id': fields.many2one('res.partner', 'Partner', required=True,domain=[('supplier', '=', True)]),
+ 'partner_id': fields.many2one('res.partner', 'Supplier', required=True,domain=[('supplier', '=', True)]),
}
def view_init(self, cr, uid, fields_list, context=None):
_______________________________________________
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
