Unifield Server

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

  1. US-8280
  2. Merge into trunk
Proposed by jftempo
Status: Needs review
Proposed branch: lp:~dorian-kemps/unifield-server/US-8280
Merge into: lp:unifield-server
Diff against target: 90 lines (+20/-2)
5 files modified
bin/addons/delivery_mechanism/delivery_mechanism.py (+4/-0)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py (+1/-0)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml (+8/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+7/-1)
bin/addons/stock_override/stock_view.xml (+0/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-8280
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+406378@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/delivery_mechanism/delivery_mechanism.py'
2--- bin/addons/delivery_mechanism/delivery_mechanism.py 2021-07-12 08:40:39 +0000
3+++ bin/addons/delivery_mechanism/delivery_mechanism.py 2021-07-29 13:33:25 +0000
4@@ -1013,6 +1013,7 @@
5 'state':'draft',
6 'in_dpo': context.get('for_dpo', False), # TODO used ?
7 'dpo_incoming': wizard.picking_id.dpo_incoming,
8+ 'physical_reception_date': wizard.physical_reception_date or False,
9 }
10
11 if usb_entity == self.REMOTE_WAREHOUSE and not context.get('sync_message_execution', False): # RW Sync - set the replicated to True for not syncing it again
12@@ -1158,6 +1159,9 @@
13 'close_in': _('In progress'),
14 }, context=context)
15
16+ if wizard.physical_reception_date:
17+ self.write(cr, uid, picking_id, {'physical_reception_date': wizard.physical_reception_date})
18+
19 # Claim specific code
20 self._claim_registration(cr, uid, wizard, picking_id, context=context)
21
22
23=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
24--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py 2021-03-29 16:25:04 +0000
25+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py 2021-07-29 13:33:25 +0000
26@@ -222,6 +222,7 @@
27 'location_dest_active_ok': fields.function(_get_location_dest_active_ok, method=True, type='boolean', string='Dest location is inactive ?', store=False),
28 'fields_as_ro': fields.boolean('Hide split/change prod', internal=True),
29 'sequence_issue': fields.boolean('Issue with To ship'),
30+ 'physical_reception_date': fields.datetime('Physical Reception Date'),
31 }
32
33 _defaults = {
34
35=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
36--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2021-04-13 10:34:09 +0000
37+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2021-07-29 13:33:25 +0000
38@@ -86,6 +86,14 @@
39 </page>
40 </notebook>
41 </group>
42+ <group colspan="4" col="4">
43+ <html>
44+ <div style="font-weight: bold; text-align: right;">
45+ <translate>Physical Reception Date :</translate>
46+ </div>
47+ </html>
48+ <field name="physical_reception_date" nolabel="1" colspan="1" />
49+ </group>
50 <group colspan="9" col="10" name="actions">
51 <separator string="Actions" colspan="9" />
52 <field name="dest_type"
53
54=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
55--- bin/addons/msf_profile/i18n/fr_MF.po 2021-07-19 08:48:39 +0000
56+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-07-29 13:33:25 +0000
57@@ -99833,10 +99833,11 @@
58 msgstr "\n"
59 "PROD"
60
61-#. module: stock, msf_supply_doc_export
62+#. module: stock, msf_supply_doc_export, msf_outgoing
63 #: field:stock.picking,physical_reception_date:0
64 #: report:addons/stock/report/stock_reception_report_xls.mako:249
65 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:256
66+#: field:stock.incoming.processor,physical_reception_date:0
67 msgid "Physical Reception Date"
68 msgstr "Date de Réception Physique"
69
70@@ -112400,3 +112401,8 @@
71 #, python-format
72 msgid "Cannot process Document/line due to Product Code %s which does not exist in this instance"
73 msgstr "Impossible de traiter le Document/la ligne. Le Code Produit %s n'existe pas dans cette instance"
74+
75+#. module: msf_outgoing
76+#: view:stock.incoming.processor:0
77+msgid "Physical Reception Date :"
78+msgstr "Date de Réception Physique :"
79
80=== modified file 'bin/addons/stock_override/stock_view.xml'
81--- bin/addons/stock_override/stock_view.xml 2021-05-18 14:23:50 +0000
82+++ bin/addons/stock_override/stock_view.xml 2021-07-29 13:33:25 +0000
83@@ -455,7 +455,6 @@
84 <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
85 <field name="shipment_ref" />
86 <field name="claim_name" readonly="1" attrs="{'invisible': [('claim', '=', False)]}"/>
87- <field name="physical_reception_date" />
88 </group>
89 </group>
90 <field name="is_esc" invisible="1" />

Subscribers

People subscribed via source and target branches