Unifield Server

Merge lp:~julie-w/unifield-server/US-6117 into lp:unifield-server

  1. US-6117
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5440
Proposed branch: lp:~julie-w/unifield-server/US-6117
Merge into: lp:unifield-server
Diff against target: 60 lines (+8/-8)
3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+2/-2)
bin/addons/purchase/purchase_workflow.py (+3/-3)
bin/addons/sale/sale_workflow.py (+3/-3)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-6117
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+370102@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/msf_profile/i18n/fr_MF.po'
2--- bin/addons/msf_profile/i18n/fr_MF.po 2019-06-20 14:24:33 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-07-15 07:18:57 +0000
4@@ -17440,8 +17440,8 @@
5 #: code:addons/purchase/purchase_workflow.py:549
6 #: code:addons/sale/sale_workflow.py:529
7 #, python-format
8-msgid "You can't use taxes with an intermission partner."
9-msgstr "Vous ne pouvez pas utiliser de taxes avec un partenaire intermission."
10+msgid "Taxes are forbidden with Intermission and Intersection partners."
11+msgstr "Les taxes sont interdites avec les partenaires Intermission et Intersection."
12
13 #. module: account
14 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
15
16=== modified file 'bin/addons/purchase/purchase_workflow.py'
17--- bin/addons/purchase/purchase_workflow.py 2019-05-14 08:00:10 +0000
18+++ bin/addons/purchase/purchase_workflow.py 2019-07-15 07:18:57 +0000
19@@ -502,15 +502,15 @@
20
21 def check_po_tax(self, cr, uid, ids, context=None):
22 """
23- Prevents from validating a PO with taxes when using an Intermission partner
24+ Prevents from validating a PO with taxes when using an Intermission or Intersection partner
25 """
26 if context is None:
27 context = {}
28 if isinstance(ids, (int, long)):
29 ids = [ids]
30 for po_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'taxes_id'], context=context):
31- if po_line.taxes_id and po_line.order_id.partner_type == 'intermission':
32- raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
33+ if po_line.taxes_id and po_line.order_id.partner_type in ('intermission', 'section'):
34+ raise osv.except_osv(_('Error'), _("Taxes are forbidden with Intermission and Intersection partners."))
35
36 def check_origin_for_validation(self, cr, uid, ids, context=None):
37 if not context:
38
39=== modified file 'bin/addons/sale/sale_workflow.py'
40--- bin/addons/sale/sale_workflow.py 2019-05-14 08:00:10 +0000
41+++ bin/addons/sale/sale_workflow.py 2019-07-15 07:18:57 +0000
42@@ -529,15 +529,15 @@
43
44 def check_fo_tax(self, cr, uid, ids, context=None):
45 """
46- Prevents from validating a FO with taxes when using an Intermission partner
47+ Prevents from validating a FO with taxes when using an Intermission or Intersection partner
48 """
49 if context is None:
50 context = {}
51 if isinstance(ids, (int, long)):
52 ids = [ids]
53 for fo_line in self.browse(cr, uid, ids, fields_to_fetch=['order_id', 'tax_id'], context=context):
54- if fo_line.tax_id and fo_line.order_id.partner_type == 'intermission':
55- raise osv.except_osv(_('Error'), _("You can't use taxes with an intermission partner."))
56+ if fo_line.tax_id and fo_line.order_id.partner_type in ('intermission', 'section'):
57+ raise osv.except_osv(_('Error'), _("Taxes are forbidden with Intermission and Intersection partners."))
58
59 def action_validate(self, cr, uid, ids, context=None):
60 '''

Subscribers

People subscribed via source and target branches