Unifield Server

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

  1. us-1680
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3969
Proposed branch: lp:~unifield-team/unifield-server/us-1680
Merge into: lp:unifield-server
Diff against target: 241 lines (+167/-8)
5 files modified
bin/addons/msf_doc_import/wizard/__init__.py (+2/-2)
bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py (+7/-1)
bin/addons/msf_profile/i18n/en_MF.po (+48/-0)
bin/addons/msf_profile/i18n/es_MF.po (+47/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+63/-5)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1680
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+305469@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeff Allen (jr.allen) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_doc_import/wizard/__init__.py'
2--- bin/addons/msf_doc_import/wizard/__init__.py 2016-07-21 07:33:07 +0000
3+++ bin/addons/msf_doc_import/wizard/__init__.py 2016-09-12 12:48:09 +0000
4@@ -59,8 +59,8 @@
5 PO_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in PO_COLUMNS_HEADER_FOR_IMPORT]
6
7 FO_COLUMNS_HEADER_FOR_IMPORT=[
8-(_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'),
9-(_('Delivery requested date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string')]
10+(_('fo_import_product_code'), 'string'), (_('fo_import_product_description'), 'string'), (_('fo_import_qty'), 'number'), (_('fo_import_uom'), 'string'),
11+(_('fo_import_price'), 'number'), (_('fo_import_drd'), 'date'), (_('fo_import_currency'), 'string'), (_('fo_import_comment'), 'string')]
12 FO_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in FO_COLUMNS_HEADER_FOR_IMPORT]
13
14 INT_COLUMNS_HEADER_FOR_IMPORT = [
15
16=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py'
17--- bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2016-09-07 15:02:37 +0000
18+++ bin/addons/msf_doc_import/wizard/wizard_import_fo_line.py 2016-09-12 12:48:09 +0000
19@@ -112,6 +112,12 @@
20
21 header_row = rows.next()
22 header_error = False
23+
24+ if len(header_row) != len(columns_for_fo_line_import):
25+ header_row = False
26+ header_error = True
27+ error_list.append(_("\n\tNumber of columns is not equal to %s") % len(columns_for_fo_line_import))
28+
29 if header_row:
30 for i, h_name in enumerate(columns_for_fo_line_import):
31 tr_header_row = _(tools.ustr(header_row[i]))
32@@ -122,7 +128,7 @@
33 error_list.append(_("\n\tPlease check spelling on column '%s'.") % tr_header_row)
34
35 if header_error:
36- msg = _("\n\tYou can not import this file because the header of columns doesn't match with the expected headers: %s") % ','.join(columns_for_fo_line_import)
37+ msg = _("\n\tYou can not import this file because the header of columns doesn't match with the expected headers: %s") % ','.join([_(x) for x in columns_for_fo_line_import])
38 error_list.append(msg)
39 msg = _("\n\tPlease ensure that all these columns are present and in this exact order.")
40 error_list.append(msg)
41
42=== modified file 'bin/addons/msf_profile/i18n/en_MF.po'
43--- bin/addons/msf_profile/i18n/en_MF.po 2016-08-15 11:49:05 +0000
44+++ bin/addons/msf_profile/i18n/en_MF.po 2016-09-12 12:48:09 +0000
45@@ -829,3 +829,51 @@
46 #, python-format
47 msgid "get_import_batch_headers_type"
48 msgstr "Type"
49+
50+#. module: msf_doc_import
51+#: code:addons/msf_doc_import/wizard/__init__.py:62
52+#, python-format
53+msgid "fo_import_product_code"
54+msgstr "Product Code"
55+
56+#. module: msf_doc_import
57+#: code:addons/msf_doc_import/wizard/__init__.py:62
58+#, python-format
59+msgid "fo_import_product_description"
60+msgstr "Product Description"
61+
62+#. module: msf_doc_import
63+#: code:addons/msf_doc_import/wizard/__init__.py:62
64+#, python-format
65+msgid "fo_import_qty"
66+msgstr "Quantity"
67+
68+#. module: msf_doc_import
69+#: code:addons/msf_doc_import/wizard/__init__.py:62
70+#, python-format
71+msgid "fo_import_uom"
72+msgstr "UoM"
73+
74+#. module: msf_doc_import
75+#: code:addons/msf_doc_import/wizard/__init__.py:63
76+#, python-format
77+msgid "fo_import_price"
78+msgstr "Price"
79+
80+#. module: msf_doc_import
81+#: code:addons/msf_doc_import/wizard/__init__.py:63
82+#, python-format
83+msgid "fo_import_drd"
84+msgstr "Delivery requested date"
85+
86+#. module: msf_doc_import
87+#: code:addons/msf_doc_import/wizard/__init__.py:63
88+#, python-format
89+msgid "fo_import_currency"
90+msgstr "Currency"
91+
92+#. module: msf_doc_import
93+#: code:addons/msf_doc_import/wizard/__init__.py:63
94+#, python-format
95+msgid "fo_import_comment"
96+msgstr "Comment"
97
98=== modified file 'bin/addons/msf_profile/i18n/es_MF.po'
99--- bin/addons/msf_profile/i18n/es_MF.po 2016-08-18 14:36:26 +0000
100+++ bin/addons/msf_profile/i18n/es_MF.po 2016-09-12 12:48:09 +0000
101@@ -78123,3 +78123,50 @@
102 msgid "get_import_batch_headers_type"
103 msgstr "Type"
104
105+#. module: msf_doc_import
106+#: code:addons/msf_doc_import/wizard/__init__.py:62
107+#, python-format
108+msgid "fo_import_product_code"
109+msgstr "Product Code"
110+
111+#. module: msf_doc_import
112+#: code:addons/msf_doc_import/wizard/__init__.py:62
113+#, python-format
114+msgid "fo_import_product_description"
115+msgstr "Product Description"
116+
117+#. module: msf_doc_import
118+#: code:addons/msf_doc_import/wizard/__init__.py:62
119+#, python-format
120+msgid "fo_import_qty"
121+msgstr "Quantity"
122+
123+#. module: msf_doc_import
124+#: code:addons/msf_doc_import/wizard/__init__.py:62
125+#, python-format
126+msgid "fo_import_uom"
127+msgstr "UoM"
128+
129+#. module: msf_doc_import
130+#: code:addons/msf_doc_import/wizard/__init__.py:63
131+#, python-format
132+msgid "fo_import_price"
133+msgstr "Price"
134+
135+#. module: msf_doc_import
136+#: code:addons/msf_doc_import/wizard/__init__.py:63
137+#, python-format
138+msgid "fo_import_drd"
139+msgstr "Delivery requested date"
140+
141+#. module: msf_doc_import
142+#: code:addons/msf_doc_import/wizard/__init__.py:63
143+#, python-format
144+msgid "fo_import_currency"
145+msgstr "Currency"
146+
147+#. module: msf_doc_import
148+#: code:addons/msf_doc_import/wizard/__init__.py:63
149+#, python-format
150+msgid "fo_import_comment"
151+msgstr "Comment"
152
153=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
154--- bin/addons/msf_profile/i18n/fr_MF.po 2016-09-08 09:14:19 +0000
155+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-09-12 12:48:09 +0000
156@@ -5762,7 +5762,7 @@
157 #: code:addons/msf_doc_import/wizard/wiz_common_import.py:84
158 #, python-format
159 msgid "The column \"%s\" is not taken into account. Please remove it. The list of columns accepted is: %s"
160-msgstr "The column \"%s\" is not taken into account. Please remove it. The list of columns accepted is: %s"
161+msgstr "La colonne \"%s\" n'est pas prise en compte. Veuillez la supprimer. La liste des colonnes acceptées est : %s"
162
163 #. module: analytic_distribution
164 #: view:analytic.distribution.wizard:0
165@@ -56211,10 +56211,20 @@
166 #: code:addons/consumption_calculation/consumption_calculation.py:359
167 #: report:addons/consumption_calculation/report/report_monthly_consumption_xls.mako:67
168 #: report:addons/consumption_calculation/report/report_real_consumption_xls.mako:70
169-#: code:addons/msf_doc_import/wizard/__init__.py:44
170-#: code:addons/msf_doc_import/wizard/__init__.py:49
171-#: code:addons/msf_doc_import/wizard/__init__.py:54
172-#: code:addons/msf_doc_import/wizard/__init__.py:59
173+#: code:addons/msf_doc_import/wizard/__init__.py:30
174+#: code:addons/msf_doc_import/wizard/__init__.py:57
175+#: code:addons/msf_doc_import/wizard/__init__.py:62
176+#: code:addons/msf_doc_import/wizard/__init__.py:67
177+#: code:addons/msf_doc_import/wizard/__init__.py:72
178+#: code:addons/msf_doc_import/wizard/__init__.py:77
179+#: code:addons/msf_doc_import/wizard/__init__.py:82
180+#: code:addons/msf_doc_import/wizard/__init__.py:87
181+#: code:addons/msf_doc_import/wizard/__init__.py:92
182+#: code:addons/msf_doc_import/wizard/__init__.py:96
183+#: code:addons/msf_doc_import/wizard/__init__.py:100
184+#: code:addons/msf_doc_import/wizard/__init__.py:104
185+#: code:addons/msf_doc_import/wizard/__init__.py:108
186+#: code:addons/msf_doc_import/wizard/__init__.py:113
187 #: report:certificate.free.gift:0
188 #: report:invoice:0
189 #: report:packing.list:0
190@@ -74544,3 +74554,51 @@
191 #, python-format
192 msgid "An unknow error occured, please contact the support team. Error message: %s"
193 msgstr "Une erreur inconnue est survenue, veuillez contacter votre équipe support. Message d'erreur : %s"
194+
195+#. module: msf_doc_import
196+#: code:addons/msf_doc_import/wizard/__init__.py:62
197+#, python-format
198+msgid "fo_import_product_code"
199+msgstr "Code Produit"
200+
201+#. module: msf_doc_import
202+#: code:addons/msf_doc_import/wizard/__init__.py:62
203+#, python-format
204+msgid "fo_import_product_description"
205+msgstr "Description Produit"
206+
207+#. module: msf_doc_import
208+#: code:addons/msf_doc_import/wizard/__init__.py:62
209+#, python-format
210+msgid "fo_import_qty"
211+msgstr "Quantité"
212+
213+#. module: msf_doc_import
214+#: code:addons/msf_doc_import/wizard/__init__.py:62
215+#, python-format
216+msgid "fo_import_uom"
217+msgstr "UdM"
218+
219+#. module: msf_doc_import
220+#: code:addons/msf_doc_import/wizard/__init__.py:63
221+#, python-format
222+msgid "fo_import_price"
223+msgstr "Prix"
224+
225+#. module: msf_doc_import
226+#: code:addons/msf_doc_import/wizard/__init__.py:63
227+#, python-format
228+msgid "fo_import_drd"
229+msgstr "Date de livraison demandée"
230+
231+#. module: msf_doc_import
232+#: code:addons/msf_doc_import/wizard/__init__.py:63
233+#, python-format
234+msgid "fo_import_currency"
235+msgstr "Devises"
236+
237+#. module: msf_doc_import
238+#: code:addons/msf_doc_import/wizard/__init__.py:63
239+#, python-format
240+msgid "fo_import_comment"
241+msgstr "Commentaire"

Subscribers

People subscribed via source and target branches

to all changes: