Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-7462 into lp:unifield-server

  1. US-7462
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5753
Proposed branch: lp:~dorian-kemps/unifield-server/US-7462
Merge into: lp:unifield-server
Diff against target: 44 lines (+10/-2)
2 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+5/-0)
bin/addons/stock/stock.py (+5/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-7462
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+386605@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 2020-06-25 08:27:13 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2020-06-30 15:41:38 +0000
4@@ -110336,3 +110336,8 @@
5 msgid "Line %s. The donation accounts are not compatible with the journal type %s."
6 msgstr "Ligne %s. Les comptes de donation ne sont pas compatibles avec le type de journal %s."
7
8+#. module: stock
9+#: code:addons/stock/stock.py:1813
10+#, python-format
11+msgid "is dispatched."
12+msgstr "est expédié."
13
14=== modified file 'bin/addons/stock/stock.py'
15--- bin/addons/stock/stock.py 2019-12-13 17:24:53 +0000
16+++ bin/addons/stock/stock.py 2020-06-30 15:41:38 +0000
17@@ -1792,10 +1792,12 @@
18 'ppl': _('Pre-Packing List')
19 }
20
21+ done_out = False
22 if pick.type == 'out' and pick.subtype in sub_type:
23 doc_name = sub_type.get(pick.subtype)
24 else:
25 doc_name = type_list.get(pick.type, _('Document'))
26+ done_out = pick.state == 'done' and pick.type == 'out' and pick.subtype == 'standard'
27 # modify the list of views
28 message = ''.join((doc_name, " '", (pick.name or '?'), "' "))
29 infolog_message = None
30@@ -1809,11 +1811,12 @@
31 'cancel': _('is cancelled.'),
32 'done': _('is done.'),
33 'delivered': _('is delivered.'),
34- 'draft':_('is in draft state.'),
35+ 'draft': _('is in draft state.'),
36+ 'dispatched': _('is dispatched.'),
37 }
38 state_list = self._hook_state_list(cr, uid, state_list=state_list, msg=msg)
39 action_xmlid = self._hook_picking_get_view(cr, uid, ids, context=context, pick=pick)
40- message += state_list[pick.state]
41+ message += done_out and state_list['dispatched'] or state_list[pick.state]
42 if infolog_message:
43 infolog_message += state_list[pick.state]
44 # modify the message to be displayed

Subscribers

People subscribed via source and target branches