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

[jftempo]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2021-02-05 16:30:31 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2021-02-22 14:05:05 +0000
@@ -16585,6 +16585,7 @@
 #: field:product.history.consumption,location_dest_id:0
 #: report:addons/stock/report/stock_delivery_report_xls.mako:198
 #: report:addons/stock/report/stock_delivery_report_xls.mako:224
+#: field:view.expired.expiring.stock.lines,location_dest_id:0
 #, python-format
 msgid "Destination Location"
 msgstr "Zone Destination"
@@ -19382,6 +19383,7 @@
 #: report:addons/stock/report/stock_delivery_report_xls.mako:223
 #: field:stock.delivery.wizard,location_id:0
 #: report:kitting.order.report:0
+#: field:view.expired.expiring.stock.lines,location_id:0
 #, python-format
 msgid "Source Location"
 msgstr "Zone Source"
@@ -40169,6 +40171,7 @@
 #: field:product.stock_out.line,substitute_3_uom_id:0
 #: field:product.stock_out.line,uom_id:0
 #: report:kitting.order.report:0
+#: field:view.expired.expiring.stock.lines,product_uom:0
 #, python-format
 msgid "UoM"
 msgstr "UdM"
@@ -51166,6 +51169,7 @@
 #: view:stock.picking:0
 #: field:report.stock.move,reason_type_id:0
 #: field:stock.reception.wizard,reason_type_id:0
+#: field:view.expired.expiring.stock.lines,reason_type_id:0
 msgid "Reason type"
 msgstr "Type de raison"
 
@@ -111871,6 +111875,7 @@
 #. module: stock
 #: model:ir.model,name:stock.model_view_expired_expiring_stock_lines
 #: view:view.expired.expiring.stock:0
+#: view:view.expired.expiring.stock.lines:0
 msgid "Expired/Expiring Products"
 msgstr "Produits Expirés/Expirants"
 
 
=== modified file 'bin/addons/stock/wizard/manage_expired_stock.py'
--- bin/addons/stock/wizard/manage_expired_stock.py	2021-02-05 15:43:46 +0000
+++ bin/addons/stock/wizard/manage_expired_stock.py	2021-02-22 14:05:05 +0000
@@ -175,6 +175,7 @@
 class view_expired_expiring_stock(osv.osv):
     _name = 'view.expired.expiring.stock'
     _description = 'View Expired/Expiring Products'
+    _rec_name = 'mng_exp_id'
 
     _columns = {
         'mng_exp_id': fields.many2one('manage.expired.stock', string='Manage Expired Stock Id', readonly=True),
 
=== modified file 'bin/addons/stock/wizard/manage_expired_stock.xml'
--- bin/addons/stock/wizard/manage_expired_stock.xml	2021-02-05 15:43:46 +0000
+++ bin/addons/stock/wizard/manage_expired_stock.xml	2021-02-22 14:05:05 +0000
@@ -59,5 +59,23 @@
                 </form>
             </field>
         </record>
+
+        <record id="view_expired_expiring_stock_lines_form" model="ir.ui.view">
+            <field name="name">view.expired.expiring.stock.lines.form</field>
+            <field name="model">view.expired.expiring.stock.lines</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Expired/Expiring Products">
+                    <field name="product_id" />
+                    <field name="prodlot_id" />
+                    <field name="expired_date" />
+                    <field name="product_qty" />
+                    <field name="product_uom" />
+                    <field name="location_id" />
+                    <field name="location_dest_id" />
+                    <field name="reason_type_id" />
+                </form>
+            </field>
+        </record>
     </data>
 </openerp>