Merge lp:~unifield-team/unifield-server/us-1544 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3914
Proposed branch: lp:~unifield-team/unifield-server/us-1544
Merge into: lp:unifield-server
Diff against target: 31 lines (+21/-0)
1 file modified
bin/addons/sale_override/sale.py (+21/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1544
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+302447@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/sale_override/sale.py'
2--- bin/addons/sale_override/sale.py 2016-07-13 13:27:48 +0000
3+++ bin/addons/sale_override/sale.py 2016-08-09 16:10:26 +0000
4@@ -1001,6 +1001,27 @@
5 res = super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
6
7 if part and order_type:
8+ p_obj = self.pool.get('res.partner')
9+ p_domain = [
10+ ('id', '=', part),
11+ ('customer', '=', True),
12+ ('check_partner_so', '=', {'order_type': order_type, 'partner_id': part}),
13+ ]
14+ if not p_obj.search(cr, uid, p_domain, limit=1, order='NO_ORDER'):
15+ res.setdefault('value', {})
16+ res['value'].update({
17+ 'partner_id': False,
18+ 'partner_type': False,
19+ 'partner_order_id': False,
20+ 'partner_invoice_id': False,
21+ 'partner_shipping_id': False,
22+ 'pricelist_id': False,
23+ })
24+ res['warning'] = {
25+ 'title': _('Bad partner'),
26+ 'message': _('You cannot select this partner because it\'s not a customer or have a partner type not compatible with order type'),
27+ }
28+
29 res2 = self.onchange_order_type(cr, uid, ids, order_type, part)
30 if res2.get('value'):
31 if res.get('value'):

Subscribers

People subscribed via source and target branches

to all changes: