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
=== modified file 'bin/addons/delivery_mechanism/delivery_mechanism.py'
--- bin/addons/delivery_mechanism/delivery_mechanism.py 2021-07-12 08:40:39 +0000
+++ bin/addons/delivery_mechanism/delivery_mechanism.py 2021-07-29 13:33:25 +0000
@@ -1013,6 +1013,7 @@
1013 'state':'draft',1013 'state':'draft',
1014 'in_dpo': context.get('for_dpo', False), # TODO used ?1014 'in_dpo': context.get('for_dpo', False), # TODO used ?
1015 'dpo_incoming': wizard.picking_id.dpo_incoming,1015 'dpo_incoming': wizard.picking_id.dpo_incoming,
1016 'physical_reception_date': wizard.physical_reception_date or False,
1016 }1017 }
10171018
1018 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 again1019 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
@@ -1158,6 +1159,9 @@
1158 'close_in': _('In progress'),1159 'close_in': _('In progress'),
1159 }, context=context)1160 }, context=context)
11601161
1162 if wizard.physical_reception_date:
1163 self.write(cr, uid, picking_id, {'physical_reception_date': wizard.physical_reception_date})
1164
1161 # Claim specific code1165 # Claim specific code
1162 self._claim_registration(cr, uid, wizard, picking_id, context=context)1166 self._claim_registration(cr, uid, wizard, picking_id, context=context)
11631167
11641168
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py 2021-03-29 16:25:04 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py 2021-07-29 13:33:25 +0000
@@ -222,6 +222,7 @@
222 'location_dest_active_ok': fields.function(_get_location_dest_active_ok, method=True, type='boolean', string='Dest location is inactive ?', store=False),222 'location_dest_active_ok': fields.function(_get_location_dest_active_ok, method=True, type='boolean', string='Dest location is inactive ?', store=False),
223 'fields_as_ro': fields.boolean('Hide split/change prod', internal=True),223 'fields_as_ro': fields.boolean('Hide split/change prod', internal=True),
224 'sequence_issue': fields.boolean('Issue with To ship'),224 'sequence_issue': fields.boolean('Issue with To ship'),
225 'physical_reception_date': fields.datetime('Physical Reception Date'),
225 }226 }
226227
227 _defaults = {228 _defaults = {
228229
=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2021-04-13 10:34:09 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2021-07-29 13:33:25 +0000
@@ -86,6 +86,14 @@
86 </page>86 </page>
87 </notebook>87 </notebook>
88 </group>88 </group>
89 <group colspan="4" col="4">
90 <html>
91 <div style="font-weight: bold; text-align: right;">
92 <translate>Physical Reception Date :</translate>
93 </div>
94 </html>
95 <field name="physical_reception_date" nolabel="1" colspan="1" />
96 </group>
89 <group colspan="9" col="10" name="actions">97 <group colspan="9" col="10" name="actions">
90 <separator string="Actions" colspan="9" />98 <separator string="Actions" colspan="9" />
91 <field name="dest_type"99 <field name="dest_type"
92100
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po 2021-07-19 08:48:39 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-07-29 13:33:25 +0000
@@ -99833,10 +99833,11 @@
99833msgstr "\n"99833msgstr "\n"
99834"PROD"99834"PROD"
9983599835
99836#. module: stock, msf_supply_doc_export99836#. module: stock, msf_supply_doc_export, msf_outgoing
99837#: field:stock.picking,physical_reception_date:099837#: field:stock.picking,physical_reception_date:0
99838#: report:addons/stock/report/stock_reception_report_xls.mako:24999838#: report:addons/stock/report/stock_reception_report_xls.mako:249
99839#: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:25699839#: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:256
99840#: field:stock.incoming.processor,physical_reception_date:0
99840msgid "Physical Reception Date"99841msgid "Physical Reception Date"
99841msgstr "Date de Réception Physique"99842msgstr "Date de Réception Physique"
9984299843
@@ -112400,3 +112401,8 @@
112400#, python-format112401#, python-format
112401msgid "Cannot process Document/line due to Product Code %s which does not exist in this instance"112402msgid "Cannot process Document/line due to Product Code %s which does not exist in this instance"
112402msgstr "Impossible de traiter le Document/la ligne. Le Code Produit %s n'existe pas dans cette instance"112403msgstr "Impossible de traiter le Document/la ligne. Le Code Produit %s n'existe pas dans cette instance"
112404
112405#. module: msf_outgoing
112406#: view:stock.incoming.processor:0
112407msgid "Physical Reception Date :"
112408msgstr "Date de Réception Physique :"
112403112409
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml 2021-05-18 14:23:50 +0000
+++ bin/addons/stock_override/stock_view.xml 2021-07-29 13:33:25 +0000
@@ -455,7 +455,6 @@
455 <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>455 <field name="warehouse_id" widget="selection" attrs="{'readonly': [('state', 'not in', ('draft', 'confirmed', 'assigned'))]}"/>
456 <field name="shipment_ref" />456 <field name="shipment_ref" />
457 <field name="claim_name" readonly="1" attrs="{'invisible': [('claim', '=', False)]}"/>457 <field name="claim_name" readonly="1" attrs="{'invisible': [('claim', '=', False)]}"/>
458 <field name="physical_reception_date" />
459 </group>458 </group>
460 </group>459 </group>
461 <field name="is_esc" invisible="1" />460 <field name="is_esc" invisible="1" />

Subscribers

People subscribed via source and target branches