Merge lp:~alejandrosantana/openerp-humanitarian-ngo/7.0-purchase-wkfl--fix-1277236 into lp:openerp-humanitarian-ngo/purchase-wkfl

Proposed by Alejandro Santana
Status: Merged
Merge reported by: Nicolas Bessi - Camptocamp
Merged at revision: not available
Proposed branch: lp:~alejandrosantana/openerp-humanitarian-ngo/7.0-purchase-wkfl--fix-1277236
Merge into: lp:openerp-humanitarian-ngo/purchase-wkfl
Diff against target: 21 lines (+2/-2)
1 file modified
purchase_requisition_extended/model/purchase_requisition.py (+2/-2)
To merge this branch: bzr merge lp:~alejandrosantana/openerp-humanitarian-ngo/7.0-purchase-wkfl--fix-1277236
Reviewer Review Type Date Requested Status
Nicolas Bessi - Camptocamp (community) Approve
Review via email: mp+205280@code.launchpad.net

Commit message

[FIX] purchase_requisition_extended: Fixes typos breaking dictionaries.

Description of the change

[FIX] purchase_requisition_extended: Fixes typos breaking dictionaries.
Fixes bug 1277236
https://bugs.launchpad.net/openerp-humanitarian-ngo/+bug/1277236

To post a comment you must log in.
Revision history for this message
Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote :

Hi,

Thanks a lot for the fix ! Seems like it's fixed.

Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

Thanks for the patch.

Bug was fixed by commit: http://bazaar.launchpad.net/~humanitarian-core-editors/openerp-humanitarian-ngo/purchase-wkfl/revision/74

My apologies I was in checkout mode not in branch mode when redoing the merge.

Can you please check the commit. If you do not agreed with patch I will revert it.

Regards

Nicolas

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'purchase_requisition_extended/model/purchase_requisition.py'
2--- purchase_requisition_extended/model/purchase_requisition.py 2014-02-06 13:53:45 +0000
3+++ purchase_requisition_extended/model/purchase_requisition.py 2014-02-07 01:43:02 +0000
4@@ -32,7 +32,7 @@
5 "bid."),
6 'bid_tendering_mode': fields.selection([('open', 'Open'),
7 ('restricted', 'Restricted')],
8- 'Call for Bids Mode'),
9+ 'Call for Bids Mode',
10 help="- Restricted : you select yourself the "
11 "bidders and generate a RFQ for each of "
12 "those. \n"
13@@ -44,7 +44,7 @@
14 'bid_receipt_mode': fields.selection([('open', 'Open'),
15 ('sealed', 'Sealed')],
16 'Bid Receipt Mode',
17- required=True),
18+ required=True,
19 help="- Open : The bids can be opened when "
20 "received and encoded. \n"
21 "- Closed : The bids can be marked as "

Subscribers

People subscribed via source and target branches