Unifield Server

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

  1. us-1213
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4176
Proposed branch: lp:~unifield-team/unifield-server/us-1213
Merge into: lp:unifield-server
Diff against target: 197 lines (+42/-27)
5 files modified
bin/addons/consumption_calculation/consumption_calculation.py (+7/-7)
bin/addons/consumption_calculation/consumption_view.xml (+2/-2)
bin/addons/msf_printed_documents/report/consumption_report.rml (+2/-2)
bin/addons/msf_profile/i18n/es_MF.po (+7/-3)
bin/addons/msf_profile/i18n/fr_MF.po (+24/-13)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1213
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+316017@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/consumption_calculation/consumption_calculation.py'
2--- bin/addons/consumption_calculation/consumption_calculation.py 2016-11-17 15:46:10 +0000
3+++ bin/addons/consumption_calculation/consumption_calculation.py 2017-01-31 14:44:16 +0000
4@@ -159,13 +159,13 @@
5 _columns = {
6 'name': fields.char(size=64, string='Reference'),
7 'creation_date': fields.datetime(string='Creation date', required=1),
8- 'cons_location_id': fields.many2one('stock.location', string='Consumer location', domain=[('usage', '=', 'internal')], required=True, select=1),
9+ 'cons_location_id': fields.many2one('stock.location', string='Source Location', domain=[('usage', '=', 'internal')], required=True, select=1),
10 'cons_location_name': fields.function(_get_act_name, method=True, type='char', string='Consumer location Name', readonly=True, size=128, multi='loc_name', store={
11- 'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['cons_location_id'], 10),
12- 'stock.location': (_get_stock_location, ['name'], 20),
13- },),
14- 'activity_id': fields.many2one('stock.location', string='Activity', domain=[('usage', '=', 'customer')], required=1, select=1),
15- 'activity_name': fields.function(_get_act_name, method=True, type='char', string='Activity Name', readonly=True, size=128, multi='loc_name', store={
16+ 'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['cons_location_id'], 10),
17+ 'stock.location': (_get_stock_location, ['name'], 20),
18+ },),
19+ 'activity_id': fields.many2one('stock.location', string='Destination Location', domain=[('usage', '=', 'customer')], required=1, select=1),
20+ 'activity_name': fields.function(_get_act_name, method=True, type='char', string='Destination Location', readonly=True, size=128, multi='loc_name', store={
21 'real.average.consumption': (lambda obj, cr, uid, ids, c={}: ids, ['activity_id'], 10),
22 'stock.location': (_get_stock_location, ['name'], 20),
23 },),
24@@ -1024,7 +1024,7 @@
25
26 _columns = {
27 'report_id': fields.many2one('real.average.consumption', string='Report'),
28- 'location_id': fields.many2one('stock.location', string='Consumer location', required=True),
29+ 'location_id': fields.many2one('stock.location', string='Source Location', required=True),
30 }
31
32 def change_location(self, cr, uid, ids, context=None):
33
34=== modified file 'bin/addons/consumption_calculation/consumption_view.xml'
35--- bin/addons/consumption_calculation/consumption_view.xml 2016-11-04 12:57:37 +0000
36+++ bin/addons/consumption_calculation/consumption_view.xml 2017-01-31 14:44:16 +0000
37@@ -102,8 +102,8 @@
38 <field name="arch" type="xml">
39 <tree string="Real consumption reports">
40 <field name="name" />
41- <field name="cons_location_name" string="Consumer location" />
42- <field name="activity_name" string="Activity" />
43+ <field name="cons_location_name" string="Source Location" />
44+ <field name="activity_name" string="Destination Location" />
45 <field name="period_from" />
46 <field name="period_to" />
47 <field name="nb_lines" />
48
49=== modified file 'bin/addons/msf_printed_documents/report/consumption_report.rml'
50--- bin/addons/msf_printed_documents/report/consumption_report.rml 2012-07-25 12:07:31 +0000
51+++ bin/addons/msf_printed_documents/report/consumption_report.rml 2017-01-31 14:44:16 +0000
52@@ -180,7 +180,7 @@
53 </tr>
54 <tr>
55 <td>
56- <para style="TextInformation" alignment="LEFT"><b>Location :</b></para>
57+ <para style="TextInformation" alignment="LEFT"><b>Source Location :</b></para>
58 </td>
59 <td>
60 <para style="TextInformation" alignment="LEFT">[[ objects[0].cons_location_id and objects[0].cons_location_id.name or False]]</para>
61@@ -194,7 +194,7 @@
62 </tr>
63 <tr>
64 <td>
65- <para style="TextInformation" alignment="LEFT"><b>Activity :</b></para>
66+ <para style="TextInformation" alignment="LEFT"><b>Destination Location :</b></para>
67 </td>
68 <td>
69 <para style="TextInformation" alignment="LEFT">[[ objects[0].activity_id and objects[0].activity_id.name or False]]</para>
70
71=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
72--- bin/addons/msf_profile/i18n/es_MF.po 2016-12-13 14:54:56 +0000
73+++ bin/addons/msf_profile/i18n/es_MF.po 2017-01-31 14:44:16 +0000
74@@ -11670,7 +11670,7 @@
75 #. module: consumption_calculation
76 #: field:real.average.consumption,cons_location_id:0
77 #: field:real.consumption.change.location,location_id:0
78-msgid "Consumer location"
79+msgid "Source Location"
80 msgstr "Ubicación de consumo"
81
82 #. module: msf_doc_import
83@@ -62621,12 +62621,16 @@
84 msgid "No correction journal found!"
85 msgstr "¡No se ha encontrado un diario de corrección!"
86
87-#. modules: base, consumption_calculation
88+#. module: base
89 #: view:workflow.activity:0
90 #: field:workflow.workitem,act_id:0
91+msgid "Activity"
92+msgstr "Actividad"
93+
94+#. module: consumption_calculation
95 #: view:real.average.consumption:0
96 #: field:real.average.consumption,activity_id:0
97-msgid "Activity"
98+msgid "Destination Location"
99 msgstr "Actividad"
100
101 #. module: register_accounting
102
103=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
104--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-23 16:14:11 +0000
105+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-31 14:44:16 +0000
106@@ -870,14 +870,18 @@
107 msgid "module base cannot be loaded! (hint: verify addons-path)"
108 msgstr "le module ne peut être chargé! (astuce: vérifier chemin des addons)"
109
110-#. modules: base, consumption_calculation
111+#. module: base
112 #: view:workflow.activity:0
113 #: field:workflow.workitem,act_id:0
114-#: view:real.average.consumption:0
115-#: field:real.average.consumption,activity_id:0
116 msgid "Activity"
117 msgstr "Activité"
118
119+#. module: consumption_calculation
120+#: view:real.average.consumption:0
121+#: field:real.average.consumption,activity_id:0
122+msgid "Destination Location"
123+msgstr "Destination - Zone"
124+
125 #. module: base
126 #: model:res.currency,currency_name:base.KES
127 msgid "KENYAN SHILLING"
128@@ -6129,8 +6133,8 @@
129
130 #. module: sale
131 #: report:msf.consumption_report:0
132-msgid "Activity :"
133-msgstr "Activité :"
134+msgid "Destination Location :"
135+msgstr "Destination - Zone :"
136
137 #. module: purchase_compare_rfq
138 #: view:wizard.choose.supplier:0
139@@ -14274,7 +14278,7 @@
140 msgid "Saint Lucia"
141 msgstr "Sainte-Lucie"
142
143-#. modules: msf_outgoing, stock_move_tracking, stock_override, specific_rules, kit, stock
144+#. modules: msf_outgoing, stock_move_tracking, stock_override, specific_rules, kit, stock, consumption_calculation
145 #: field:kit.creation.to.consume,location_src_id_to_consume:0
146 #: field:process.to.consume.line,location_src_id_process_to_consume:0
147 #: field:substitute.item,location_id_substitute_item:0
148@@ -14297,6 +14301,9 @@
149 #: code:addons/msf_doc_import/wizard/__init__.py:78
150 #: report:delivery.order:0
151 #: report:internal.move:0
152+#: field:real.average.consumption,cons_location_id:0
153+#: field:real.consumption.change.location,location_id:0
154+#: view:real.average.consumption:0
155 msgid "Source Location"
156 msgstr "Zone Source"
157
158@@ -16193,12 +16200,6 @@
159 msgid "Delivery Lead Time"
160 msgstr "Délai de Livraison"
161
162-#. module: consumption_calculation
163-#: field:real.average.consumption,cons_location_id:0
164-#: field:real.consumption.change.location,location_id:0
165-msgid "Consumer location"
166-msgstr "Zone Consommateur"
167-
168 #. module: sale_override
169 #: model:ir.module.module,shortdesc:sale_override.module_meta_information
170 msgid "Sale override"
171@@ -69582,11 +69583,16 @@
172
173 #. modules: consumption_calculation, sale
174 #: report:expiry.report:0
175-#: report:msf.consumption_report:0
176 #: report:msf.product_list:0
177 msgid "Location :"
178 msgstr "Zone:"
179
180+#. module: consumption_calculation
181+#: report:msf.consumption_report:0
182+msgid "Location :"
183+msgstr "Zone Source :"
184+
185+
186 #. module: account
187 #: view:account.period:0
188 msgid "Search Period"
189@@ -76088,3 +76094,8 @@
190 #, python-format
191 msgid "A line was added to the %s %s to re-source the canceled line."
192 msgstr "Une ligne a été ajoutée a la %s %s pour 're-sourcer' la ligne annulée."
193+
194+#. modules: sale, msf_printed_documents
195+#: report:msf.consumption_report:0
196+msgid "Source Location :"
197+msgstr "Source Location :"

Subscribers

People subscribed via source and target branches

to all changes: