Merge lp:~unifield-team/unifield-addons/uf-485+oeb-63 into lp:unifield-addons

Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4506
Proposed branch: lp:~unifield-team/unifield-addons/uf-485+oeb-63
Merge into: lp:unifield-addons
Diff against target: 31 lines (+9/-1)
2 files modified
purchase/purchase.py (+8/-0)
purchase/test/procurement_buy.yml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/uf-485+oeb-63
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+79544@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 'purchase/purchase.py'
2--- purchase/purchase.py 2011-10-03 07:27:27 +0000
3+++ purchase/purchase.py 2011-10-17 12:05:26 +0000
4@@ -701,6 +701,14 @@
5 'uom': uom,
6 'date': date_order,
7 })[pricelist]
8+ if price is False:
9+ warning = {
10+ 'title': 'No valid pricelist line found !',
11+ 'message':
12+ "Couldn't find a pricelist line matching this product and quantity.\n"
13+ "You have to change either the product, the quantity or the pricelist."
14+ }
15+ res.update({'warning': warning})
16 dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
17
18
19
20=== modified file 'purchase/test/procurement_buy.yml'
21--- purchase/test/procurement_buy.yml 2011-01-14 00:11:01 +0000
22+++ purchase/test/procurement_buy.yml 2011-10-17 12:05:26 +0000
23@@ -24,7 +24,7 @@
24 seller_delay: '1'
25 seller_ids:
26 - delay: 1
27- name: base.res_partner_asus
28+ name: base.res_partner_10
29 min_qty: 2.0
30 qty: 5.0
31 -

Subscribers

People subscribed via source and target branches

to all changes: