Unifield Server

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

  1. US-8309
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5945
Proposed branch: lp:~dorian-kemps/unifield-server/US-8309
Merge into: lp:unifield-server
Diff against target: 83 lines (+24/-0)
3 files modified
bin/addons/msf_profile/i18n/fr_MF.po (+5/-0)
bin/addons/stock/wizard/manage_expired_stock.py (+1/-0)
bin/addons/stock/wizard/manage_expired_stock.xml (+18/-0)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-8309
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+398457@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 2021-02-05 16:30:31 +0000
3+++ bin/addons/msf_profile/i18n/fr_MF.po 2021-02-22 14:05:05 +0000
4@@ -16585,6 +16585,7 @@
5 #: field:product.history.consumption,location_dest_id:0
6 #: report:addons/stock/report/stock_delivery_report_xls.mako:198
7 #: report:addons/stock/report/stock_delivery_report_xls.mako:224
8+#: field:view.expired.expiring.stock.lines,location_dest_id:0
9 #, python-format
10 msgid "Destination Location"
11 msgstr "Zone Destination"
12@@ -19382,6 +19383,7 @@
13 #: report:addons/stock/report/stock_delivery_report_xls.mako:223
14 #: field:stock.delivery.wizard,location_id:0
15 #: report:kitting.order.report:0
16+#: field:view.expired.expiring.stock.lines,location_id:0
17 #, python-format
18 msgid "Source Location"
19 msgstr "Zone Source"
20@@ -40169,6 +40171,7 @@
21 #: field:product.stock_out.line,substitute_3_uom_id:0
22 #: field:product.stock_out.line,uom_id:0
23 #: report:kitting.order.report:0
24+#: field:view.expired.expiring.stock.lines,product_uom:0
25 #, python-format
26 msgid "UoM"
27 msgstr "UdM"
28@@ -51166,6 +51169,7 @@
29 #: view:stock.picking:0
30 #: field:report.stock.move,reason_type_id:0
31 #: field:stock.reception.wizard,reason_type_id:0
32+#: field:view.expired.expiring.stock.lines,reason_type_id:0
33 msgid "Reason type"
34 msgstr "Type de raison"
35
36@@ -111871,6 +111875,7 @@
37 #. module: stock
38 #: model:ir.model,name:stock.model_view_expired_expiring_stock_lines
39 #: view:view.expired.expiring.stock:0
40+#: view:view.expired.expiring.stock.lines:0
41 msgid "Expired/Expiring Products"
42 msgstr "Produits Expirés/Expirants"
43
44
45=== modified file 'bin/addons/stock/wizard/manage_expired_stock.py'
46--- bin/addons/stock/wizard/manage_expired_stock.py 2021-02-05 15:43:46 +0000
47+++ bin/addons/stock/wizard/manage_expired_stock.py 2021-02-22 14:05:05 +0000
48@@ -175,6 +175,7 @@
49 class view_expired_expiring_stock(osv.osv):
50 _name = 'view.expired.expiring.stock'
51 _description = 'View Expired/Expiring Products'
52+ _rec_name = 'mng_exp_id'
53
54 _columns = {
55 'mng_exp_id': fields.many2one('manage.expired.stock', string='Manage Expired Stock Id', readonly=True),
56
57=== modified file 'bin/addons/stock/wizard/manage_expired_stock.xml'
58--- bin/addons/stock/wizard/manage_expired_stock.xml 2021-02-05 15:43:46 +0000
59+++ bin/addons/stock/wizard/manage_expired_stock.xml 2021-02-22 14:05:05 +0000
60@@ -59,5 +59,23 @@
61 </form>
62 </field>
63 </record>
64+
65+ <record id="view_expired_expiring_stock_lines_form" model="ir.ui.view">
66+ <field name="name">view.expired.expiring.stock.lines.form</field>
67+ <field name="model">view.expired.expiring.stock.lines</field>
68+ <field name="type">form</field>
69+ <field name="arch" type="xml">
70+ <form string="Expired/Expiring Products">
71+ <field name="product_id" />
72+ <field name="prodlot_id" />
73+ <field name="expired_date" />
74+ <field name="product_qty" />
75+ <field name="product_uom" />
76+ <field name="location_id" />
77+ <field name="location_dest_id" />
78+ <field name="reason_type_id" />
79+ </form>
80+ </field>
81+ </record>
82 </data>
83 </openerp>

Subscribers

People subscribed via source and target branches