Unifield Addons

Merge lp:~unifield-team/unifield-addons/ref_addons-uftp-90-93 into lp:unifield-addons/ref-addons

  1. ref_addons-uftp-90-93
  2. Merge into ref_addons
Proposed by jftempo
Status: Merged
Merged at revision: 4621
Proposed branch: lp:~unifield-team/unifield-addons/ref_addons-uftp-90-93
Merge into: lp:unifield-addons/ref-addons
Diff against target: 27 lines (+6/-4)
1 file modified
sale/sale.py (+6/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/ref_addons-uftp-90-93
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+212444@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 'sale/sale.py'
2--- sale/sale.py 2014-02-20 10:38:28 +0000
3+++ sale/sale.py 2014-03-24 15:03:41 +0000
4@@ -316,9 +316,10 @@
5 # Deleting the existing instance of workflow for SO
6 wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
7 wf_service.trg_create(uid, 'sale.order', inv_id, cr)
8- for (id,name) in self.name_get(cr, uid, ids):
9- message = _("The sales order '%s' has been set in draft state.") %(name,)
10- self.log(cr, uid, id, message)
11+ for sale in self.browse(cr, uid, ids, context=context):
12+ sale_order_label = 'IR' if sale.procurement_request else 'FO' # UFTP-93
13+ message = _("The %s '%s' has been set in draft state.") % (sale_order_label, sale.name,)
14+ self.log(cr, uid, sale.id, message)
15 return True
16
17 def onchange_partner_id(self, cr, uid, ids, part):
18@@ -592,7 +593,8 @@
19 wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
20 sale_order_line_obj.write(cr, uid, [l.id for l in sale.order_line],
21 {'state': 'cancel'}, context=context)
22- message = _("The sales order '%s' has been cancelled.") % (sale.name,)
23+ sale_order_label = 'IR' if sale.procurement_request else 'FO' # UFTP-93
24+ message = _("The %s '%s' has been cancelled.") % (sale_order_label, sale.name,)
25 self.log(cr, uid, sale.id, message)
26 self.write(cr, uid, ids, {'state': 'cancel'})
27 return True

Subscribers

People subscribed via source and target branches

to all changes: