Unifield Server

Merge lp:~unifield-team/unifield-server/us-1096 into lp:unifield-server

  1. us-1096
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4157
Proposed branch: lp:~unifield-team/unifield-server/us-1096
Merge into: lp:unifield-server
Diff against target: 133 lines (+14/-14)
6 files modified
bin/addons/msf_profile/i18n/allmsf.pot (+1/-1)
bin/addons/msf_profile/i18n/es_MF.po (+2/-2)
bin/addons/msf_profile/i18n/fr_MF.po (+2/-2)
bin/addons/stock_batch_recall/__openerp__.py (+2/-2)
bin/addons/stock_batch_recall/stock.py (+2/-2)
bin/addons/stock_batch_recall/stock_view.xml (+5/-5)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1096
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314820@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/allmsf.pot'
2--- bin/addons/msf_profile/i18n/allmsf.pot 2013-10-17 07:46:50 +0000
3+++ bin/addons/msf_profile/i18n/allmsf.pot 2017-01-16 10:12:32 +0000
4@@ -20017,7 +20017,7 @@
5 #: model:ir.ui.menu,name:stock_batch_recall.menu_batch_recall
6 #: view:report.batch.recall:0
7 #: view:stock.batch.recall:0
8-msgid "Batch Recall"
9+msgid "Batch Location"
10 msgstr ""
11
12 #. module: product_asset
13
14=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
15--- bin/addons/msf_profile/i18n/es_MF.po 2016-11-17 10:53:26 +0000
16+++ bin/addons/msf_profile/i18n/es_MF.po 2017-01-16 10:12:32 +0000
17@@ -45369,8 +45369,8 @@
18 #: model:ir.ui.menu,name:stock_batch_recall.menu_batch_recall
19 #: view:report.batch.recall:0
20 #: view:stock.batch.recall:0
21-msgid "Batch Recall"
22-msgstr "Recuperación de lotes"
23+msgid "Batch Location"
24+msgstr "Ubicación de lotes"
25
26 #. module: msf_cross_docking
27 #: code:addons/msf_cross_docking/cross_docking.py:349
28
29=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
30--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-02 08:52:42 +0000
31+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-16 10:12:32 +0000
32@@ -60235,8 +60235,8 @@
33 #: model:ir.ui.menu,name:stock_batch_recall.menu_batch_recall
34 #: view:report.batch.recall:0
35 #: view:stock.batch.recall:0
36-msgid "Batch Recall"
37-msgstr "Rappel de Lot"
38+msgid "Batch Location"
39+msgstr "Emplacements des Lots"
40
41 #. module: stock
42 #: code:addons/stock/wizard/stock_return_picking.py:92
43
44=== modified file 'bin/addons/stock_batch_recall/__openerp__.py'
45--- bin/addons/stock_batch_recall/__openerp__.py 2011-12-14 16:34:10 +0000
46+++ bin/addons/stock_batch_recall/__openerp__.py 2017-01-16 10:12:32 +0000
47@@ -20,7 +20,7 @@
48 ##############################################################################
49
50 {
51- "name": "Batch Recall",
52+ "name": "Batch Location",
53 "version": "1.0",
54 "depends": ["base", "stock_move_tracking", "product_expiry", "specific_rules"],
55 "author": "TeMPO Consulting, MSF",
56@@ -44,4 +44,4 @@
57 # 'certificate': 'certificate',
58 }
59
60-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
61\ No newline at end of file
62+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
63
64=== modified file 'bin/addons/stock_batch_recall/stock.py'
65--- bin/addons/stock_batch_recall/stock.py 2015-05-26 14:25:23 +0000
66+++ bin/addons/stock_batch_recall/stock.py 2017-01-16 10:12:32 +0000
67@@ -29,7 +29,7 @@
68
69 class stock_batch_recall(osv.osv_memory):
70 _name = 'stock.batch.recall'
71- _description = 'Batch Recall'
72+ _description = 'Batch Location'
73
74 _columns = {
75 'product_id': fields.many2one('product.product', string='Product'),
76@@ -87,7 +87,7 @@
77 class report_batch_recall(osv.osv):
78 _name = 'report.batch.recall'
79 _rec_name = 'product_id'
80- _description = 'Batch Recall'
81+ _description = 'Batch Location'
82 _auto = False
83 _columns = {
84 'product_id':fields.many2one('product.product', 'Product', readonly=True),
85
86=== modified file 'bin/addons/stock_batch_recall/stock_view.xml'
87--- bin/addons/stock_batch_recall/stock_view.xml 2012-10-30 16:05:53 +0000
88+++ bin/addons/stock_batch_recall/stock_view.xml 2017-01-16 10:12:32 +0000
89@@ -7,7 +7,7 @@
90 <field name="model">report.batch.recall</field>
91 <field name="type">search</field>
92 <field name="arch" type="xml">
93- <search string="Batch Recall">
94+ <search string="Batch Location">
95 <group expand="0" string="Filters...">
96 <filter icon="terp-go-home" name="location_type_internal" string="Internal" domain="[('location_type','=','internal')]"/>
97 <separator orientation="vertical"/>
98@@ -28,7 +28,7 @@
99 <field name="model">report.batch.recall</field>
100 <field name="type">tree</field>
101 <field name="arch" type="xml">
102- <tree string="Batch Recall">
103+ <tree string="Batch Location">
104 <field name="location_type" invisible="1"/>
105 <field name="product_id"/>
106 <field name="prodlot_id"/>
107@@ -46,7 +46,7 @@
108 <field name="model">stock.batch.recall</field>
109 <field name="type">form</field>
110 <field name="arch" type="xml">
111- <form string="Batch Recall">
112+ <form string="Batch Location">
113 <field name="product_id" colspan="4" />
114 <field name="prodlot_id" colspan="4" />
115 <field name="expired_date" colspan="4" />
116@@ -57,7 +57,7 @@
117 </record>
118
119 <record id="action_batch_recall" model="ir.actions.act_window">
120- <field name="name">Batch Recall</field>
121+ <field name="name">Batch Location</field>
122 <field name="res_model">stock.batch.recall</field>
123 <field name="view_type">form</field>
124 <field name="view_mode">form</field>
125@@ -70,7 +70,7 @@
126 parent="stock.menu_traceability" />
127
128 <record id="action_report_batch_recall" model="ir.actions.act_window">
129- <field name="name">Batch Recall</field>
130+ <field name="name">Batch Location</field>
131 <field name="res_model">report.batch.recall</field>
132 <field name="view_type">form</field>
133 <field name="view_mode">tree</field>

Subscribers

People subscribed via source and target branches

to all changes: