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
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py 2011-10-03 07:27:27 +0000
+++ purchase/purchase.py 2011-10-17 12:05:26 +0000
@@ -701,6 +701,14 @@
701 'uom': uom,701 'uom': uom,
702 'date': date_order,702 'date': date_order,
703 })[pricelist]703 })[pricelist]
704 if price is False:
705 warning = {
706 'title': 'No valid pricelist line found !',
707 'message':
708 "Couldn't find a pricelist line matching this product and quantity.\n"
709 "You have to change either the product, the quantity or the pricelist."
710 }
711 res.update({'warning': warning})
704 dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')712 dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
705713
706714
707715
=== modified file 'purchase/test/procurement_buy.yml'
--- purchase/test/procurement_buy.yml 2011-01-14 00:11:01 +0000
+++ purchase/test/procurement_buy.yml 2011-10-17 12:05:26 +0000
@@ -24,7 +24,7 @@
24 seller_delay: '1'24 seller_delay: '1'
25 seller_ids:25 seller_ids:
26 - delay: 126 - delay: 1
27 name: base.res_partner_asus27 name: base.res_partner_10
28 min_qty: 2.028 min_qty: 2.0
29 qty: 5.029 qty: 5.0
30-30-

Subscribers

People subscribed via source and target branches

to all changes: