Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-4763 into lp:unifield-server

  1. US-4763
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5426
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-4763
Merge into: lp:unifield-server
Diff against target: 13768 lines (+3058/-2228)
92 files modified
bin/addons/__init__.py (+3/-0)
bin/addons/account/report/account_print_invoice.rml (+1/-1)
bin/addons/base/ir/ir_translation.py (+25/-1)
bin/addons/base/module/module.py (+2/-1)
bin/addons/consumption_calculation/consumption_calculation_report.xml (+1/-1)
bin/addons/consumption_calculation/history_consumption.py (+5/-4)
bin/addons/consumption_calculation/report/expiry_report.mako (+32/-32)
bin/addons/consumption_calculation/report/expiry_report.rml (+0/-1)
bin/addons/consumption_calculation/report/product_likely_expire.rml (+0/-1)
bin/addons/consumption_calculation/report/weekly_forecast_report_xls.mako (+6/-6)
bin/addons/consumption_calculation/weekly_forecast_report.py (+21/-12)
bin/addons/consumption_calculation/wizard/wizard_import_rac.py (+20/-22)
bin/addons/kit/report/kit_report.rml (+1/-1)
bin/addons/mission_stock/mission_stock.py (+70/-70)
bin/addons/msf_audittrail/audittrail.py (+22/-20)
bin/addons/msf_audittrail/report/log_line.py (+3/-8)
bin/addons/msf_audittrail/report/log_line.rml (+2/-2)
bin/addons/msf_audittrail/report/log_line_xls.mako (+8/-8)
bin/addons/msf_budget/report/engagement.rml (+2/-2)
bin/addons/msf_doc_import/purchase_order.py (+11/-1)
bin/addons/msf_doc_import/supplier_catalogue.py (+1/-1)
bin/addons/msf_doc_import/wizard/__init__.py (+7/-3)
bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py (+3/-5)
bin/addons/msf_doc_import/wizard/wizard_import_po_line.py (+2/-3)
bin/addons/msf_doc_import/wizard/wizard_import_product_list.py (+1/-1)
bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py (+5/-5)
bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+9/-10)
bin/addons/msf_order_date/wizard/update_lines.py (+2/-2)
bin/addons/msf_outgoing/__init__.py (+28/-26)
bin/addons/msf_outgoing/msf_outgoing.py (+1/-1)
bin/addons/msf_outgoing/report/packing_list_xls.mako (+42/-31)
bin/addons/msf_outgoing/report/picking_ticket.py (+3/-3)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml (+1/-1)
bin/addons/msf_printed_documents/report/freight_manifest.rml (+1/-1)
bin/addons/msf_printed_documents/report/sale_order.rml (+1/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+2265/-1682)
bin/addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako (+1/-1)
bin/addons/msf_supply_doc_export/wizard/po_follow_up.py (+0/-16)
bin/addons/msf_tools/report/report_inconsistencies_xls.mako (+1/-1)
bin/addons/msf_tools/report/report_stopped_products_xls.mako (+11/-11)
bin/addons/order_types/report/gift_certificate.rml (+1/-1)
bin/addons/procurement_request/procurement_request_view.xml (+1/-1)
bin/addons/procurement_request/wizard/wizard_import_list.py (+9/-9)
bin/addons/product_attributes/product_attributes.py (+4/-3)
bin/addons/product_attributes/product_attributes_data.xml (+1/-1)
bin/addons/product_attributes/report/standard_price_track_changes.mako (+22/-18)
bin/addons/purchase/__init__.py (+9/-0)
bin/addons/purchase/purchase_order.py (+4/-3)
bin/addons/purchase/purchase_order_line.py (+8/-7)
bin/addons/purchase/purchase_view.xml (+0/-1)
bin/addons/purchase/report/order.rml (+1/-1)
bin/addons/purchase/report/purchase_report_view.xml (+1/-1)
bin/addons/purchase/report/request_quotation.rml (+2/-2)
bin/addons/purchase_allocation_report/report/po_line_allocation_report.rml (+1/-1)
bin/addons/purchase_followup/report/po_track_changes_report_xls.mako (+3/-3)
bin/addons/purchase_followup/report/purchase_follow_up_report.rml (+4/-10)
bin/addons/purchase_followup/report/purchase_follow_up_report_xls.mako (+1/-1)
bin/addons/purchase_override/purchase.py (+1/-2)
bin/addons/purchase_override/report/merged_order.rml (+1/-1)
bin/addons/purchase_override/report/purchase_order.rml (+1/-1)
bin/addons/purchase_override/report/rfq.rml (+1/-1)
bin/addons/return_claim/return_claim.py (+3/-7)
bin/addons/sale/__init__.py (+9/-0)
bin/addons/sale/report/sale_donation_stock_moves_report_xls.mako (+2/-2)
bin/addons/sale/report/sale_loan_stock_moves_report.py (+8/-7)
bin/addons/sale/report/sale_loan_stock_moves_report_xls.mako (+3/-3)
bin/addons/sale/report/sale_order.rml (+1/-1)
bin/addons/sale/sale_order.py (+12/-11)
bin/addons/sale/sale_view.xml (+0/-16)
bin/addons/sales_followup/report/ir_follow_up_location_report.py (+5/-3)
bin/addons/sales_followup/report/ir_follow_up_location_report_xls.mako (+2/-2)
bin/addons/sales_followup/report/ir_track_changes_report_xls.mako (+3/-3)
bin/addons/sales_followup/report/sale_follow_up_multi_report_xls.mako (+2/-2)
bin/addons/sales_followup/report/sale_follow_up_report.py (+7/-9)
bin/addons/sales_followup/report/sale_follow_up_report_multi.py (+2/-1)
bin/addons/sales_followup/report/sale_follow_up_report_xls.mako (+1/-1)
bin/addons/sourcing/sale_order_line.py (+4/-4)
bin/addons/specific_rules/report/report_stock_inventory_view.xml (+8/-8)
bin/addons/specific_rules/report/report_stock_inventory_xls.mako (+11/-11)
bin/addons/specific_rules/report/unconsistent_stock_report_xls.mako (+10/-10)
bin/addons/specific_rules/specific_rules.py (+6/-6)
bin/addons/stock_move_tracking/report/move_tracking.rml (+4/-4)
bin/addons/stock_move_tracking/stock_report.xml (+7/-7)
bin/addons/stock_override/report/delivery_order.py (+10/-10)
bin/addons/stock_override/report/report_stock_move_view.xml (+8/-8)
bin/addons/stock_override/report/report_stock_move_xls.mako.THIS (+196/-0)
bin/addons/stock_override/report/stock_card_report_xls.mako (+10/-10)
bin/addons/stock_override/stock_view.xml (+2/-2)
bin/addons/sync_client/sync_client.py (+5/-5)
bin/report/render/rml2pdf/trml2pdf.py (+1/-1)
bin/tools/translate.py (+20/-4)
tools/translation_scripts/clean.py (+0/-3)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-4763
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+360452@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/__init__.py'
2--- bin/addons/__init__.py 2018-10-05 09:20:46 +0000
3+++ bin/addons/__init__.py 2019-07-23 09:03:33 +0000
4@@ -972,6 +972,9 @@
5 for kind in ('init', 'demo', 'update'):
6 tools.config[kind] = {}
7
8+ if update_module:
9+ pool.get('ir.translation').has_duplicate(cr, 1, verbose=True)
10+
11 cr.commit()
12 if update_module:
13 cr.execute("select id,name from ir_module_module where state=%s", ('to remove',))
14
15=== modified file 'bin/addons/account/report/account_print_invoice.rml'
16--- bin/addons/account/report/account_print_invoice.rml 2011-01-14 00:11:01 +0000
17+++ bin/addons/account/report/account_print_invoice.rml 2019-07-23 09:03:33 +0000
18@@ -140,7 +140,7 @@
19 <story>
20 <pto>
21 <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
22- <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
23+ <para style="terp_default_8"></para>
24 <pto_header><!-- Must be after setLang() -->
25 <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
26 <tr>
27
28=== modified file 'bin/addons/base/ir/ir_translation.py'
29--- bin/addons/base/ir/ir_translation.py 2019-02-05 09:03:45 +0000
30+++ bin/addons/base/ir/ir_translation.py 2019-07-23 09:03:33 +0000
31@@ -21,6 +21,7 @@
32
33 from osv import fields, osv
34 import tools
35+import logging
36
37 TRANSLATION_TYPE = [
38 ('field', 'Field'),
39@@ -65,7 +66,30 @@
40 # They are used to resolve the res_id above after loading is done.
41 'module': fields.char('Module', size=64, help='Maps to the ir_model_data for which this translation is provided.'),
42 'xml_id': fields.char('XML Id', size=128, help='Maps to the ir_model_data for which this translation is provided.', select=True),
43- }
44+ 'updated_by_modules': fields.boolean('Updated by last msf_profile update'),
45+ }
46+
47+ _defaults = {
48+ 'updated_by_modules': False,
49+ }
50+
51+ def has_duplicate(self, cr, uid, verbose=False, context=None):
52+
53+ cr.execute("""select src,type,count(*), lang
54+ from ir_translation
55+ where
56+ type in ('code', 'sql_constraint') and
57+ lang in ('fr_MF', 'en_MF')
58+ group by src,type, lang
59+ having count(distinct(value)) > 1"""
60+ )
61+
62+ nb = cr.rowcount
63+ if verbose:
64+ logger = logging.getLogger('translate')
65+ for x in cr.fetchall():
66+ logger.warn("%s duplicated %s %s translations: %s" % (x[2], x[3], x[1], x[0]))
67+ return nb
68
69 def _auto_init(self, cr, context={}):
70 super(ir_translation, self)._auto_init(cr, context)
71
72=== modified file 'bin/addons/base/module/module.py'
73--- bin/addons/base/module/module.py 2018-08-23 08:57:01 +0000
74+++ bin/addons/base/module/module.py 2019-07-23 09:03:33 +0000
75@@ -528,8 +528,9 @@
76 iso_lang = iso_lang.split('_')[0]
77 f = addons.get_module_resource(mod.name, 'i18n', iso_lang + '.po')
78 if f:
79+ delete_old = mod.name == 'msf_profile' and context2.get('overwrite') and lang== 'fr_MF'
80 logger.info('module %s: loading translation file (%s) for language %s', mod.name, iso_lang, lang)
81- tools.trans_load(cr, f, lang, verbose=False, context=context2)
82+ tools.trans_load(cr, f, lang, verbose=False, context=context2, delete_old=delete_old)
83 tools.trans_update_res_ids(cr)
84
85 def check(self, cr, uid, ids, context=None):
86
87=== modified file 'bin/addons/consumption_calculation/consumption_calculation_report.xml'
88--- bin/addons/consumption_calculation/consumption_calculation_report.xml 2013-12-20 13:53:48 +0000
89+++ bin/addons/consumption_calculation/consumption_calculation_report.xml 2019-07-23 09:03:33 +0000
90@@ -16,7 +16,7 @@
91 name="expiry.report_xls"
92 header="False"
93 report_type="webkit"
94- file="addons/consumption_calculation/report/expiry_report.mako"
95+ file="consumption_calculation/report/expiry_report.mako"
96 string="Expiry Report Excel" />
97
98 </data>
99
100=== modified file 'bin/addons/consumption_calculation/history_consumption.py'
101--- bin/addons/consumption_calculation/history_consumption.py 2019-05-09 15:37:21 +0000
102+++ bin/addons/consumption_calculation/history_consumption.py 2019-07-23 09:03:33 +0000
103@@ -24,6 +24,7 @@
104 from mx.DateTime import DateFrom, RelativeDateTime
105 from lxml import etree
106 from tools.translate import _
107+from tools.misc import to_xml
108 import logging
109
110 import time
111@@ -476,9 +477,9 @@
112 res = super(product_product, self).fields_view_get(cr, uid, view_id, view_type, context=ctx, toolbar=toolbar, submenu=submenu)
113
114 if context.get('history_cons', False) and view_type == 'tree':
115- line_view = """<tree string="Historical consumption" hide_new_button="1">
116+ line_view = """<tree string="%s" hide_new_button="1">
117 <field name="default_code"/>
118- <field name="name" />"""
119+ <field name="name" />""" % (to_xml(_('Historical consumption')),)
120
121 if context.get('amc', False):
122 line_view += """<field name="average" />"""
123@@ -513,7 +514,7 @@
124 xml_view.insert(0, separator_node)
125 product_ids = self.pool.get('product.history.consumption').get_data(cr, uid, [context.get('obj_id')], context=context)[0]
126 product_ids = self.pool.get('product.product').search(cr, uid, [('id', 'in', product_ids), ('average', '>', 0)], context=context)
127- new_filter = """<filter string="Av.%s &gt; 0" name="average" icon="terp-accessories-archiver-minus" domain="[('id', 'in', %s)]" />""" % (context.get('amc', 'AMC'), product_ids)
128+ new_filter = """<filter string="%s%s &gt; 0" name="average" icon="terp-accessories-archiver-minus" domain="[('id', 'in', %s)]" />""" % (_('Av.'), _(context.get('amc', 'AMC')), product_ids)
129 # generate new xml form$
130 filter_node = etree.fromstring(new_filter)
131 xml_view.insert(0, filter_node)
132@@ -540,7 +541,7 @@
133 res.update({'average': {'digits': (16,2),
134 'selectable': True,
135 'type': 'float',
136- 'string': 'Av. %s' %context.get('amc')}})
137+ 'string': _('Av. %s') % _(context.get('amc','AMC'))}})
138
139 return res
140
141
142=== modified file 'bin/addons/consumption_calculation/report/expiry_report.mako'
143--- bin/addons/consumption_calculation/report/expiry_report.mako 2017-04-11 08:15:37 +0000
144+++ bin/addons/consumption_calculation/report/expiry_report.mako 2019-07-23 09:03:33 +0000
145@@ -104,7 +104,7 @@
146 <NumberFormat ss:Format="Short Date"/>
147 </Style>
148 </Styles>
149-<ss:Worksheet ss:Name="Expiry report">
150+<ss:Worksheet ss:Name="${_('Expiry report')|x}">
151 <Table x:FullColumns="1" x:FullRows="1">
152 <%
153 cols_count = 10
154@@ -122,23 +122,23 @@
155 <Column ss:AutoFitWidth="1" ss:Width="60" />
156 ## header
157 <Row>
158-<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">Report date :</Data></Cell>
159+<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">${_('Report date')|x} :</Data></Cell>
160 <Cell ss:StyleID="ssCell" ss:MergeAcross="8"><Data ss:Type="String">${toDate()|x}</Data></Cell>
161 </Row>
162 <Row>
163-<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">Location :</Data></Cell>
164+<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">${_('Location')|x} :</Data></Cell>
165 <Cell ss:StyleID="ssCell" ss:MergeAcross="8"><Data ss:Type="String">${(objects[0].location_id and objects[0].location_id.name or '')|x}</Data></Cell>
166 </Row>
167 <Row>
168-<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">Period of&#10;calculation :</Data></Cell>
169-<Cell ss:StyleID="ssCell" ss:MergeAcross="8"><Data ss:Type="String">${objects[0].week_nb} week${objects[0].week_nb > 1 and 's' or ''}</Data></Cell>
170+<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">${_('Period of calculation')|x} :</Data></Cell>
171+<Cell ss:StyleID="ssCell" ss:MergeAcross="8"><Data ss:Type="String">${objects[0].week_nb} ${_('week')}${objects[0].week_nb > 1 and 's' or ''}</Data></Cell>
172 </Row>
173 <Row>
174-<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">Limit date :</Data></Cell>
175+<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">${_('Limit date')|x} :</Data></Cell>
176 <Cell ss:StyleID="ssCell" ss:MergeAcross="8"><Data ss:Type="String">${toDate(objects[0].date_to)|x}</Data></Cell>
177 </Row>
178 <Row>
179-<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">Currency :</Data></Cell>
180+<Cell ss:StyleID="ssCellBold"><Data ss:Type="String">${_('Currency')|x} :</Data></Cell>
181 <Cell ss:StyleID="ssCell" ss:MergeAcross="8"><Data ss:Type="String">${getCurrency()|x}</Data></Cell>
182 </Row>
183 <Row>
184@@ -148,19 +148,19 @@
185 </Row>
186 ## products/batches already expired
187 <Row>
188-<Cell ss:StyleID="headerLeft" ss:MergeAcross="9"><Data ss:Type="String">Products/batches already expired</Data></Cell>
189+<Cell ss:StyleID="headerLeft" ss:MergeAcross="9"><Data ss:Type="String">${_('Products/batches already expired')|x}</Data></Cell>
190 </Row>
191 <Row>
192-<Cell ss:StyleID="header"><Data ss:Type="String">CODE</Data></Cell>
193-<Cell ss:StyleID="header"><Data ss:Type="String">DESCRIPTION</Data></Cell>
194-<Cell ss:StyleID="header"><Data ss:Type="String">Location</Data></Cell>
195-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Stock</Data></Cell>
196-<Cell ss:StyleID="header"><Data ss:Type="String">UoM</Data></Cell>
197-<Cell ss:StyleID="header"><Data ss:Type="String">Batch</Data></Cell>
198-<Cell ss:StyleID="header"><Data ss:Type="String">Expiry Date</Data></Cell>
199-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Exp. Qty</Data></Cell>
200-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Unit Cost</Data></Cell>
201-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Exp. Value</Data></Cell>
202+<Cell ss:StyleID="header"><Data ss:Type="String">${_('CODE')|x}</Data></Cell>
203+<Cell ss:StyleID="header"><Data ss:Type="String">${_('DESCRIPTION')|x}</Data></Cell>
204+<Cell ss:StyleID="header"><Data ss:Type="String">${_('Location')|x}</Data></Cell>
205+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Stock')|x}</Data></Cell>
206+<Cell ss:StyleID="header"><Data ss:Type="String">${_('UoM')|x}</Data></Cell>
207+<Cell ss:StyleID="header"><Data ss:Type="String">${_('Batch')|x}</Data></Cell>
208+<Cell ss:StyleID="header"><Data ss:Type="String">${_('Expiry Date')|x}</Data></Cell>
209+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Exp. Qty')|x}</Data></Cell>
210+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Unit Cost')|x}</Data></Cell>
211+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Exp. Value')|x}</Data></Cell>
212 </Row>
213 % for l in sorted(objects[0].line_ids, key=lambda x: (x.product_code, x.batch_number, x.expiry_date)):
214 % if l.expiry_date < now:
215@@ -191,7 +191,7 @@
216 <Cell ss:StyleID="ssCell"></Cell>
217 <Cell ss:StyleID="ssCell"></Cell>
218 <Cell ss:StyleID="ssCell"></Cell>
219-<Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">TOTAL</Data></Cell>
220+<Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">${_('TOTAL')|x}</Data></Cell>
221 <Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">${formatLang(getTotal(objects[0], 'expired'))}</Data></Cell>
222 </Row>
223 ## products/batches to expire
224@@ -201,19 +201,19 @@
225 % endfor
226 </Row>
227 <Row>
228-<Cell ss:StyleID="headerLeft" ss:MergeAcross="9"><Data ss:Type="String">Products/batches to expire</Data></Cell>
229+<Cell ss:StyleID="headerLeft" ss:MergeAcross="9"><Data ss:Type="String">${_('Products/batches to expire')|x}</Data></Cell>
230 </Row>
231 <Row>
232-<Cell ss:StyleID="header"><Data ss:Type="String">CODE</Data></Cell>
233-<Cell ss:StyleID="header"><Data ss:Type="String">DESCRIPTION</Data></Cell>
234-<Cell ss:StyleID="header"><Data ss:Type="String">Location</Data></Cell>
235-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Stock</Data></Cell>
236-<Cell ss:StyleID="header"><Data ss:Type="String">UoM</Data></Cell>
237-<Cell ss:StyleID="header"><Data ss:Type="String">Batch</Data></Cell>
238-<Cell ss:StyleID="header"><Data ss:Type="String">Expiry Date</Data></Cell>
239-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Exp. Qty</Data></Cell>
240-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Unit Cost</Data></Cell>
241-<Cell ss:StyleID="headerRight"><Data ss:Type="String">Exp. Value</Data></Cell>
242+<Cell ss:StyleID="header"><Data ss:Type="String">${_('CODE')|x}</Data></Cell>
243+<Cell ss:StyleID="header"><Data ss:Type="String">${_('DESCRIPTION')|x}</Data></Cell>
244+<Cell ss:StyleID="header"><Data ss:Type="String">${_('Location')|x}</Data></Cell>
245+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Stock')|x}</Data></Cell>
246+<Cell ss:StyleID="header"><Data ss:Type="String">${_('UoM')|x}</Data></Cell>
247+<Cell ss:StyleID="header"><Data ss:Type="String">${_('Batch')|x}</Data></Cell>
248+<Cell ss:StyleID="header"><Data ss:Type="String">${_('Expiry Date')|x}</Data></Cell>
249+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Exp. Qty')|x}</Data></Cell>
250+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Unit Cost')|x}</Data></Cell>
251+<Cell ss:StyleID="headerRight"><Data ss:Type="String">${_('Exp. Value')|x}</Data></Cell>
252 </Row>
253 % for l in sorted(objects[0].line_ids, key=lambda x: (x.product_code, x.batch_number, x.expiry_date)):
254 % if l.expiry_date >= now:
255@@ -240,7 +240,7 @@
256 <Cell ss:StyleID="ssCell"></Cell>
257 <Cell ss:StyleID="ssCell"></Cell>
258 <Cell ss:StyleID="ssCell"></Cell>
259-<Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">TOTAL</Data></Cell>
260+<Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">${_('TOTAL')|x}</Data></Cell>
261 <Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">${formatLang(getTotal(objects[0], 'expiry'))}</Data></Cell>
262 </Row>
263 ## ALL TOTAL
264@@ -258,7 +258,7 @@
265 <Cell ss:StyleID="ssCell"></Cell>
266 <Cell ss:StyleID="ssCell"></Cell>
267 <Cell ss:StyleID="ssCell"></Cell>
268-<Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">ALL TOTAL</Data></Cell>
269+<Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">${_('ALL TOTAL')|x}</Data></Cell>
270 <Cell ss:StyleID="ssCellRightBold"><Data ss:Type="String">${formatLang(getTotal(objects[0], 'all'))}</Data></Cell>
271 </Row>
272 </Table>
273
274=== modified file 'bin/addons/consumption_calculation/report/expiry_report.rml'
275--- bin/addons/consumption_calculation/report/expiry_report.rml 2017-03-30 07:17:52 +0000
276+++ bin/addons/consumption_calculation/report/expiry_report.rml 2019-07-23 09:03:33 +0000
277@@ -50,7 +50,6 @@
278
279 <story>
280
281- [[ setLang('en_US') ]]
282
283 <blockTable colWidths="310.0,132.0,310.0" style="TitleTable">
284 <tr>
285
286=== modified file 'bin/addons/consumption_calculation/report/product_likely_expire.rml'
287--- bin/addons/consumption_calculation/report/product_likely_expire.rml 2018-09-04 14:54:02 +0000
288+++ bin/addons/consumption_calculation/report/product_likely_expire.rml 2019-07-23 09:03:33 +0000
289@@ -51,7 +51,6 @@
290
291 <story>
292
293- [[ setLang('en_US') ]]
294
295 <blockTable colWidths="310.0,132.0,310.0" style="TitleTable">
296 <tr>
297
298=== modified file 'bin/addons/consumption_calculation/report/weekly_forecast_report_xls.mako'
299--- bin/addons/consumption_calculation/report/weekly_forecast_report_xls.mako 2014-04-07 13:30:02 +0000
300+++ bin/addons/consumption_calculation/report/weekly_forecast_report_xls.mako 2019-07-23 09:03:33 +0000
301@@ -81,27 +81,27 @@
302 </Style>
303 </Styles>
304 % for o in objects:
305- <ss:Worksheet ss:Name="Periodical forecast report">
306+ <ss:Worksheet ss:Name="${_('Periodical forecast report')|x}">
307 <Table x:FullColumns="1" x:FullRows="1">
308
309 <Row>
310- <Cell ss:StyleID="header"><Data ss:Type="String">DB/instance name</Data></Cell>
311+ <Cell ss:StyleID="header"><Data ss:Type="String">${_('DB/instance name')|x}</Data></Cell>
312 <Cell ss:StyleID="line"><Data ss:Type="String">${o.requestor_id and o.requestor_id.company_id and o.requestor_id.company_id.instance_id and o.requestor_id.company_id.instance_id.name or ''|x}</Data></Cell>
313 </Row>
314
315 <Row>
316- <Cell ss:StyleID="header"><Data ss:Type="String">From</Data></Cell>
317+ <Cell ss:StyleID="header"><Data ss:Type="String">${_('From date')|x}</Data></Cell>
318 <Cell ss:StyleID="header_short_date"><Data ss:Type="DateTime">${o.requestor_date[:10]|n}T${o.requestor_date[11:]|n}.000</Data></Cell>
319 </Row>
320
321 <Row>
322- <Cell ss:StyleID="header"><Data ss:Type="String">Number of ${o.interval_type == 'week' and 'weeks' or 'months'|n} from now</Data></Cell>
323+ <Cell ss:StyleID="header"><Data ss:Type="String">${_('Number of')|x} ${o.interval_type == 'week' and _('weeks') or _('months')|n} ${_('from now')|x}</Data></Cell>
324 <Cell ss:StyleID="line"><Data ss:Type="Number">${o.interval|x}</Data></Cell>
325 </Row>
326
327 <Row>
328- <Cell ss:StyleID="header"><Data ss:Type="String">Consumption calculation method</Data></Cell>
329- <Cell ss:StyleID="line"><Data ss:Type="String">${o.consumption_type == 'fmc' and 'FMC' or o.consumption_type == 'amc' and 'AMC' or 'RAC'|x}</Data></Cell>
330+ <Cell ss:StyleID="header"><Data ss:Type="String">${_('Consumption calculation method')|x}</Data></Cell>
331+ <Cell ss:StyleID="line"><Data ss:Type="String">${o.consumption_type == 'fmc' and _('FMC') or o.consumption_type == 'amc' and _('AMC') or _('RAC')|x}</Data></Cell>
332 </Row>
333
334 ${o.xml_data}
335
336=== modified file 'bin/addons/consumption_calculation/weekly_forecast_report.py'
337--- bin/addons/consumption_calculation/weekly_forecast_report.py 2017-05-11 07:26:26 +0000
338+++ bin/addons/consumption_calculation/weekly_forecast_report.py 2019-07-23 09:03:33 +0000
339@@ -250,7 +250,7 @@
340 """
341 datas = {
342 'ids': ids,
343- 'target_filename': 'Periodical Forecast Report',
344+ 'target_filename': _('Periodical Forecast Report'),
345 }
346 return {
347 'type': 'ir.actions.report.xml',
348@@ -411,11 +411,11 @@
349 while i != report.interval:
350 i += 1
351 if report.interval_type == 'week':
352- interval_name = 'Week %s' % i
353+ interval_name = '%s %s' % (_('Week'), i)
354 interval_from = now() + RelativeDateTime(weeks=i-1, hour=0, minute=0, second=0)
355 interval_to = now() + RelativeDateTime(weeks=i, days=-1, hour=23, minute=59, second=59)
356 else:
357- interval_name = 'Month %s' % i
358+ interval_name = '%s %s' % (_('Month'), i)
359 interval_from = now() + RelativeDateTime(months=i-1, hour=0, minute=0, second=0)
360 interval_to = now() + RelativeDateTime(months=i, days=-1, hour=23, minute=59, second=59)
361
362@@ -493,14 +493,23 @@
363 t = t + jump
364
365 line_values = """<Row></Row><Row>
366- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Product Code</Data></Cell>
367- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Description</Data></Cell>
368- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Unit Price</Data></Cell>
369- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Stock value</Data></Cell>
370- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">AMC/FMC</Data></Cell>
371- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Current Stock Qty</Data></Cell>
372- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Pipeline Qty</Data></Cell>
373- <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">Expiry Qty</Data></Cell>"""
374+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
375+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
376+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
377+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
378+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
379+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
380+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>
381+ <Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%s</Data></Cell>""" % (
382+ _('Product Code'),
383+ _('Description'),
384+ _('Unit Price'),
385+ _('Stock value'),
386+ _('AMC/FMC'),
387+ _('Current Stock Qty'),
388+ _('Pipeline Qty'),
389+ _('Expiry Qty'),
390+ )
391
392 for interval in intervals:
393 line_values += """<Cell ss:StyleID=\"header\"><Data ss:Type=\"String\">%(interval_name)s</Data></Cell>""" % {
394@@ -605,7 +614,7 @@
395 # Sort the key of the dict, to have the values in good order
396 # TODO: Use OrderedDict instead of this sort of dict keys but only available on Python 2.7
397 interval_keys = inter.keys()
398- interval_keys.sort(key=lambda x: int(x[5:]))
399+ interval_keys.sort(key=lambda x: int(x.split(' ')[-1]))
400 last_value = product['qty_available']
401 for interval_name in interval_keys:
402 interval_values = inter.get(interval_name)
403
404=== modified file 'bin/addons/consumption_calculation/wizard/wizard_import_rac.py'
405--- bin/addons/consumption_calculation/wizard/wizard_import_rac.py 2015-03-10 09:51:28 +0000
406+++ bin/addons/consumption_calculation/wizard/wizard_import_rac.py 2019-07-23 09:03:33 +0000
407@@ -30,23 +30,23 @@
408 class wizard_import_rac(osv.osv_memory):
409 _name = 'wizard.import.rac'
410 _description = 'Import RAC from Excel sheet'
411-
412+
413+ _msg = _("""
414+ IMPORTANT : The first line will be ignored by the system.
415+
416+ The file should be in XML 2003 format.
417+ The columns should be in this order :
418+ Product Code ; Product Description ; UoM ; Batch Number ; Expiry Date (DD/MM/YYYY) (ignored if batch number is set) ; Asset ; Consumed quantity ; Remark
419+ """)
420 _columns = {
421 'file': fields.binary(string='File to import', required=True),
422 'message': fields.text(string='Message', readonly=True),
423 'rac_id': fields.many2one('real.average.consumption', string='Real average consumption', required=True),
424 }
425-
426+
427 _defaults = {
428- 'message': lambda *a : _("""
429- IMPORTANT : The first line will be ignored by the system.
430-
431- The file should be in XML 2003 format.
432- The columns should be in this order :
433- Product Code ; Product Description ; UoM ; Batch Number ; Expiry Date (DD/MM/YYYY) (ignored if batch number is set) ; Asset ; Consumed quantity ; Remark
434- """)
435 }
436-
437+
438 def default_get(self, cr, uid, fields, context=None):
439 '''
440 Set rac_id with the active_id value in context
441@@ -57,9 +57,9 @@
442 rac_id = context.get('active_id')
443 res = super(wizard_import_rac, self).default_get(cr, uid, fields, context=context)
444 res['rac_id'] = rac_id
445-
446+ res['message'] = _(self._msg)
447 return res
448-
449+
450 def import_file(self, cr, uid, ids, context=None):
451 '''
452 Import file
453@@ -77,7 +77,7 @@
454
455 import_rac = self.browse(cr, uid, ids[0], context)
456 rac_id = import_rac.rac_id.id
457-
458+
459 ignore_lines, complete_lines, lines_to_correct = 0, 0, 0
460 error_log = ''
461 line_num = 0
462@@ -114,7 +114,6 @@
463 expiry_date = None # date type
464 batch_mandatory = False
465 date_mandatory = False
466- asset_mandatory = False
467 line_num += 1
468 context.update({'import_in_progress': True, 'noraise': True})
469 try:
470@@ -124,7 +123,7 @@
471 consumed_qty = float(row.cells[6].data)
472 except ValueError:
473 error += _("Line %s of the imported file: the Consumed Quantity should be a number and not %s \n.") % (line_num, row.cells[6].data,)
474-
475+
476 # Cell 0: Product Code
477 expiry_date = False
478 p_value = {}
479@@ -179,7 +178,6 @@
480
481 # Cell 5 : Asset
482 if _get_asset_mandatory(prod):
483- asset_mandatory = True
484 if not row[5].data:
485 error += _("Line %s of the imported file: Asset form required.\n") % (line_num,)
486 if row[5].data:
487@@ -191,7 +189,7 @@
488 else:
489 product_id = False
490 error += _('Line %s of the imported file: Product Code [%s] not found ! Details: %s \n') % (line_num, row[0], p_value['error_list'])
491-
492+
493 # Cell 2: UOM
494 uom_value = {}
495 # The consistency between the product and the uom used the product_id value contained in the write dictionary.
496@@ -208,7 +206,7 @@
497 if round_qty.get('warning', {}).get('message'):
498 consumed_qty = round_qty['value']['consumed_qty']
499 error_log += _('Line %s of the imported file: %s') % (line_num, round_qty.get('warning', {}).get('message'))
500-
501+
502 # Cell 6: Remark
503 if row.cells[7] and row.cells[7].data:
504 remark = row.cells[7].data
505@@ -276,9 +274,9 @@
506 ''') % (total_time ,complete_lines, lines_to_correct, ignore_lines, error_log)}
507 try:
508 self.write(cr, uid, ids, vals, context=context)
509-
510+
511 view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'consumption_calculation', 'wizard_to_import_rac_end')[1],
512-
513+
514 return {'type': 'ir.actions.act_window',
515 'res_model': 'wizard.import.rac',
516 'view_type': 'form',
517@@ -290,13 +288,13 @@
518 }
519 except Exception, e:
520 raise osv.except_osv(_('Error !'), _('%s !') % e)
521-
522+
523 def close_import(self, cr, uid, ids, context=None):
524 '''
525 Return to the initial view
526 '''
527 return {'type': 'ir.actions.act_window_close'}
528-
529+
530 wizard_import_rac()
531
532 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
533
534=== modified file 'bin/addons/kit/report/kit_report.rml'
535--- bin/addons/kit/report/kit_report.rml 2014-05-09 08:35:26 +0000
536+++ bin/addons/kit/report/kit_report.rml 2019-07-23 09:03:33 +0000
537@@ -65,7 +65,7 @@
538 <blockTable colWidths="842.0" style="MainTitle">
539 <tr>
540 <td>
541- <para style="Title">[[ o.composition_type == 'theoretical' and 'THEORETICAL KIT COMPOSITION' or 'KIT COMPOSITION LIST' ]]</para>
542+ <para style="Title">[[ o.composition_type == 'theoretical' and translate('THEORETICAL KIT COMPOSITION') or translate('KIT COMPOSITION LIST') ]]</para>
543 </td>
544 </tr>
545 </blockTable>
546
547=== modified file 'bin/addons/mission_stock/mission_stock.py'
548--- bin/addons/mission_stock/mission_stock.py 2019-05-13 14:21:36 +0000
549+++ bin/addons/mission_stock/mission_stock.py 2019-07-23 09:03:33 +0000
550@@ -48,61 +48,61 @@
551
552 HEADER_DICT = {
553 'ns_nv_vals': (
554- ('Reference', 'default_code'),
555- ('Name', 'pt_name'),
556- ('UoM', 'pu_name'),
557- ('Instance stock', 'l_internal_qty'),
558- ('Warehouse stock', 'l_wh_qty'),
559- ('Cross-Docking Qty.', 'l_cross_qty'),
560- ('Secondary Stock Qty.', 'l_secondary_qty'),
561- ('Internal Cons. Unit Qty.', 'l_cu_qty'),
562- ('AMC', 'product_amc'),
563- ('FMC', 'product_consumption'),
564- ('In Pipe Qty', 'l_in_pipe_qty'),),
565+ (_('Reference'), 'default_code'),
566+ (_('Name'), 'pt_name'),
567+ (_('UoM'), 'pu_name'),
568+ (_('Instance stock'), 'l_internal_qty'),
569+ (_('Warehouse stock'), 'l_wh_qty'),
570+ (_('Cross-Docking Qty.'), 'l_cross_qty'),
571+ (_('Secondary Stock Qty.'), 'l_secondary_qty'),
572+ (_('Internal Cons. Unit Qty.'), 'l_cu_qty'),
573+ (_('AMC'), 'product_amc'),
574+ (_('FMC'), 'product_consumption'),
575+ (_('In Pipe Qty'), 'l_in_pipe_qty'),),
576 'ns_v_vals': (
577- ('Reference', 'default_code'),
578- ('Name', 'pt_name'),
579- ('UoM', 'pu_name'),
580- ('Cost Price', 'pt_standard_price'),
581- ('Func. Cur.', 'rc_name'),
582- ('Instance stock', 'l_internal_qty'),
583- ('Instance stock val.', 'l_internal_qty_pt_price'),
584- ('Warehouse stock', 'l_wh_qty'),
585- ('Cross-Docking Qty.', 'l_cross_qty'),
586- ('Secondary Stock Qty.', 'l_secondary_qty'),
587- ('Internal Cons. Unit Qty.', 'l_cu_qty'),
588- ('AMC', 'product_amc'),
589- ('FMC', 'product_consumption'),
590- ('In Pipe Qty', 'l_in_pipe_qty'),),
591+ (_('Reference'), 'default_code'),
592+ (_('Name'), 'pt_name'),
593+ (_('UoM'), 'pu_name'),
594+ (_('Cost Price'), 'pt_standard_price'),
595+ (_('Func. Cur.'), 'rc_name'),
596+ (_('Instance stock'), 'l_internal_qty'),
597+ (_('Instance stock val.'), 'l_internal_qty_pt_price'),
598+ (_('Warehouse stock'), 'l_wh_qty'),
599+ (_('Cross-Docking Qty.'), 'l_cross_qty'),
600+ (_('Secondary Stock Qty.'), 'l_secondary_qty'),
601+ (_('Internal Cons. Unit Qty.'), 'l_cu_qty'),
602+ (_('AMC'), 'product_amc'),
603+ (_('FMC'), 'product_consumption'),
604+ (_('In Pipe Qty'), 'l_in_pipe_qty'),),
605 's_nv_vals': (
606- ('Reference', 'default_code'),
607- ('Name', 'pt_name'),
608- ('UoM', 'pu_name'),
609- ('Instance stock', 'l_internal_qty'),
610- ('Stock Qty.', 'l_stock_qty'),
611- ('Unallocated Stock Qty.', 'l_central_qty'),
612- ('Cross-Docking Qty.', 'l_cross_qty'),
613- ('Secondary Stock Qty.', 'l_secondary_qty'),
614- ('Internal Cons. Unit Qty.', 'l_cu_qty'),
615- ('AMC', 'product_amc'),
616- ('FMC', 'product_consumption'),
617- ('In Pipe Qty', 'l_in_pipe_qty'),),
618+ (_('Reference'), 'default_code'),
619+ (_('Name'), 'pt_name'),
620+ (_('UoM'), 'pu_name'),
621+ (_('Instance stock'), 'l_internal_qty'),
622+ (_('Stock Qty.'), 'l_stock_qty'),
623+ (_('Unallocated Stock Qty.'), 'l_central_qty'),
624+ (_('Cross-Docking Qty.'), 'l_cross_qty'),
625+ (_('Secondary Stock Qty.'), 'l_secondary_qty'),
626+ (_('Internal Cons. Unit Qty.'), 'l_cu_qty'),
627+ (_('AMC'), 'product_amc'),
628+ (_('FMC'), 'product_consumption'),
629+ (_('In Pipe Qty'), 'l_in_pipe_qty'),),
630 's_v_vals': (
631- ('Reference', 'default_code'),
632- ('Name', 'pt_name'),
633- ('UoM', 'pu_name'),
634- ('Cost Price', 'pt_standard_price'),
635- ('Func. Cur.', 'rc_name'),
636- ('Instance stock', 'l_internal_qty'),
637- ('Instance stock val.', 'l_internal_qty_pt_price'),
638- ('Stock Qty.', 'l_stock_qty'),
639- ('Unallocated Stock Qty.', 'l_central_qty'),
640- ('Cross-Docking Qty.', 'l_cross_qty'),
641- ('Secondary Stock Qty.', 'l_secondary_qty'),
642- ('Internal Cons. Unit Qty.', 'l_cu_qty'),
643- ('AMC', 'product_amc'),
644- ('FMC', 'product_consumption'),
645- ('In Pipe Qty', 'l_in_pipe_qty'),),
646+ (_('Reference'), 'default_code'),
647+ (_('Name'), 'pt_name'),
648+ (_('UoM'), 'pu_name'),
649+ (_('Cost Price'), 'pt_standard_price'),
650+ (_('Func. Cur.'), 'rc_name'),
651+ (_('Instance stock'), 'l_internal_qty'),
652+ (_('Instance stock val.'), 'l_internal_qty_pt_price'),
653+ (_('Stock Qty.'), 'l_stock_qty'),
654+ (_('Unallocated Stock Qty.'), 'l_central_qty'),
655+ (_('Cross-Docking Qty.'), 'l_cross_qty'),
656+ (_('Secondary Stock Qty.'), 'l_secondary_qty'),
657+ (_('Internal Cons. Unit Qty.'), 'l_cu_qty'),
658+ (_('AMC'), 'product_amc'),
659+ (_('FMC'), 'product_consumption'),
660+ (_('In Pipe Qty'), 'l_in_pipe_qty'),),
661 }
662
663
664@@ -240,7 +240,7 @@
665 string='Is a local report ?', help='If the report is a local report, it will be updated periodically'),
666 'report_line': fields.one2many('stock.mission.report.line', 'mission_report_id', string='Lines'),
667 'last_update': fields.datetime(string='Last update'),
668- 'move_ids': fields.many2many('stock.move', 'mission_move_rel', 'mission_id', 'move_id', string='Noves'),
669+ 'move_ids': fields.many2many('stock.move', 'mission_move_rel', 'mission_id', 'move_id', string='Moves'),
670 'export_ok': fields.boolean(string='Export file possible ?'),
671 'export_state': fields.selection([('draft', 'Draft'), ('in_progress', 'In Progress'), ('done', 'Done'), ('error', 'Error')], string="Export state"),
672 'export_error_msg': fields.text('Error message', readonly=True)
673@@ -498,7 +498,7 @@
674 sheet.write(0, 1, instance_name, row_style)
675 sheet.col(0).width=5000
676 sheet.write(1, 0, _("Instance selection"), row_style)
677- report_name = 'All loc'
678+ report_name = _('All loc')
679 sheet.write(1, 1, report_name, row_style)
680 sheet.col(1).width=5000
681
682@@ -508,23 +508,23 @@
683 sheet.remove_splits = True
684
685 fixed_data = [
686- ('Reference', 'default_code'),
687- ('Name', 'pt_name'),
688- ('UoM', 'pu_name'),
689- ('Cost Price', 'pt_standard_price'),
690- ('Func. Cur.', 'rc_name')
691+ (_('Reference'), 'default_code'),
692+ (_('Name'), 'pt_name'),
693+ (_('UoM'), 'pu_name'),
694+ (_('Cost Price'), 'pt_standard_price'),
695+ (_('Func. Cur.'), 'rc_name')
696 ]
697 repeated_data = [
698- ('Instance stock', 'l_internal_qty'),
699- ('Instance stock val.', 'l_internal_qty_pt_price'),
700- ('Stock Qty.', 'l_stock_qty'),
701- ('Unallocated Stock Qty.', 'l_central_qty'),
702- ('Cross-Docking Qty.', 'l_cross_qty'),
703- ('Secondary Stock Qty.', 'l_secondary_qty'),
704- ('Internal Cons. Unit Qty.', 'l_cu_qty'),
705- ('AMC', 'product_amc'),
706- ('FMC', 'product_consumption'),
707- ('In Pipe Qty', 'l_in_pipe_qty')
708+ (_('Instance stock'), 'l_internal_qty'),
709+ (_('Instance stock val.'), 'l_internal_qty_pt_price'),
710+ (_('Stock Qty.'), 'l_stock_qty'),
711+ (_('Unallocated Stock Qty.'), 'l_central_qty'),
712+ (_('Cross-Docking Qty.'), 'l_cross_qty'),
713+ (_('Secondary Stock Qty.'), 'l_secondary_qty'),
714+ (_('Internal Cons. Unit Qty.'), 'l_cu_qty'),
715+ (_('AMC'), 'product_amc'),
716+ (_('FMC'), 'product_consumption'),
717+ (_('In Pipe Qty'), 'l_in_pipe_qty')
718 ]
719
720 header_row = []
721@@ -1512,7 +1512,7 @@
722 'in_pipe_coor_val': fields.float(digits=(16,2), string='In Pipe from Coord.', related_uom='uom_id'),
723 'updated': fields.boolean(string='Updated'),
724 'full_view': fields.related('mission_report_id', 'full_view', string='Full view', type='boolean', store=True),
725- 'move_ids': fields.many2many('stock.move', 'mission_line_move_rel', 'line_id', 'move_id', string='Noves'),
726+ 'move_ids': fields.many2many('stock.move', 'mission_line_move_rel', 'line_id', 'move_id', string='Moves'),
727 'instance_id': fields.many2one(
728 'msf.instance',
729 string='HQ Instance',
730
731=== modified file 'bin/addons/msf_audittrail/audittrail.py'
732--- bin/addons/msf_audittrail/audittrail.py 2019-05-13 08:11:54 +0000
733+++ bin/addons/msf_audittrail/audittrail.py 2019-07-23 09:03:33 +0000
734@@ -103,17 +103,19 @@
735 ('model', '=', 'product.template'),
736 ('res_id', '=', res_id),
737 ]
738-
739+ field_id = False
740 log_sequence = audit_seq_obj.search(cr, uid, domain)
741 if log_sequence:
742 log_seq = audit_seq_obj.browse(cr, uid, log_sequence[0]).sequence
743 log = log_seq.get_id(code_or_id='id')
744
745- if name == 'seller_ids' and context.get('real_user'):
746- user_id = self.pool.get('res.users').browse(cr, uid, context['real_user'], fields_to_fetch=['id'], context=context).id
747- else:
748- user_id = uid
749-
750+ user_id = uid
751+ if name == 'seller_ids':
752+ field_id = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=', 'product.template'), ('name', '=', 'seller_ids')], limit=1, context=context)
753+ if field_id:
754+ field_id = field_id[0]
755+ if context.get('real_user'):
756+ user_id = context['real_user']
757 vals = {
758 'user_id': user_id,
759 'method': 'write',
760@@ -122,6 +124,7 @@
761 'res_id': res_id,
762 'fct_object_id': fct_object_id,
763 'fct_res_id': fct_res_id,
764+ 'field_id': field_id or False,
765 'sub_obj_name': sub_obj_name,
766 'timestamp': time.strftime('%Y-%m-%d %H:%M:%S'),
767 'field_description': field_description,
768@@ -884,15 +887,19 @@
769
770 for line in self.browse(cr, uid, ids, context=context):
771 res[line.id] = {'old_value_fct': False, 'new_value_fct': False}
772+ obj_to_log = line.fct_object_id or line.object_id
773+
774+ # translate value of fields.selection
775+ to_compute = line.field_id.name in ('state_to_display', 'state', 'state_hidden_sale_order') and obj_to_log.model in ('sale.order', 'sale.order.line', 'purchase.order', 'purchase.order.line')
776 if line.method == 'create':
777 res[line.id]['old_value_fct'] = False
778- elif not line.old_value_text:
779- res[line.id]['old_value_fct'] = get_value_text(self, cr, uid, line.field_id.id, False, line.old_value, line.fct_object_id or line.object_id, context=context)
780+ elif to_compute or not line.old_value_text:
781+ res[line.id]['old_value_fct'] = get_value_text(self, cr, uid, line.field_id.id, False, line.old_value, obj_to_log, context=context)
782 else:
783 res[line.id]['old_value_fct'] = line.old_value_text
784
785- if not line.new_value_text:
786- res[line.id]['new_value_fct'] = get_value_text(self, cr, uid, line.field_id.id, False, line.new_value, line.fct_object_id or line.object_id, context=context)
787+ if to_compute or not line.new_value_text:
788+ res[line.id]['new_value_fct'] = get_value_text(self, cr, uid, line.field_id.id, False, line.new_value, obj_to_log, context=context)
789 else:
790 res[line.id]['new_value_fct'] = line.new_value_text
791
792@@ -916,11 +923,12 @@
793
794 for line in self.browse(cr, uid, ids, fields_to_fetch=['field_id', 'object_id', 'fct_object_id', 'res_id', 'name', 'field_description'], context=context):
795 res[line.id] = False
796-
797 # Translation of field name
798 if line.field_id:
799- field_name = '%s,%s' % (line.object_id.model, line.field_id.name)
800- tr_ids = tr_obj.search(cr, uid, [('name', '=', field_name),
801+ field_name = ['%s,%s' % (line.object_id.model, line.field_id.name)]
802+ if line.object_id.model == 'product.template':
803+ field_name.append('product.product,%s' % (line.field_id.name))
804+ tr_ids = tr_obj.search(cr, uid, [('name', 'in', field_name),
805 ('lang', '=', lang),
806 ('type', '=', 'field'),
807 ('src', '=', line.field_id.field_description)], context=context)
808@@ -1149,16 +1157,10 @@
809 elif field['ttype'] == 'selection':
810 res = False
811 if values:
812- translation_obj = self.pool.get('ir.translation')
813 fct_object = model_pool.browse(cr, uid, model.id, fields_to_fetch=['model'], context=context).model
814- sel = self.pool.get(fct_object).fields_get(cr, uid, [field['name']])
815+ sel = self.pool.get(fct_object).fields_get(cr, uid, [field['name']], context=context)
816 if field['name'] in sel:
817 res = dict(sel[field['name']]['selection']).get(values)
818- name = '%s,%s' % (fct_object, field['name'])
819- # Search translation
820- res_tr_ids = translation_obj.search(cr, uid, [('type', '=', 'selection'), ('name', '=', name), ('src', 'in', [values])])
821- if res_tr_ids:
822- res = translation_obj.read(cr, uid, res_tr_ids, ['value'])[0]['value']
823 else:
824 res = values
825 return res
826
827=== modified file 'bin/addons/msf_audittrail/report/log_line.py'
828--- bin/addons/msf_audittrail/report/log_line.py 2015-11-04 10:43:56 +0000
829+++ bin/addons/msf_audittrail/report/log_line.py 2019-07-23 09:03:33 +0000
830@@ -50,17 +50,12 @@
831 def _get_lines(self, order):
832 model = order._name
833 lines = self.pool.get('audittrail.log.line').search(self.cr, self.uid, [('object_id', '=', model), ('res_id', '=', order.id)])
834- return self.pool.get('audittrail.log.line').browse(self.cr, self.uid, lines)
835+ return self.pool.get('audittrail.log.line').browse(self.cr, self.uid, lines, context=self.localcontext)
836
837 def _get_method(self, o, field):
838- sel = self.pool.get(o._name).fields_get(self.cr, self.uid, [field])
839+ sel = self.pool.get(o._name).fields_get(self.cr, self.uid, [field], context=self.localcontext)
840 res = dict(sel[field]['selection']).get(getattr(o,field),getattr(o,field))
841- name = '%s,%s' % (o._name, field)
842- tr_ids = self.pool.get('ir.translation').search(self.cr, self.uid, [('type', '=', 'selection'), ('name', '=', name),('src', '=', res)])
843- if tr_ids:
844- return self.pool.get('ir.translation').read(self.cr, self.uid, tr_ids, ['value'])[0]['value']
845- else:
846- return res
847+ return res
848
849
850 report_sxw.report_sxw('report.msf.log.line', 'audittrail.log.line', 'addons/msf_audittrail/report/log_line.rml', parser=log_line, header="internal landscape")
851
852=== modified file 'bin/addons/msf_audittrail/report/log_line.rml'
853--- bin/addons/msf_audittrail/report/log_line.rml 2013-08-06 12:10:27 +0000
854+++ bin/addons/msf_audittrail/report/log_line.rml 2019-07-23 09:03:33 +0000
855@@ -47,7 +47,7 @@
856 </stylesheet>
857 <story>
858 <para style="terp_default_8">[[repeatIn([objects[0]],'o')]]</para>
859- <para style="P1">[[ setLang(o.user_id.context_lang) ]]</para>
860+ <para style="P1"> </para>
861 <para style="P2">
862 <font face="Helvetica" size="8.0"> </font>
863 </para>
864@@ -55,7 +55,7 @@
865 <tr>
866 <td>
867 <para style="P3">
868- <font face="Helvetica">Modifications[[ (order_name(o.id) and " on %s" % order_name(o.id)) ]]</font>
869+ <font face="Helvetica">Modifications[[ (order_name(o.id) and " %s %s" % (translate('on'), order_name(o.id))) ]]</font>
870 </para>
871 </td>
872 </tr>
873
874=== modified file 'bin/addons/msf_audittrail/report/log_line_xls.mako'
875--- bin/addons/msf_audittrail/report/log_line_xls.mako 2017-01-26 13:48:32 +0000
876+++ bin/addons/msf_audittrail/report/log_line_xls.mako 2019-07-23 09:03:33 +0000
877@@ -68,14 +68,14 @@
878 <Column ss:AutoFitWidth="1" ss:Width="100" />
879
880 <Row>
881- <Cell ss:StyleID="header" ><Data ss:Type="String">Log ID</Data></Cell>
882- <Cell ss:StyleID="header" ><Data ss:Type="String">Date</Data></Cell>
883- <Cell ss:StyleID="header" ><Data ss:Type="String">Order Line</Data></Cell>
884- <Cell ss:StyleID="header" ><Data ss:Type="String">Method</Data></Cell>
885- <Cell ss:StyleID="header" ><Data ss:Type="String">Field description</Data></Cell>
886- <Cell ss:StyleID="header" ><Data ss:Type="String">Old value</Data></Cell>
887- <Cell ss:StyleID="header" ><Data ss:Type="String">New value</Data></Cell>
888- <Cell ss:StyleID="header" ><Data ss:Type="String">User</Data></Cell>
889+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Log ID')}</Data></Cell>
890+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Date')}</Data></Cell>
891+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Order Line')}</Data></Cell>
892+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Method')}</Data></Cell>
893+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Field description')}</Data></Cell>
894+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Old value')}</Data></Cell>
895+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('New value')}</Data></Cell>
896+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('User')}</Data></Cell>
897 </Row>
898
899 % for line in get_lines(order_id(objects[0].id)):
900
901=== modified file 'bin/addons/msf_budget/report/engagement.rml'
902--- bin/addons/msf_budget/report/engagement.rml 2018-01-04 09:07:29 +0000
903+++ bin/addons/msf_budget/report/engagement.rml 2019-07-23 09:03:33 +0000
904@@ -301,7 +301,7 @@
905 <tr>
906 <para style="P20">[[ repeatIn(get_report_lines(o),'line', 'blockTable') ]]</para>
907 <td>
908- <para style="P3">[[ line[0] ]]</para>
909+ <para style="P3">[[ line[0] == 'TOTALS' and translate('TOTALS') or line[0] ]]</para>
910 </td>
911 <td>
912 <para style="P3a">[[ line[1] ]]</para>
913@@ -311,7 +311,7 @@
914 </td>
915 <td>
916 <para style="P3">
917- <font color="red">[[ (line[2] == 'Budget missing' and line[2]) or '' ]]</font>[[ (line[2] != 'Budget missing' and formatLang(line[2], digits=0, grouping=True )) or '' ]]</para>
918+ <font color="red">[[ (line[2] == 'Budget missing' and translate('Budget missing')) or '' ]]</font>[[ (line[2] != 'Budget missing' and formatLang(line[2], digits=0, grouping=True )) or '' ]]</para>
919 </td>
920 <td>
921 <para style="P3">[[ formatLang(line[3], digits=0, grouping=True ) or '' ]]</para>
922
923=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
924--- bin/addons/msf_doc_import/purchase_order.py 2019-05-17 09:46:15 +0000
925+++ bin/addons/msf_doc_import/purchase_order.py 2019-07-23 09:03:33 +0000
926@@ -30,6 +30,8 @@
927 from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetCreator
928 from msf_doc_import.wizard import PO_COLUMNS_HEADER_FOR_IMPORT as columns_header_for_po_line_import
929 from msf_doc_import.wizard import PO_LINE_COLUMNS_FOR_IMPORT as columns_for_po_line_import
930+from msf_doc_import.wizard import RFQ_COLUMNS_HEADER_FOR_IMPORT
931+from msf_doc_import.wizard import RFQ_LINE_COLUMNS_FOR_IMPORT
932 from msf_doc_import import GENERIC_MESSAGE
933 from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
934 import xml.etree.ElementTree as ET
935@@ -617,8 +619,16 @@
936 po = self.browse(cr, uid, [ids[0]], context=context)[0]
937 columns = columns_for_po_line_import
938 columns_header = [(_(f[0]), f[1]) for f in columns_header_for_po_line_import]
939+
940+ if po.rfq_ok:
941+ columns = RFQ_LINE_COLUMNS_FOR_IMPORT
942+ columns_header = [(_(f[0]), f[1]) for f in RFQ_COLUMNS_HEADER_FOR_IMPORT]
943+ if po.state != 'rfq_sent':
944+ columns = columns[1:]
945+ columns_header = columns_header[1:]
946+
947 # if PO is not a RfQ, then we doesn't take in account the first column (Line Number):
948- if not po.rfq_ok or po.state != 'rfq_sent':
949+ if not po.rfq_ok:
950 columns = columns_for_po_line_import[1:]
951 columns_header = columns_header[1:]
952
953
954=== modified file 'bin/addons/msf_doc_import/supplier_catalogue.py'
955--- bin/addons/msf_doc_import/supplier_catalogue.py 2018-03-08 10:37:40 +0000
956+++ bin/addons/msf_doc_import/supplier_catalogue.py 2019-07-23 09:03:33 +0000
957@@ -133,7 +133,7 @@
958 'file': template_file,
959 'filename_template': _('Supplier Catalogue template.xls'),
960 'message': """%s %s""" % (
961- GENERIC_MESSAGE,
962+ _(GENERIC_MESSAGE),
963 ', '.join([_(f) for f in sup_cat_columns]),
964 ),
965 'filename': _('Lines Not imported.xls'),
966
967=== modified file 'bin/addons/msf_doc_import/wizard/__init__.py'
968--- bin/addons/msf_doc_import/wizard/__init__.py 2019-05-03 13:44:52 +0000
969+++ bin/addons/msf_doc_import/wizard/__init__.py 2019-07-23 09:03:33 +0000
970@@ -52,15 +52,19 @@
971 ('Delivery Confirmed Date', 'date'),('Origin', 'string'), ('Comment', 'string'), ('Notes', 'string'), ('Supplier Reference', 'string'), ('Incoterm', 'string')]
972
973 #Important NOTE: I didn't set the fields of type date with the attribute 'date' (2nd part of the tuple) because for Excel, when a date is empty, the field becomes '1899-30-12' as default. So I set 'string' instead for the fields date.
974+RFQ_COLUMNS_HEADER_FOR_IMPORT = [
975+ (_('Line Number'), 'number'), (_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'),
976+ (_('Delivery Request Date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string'), (_('Justification Code'), 'string'), (_('Justification Coordination'), 'string'), (_('HQ Remarks'), 'string'), (_('Justification Y/N'), 'string'), (_('State'), 'string')
977+]
978+RFQ_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in RFQ_COLUMNS_HEADER_FOR_IMPORT]
979
980 PO_COLUMNS_HEADER_FOR_IMPORT=[
981- (_('Line Number'), 'number'), (_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'),
982- (_('Delivery Request Date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string'), (_('Justification Code'), 'string'), (_('Justification Coordination'), 'string'), (_('HQ Remarks'), 'string'), (_('Justification Y/N'), 'string'), (_('state'), 'string')]
983+ (_('Line Number'), 'number'), (_('Product Code'), 'string'), (_('Product Description'), 'string'), (_('Quantity'), 'number'), (_('UoM'), 'string'), (_('Price'), 'number'), (_('Delivery Request Date'), 'date'), (_('Currency'), 'string'), (_('Comment'), 'string'), (_('Justification Code'), 'string'), (_('Justification Coordination'), 'string'), (_('HQ Remarks'), 'string'), (_('Justification Y/N'), 'string'), (_('Cold chain type'), 'string'), (_('Dangerous Good Type'), 'string'), (_('Controlled Substance Type'), 'string'), (_('Status'), 'string')]
984 PO_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in PO_COLUMNS_HEADER_FOR_IMPORT]
985
986 FO_COLUMNS_HEADER_FOR_IMPORT=[
987 (_('fo_import_product_code'), 'string'), (_('fo_import_product_description'), 'string'), (_('fo_import_qty'), 'number'), (_('fo_import_uom'), 'string'),
988- (_('fo_import_price'), 'number'), (_('fo_import_drd'), 'date'), (_('fo_import_currency'), 'string'), (_('fo_import_comment'), 'string'), (_('state'), 'string')]
989+ (_('fo_import_price'), 'number'), (_('fo_import_drd'), 'date'), (_('fo_import_currency'), 'string'), (_('fo_import_comment'), 'string'), (_('State'), 'string')]
990 FO_LINE_COLUMNS_FOR_IMPORT = [x for (x, y) in FO_COLUMNS_HEADER_FOR_IMPORT]
991
992 INT_COLUMNS_HEADER_FOR_IMPORT = [
993
994=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py'
995--- bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py 2018-06-05 09:49:04 +0000
996+++ bin/addons/msf_doc_import/wizard/wizard_import_ir_line.py 2019-07-23 09:03:33 +0000
997@@ -116,13 +116,11 @@
998 currency_index, order_currency_code)
999 except Exception as e:
1000 lines_to_correct = -1
1001- msg = "An error occurred when the system was checking the "\
1002- "currency value of data. Error raised: %s" % str(e)
1003+ msg = _("An error occurred when the system was checking the currency value of data. Error raised: %s") % str(e)
1004 error_list.append(msg)
1005 if lines_to_correct > 0:
1006- msg = "You can not import this file because it contains" \
1007- " line(s) with currency not of the order currency (%s)" % (
1008- order_currency_code, )
1009+ msg = _("You can not import this file because it contains line(s) with currency not of the order currency (%s)") % (
1010+ order_currency_code, )
1011 error_list.append(msg)
1012
1013 if not error_list:
1014
1015=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_po_line.py'
1016--- bin/addons/msf_doc_import/wizard/wizard_import_po_line.py 2019-05-09 10:20:59 +0000
1017+++ bin/addons/msf_doc_import/wizard/wizard_import_po_line.py 2019-07-23 09:03:33 +0000
1018@@ -131,9 +131,8 @@
1019 if lines_to_correct > 0:
1020 categ_log = ''
1021 line_num = 0
1022- msg = "You can not import this file because it contains" \
1023- " line(s) with currency not of the order currency (%s)" % (
1024- order_currency_code, )
1025+ msg = _("You can not import this file because it contains line(s) with currency not of the order currency (%s)") % (
1026+ order_currency_code, )
1027 error_list.append(msg)
1028
1029 if not error_list:
1030
1031=== modified file 'bin/addons/msf_doc_import/wizard/wizard_import_product_list.py'
1032--- bin/addons/msf_doc_import/wizard/wizard_import_product_list.py 2018-03-16 09:23:45 +0000
1033+++ bin/addons/msf_doc_import/wizard/wizard_import_product_list.py 2019-07-23 09:03:33 +0000
1034@@ -246,7 +246,7 @@
1035 total_time = tools.ustr(round(end_time-start_time)) + _(' second(s)')
1036 final_message = _('''
1037 Importation completed in %s!
1038-# of imported linse: %s on %s lines
1039+# of imported lines: %s on %s lines
1040 # of ignored lines: %s
1041 # of lines to correct: %s
1042 %s
1043
1044=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
1045--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py 2019-04-25 15:25:38 +0000
1046+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py 2019-07-23 09:03:33 +0000
1047@@ -831,7 +831,7 @@
1048 if pack_errors_ids:
1049 pack_error_string = dict(PACK_INTEGRITY_STATUS_SELECTION)
1050 for pack_error in pack_info_obj.browse(cr, uid, pack_errors_ids, context=context):
1051- values_header_errors.append("Packing List %s, Pack from parcel %s, to parcel %s, integrity error %s" % (pack_error.packing_list or '-', pack_error.parcel_from, pack_error.parcel_to, pack_error_string.get(pack_error.integrity_status)))
1052+ values_header_errors.append(_("Packing List %s, Pack from parcel %s, to parcel %s, integrity error %s") % (pack_error.packing_list or '-', pack_error.parcel_from, pack_error.parcel_to, _(pack_error_string.get(pack_error.integrity_status))))
1053
1054
1055 rounding_text = ""
1056@@ -963,7 +963,7 @@
1057
1058 if err_msg:
1059 for err in err_msg:
1060- err = 'Line %s of the Excel file: %s' % (file_line[0], err)
1061+ err = _('Line %s of the Excel file: %s') % (file_line[0], err)
1062 values_line_errors.append(err)
1063
1064
1065@@ -986,7 +986,7 @@
1066
1067 if err_msg:
1068 for err in err_msg:
1069- err = 'Line %s of the Excel file: %s' % (in_line, err)
1070+ err = _('Line %s of the Excel file: %s') % (in_line, err)
1071 values_line_errors.append(err)
1072 # Commit modifications
1073 cr.commit()
1074@@ -1007,13 +1007,13 @@
1075 if len(values_header_errors):
1076 import_error_ok = True
1077 can_be_imported = False
1078- message += '\n## Error on header values ##\n\n'
1079+ message += '\n## %s ##\n\n' % (_('Error on header values'),)
1080 for err in values_header_errors:
1081 message += '%s\n' % err
1082
1083 if len(values_line_errors):
1084 import_error_ok = True
1085- message += '\n## Error on line values ##\n\n'
1086+ message += '\n## %s ##\n\n' % (_('Error on line values'),)
1087 for err in values_line_errors:
1088 message += '%s\n' % err
1089 if wiz.with_pack:
1090
1091=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
1092--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2019-05-28 07:30:48 +0000
1093+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2019-07-23 09:03:33 +0000
1094@@ -959,8 +959,6 @@
1095 if not line_number and not ext_ref:
1096 not_ok = True
1097 err1 = _('The line must have either the line number or the external ref. set')
1098- err = _('Line %s of the file: %s') % (x, err1)
1099- values_line_errors.append(err)
1100 file_line_error.append(err1)
1101
1102 if line_number and ext_ref and (ext_ref not in LN_BY_EXT_REF[wiz.id].keys() or line_number not in LN_BY_EXT_REF[wiz.id][ext_ref]):
1103@@ -1135,7 +1133,7 @@
1104
1105 if err_msg:
1106 for err in err_msg:
1107- err = 'Line %s of the PO: %s' % (file_line[2], err)
1108+ err = _('Line %s of the PO: %s') % (file_line[2], err)
1109 values_line_errors.append(err)
1110
1111
1112@@ -1161,9 +1159,9 @@
1113 if err_msg:
1114 for err in err_msg:
1115 if line_n:
1116- err = 'Line %s of the PO: %s' % (line_n, err)
1117+ err = _('Line %s of the PO: %s') % (line_n, err)
1118 else:
1119- err = 'Line %s of the file: %s' % (po_line, err)
1120+ err = _('Line %s of the file: %s') % (po_line, err)
1121 values_line_errors.append(err)
1122 # Commit modifications
1123 cr.commit()
1124@@ -1182,13 +1180,13 @@
1125 import_error_ok = False
1126 if len(values_header_errors):
1127 import_error_ok = True
1128- message += '\n## Error on header values ##\n\n'
1129+ message += '\n## %s ##\n\n' % (_('Error on header values'), )
1130 for err in values_header_errors:
1131 message += '%s\n' % err
1132
1133 if len(values_line_errors):
1134 import_error_ok = True
1135- message += '\n## Error on line values ##\n\n'
1136+ message += '\n## %s ##\n\n' % (_('Error on line values'), )
1137 for err in values_line_errors:
1138 message += '%s\n' % err
1139
1140@@ -1338,14 +1336,15 @@
1141 delete_line_numbers.add(x['in_line_number'])
1142
1143 res = {}
1144+ chg_dict = dict(self.fields_get(cr, uid, ['type_change'], context=context).get('type_change', {}).get('selection', []))
1145 for line in self.browse(cr, uid, ids, context=context):
1146 chg = ''
1147 if line.type_change in ('warning', 'del', 'ignore'):
1148- chg = dict(self._columns['type_change'].selection).get(line.type_change) or ''
1149+ chg = chg_dict.get(line.type_change) or ''
1150 elif line.chg_text:
1151 chg = line.chg_text
1152 elif line.type_change:
1153- chg = dict(self._columns['type_change'].selection).get(line.type_change) or ''
1154+ chg = chg_dict.get(line.type_change) or ''
1155 res[line.id] = {'in_product_id': False,
1156 'in_nomen': False,
1157 'in_comment': False,
1158@@ -1413,7 +1412,7 @@
1159 res[line.id]['in_uom'] = line.imp_uom.id
1160
1161 if line.type_change in ('warning', 'del', 'ignore'):
1162- res[line.id]['chg_text'] = dict(self._columns['type_change'].selection).get(line.type_change) or ''
1163+ res[line.id]['chg_text'] = chg_dict.get(line.type_change) or ''
1164
1165 return res
1166
1167
1168=== modified file 'bin/addons/msf_order_date/wizard/update_lines.py'
1169--- bin/addons/msf_order_date/wizard/update_lines.py 2019-05-09 08:29:36 +0000
1170+++ bin/addons/msf_order_date/wizard/update_lines.py 2019-07-23 09:03:33 +0000
1171@@ -109,7 +109,7 @@
1172
1173 _moves_fields = result['fields']
1174 # add field related to picking type only
1175- _moves_fields.update({'stock_take_date': {'type': 'date', 'string': 'Date of Stock Take', 'readonly': True, },})
1176+ _moves_fields.update({'stock_take_date': {'type': 'date', 'string': _('Date of Stock Take'), 'readonly': True, },})
1177
1178 _moves_arch_lst += """</form>"""
1179 else:
1180@@ -128,7 +128,7 @@
1181
1182 _moves_fields = result['fields']
1183 # add field related to picking type only
1184- _moves_fields.update({'delivery_%s_date'%field_name: {'type' : 'date', 'string' : 'Delivery %s date'%field_name, 'readonly': True,},
1185+ _moves_fields.update({'delivery_%s_date'%field_name: {'type' : 'date', 'string' : _('Delivery %s date')% _(field_name), 'readonly': True,},
1186 })
1187
1188 _moves_arch_lst += """</form>"""
1189
1190=== modified file 'bin/addons/msf_outgoing/__init__.py'
1191--- bin/addons/msf_outgoing/__init__.py 2018-12-06 16:16:26 +0000
1192+++ bin/addons/msf_outgoing/__init__.py 2019-07-23 09:03:33 +0000
1193@@ -19,45 +19,47 @@
1194 #
1195 ##############################################################################
1196
1197+from tools.translate import _
1198+
1199 PACK_INTEGRITY_STATUS_SELECTION = [
1200 ('empty', ''),
1201- ('ok', 'Ok'),
1202- ('missing_1', 'The first sequence must start with 1'),
1203- ('to_smaller_than_from', 'To value must be greater or equal to From value'),
1204- ('overlap', 'The sequence overlaps previous one'),
1205- ('gap', 'A gap exist in the sequence'),
1206+ ('ok', _('Ok')),
1207+ ('missing_1', _('The first sequence must start with 1')),
1208+ ('to_smaller_than_from', _('To value must be greater or equal to From value')),
1209+ ('overlap', _('The sequence overlaps previous one')),
1210+ ('gap', _('A gap exist in the sequence')),
1211 ]
1212 INTEGRITY_STATUS_SELECTION = [
1213- ('negative', 'Negative Value'),
1214+ ('negative', _('Negative Value')),
1215 # picking
1216- ('missing_lot', 'Batch Number is Missing'),
1217- ('missing_date', 'Expiry Date is Missing'),
1218- ('no_lot_needed', 'No Batch Number/Expiry Date Needed'),
1219- ('wrong_lot_type', 'Wrong Batch Number Type'),
1220- ('wrong_lot_type_need_internal', 'Need Expiry Date (Internal) not Batch Number (Standard)'),
1221- ('wrong_lot_type_need_standard', 'Need Batch Number (Standard) not Expiry Date (Internal)'),
1222- ('empty_picking', 'Empty Picking Ticket'),
1223+ ('missing_lot', _('Batch Number is Missing')),
1224+ ('missing_date', _('Expiry Date is Missing')),
1225+ ('no_lot_needed', _('No Batch Number/Expiry Date Needed')),
1226+ ('wrong_lot_type', _('Wrong Batch Number Type')),
1227+ ('wrong_lot_type_need_internal', _('Need Expiry Date (Internal) not Batch Number (Standard)')),
1228+ ('wrong_lot_type_need_standard', _('Need Batch Number (Standard) not Expiry Date (Internal)')),
1229+ ('empty_picking', _('Empty Picking Ticket')),
1230 # return ppl
1231- ('return_qty_too_much', 'Too much quantity selected'),
1232+ ('return_qty_too_much', _('Too much quantity selected')),
1233 # ppl2
1234- ('missing_weight', 'Weight is Missing'),
1235+ ('missing_weight', _('Weight is Missing')),
1236 # create shipment
1237- ('too_many_packs', 'Too many packs selected'),
1238+ ('too_many_packs', _('Too many packs selected')),
1239 # return from shipment
1240- ('seq_out_of_range', 'Selected Sequence is out of range'),
1241+ ('seq_out_of_range', _('Selected Sequence is out of range')),
1242 # substitute kit
1243- ('not_available', 'Not Available'),
1244- ('must_be_greater_than_0', 'Quantity must be greater than 0.0'),
1245- ('missing_asset', 'Asset is Missing'),
1246- ('no_asset_needed', 'No Asset Needed'),
1247+ ('not_available', _('Not Available')),
1248+ ('must_be_greater_than_0', _('Quantity must be greater than 0.0')),
1249+ ('missing_asset', _('Asset is Missing')),
1250+ ('no_asset_needed', _('No Asset Needed')),
1251 # assign kit
1252- ('greater_than_available', 'Assigned qty must be smaller or equal to available qty'),
1253- ('greater_than_required', 'Assigned qty must be smaller or equal to required qty'),
1254+ ('greater_than_available', _('Assigned qty must be smaller or equal to available qty')),
1255+ ('greater_than_required', _('Assigned qty must be smaller or equal to required qty')),
1256 # pol dekitting
1257- ('price_must_be_greater_than_0', 'Unit Price must be greater than 0.0'),
1258+ ('price_must_be_greater_than_0', _('Unit Price must be greater than 0.0')),
1259 # claims
1260- ('missing_src_location', 'Src Location is missing'),
1261- ('not_exist_in_picking', 'Does not exist in selected IN/OUT'),
1262+ ('missing_src_location', _('Src Location is missing')),
1263+ ('not_exist_in_picking', _('Does not exist in selected IN/OUT')),
1264 ] + PACK_INTEGRITY_STATUS_SELECTION
1265
1266 import msf_outgoing
1267
1268=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
1269--- bin/addons/msf_outgoing/msf_outgoing.py 2019-05-10 13:59:15 +0000
1270+++ bin/addons/msf_outgoing/msf_outgoing.py 2019-07-23 09:03:33 +0000
1271@@ -5408,7 +5408,7 @@
1272 for pack in pack_obj:
1273 res_id = pack['draft_packing_id'][0]
1274 return {
1275- 'name': 'Change description',
1276+ 'name': _('Change description'),
1277 'view_type': 'form',
1278 'view_mode': 'form',
1279 'view_id': [res and res[1] or False],
1280
1281=== modified file 'bin/addons/msf_outgoing/report/packing_list_xls.mako'
1282--- bin/addons/msf_outgoing/report/packing_list_xls.mako 2018-10-02 13:05:28 +0000
1283+++ bin/addons/msf_outgoing/report/packing_list_xls.mako 2019-07-23 09:03:33 +0000
1284@@ -300,7 +300,7 @@
1285
1286 % for p in getPackingList(objects[0]):
1287 <Row ss:Height="16.5">
1288- <Cell ss:StyleID="s104"><Data ss:Type="String">PACKING LIST</Data></Cell>
1289+ <Cell ss:StyleID="s104"><Data ss:Type="String">${_('PACKING LIST')|x}</Data></Cell>
1290 </Row>
1291 <Row>
1292 <Cell><Data ss:Type="String">${(p['ppl'].name)|x}</Data></Cell>
1293@@ -310,18 +310,18 @@
1294 <Cell><Data ss:Type="String"></Data></Cell>
1295 </Row>
1296 <Row ss:AutoFitHeight="0">
1297- <Cell ss:MergeAcross="1" ss:StyleID="m99299328"><Data ss:Type="String">Your Ref.:</Data></Cell>
1298+ <Cell ss:MergeAcross="1" ss:StyleID="m99299328"><Data ss:Type="String">${_('Your Ref.:')|x}</Data></Cell>
1299 <Cell ss:StyleID="s17"><Data ss:Type="String">${(p['ppl'].sale_id and p['ppl'].sale_id.client_order_ref or '-')|x}</Data></Cell>
1300- <Cell ss:StyleID="s16"><Data ss:Type="String">Shipper:</Data></Cell>
1301- <Cell ss:StyleID="s18"/>
1302- <Cell ss:StyleID="s16"><Data ss:Type="String">Consignee:</Data></Cell>
1303- <Cell ss:StyleID="s16"><Data ss:Type="String">Dispatch:</Data></Cell>
1304- <Cell ss:StyleID="s18"/>
1305- <Cell ss:StyleID="s16"><Data ss:Type="String">Invoice to:</Data></Cell>
1306+ <Cell ss:StyleID="s16"><Data ss:Type="String">${_('Shipper:')|x}</Data></Cell>
1307+ <Cell ss:StyleID="s18"/>
1308+ <Cell ss:StyleID="s16"><Data ss:Type="String">${_('Consignee:')|x}</Data></Cell>
1309+ <Cell ss:StyleID="s16"><Data ss:Type="String">${_('Dispatch:')|x}</Data></Cell>
1310+ <Cell ss:StyleID="s18"/>
1311+ <Cell ss:StyleID="s16"><Data ss:Type="String">${_('Invoice to:')|x}</Data></Cell>
1312 <Cell ss:StyleID="s107"/>
1313 </Row>
1314 <Row ss:AutoFitHeight="0" ss:Height="12">
1315- <Cell ss:MergeAcross="1" ss:StyleID="m99299368"><Data ss:Type="String">Our Ref.:</Data></Cell>
1316+ <Cell ss:MergeAcross="1" ss:StyleID="m99299368"><Data ss:Type="String">${_('Our Ref.:')|x}</Data></Cell>
1317 <Cell ss:StyleID="s17"><Data ss:Type="String">${(p['ppl'].sale_id and p['ppl'].sale_id.name or '-')|x}</Data></Cell>
1318 <Cell ss:StyleID="s17"><Data ss:Type="String">${(objects[0].shipper_name or '')|x}</Data></Cell>
1319 <Cell ss:StyleID="s18"/>
1320@@ -332,7 +332,7 @@
1321 <Cell ss:StyleID="s107"/>
1322 </Row>
1323 <Row ss:AutoFitHeight="0" ss:Height="12">
1324- <Cell ss:MergeAcross="1" ss:StyleID="m99299368"><Data ss:Type="String">Supplier Packing List:</Data></Cell>
1325+ <Cell ss:MergeAcross="1" ss:StyleID="m99299368"><Data ss:Type="String">${_('Supplier Packing List')|x}:</Data></Cell>
1326 <Cell ss:StyleID="s17"><Data ss:Type="String">${(p['ppl'].packing_list or '-')|x}</Data></Cell>
1327 <Cell ss:StyleID="s17"><Data ss:Type="String">${(objects[0].shipper_contact or '')|x}</Data></Cell>
1328 <Cell ss:StyleID="s18"/>
1329@@ -343,7 +343,7 @@
1330 <Cell ss:StyleID="s107"/>
1331 </Row>
1332 <Row ss:AutoFitHeight="0" ss:Height="12">
1333- <Cell ss:MergeAcross="1" ss:StyleID="m99299388"><Data ss:Type="String">FO Date:</Data></Cell>
1334+ <Cell ss:MergeAcross="1" ss:StyleID="m99299388"><Data ss:Type="String">${_('FO Date:')|x}</Data></Cell>
1335 % if p['ppl'].sale_id and isDate(p['ppl'].sale_id.date_order):
1336 <Cell ss:StyleID="s17_short_date"><Data ss:Type="DateTime">${p['ppl'].sale_id.date_order|n}T00:00:00.000</Data></Cell>
1337 % else:
1338@@ -358,7 +358,7 @@
1339 <Cell ss:StyleID="s107"/>
1340 </Row>
1341 <Row ss:AutoFitHeight="0" ss:Height="12">
1342- <Cell ss:MergeAcross="1" ss:StyleID="m99299408"><Data ss:Type="String">Packing date:</Data></Cell>
1343+ <Cell ss:MergeAcross="1" ss:StyleID="m99299408"><Data ss:Type="String">${_('Packing date:')|x}</Data></Cell>
1344 % if p['ppl'].date and isDate(p['ppl'].date[0:10]):
1345 <Cell ss:StyleID="s17_short_date"><Data ss:Type="DateTime">${p['ppl'].date[0:10]|n}T00:00:00.000</Data></Cell>
1346 % else:
1347@@ -373,12 +373,23 @@
1348 <Cell ss:StyleID="s107"/>
1349 </Row>
1350 <Row ss:AutoFitHeight="0" ss:Height="12">
1351- <Cell ss:MergeAcross="1" ss:StyleID="m99299428"><Data ss:Type="String">RTS date:</Data></Cell>
1352+ <Cell ss:MergeAcross="1" ss:StyleID="m99299428"><Data ss:Type="String">${_('RTS date:')|x}</Data></Cell>
1353 % if objects[0].shipment_expected_date and isDate(objects[0].shipment_expected_date[0:10]):
1354 <Cell ss:StyleID="s17_short_date"><Data ss:Type="DateTime">${objects[0].shipment_expected_date[0:10]|n}T00:00:00.000</Data></Cell>
1355 % else:
1356 <Cell ss:StyleID="s17"><Data ss:Type="String"></Data></Cell>
1357- % endif
1358+ % endif
1359+ <Cell ss:StyleID="s17"><Data ss:Type="String">${(objects[0].shipper_phone or '')|x}</Data></Cell>
1360+ <Cell ss:StyleID="s18"/>
1361+ <Cell ss:StyleID="s17"><Data ss:Type="String">${(objects[0].consignee_phone or '')|x}</Data></Cell>
1362+ <Cell ss:StyleID="s17"><Data ss:Type="String">${(p['ppl'].sale_id and p['ppl'].sale_id.partner_shipping_id.street2 or '')|x}</Data></Cell>
1363+ <Cell ss:StyleID="s18"/>
1364+ <Cell ss:StyleID="s18"/>
1365+ <Cell ss:StyleID="s107"/>
1366+ </Row>
1367+ <Row ss:AutoFitHeight="0" ss:Height="12">
1368+ <Cell ss:MergeAcross="1" ss:StyleID="m99299448"><Data ss:Type="String">${_('Transport mode:')|x}</Data></Cell>
1369+ <Cell ss:StyleID="s17"><Data ss:Type="String">${(getSel(objects[0], 'transport_type'))|x}</Data></Cell>
1370 <Cell ss:StyleID="s18"/>
1371 <Cell ss:StyleID="s18"/>
1372 <Cell ss:StyleID="s17"><Data ss:Type="String">${(objects[0].consignee_other or '')|x}</Data></Cell>
1373@@ -388,7 +399,7 @@
1374 <Cell ss:StyleID="s107"/>
1375 </Row>
1376 <Row ss:AutoFitHeight="0" ss:Height="12">
1377- <Cell ss:MergeAcross="1" ss:StyleID="m99299448"><Data ss:Type="String">Transport mode:</Data></Cell>
1378+ <Cell ss:MergeAcross="1" ss:StyleID="m99299448"><Data ss:Type="String">${_('Transport mode')|x}:</Data></Cell>
1379 <Cell ss:StyleID="s17"><Data ss:Type="String">${(getSel(objects[0], 'transport_type'))|x}</Data></Cell>
1380 <Cell ss:StyleID="s17"><Data ss:Type="String">${(objects[0].shipper_other or '')|x}</Data></Cell>
1381 <Cell ss:StyleID="s18"/>
1382@@ -404,37 +415,37 @@
1383 <Cell ss:StyleID="s125"/>
1384 <Cell ss:StyleID="s125"/>
1385 <Cell ss:StyleID="s125"/>
1386- <Cell ss:StyleID="s17"><Data ss:Type="String">${(p['ppl'].sale_id and p['ppl'].sale_id.partner_shipping_id.phone or p['ppl'].sale_id.partner_shipping_id.mobile or '')|x}</Data></Cell>
1387+ <Cell ss:StyleID="s17"><Data ss:Type="String">${(p['ppl'].sale_id and p['ppl'].sale_id.partner_shipping_id and (p['ppl'].sale_id.partner_shipping_id.phone or p['ppl'].sale_id.partner_shipping_id.mobile) or '')|x}</Data></Cell>
1388 <Cell ss:StyleID="s125"/>
1389 <Cell ss:StyleID="s125"/>
1390 <Cell ss:StyleID="s118"/>
1391 </Row>
1392 % if not p['pf']:
1393 <Row>
1394- <Cell ss:StyleID="NoPack" ss:MergeAcross="11"><Data ss:Type="String">NO PACK FAMILIES IN THIS PPL</Data></Cell>
1395+ <Cell ss:StyleID="NoPack" ss:MergeAcross="11"><Data ss:Type="String">${_('NO PACK FAMILIES IN THIS PPL')|x}</Data></Cell>
1396 </Row>
1397 % endif
1398 % for pf in getParcel(p['pf']):
1399 <Row>
1400- <Cell ss:StyleID="s135" ss:MergeAcross="1"><Data ss:Type="String">Parcel No: ${(pf.from_pack)|x} to ${(pf.to_pack)|x}</Data></Cell>
1401- <Cell ss:StyleID="s135"><Data ss:Type="String">${(pf.num_of_packs)|x} Parcel${(pf.num_of_packs > 1 and 's' or '')|x}</Data></Cell>
1402- <Cell ss:StyleID="s135" ss:MergeAcross="3"><Data ss:Type="String">Total weight ${(formatLang(pf.total_weight or 0.00))|x} kg - Total volume ${(formatLang(pf.total_volume or 0.00))|x} dm³</Data></Cell>
1403+ <Cell ss:StyleID="s135" ss:MergeAcross="1"><Data ss:Type="String">${_('Parcel No:')|x} ${(pf.from_pack)|x} ${_('to')|x} ${(pf.to_pack)|x}</Data></Cell>
1404+ <Cell ss:StyleID="s135"><Data ss:Type="String">${(pf.num_of_packs)|x} ${_('Parcel')|x}${(pf.num_of_packs > 1 and 's' or '')|x}</Data></Cell>
1405+ <Cell ss:StyleID="s135" ss:MergeAcross="3"><Data ss:Type="String">${_('Total weight')|x} ${(formatLang(pf.total_weight or 0.00))|x} kg - ${_('Total volume')|x} ${(formatLang(pf.total_volume or 0.00))|x} dm³</Data></Cell>
1406 <Cell ss:StyleID="s135"/>
1407 <Cell ss:StyleID="s135"/>
1408 <Cell ss:StyleID="s130" ss:MergeAcross="2"><ss:Data ss:Type="String"
1409- xmlns="http://www.w3.org/TR/REC-html40"><Font html:Color="#000000">Containing:</Font></ss:Data></Cell>
1410+ xmlns="http://www.w3.org/TR/REC-html40"><Font html:Color="#000000">${_('Containing:')|x}</Font></ss:Data></Cell>
1411 </Row>
1412 <Row ss:AutoFitHeight="0" ss:Height="17.25">
1413- <Cell ss:StyleID="s131"><Data ss:Type="String">Item</Data></Cell>
1414- <Cell ss:StyleID="s131"><Data ss:Type="String">Code</Data></Cell>
1415- <Cell ss:StyleID="s131"><Data ss:Type="String">Description</Data></Cell>
1416- <Cell ss:StyleID="s131" ss:MergeAcross="2"><Data ss:Type="String">Comment</Data></Cell>
1417- <Cell ss:StyleID="s136"><Data ss:Type="String">Total Qty.</Data></Cell>
1418- <Cell ss:StyleID="s131"><Data ss:Type="String">Batch</Data></Cell>
1419- <Cell ss:StyleID="s131"><Data ss:Type="String">Exp. Date</Data></Cell>
1420- <Cell ss:StyleID="s131"><Data ss:Type="String">KC</Data></Cell>
1421- <Cell ss:StyleID="s131"><Data ss:Type="String">DG</Data></Cell>
1422- <Cell ss:StyleID="s131"><Data ss:Type="String">CS</Data></Cell>
1423+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('Item')|x}</Data></Cell>
1424+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('Code')|x}</Data></Cell>
1425+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('Description')|x}</Data></Cell>
1426+ <Cell ss:StyleID="s131" ss:MergeAcross="2"><Data ss:Type="String">${_('Comment')|x}</Data></Cell>
1427+ <Cell ss:StyleID="s136"><Data ss:Type="String">${_('Total Qty.')|x}</Data></Cell>
1428+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('Batch')|x}</Data></Cell>
1429+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('Exp. Date')|x}</Data></Cell>
1430+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('KC')|x}</Data></Cell>
1431+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('DG')|x}</Data></Cell>
1432+ <Cell ss:StyleID="s131"><Data ss:Type="String">${_('CS')|x}</Data></Cell>
1433 </Row>
1434 % for m in pf.move_lines:
1435 <Row ss:AutoFitHeight="0" ss:Height="11.0625">
1436
1437=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.py'
1438--- bin/addons/msf_outgoing/report/picking_ticket.py 2019-02-11 09:38:43 +0000
1439+++ bin/addons/msf_outgoing/report/picking_ticket.py 2019-07-23 09:03:33 +0000
1440@@ -240,11 +240,11 @@
1441
1442 for m in picking.move_lines:
1443 if m.kc_check:
1444- kc = 'heat sensitive'
1445+ kc = _('heat sensitive')
1446 if m.dg_check:
1447- dg = 'dangerous goods'
1448+ dg = _('dangerous goods')
1449 if kc and dg:
1450- and_msg = ' and '
1451+ and_msg = _(' and ')
1452 break
1453
1454 if kc or dg:
1455
1456=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
1457--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2019-05-10 10:35:39 +0000
1458+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2019-07-23 09:03:33 +0000
1459@@ -106,7 +106,7 @@
1460 <html>
1461 <div style="align: center">
1462 <p style="font-size:14px;text-align: center; v-align: middle;">
1463- <translate>Warning! There is a risk of producing inconsistent data if you process this Incoming Shipment before it receives the delivery details and is changed into status "Available Shipped” after synchronization. To avoid major misalignment please proceed only if you can do a full reception.</translate>
1464+ <translate>Warning! There is a risk of producing inconsistent data if you process this Incoming Shipment before it receives the delivery details and is changed into status "Available Shipped" after synchronization. To avoid major misalignment please proceed only if you can do a full reception.</translate>
1465 </p>
1466 </div>
1467 </html>
1468
1469=== modified file 'bin/addons/msf_printed_documents/report/freight_manifest.rml'
1470--- bin/addons/msf_printed_documents/report/freight_manifest.rml 2018-12-12 08:47:32 +0000
1471+++ bin/addons/msf_printed_documents/report/freight_manifest.rml 2019-07-23 09:03:33 +0000
1472@@ -178,7 +178,7 @@
1473
1474 <story>
1475
1476- <para style="Standard">[[ setLang(objects[0].partner_id2.lang) ]]</para>
1477+ <para style="Standard"></para>
1478 <para style="Standard">
1479 <font color="white"> </font>
1480 </para>
1481
1482=== modified file 'bin/addons/msf_printed_documents/report/sale_order.rml'
1483--- bin/addons/msf_printed_documents/report/sale_order.rml 2019-01-29 10:16:00 +0000
1484+++ bin/addons/msf_printed_documents/report/sale_order.rml 2019-07-23 09:03:33 +0000
1485@@ -83,7 +83,7 @@
1486
1487 <story>
1488
1489- <para style="Standard">[[ setLang(objects[0].partner_id.lang) ]]</para>
1490+ <para style="Standard"> </para>
1491 <para style="Standard">
1492 <font color="white"> </font>
1493 </para>
1494
1495=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
1496--- bin/addons/msf_profile/i18n/fr_MF.po 2019-06-20 14:24:33 +0000
1497+++ bin/addons/msf_profile/i18n/fr_MF.po 2019-07-23 09:03:33 +0000
1498@@ -1,4 +1,4 @@
1499-# Translation of OpenERP Server.
1500+# Translatio of OpenERP Server.
1501 # This file contains the translation of the following modules:
1502 # * report_webkit_override
1503 # * analytic_distribution_supply
1504@@ -156,7 +156,7 @@
1505 #. module: msf_outgoing
1506 #: field:validate.picking.processor,move_ids:0
1507 msgid "Moves to process"
1508-msgstr "Moves to process"
1509+msgstr "Mouvements à traiter"
1510
1511 #. module: account
1512 #: view:account.addtmpl.wizard:0
1513@@ -180,7 +180,7 @@
1514 #: selection:wizard.import.po.simulation.screen.line,type_change:0
1515 #: selection:wizard.simu.import.po.line,change_type:0
1516 msgid "Del"
1517-msgstr "Del"
1518+msgstr "Suppr"
1519
1520 #. module: base
1521 #: selection:ir.ui.view,type:0
1522@@ -245,6 +245,7 @@
1523 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:287
1524 #: report:ir.follow.up.location.report_pdf:0
1525 #: report:sales.follow.up.multi.report_pdf:0
1526+#: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:886
1527 msgid "Qty ordered"
1528 msgstr "Qté commandée"
1529
1530@@ -297,8 +298,9 @@
1531
1532 #. module: stock_override
1533 #: report:stock.card.report:0
1534+#: report:addons/stock_override/report/stock_card_report_xls.mako:103
1535 msgid "STOCK CARD"
1536-msgstr "STOCK CARD"
1537+msgstr "FICHE DE STOCK"
1538
1539 #. module: procurement_cycle
1540 #: view:stock.warehouse.order.cycle:0
1541@@ -315,11 +317,12 @@
1542 msgid "Instance code / Place of payment"
1543 msgstr "Code de l'Instance / Lieu du paiement"
1544
1545-#. modules: account, register_accounting, account_mcdb
1546+#. modules: account, register_accounting, account_mcdb, sale
1547 #: selection:account.period,state:0
1548 #: selection:account.fiscalyear.state,state:0
1549 #: selection:account.period.state,state:0
1550 #: selection:account.direct.invoice.wizard,state:0
1551+#: code:addons/sale/report/sale_loan_stock_moves_report.py:92
1552 msgid "Open"
1553 msgstr "Ouverte"
1554
1555@@ -354,17 +357,6 @@
1556 msgid "Debug to server log"
1557 msgstr "Déboguer dans le journal du serveur"
1558
1559-#. modules: account, finance, account_mcdb
1560-#: report:account.partner.balance:0
1561-#: view:account.partner.balance:0
1562-#: code:addons/finance/wizard/account_report_partner_balance_tree.py:490
1563-#: model:ir.actions.act_window,name:account.action_account_partner_balance
1564-#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
1565-#: model:ir.actions.report.xml,name:finance.account_partner_balance_tree_xls
1566-#: selection:finance.sync.query,model:0
1567-msgid "Partner Balance"
1568-msgstr "Balance Partenaire"
1569-
1570 #. module: base
1571 #: view:res.log:0
1572 msgid "System Logs"
1573@@ -447,15 +439,6 @@
1574 msgid "Angola"
1575 msgstr "Angola"
1576
1577-#. module: account
1578-#: report:account.account.balance:0
1579-#: report:account.central.journal:0
1580-#: report:account.general.journal:0
1581-#: report:account.journal.period.print:0
1582-#: report:account.vat.declaration:0
1583-msgid "Start Period"
1584-msgstr "Commencer Période"
1585-
1586 #. module: purchase_override
1587 #: report:msf.purchase.order:0
1588 #: report:purchase.order.merged:0
1589@@ -613,8 +596,10 @@
1590 #. module: consumption_calculation
1591 #: view:expiry.quantity.report:0
1592 #: report:expiry.report:0
1593+#: report:addons/consumption_calculation/report/expiry_report.mako:161
1594+#: report:addons/consumption_calculation/report/expiry_report.mako:214
1595 msgid "Exp. Qty"
1596-msgstr "Quantités Expirées"
1597+msgstr "Qtés. Exp."
1598
1599 #. module: stock
1600 #: model:ir.actions.server,name:stock.action_partial_move_server
1601@@ -987,12 +972,12 @@
1602 #: view:shipment.processor:0
1603 #, python-format
1604 msgid "Create shipment"
1605-msgstr "Create shipment"
1606+msgstr "Créer une Expédition"
1607
1608 #. module: purchase
1609 #: model:process.node,note:purchase.process_node_rfq_done
1610 msgid "Closed state of request for quotation."
1611-msgstr "Statut fermé d'une Demande de Devis"
1612+msgstr "État fermé d'une Demande de Devis"
1613
1614 #. modules: base, consumption_calculation
1615 #: view:workflow.activity:0
1616@@ -1114,7 +1099,7 @@
1617 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1485
1618 #, python-format
1619 msgid "The currency on the file is not the same as the currency of the PO line - You must have the same currency on both side - Currency of the initial line kept."
1620-msgstr "The currency on the file is not the same as the currency of the PO line - You must have the same currency on both side - Currency of the initial line kept."
1621+msgstr "La devise du fichier n'est pas la même devise que celle de la ligne du BC.Vous devez avoir la même devise des deux côtés - Devise de la ligne initiale maintenue."
1622
1623 #. module: kit
1624 #: code:addons/kit/kit.py:1174
1625@@ -1161,10 +1146,11 @@
1626 msgid "If the active field is set to False, it will allow you to hide the pricelist without removing it."
1627 msgstr "Décocher le champ \"Actif\" si réglé sur Faux, cela vous permettra de cacher la liste de prix sans la supprimer."
1628
1629-#. module: product_attributes
1630+#. module: product_attributes, msf_tools
1631 #: field:product.product,standard_ok:0
1632+#: report:addons/msf_tools/report/report_stopped_products_xls.mako:82
1633 msgid "Standardization Level"
1634-msgstr "Standardization Level"
1635+msgstr "Niveau de standardisation"
1636
1637 #. module: account
1638 #: code:addons/account/account.py:1424
1639@@ -1196,6 +1182,7 @@
1640 #: code:addons/msf_doc_import/wizard/wizard_import_fo_line.py:368
1641 #: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:324
1642 #: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:275
1643+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:409
1644 #: code:addons/msf_doc_import/wizard/wizard_import_product_line.py:280
1645 #, python-format
1646 msgid "Import in progress, please leave this window open and press the button 'Update' when you think that the import is done.\n"
1647@@ -1423,7 +1410,7 @@
1648 #: code:addons/msf_doc_import/wizard/__init__.py:63
1649 #, python-format
1650 msgid "fo_import_drd"
1651-msgstr "Date de livraison demandée"
1652+msgstr "Date de livraison souhaitée"
1653
1654 #. module: analytic_distribution
1655 #: field:analytic.distribution.wizard.f1.lines,wizard_id:0
1656@@ -1700,6 +1687,7 @@
1657
1658 #. module: product_attributes, product
1659 #: selection:product.product,state_ud:0
1660+#: model:product.status,name:product_attributes.status_3
1661 #: selection:product.mass.update,product_state:0
1662 msgid "Stopped"
1663 msgstr "Arrêté"
1664@@ -1851,7 +1839,7 @@
1665 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1402
1666 #, python-format
1667 msgid "The line should have a Line no. or an Ext Ref."
1668-msgstr "The line should have a Line no. or an Ext Ref."
1669+msgstr "La ligne doit avoir un n° de ligne ou une Réf. Ext."
1670
1671 #. module: unifield_setup
1672 #: view:restrictive.country.setup:0
1673@@ -2075,7 +2063,7 @@
1674 #: code:addons/return_claim/return_claim.py:930
1675 #, python-format
1676 msgid "PPL or Packing should not be selected."
1677-msgstr "Liste de Pré-Colisage ou Emballage ne ​​devrait pas être sélectionné."
1678+msgstr "LPC ou Emballage ne devrait pas être sélectionné."
1679
1680 #. module: msf_outgoing
1681 #: code:addons/msf_outgoing/wizard/incoming_shipment_processor.py:764
1682@@ -2239,11 +2227,6 @@
1683 msgid "The modification of the destination locations is only available for Internal moves."
1684 msgstr "La modification de la zone de destination est seulement disponible pour les demandes internes"
1685
1686-#. module: msf_budget
1687-#: report:msf.pdf.budget.monthly:0
1688-msgid "Dec"
1689-msgstr "Décembre"
1690-
1691 #. module: partner_modification
1692 #: model:ir.module.module,description:partner_modification.module_meta_information
1693 msgid "\n"
1694@@ -2253,24 +2236,15 @@
1695 " Modification of patner with new lead times\n"
1696 " "
1697
1698-#. modules: account, res_currency_tables
1699-#: field:account.aged.trial.balance,period_to:0
1700-#: field:account.balance.report,period_to:0
1701-#: field:account.bs.report,period_to:0
1702-#: field:account.central.journal,period_to:0
1703-#: field:account.common.account.report,period_to:0
1704-#: field:account.common.journal.report,period_to:0
1705-#: field:account.common.partner.report,period_to:0
1706-#: field:account.common.report,period_to:0
1707-#: field:account.general.journal,period_to:0
1708-#: field:account.pl.report,period_to:0
1709-#: field:account.print.journal,period_to:0
1710-#: field:account.report.general.ledger,period_to:0
1711-#: field:account.vat.declaration,period_to:0
1712-#: field:wizard.report.currency.table,end_period_id:0
1713-#: field:wizard.report.rates.table,end_period_id:0
1714-msgid "End period"
1715-msgstr "Fin de Période"
1716+#. module: purchase_followup
1717+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:195
1718+msgid "PO Track Changes"
1719+msgstr "BdC suivi"
1720+
1721+#. module: purchase_followup
1722+#: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:195
1723+msgid "PURCHASE ORDER Track Changes report"
1724+msgstr "BON DE COMMANDE RAPPORT DE SUIVI DES CHANGEMENTS"
1725
1726 #. modules: sales_followup, purchase_followup
1727 #: report:addons/purchase_followup/report/po_track_changes_report_xls.mako:195
1728@@ -2293,7 +2267,7 @@
1729 #: field:shipment.additionalitems,weight:0
1730 #: field:stock.move.memory.shipment.additionalitems,weight:0
1731 msgid "Weight[kg]"
1732-msgstr "Weight[kg]"
1733+msgstr "Poids[kg]"
1734
1735 #. module: account_mcdb
1736 #: selection:account.mcdb,reversed:0
1737@@ -2316,7 +2290,7 @@
1738 #: report:stock.card.report:0
1739 #: field:stock.card.wizard.line,qty_out:0
1740 msgid "Qty OUT"
1741-msgstr "Qty OUT"
1742+msgstr "Qté Sortante"
1743
1744 #. module: return_claim
1745 #: view:return.claim:0
1746@@ -2333,18 +2307,6 @@
1747 msgid "wizard.hard.posting"
1748 msgstr "wizard.hard.posting"
1749
1750-#. modules: msf_order_date, purchase, msf_partner, stock_override, purchase_override, sale
1751-#: selection:sale.order,partner_type:0
1752-#: view:res.partner:0
1753-#: selection:res.partner,partner_type:0
1754-#: selection:purchase.order,partner_type:0
1755-#: selection:purchase.order.line,po_partner_type_stored:0
1756-#: selection:purchase.order.change.currency,partner_type:0
1757-#: selection:sale.order.change.currency,partner_type:0
1758-#: selection:stock.picking,partner_type_stock_picking:0
1759-msgid "Intermission"
1760-msgstr "Intermissions"
1761-
1762 #. module: account_payment
1763 #: help:payment.line,communication:0
1764 msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"
1765@@ -2523,11 +2485,6 @@
1766 msgid "Eligibility date to"
1767 msgstr "Date d'Eligibilité - Au"
1768
1769-#. module: account_mcdb
1770-#: field:account.mcdb,account_ids:0
1771-msgid "Account Code"
1772-msgstr "Compte- Code"
1773-
1774 #. module: unifield_setup
1775 #: model:ir.model,name:unifield_setup.model_lang_setup
1776 msgid "lang.setup"
1777@@ -2644,7 +2601,7 @@
1778 #: help:stock.move.processor,ssl_check:0
1779 #: help:validate.move.processor,ssl_check:0
1780 msgid "Ticked if the product is a Short Shelf Life product"
1781-msgstr "Ticked if the product is a Short Shelf Life product"
1782+msgstr "Coché si le produit est à durée de conservation limitée"
1783
1784 #. module: sourcing
1785 #: code:addons/sourcing/sale_order_line.py:898
1786@@ -2745,7 +2702,7 @@
1787 #. module: procurement_request
1788 #: report:procurement.request.report:0
1789 msgid "Requestor :"
1790-msgstr "Requestor :"
1791+msgstr "Demandeur :"
1792
1793 #. modules: base, base_setup, unifield_setup
1794 #: model:res.country,name:base.bg
1795@@ -2888,11 +2845,16 @@
1796 msgid "Compute recap lines & total to transfer"
1797 msgstr "Calculer les lignes de récap. et le total à transférer"
1798
1799-#. module: msf_doc_import
1800+#. module: msf_doc_import, stock_override,specific_rules,stock
1801 #: code:addons/msf_doc_import/wizard/wizard_import_batch.py:75
1802+#: view:stock.production.lot:0
1803+#: model:ir.actions.act_window,name:stock.action_production_lot_form
1804+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
1805+#: view:stock.inventory.line.split:0
1806+#: view:stock.move.split:0
1807 #, python-format
1808 msgid "Batch numbers"
1809-msgstr "Numéro de Lot"
1810+msgstr "Numéros de Lot"
1811
1812 #. module: msf_outgoing
1813 #: help:ppl.processor,draft_step1:0
1814@@ -2915,11 +2877,6 @@
1815 msgid "Sale Order Line Number"
1816 msgstr "Commande de Terrain – Numéro de Ligne"
1817
1818-#. module: sale
1819-#: report:addons/sale/report/sale_loan_stock_moves_report_xls.mako:164
1820-msgid "Move Ref."
1821-msgstr "Ref. du Mouvement"
1822-
1823 #. module: account
1824 #: selection:account.account.type,report_type:0
1825 msgid "Balance Sheet (Liability Accounts)"
1826@@ -3026,6 +2983,7 @@
1827 #: selection:claim.product.line,integrity_status_claim_product_line:0
1828 #: selection:stock.move.memory.in,integrity_status_func_stock_memory_move:0
1829 #: selection:stock.move.memory.out,integrity_status_func_stock_memory_move:0
1830+#: code:addons/msf_outgoing/__init__.py:63
1831 msgid "Src Location is missing"
1832 msgstr "La Zone Src est manquante"
1833
1834@@ -3342,6 +3300,8 @@
1835 #: field:process.node,model_id:0
1836 #: view:process.process:0
1837 #: field:process.process,model_id:0
1838+#: field:import_category,object:0
1839+#: field:import_nomenclature,object:0
1840 msgid "Object"
1841 msgstr "Objet"
1842
1843@@ -3349,13 +3309,7 @@
1844 #: code:addons/delivery_mechanism/delivery_mechanism.py:1510
1845 #, python-format
1846 msgid "From pack %s, to pack %s, error: %s"
1847-msgstr "From pack %s, to pack %s, error: %s"
1848-
1849-#. module: return_claim
1850-#: field:add.event,claim_type:0
1851-#: field:claim.product.line,claim_type_claim_product_line:0
1852-msgid "Claim Type"
1853-msgstr "Réclamation - Type"
1854+msgstr "De colis %s, à colis %s, erreur: %s"
1855
1856 #. module: tender_flow
1857 #: model:process.node,note:tender_flow.process_node_tender_po
1858@@ -3561,6 +3515,7 @@
1859
1860 #. module: product_asset
1861 #: model:ir.ui.menu,name:product_asset.menu_asset_sales
1862+#: field:product.product,asset_ids:0
1863 msgid "Assets"
1864 msgstr "Actifs"
1865
1866@@ -3571,11 +3526,6 @@
1867 msgid "Account code \"%s\" not found"
1868 msgstr "Account code \"%s\" not found"
1869
1870-#. module: mission_stock
1871-#: report:addons/mission_stock/report/stock_mission_report_xls.mako:56
1872-msgid "Instance stock"
1873-msgstr "Instance stock"
1874-
1875 #. modules: account_override, register_accounting
1876 #: field:account.direct.invoice.wizard,register_posting_date:0
1877 #: field:account.invoice,register_posting_date:0
1878@@ -3717,6 +3667,12 @@
1879 #: code:addons/consumption_calculation/wizard/wizard_export_fmc_rac.py:41
1880 #: selection:product.history.consumption.product,cons_type:0
1881 #: report:addons/mission_stock/report/stock_mission_report_xls.mako:69
1882+#: code:addons/mission_stock/mission_stock.py:59
1883+#: code:addons/mission_stock/mission_stock.py:74
1884+#: code:addons/mission_stock/mission_stock.py:87
1885+#: code:addons/mission_stock/mission_stock.py:103
1886+#: code:addons/mission_stock/mission_stock.py:524
1887+#: report:addons/consumption_calculation/report/weekly_forecast_report_xls.mako:104
1888 #: report:addons/stock/report/products_situation_report_xls.mako:226
1889 #, python-format
1890 msgid "AMC"
1891@@ -3725,7 +3681,7 @@
1892 #. module: msf_supply_doc_export
1893 #: model:ir.actions.report.xml,name:msf_supply_doc_export.report_stock_initial_inventory_xls
1894 msgid "Stock Initial Excel Export"
1895-msgstr "Exportation initiale des stocks en Excel"
1896+msgstr "Export initial des stocks en Excel"
1897
1898 #. module: account_period_closing_level
1899 #: model:ir.model,name:account_period_closing_level.model_account_year_end_closing
1900@@ -3815,18 +3771,6 @@
1901 msgid "The catalogue you try to confirm is already confirmed. Please reload the page to update the status of this catalogue"
1902 msgstr "Le catalogue que vous essayez de confirmer est déjà confirmé. Merci de rafraîchir la page pour mettre à jour le statut de ce catalogue"
1903
1904-#. module: msf_doc_import
1905-#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:192
1906-#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:181
1907-#: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:275
1908-#: code:addons/msf_doc_import/wizard/wizard_import_stock_warehouse_order_point_line.py:237
1909-#: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:382
1910-#: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:200
1911-#: code:addons/msf_doc_import/wizard/wizard_import_product_line.py:190
1912-#, python-format
1913-msgid "Line %s in the Excel file was added to the file of the lines with errors, it got elements outside the defined %s columns. Details: %s"
1914-msgstr "La ligne %s du fichier Excel a été ajoutée au fichier des lignes en erreur, elle a des éléments en dehors des colonnes définies %s. Détails: %s"
1915-
1916 #. module: purchase
1917 #: report:purchase.order:0
1918 msgid "Purchase Order Confirmation N°"
1919@@ -3914,7 +3858,7 @@
1920 msgid "America/Catamarca"
1921 msgstr "America/Catamarca"
1922
1923-#. modules: msf_doc_import, product, stock, msf_supply_doc_export, mission_stock, procurement_request
1924+#. modules: msf_doc_import, product, stock, msf_supply_doc_export, mission_stock, procurement_request, sale
1925 #: code:addons/msf_doc_import/wizard/__init__.py:82
1926 #: report:addons/msf_supply_doc_export/report/report_internal_request_xls.mako:61
1927 #: model:product.price.type,name:product.standard_price
1928@@ -3924,10 +3868,18 @@
1929 #: report:procurement.request.report:0
1930 #: selection:product.price.type,field:0
1931 #: selection:product.pricelist.item,base:0
1932+#: code:addons/mission_stock/mission_stock.py:66
1933+#: code:addons/mission_stock/mission_stock.py:94
1934+#: code:addons/mission_stock/mission_stock.py:513
1935+#: report:addons/msf_supply_doc_export/report/internal_request_export_xls.mako:133
1936+#: code:addons/sale/wizard/internal_request_import.py:46
1937+#: field:internal.request.import.line,imp_cost_price:0
1938+#: field:internal.request.import.line,in_cost_price:0
1939+#: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:217
1940 #: report:addons/stock/report/products_situation_report_xls.mako:219
1941 #, python-format
1942 msgid "Cost Price"
1943-msgstr "Prix Coûtant"
1944+msgstr "Prix"
1945
1946 #. module: stock
1947 #: model:ir.model,name:stock.model_physical_inventory_import_wizard
1948@@ -4066,7 +4018,8 @@
1949 msgid "You cannot perform this action now."
1950 msgstr "Vous ne pouvez pas faire cette action maintenant."
1951
1952-#. module: specific_rules
1953+#. module: specific_rules, stock
1954+#: code:addons/stock/stock.py:1729
1955 #: code:addons/specific_rules/stock.py:173
1956 #, python-format
1957 msgid "is done."
1958@@ -4133,7 +4086,7 @@
1959 #: selection:product.price.type,field:0
1960 #: field:product.product,soq_weight:0
1961 msgid "SoQ Weight"
1962-msgstr "Poids QS"
1963+msgstr "Poids QcS"
1964
1965 #. module: account
1966 #: report:account.analytic.account.cost_ledger:0
1967@@ -4215,13 +4168,15 @@
1968 #. module: sourcing
1969 #: view:sale.order.line:0
1970 msgid "UoM Stock"
1971-msgstr "UoM Stock"
1972+msgstr "Stock UdM"
1973
1974-#. modules: stock, sync_client, base, stock_override
1975+#. modules: stock, sync_client, base, stock_override, stock_move_tracking
1976 #: view:stock.move:0
1977 #: field:ir.translation,src:0
1978 #: view:sync.client.message_received:0
1979 #: view:sync.client.update_received:0
1980+#: report:addons/stock_override/report/report_stock_move_xls.mako:142
1981+#: report:tracking.move.report:0
1982 #: code:addons/stock_override/report/report_stock_move.py:759
1983 msgid "Source"
1984 msgstr "Origine"
1985@@ -4234,7 +4189,7 @@
1986 #. module: sourcing
1987 #: field:sale.order.line,rts:0
1988 msgid "RTS"
1989-msgstr "RTS"
1990+msgstr "PàE"
1991
1992 #. module: msf_outgoing
1993 #: code:addons/msf_outgoing/msf_outgoing.py:1263
1994@@ -4479,7 +4434,7 @@
1995 #. module: msf_outgoing
1996 #: report:empty.picking.ticket:0
1997 msgid "Our Ref:"
1998-msgstr "Our Ref:"
1999+msgstr "Notre Réf:"
2000
2001 #. module: msf_tools
2002 #: code:addons/msf_tools/automated_export.py:366
2003@@ -4828,11 +4783,14 @@
2004 #. module: consumption_calculation
2005 #: report:product.likely.expire.report_pdf:0
2006 #: report:addons/consumption_calculation/report/product_likely_expire_xls.mako:195
2007+#: code:addons/consumption_calculation/weekly_forecast_report.py:511
2008 msgid "Expiry Qty"
2009 msgstr "Qté Expirée"
2010
2011-#. module: purchase_override
2012+#. module: purchase_override, purchase,register_accounting
2013 #: field:purchase.order.merged.line,fake_id:0
2014+#: field:purchase.order.line,fake_id:0
2015+#: field:account.bank.statement,virtual_id:0
2016 msgid "Id"
2017 msgstr "Id"
2018
2019@@ -4885,7 +4843,7 @@
2020 msgid "Month:"
2021 msgstr "Mois :"
2022
2023-#. modules: delivery_mechanism, account, msf_outgoing, stock_override, supplier_catalogue, sale, consumption_calculation, purchase_override, kit, account_override, order_line_number, msf_doc_import, stock
2024+#. modules: delivery_mechanism, account, msf_outgoing, stock_override, supplier_catalogue, sale, consumption_calculation, purchase_override, kit, account_override, order_line_number, msf_doc_import, msf_supply_doc_export, stock
2025 #: view:account.invoice.line:0
2026 #: report:allocation.invoices.report:0
2027 #: field:product.likely.expire.report.item,line_id:0
2028@@ -4928,16 +4886,21 @@
2029 #: report:msf.purchase.quotation:0
2030 #: field:purchase.order.merged.line,line_number:0
2031 #: report:msf.sale.order:0
2032-#: report:delivery.order:0
2033 #: report:internal.move:0
2034 #: field:supplier.catalogue.line,line_number:0
2035 #: view:account.invoice:0
2036 #: field:internal.request.import.line,ir_line_id:0
2037 #: report:addons/stock/report/stock_reception_report_xls.mako:236
2038+#: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:883
2039 #, python-format
2040 msgid "Line"
2041 msgstr "Ligne"
2042
2043+#. module: stock_override
2044+#: report:delivery.order:0
2045+msgid "Line"
2046+msgstr "N°"
2047+
2048 #. module: msf_supply_doc_export
2049 #: report:addons/msf_supply_doc_export/report/report_incoming_shipment_xls.mako:132
2050 msgid "Message ESC header"
2051@@ -4970,11 +4933,6 @@
2052 msgid "Line %s, incorrect column number value and name should not be empty."
2053 msgstr "Line %s, incorrect column number value and name should not be empty."
2054
2055-#. module: sync_client
2056-#: help:memory.usage,remote_id:0
2057-msgid "Holds the row id of rows imported from a remote instance. Unused except for de-duplicating during count centralization."
2058-msgstr "Holds the row id of rows imported from a remote instance. Unused except for de-duplicating during count centralization."
2059-
2060 #. modules: return_claim, msf_outgoing, stock_override, kit, msf_doc_import
2061 #: selection:assign.to.kit.line,integrity_status:0
2062 #: selection:kit.selection.line,integrity_status:0
2063@@ -5007,6 +4965,7 @@
2064 #: selection:stock.move.in.processor,sequence_issue:0
2065 #: selection:stock.move.processor,integrity_status:0
2066 #: selection:validate.move.processor,integrity_status:0
2067+#: code:addons/msf_outgoing/__init__.py:30
2068 msgid "A gap exist in the sequence"
2069 msgstr "Un écart existe dans la séquence"
2070
2071@@ -5101,17 +5060,6 @@
2072 msgid "Please choose a Purchase Order."
2073 msgstr "Veuillez choisir un Bon de Commande"
2074
2075-#. modules: msf_currency_revaluation, register_accounting, finance
2076-#: model:ir.actions.act_window,name:msf_currency_revaluation.action_view_account_currency_revaluation_wizard
2077-#: model:ir.ui.menu,name:msf_currency_revaluation.menu_view_account_currency_revaluation_wizard
2078-#: selection:cash.request.liquidity,type:0
2079-#: selection:cash.request.liquidity.bank,type:0
2080-#: selection:cash.request.liquidity.cash,type:0
2081-#: selection:cash.request.liquidity.cheque,type:0
2082-#: selection:wizard.register.opening.confirmation,register_type:0
2083-msgid "Revaluation"
2084-msgstr "Ré-evaluation"
2085-
2086 #. module: msf_tools
2087 #: view:automated.import.job:0
2088 #: model:ir.actions.act_window,name:msf_tools.automated_import_job_action
2089@@ -5119,11 +5067,6 @@
2090 msgid "Import job reports"
2091 msgstr "Import job reports"
2092
2093-#. module: base
2094-#: selection:res.widget.wizard,widgets_list:0
2095-msgid "Google Maps"
2096-msgstr "Google Maps"
2097-
2098 #. modules: base, base_setup, unifield_setup
2099 #: selection:res.config.users,context_tz:0
2100 #: model:res.country,name:base.ir
2101@@ -5325,7 +5268,7 @@
2102 #. module: consumption_calculation
2103 #: field:weekly.forecast.report,interval_type:0
2104 msgid "Interval type"
2105-msgstr "Interval type"
2106+msgstr "Type d'intervalle"
2107
2108 #. module: res_currency_tables
2109 #: view:confirm.import.currencies:0
2110@@ -5371,11 +5314,6 @@
2111 msgid "Accounting Corrections Wizard (from Analytic Journal Items)"
2112 msgstr "Accounting Corrections Wizard (from Analytic Journal Items)"
2113
2114-#. module: procurement_request
2115-#: model:ir.actions.act_window,name:procurement_request.action_open_wizard_import
2116-msgid "Import lines"
2117-msgstr "Importer les Lignes"
2118-
2119 #. module: register_accounting
2120 #: code:addons/register_accounting/account_bank_statement.py:2728
2121 #, python-format
2122@@ -5814,9 +5752,10 @@
2123 msgid "Partner type"
2124 msgstr "Type de partenaire"
2125
2126-#. modules: product_list, stock
2127+#. modules: product_list, stock, msf_doc_import
2128 #: view:product.list.add.products:0
2129 #: view:physical.inventory.select.products:0
2130+#: view:wizard.common.import.line:0
2131 msgid "Add products"
2132 msgstr "Ajouter des produits"
2133
2134@@ -5831,15 +5770,10 @@
2135 msgid "Partial Reconciliation with change"
2136 msgstr "Lettrage Partiel avec changement"
2137
2138-#. module: sales_followup
2139-#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:235
2140-msgid "Subtotal"
2141-msgstr "Sous-Total"
2142-
2143 #. module: product_asset
2144 #: report:product.asset:0
2145 msgid "Asset Form N°"
2146-msgstr "Bien - Numéro du Formulaire"
2147+msgstr "Actif - Numéro du Formulaire"
2148
2149 #. modules: msf_budget, account, account_mcdb, financing_contract
2150 #: report:combined.journals.report.pdf:0
2151@@ -5987,7 +5921,7 @@
2152 msgid "Search Real Kit Composition Item"
2153 msgstr "Rechercher l'Article de la Composition Réelle du Kit"
2154
2155-#. modules: process, financing_contract, account_voucher, account_hq_entries, account_override, product_attributes, base_report_designer, msf_accrual, return_claim, account_mcdb, stock_override, analytic, purchase_followup, msf_doc_import, stock, product, finance, msf_homere_interface, hr, register_accounting, base, product_list, msf_tools, procurement_report, purchase, account, msf_outgoing, vertical_integration, sale, sales_followup, procurement, sourcing, msf_audittrail, msf_supply_doc_export
2156+#. modules: process, financing_contract, account_voucher, account_hq_entries, account_override, product_attributes, base_report_designer, msf_accrual, return_claim, account_mcdb, stock_override, analytic, purchase_followup, msf_doc_import, stock, product, finance, msf_homere_interface, hr, register_accounting, base, product_list, msf_tools, procurement_report, purchase, account, msf_outgoing, vertical_integration, sale, sales_followup, procurement, sourcing, msf_audittrail, msf_supply_doc_export, consumption_calculation, specific_rules
2157 #: view:account.account.type:0
2158 #: field:account.account.type,note:0
2159 #: view:account.analytic.account:0
2160@@ -6103,6 +6037,11 @@
2161 #: field:stock.production.lot.revision,description:0
2162 #: report:stock.card.report:0
2163 #: report:addons/vertical_integration/report/open_invoices_xls.mako:294
2164+#: report:addons/msf_outgoing/report/packing_list_xls.mako:430
2165+#: code:addons/consumption_calculation/weekly_forecast_report.py:505
2166+#: report:addons/stock_override/report/stock_card_report_xls.mako:142
2167+#: report:addons/specific_rules/report/unconsistent_stock_report_xls.mako:93
2168+#: report:addons/msf_tools/report/report_stopped_products_xls.mako:80
2169 #: field:products.situation.report,p_desc:0
2170 #, python-format
2171 msgid "Description"
2172@@ -6336,8 +6275,8 @@
2173 #, python-format
2174 msgid "The number of columns in the Excel file (%s) is different than the expected number of columns (%s).\n"
2175 "Columns should be in this order: %s"
2176-msgstr "The number of columns in the Excel file (%s) is different than the expected number of columns (%s).\n"
2177-"Columns should be in this order: %s"
2178+msgstr "Le nombre de colonnes du fichier Excel (%s) et différent du nombre de colonnes attendu (%s).\n"
2179+"Les colonnes doivent être dans cet ordre: %s"
2180
2181 #. module: msf_outgoing
2182 #: report:certificate.free.gift:0
2183@@ -6468,8 +6407,10 @@
2184
2185 #. module: consumption_calculation
2186 #: report:expiry.report:0
2187+#: report:addons/consumption_calculation/report/expiry_report.mako:163
2188+#: report:addons/consumption_calculation/report/expiry_report.mako:216
2189 msgid "Exp. Value"
2190-msgstr "Valeur d'Expirés"
2191+msgstr "Valeur Expirées"
2192
2193 #. module: account
2194 #: code:addons/account/account.py:611
2195@@ -6532,11 +6473,6 @@
2196 msgid "Partners Reconciled Today"
2197 msgstr "Partenaires Lettrés aujourd'hui"
2198
2199-#. module: sourcing
2200-#: field:purchase.order,related_sourcing_id:0
2201-msgid "Sourcing group"
2202-msgstr "Groupe d'Approvisionnement"
2203-
2204 #. module: msf_partner
2205 #: field:product.supplierinfo,get_first_price:0
2206 msgid "Indicative Price"
2207@@ -6754,7 +6690,7 @@
2208 #: report:msf.purchase.quotation:0
2209 #: report:purchase.order.merged:0
2210 msgid "Dated before :"
2211-msgstr "Daté avant:"
2212+msgstr "Daté avant :"
2213
2214 #. module: msf_config_locations
2215 #: model:stock.location,name:msf_config_locations.stock_location_quarantine_view
2216@@ -6972,8 +6908,9 @@
2217 #. module: msf_supply_doc_export
2218 #: code:addons/msf_supply_doc_export/wizard/po_follow_up.py:230
2219 #: field:po.follow.up,po_date_thru:0
2220+#: report:addons/msf_supply_doc_export/report/report_po_follow_up_xls.mako:157
2221 msgid "PO date to"
2222-msgstr "BC date fin"
2223+msgstr "BdC jusqu'au"
2224
2225 #. module: base
2226 #: selection:res.config.users,context_tz:0
2227@@ -7102,9 +7039,39 @@
2228 msgid "Sending Goods"
2229 msgstr "Envoi de Marchandises"
2230
2231-#. modules: sale, msf_supply_doc_export
2232+#. module: sale, msf_outgoing, specific_rules,stock_override, msf_doc_import,stock, msf_supply_doc_export, specific_rules
2233 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:161
2234 #: report:msf.report_reception_in:0
2235+#: report:addons/msf_outgoing/report/packing_list_xls.mako:436
2236+#: field:stock.move.memory.picking,dg_check:0
2237+#: field:stock.move.memory.ppl,dg_check:0
2238+#: field:stock.move.memory.returnproducts,dg_check:0
2239+#: report:msf.freight_manifest:0
2240+#: field:initial.stock.inventory.line,dg_check:0
2241+#: field:stock.inventory.line,dg_check:0
2242+#: field:stock.move,dg_check:0
2243+#: field:stock.move.memory.in,dg_check:0
2244+#: field:stock.move.memory.out,dg_check:0
2245+#: field:stock.production.lot,dg_check:0
2246+#: report:destruction.location:0
2247+#: field:wizard.import.in.line.simulation.screen,dg_check:0
2248+#: field:create.picking.move.processor,dg_check:0
2249+#: report:empty.picking.ticket:0
2250+#: field:internal.move.processor,dg_check:0
2251+#: field:outgoing.delivery.move.processor,dg_check:0
2252+#: report:packing.list:0
2253+#: report:picking.ticket:0
2254+#: field:ppl.move.processor,dg_check:0
2255+#: field:return.ppl.move.processor,dg_check:0
2256+#: field:stock.move.in.processor,dg_check:0
2257+#: field:stock.move.processor,dg_check:0
2258+#: field:validate.move.processor,dg_check:0
2259+#: view:physical.inventory:0
2260+#: field:physical.inventory.counting,is_dg:0
2261+#: view:physical.inventory.select.products:0
2262+#: code:addons/specific_rules/specific_rules.py:53
2263+#: report:addons/msf_outgoing/report/pre_packing_excel_report_xls.mako:223
2264+#, python-format
2265 msgid "DG"
2266 msgstr "MD"
2267
2268@@ -7430,7 +7397,7 @@
2269 #: view:sale.order:0
2270 #: view:purchase.order:0
2271 msgid "Round Qty to SoQ"
2272-msgstr "Arrondir la Qté à la QS"
2273+msgstr "Arrondir la Qté à la QcS"
2274
2275 #. module: product_attributes
2276 #: code:addons/product_attributes/product_attributes.py:1443
2277@@ -7569,7 +7536,7 @@
2278 #: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:472
2279 #, python-format
2280 msgid "Please note that %s is temporary not editable during the import to avoid conflict accesses (you can see the loading on the PO note tab check box). At the end of the load, POXX will be back in the right state. You can refresh the screen if you need to follow the upload progress"
2281-msgstr "Please note that %s is temporary not editable during the import to avoid conflict accesses (you can see the loading on the PO note tab check box). At the end of the load, POXX will be back in the right state. You can refresh the screen if you need to follow the upload progress"
2282+msgstr "Veuillez noter que %s est temporairement fermé durant l'import pour éviter des conflicts d'accès (vous pouvez voir le niveau de chargement à partir de l'onglet Note). A la fin du téléchargement, POXX sera remise au statut correct. Vous pouvez rafraichir l'écran si vous avez besoin de suivre la progresion du téléchargement"
2283
2284 #. modules: account, register_accounting
2285 #: help:account.direct.invoice.wizard,account_id:0
2286@@ -8124,7 +8091,7 @@
2287 #. module: msf_outgoing
2288 #: view:stock.picking:0
2289 msgid "Save description"
2290-msgstr "Save description"
2291+msgstr "Sauvegarder la description"
2292
2293 #. module: procurement
2294 #: view:stock.warehouse.orderpoint:0
2295@@ -8270,7 +8237,7 @@
2296 #: view:shipment:0
2297 #: view:stock.picking:0
2298 msgid "Synchronization engine should confirm the delivery at the project reception, are you sure?"
2299-msgstr "Synchronization engine should confirm the delivery at the project reception, are you sure?"
2300+msgstr "Le moteur de synchro devrait Valider la livraison lors de la réception au projet, voulez-vous continuer ?"
2301
2302 #. modules: account, base, account_payment
2303 #: selection:res.partner.bank,state:0
2304@@ -8323,11 +8290,6 @@
2305 msgid "XML File"
2306 msgstr "Fichier XML"
2307
2308-#. module: msf_budget
2309-#: report:msf.pdf.budget.monthly:0
2310-msgid "Oct"
2311-msgstr "Octobre"
2312-
2313 #. modules: account_hq_entries, msf_homere_interface
2314 #: field:hq.entries,analytic_state:0
2315 #: field:hr.payroll.msf,analytic_state:0
2316@@ -8357,9 +8319,9 @@
2317 ""
2318 msgstr "## IMPORT STOPPÉ ##\n"
2319 "\n"
2320-"Rien n'a été importé du à %s. Voir ci-après:\n"
2321+"Rien n'a été importé dû à %s. Voir ci-après:\n"
2322 "\n"
2323-" ## Erreur de fichier ##\n"
2324+" ## Erreurs dans le fichier ##\n"
2325 "\n"
2326 ""
2327
2328@@ -8543,6 +8505,7 @@
2329 #: field:internal.request.import.line,imp_qty:0
2330 #: field:internal.request.import.line,in_qty:0
2331 #: report:addons/procurement_request/report/internal_request_import_overview_export_xls.mako:216
2332+#: report:addons/specific_rules/report/unconsistent_stock_report_xls.mako:98
2333 #: code:addons/stock_override/report/report_stock_move.py:759
2334 #, python-format
2335 msgid "Quantity"
2336@@ -8808,6 +8771,8 @@
2337 #: selection:internal.request.import,state:0
2338 #: field:po.follow.up,draft_ok:0
2339 #: selection:wizard.import.ppl.to.create.ship,state:0
2340+#: selection:sale.order.line,state_to_display:0
2341+#: selection:purchase.order.line,state_to_display:0
2342 #: selection:wizard.import.product.line,state:0
2343 #: selection:product.mass.update,state:0
2344 #: selection:stock.expired.damaged.report,state:0
2345@@ -8953,6 +8918,10 @@
2346 #: code:addons/msf_doc_import/wizard/wizard_import_threshold_value_line.py:236
2347 #: code:addons/msf_doc_import/wizard/wizard_import_supplier_catalogue.py:407
2348 #: code:addons/msf_doc_import/wizard/wizard_import_ir_line.py:270
2349+#: code:addons/msf_doc_import/wizard/wizard_import_tender_line.py:216
2350+#: code:addons/msf_doc_import/wizard/wizard_import_product_list.py:247
2351+#: code:addons/msf_doc_import/wizard/wizard_import_auto_supply_line.py:226
2352+#: code:addons/msf_doc_import/wizard/wizard_import_order_cycle_line.py:215
2353 #, python-format
2354 msgid " \n"
2355 "Importation completed in %s!\n"
2356@@ -9035,7 +9004,7 @@
2357 #. module: msf_supply_doc_export
2358 #: model:ir.actions.report.xml,name:msf_supply_doc_export.report_internal_move_xls
2359 msgid "Internal Move Excel Export"
2360-msgstr "Internal Move Excel Export"
2361+msgstr "Mouvement Int. Rapport Excel"
2362
2363 #. module: stock
2364 #: view:stock.move:0
2365@@ -9090,14 +9059,16 @@
2366 #: selection:product.product,controlled_substance:0
2367 #: selection:products.situation.report,controlled_substance:0
2368 msgid "! - Requires national export license"
2369-msgstr "! - Requires national export license"
2370+msgstr "! - Nécessite une licence d'exportation nationale"
2371
2372 #. modules: purchase, purchase_override, sale
2373 #: selection:purchase.order.line,state:0
2374 #: selection:purchase.order.merged.line,state:0
2375 #: selection:sale.order.line,state:0
2376+#: selection:purchase.order.line,state_to_display:0
2377+#: selection:sale.order.line,state_to_display:0
2378 msgid "Cancelled-r"
2379-msgstr "Annulé-r"
2380+msgstr "Annulée-r"
2381
2382 #. modules: base_setup, unifield_setup, base
2383 #: selection:base.setup.company,country_id:0
2384@@ -9107,8 +9078,10 @@
2385 msgid "Nigeria"
2386 msgstr "Nigéria"
2387
2388-#. module: purchase
2389+#. module: purchase, product_asset, purchase_override
2390 #: field:purchase.order.line,fnct_project_ref:0
2391+#: field:product.asset,project_po:0
2392+#: field:purchase.order.merged.line,fnct_project_ref:0
2393 msgid "Project PO"
2394 msgstr "BdC Projet"
2395
2396@@ -9369,17 +9342,9 @@
2397 msgid "View Type"
2398 msgstr "Type de Vue"
2399
2400-#. modules: procurement_request, stock_override, kit
2401-#: report:kit.report:0
2402-#: report:procurement.request.report:0
2403-#: report:delivery.order:0
2404-#: report:destruction.location:0
2405-#: report:internal.move:0
2406-msgid "25 550 818 550"
2407-msgstr "25 550 818 550"
2408-
2409-#. module: msf_doc_import
2410+#. modules: msf_doc_import, sale
2411 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:622
2412+#: code:addons/sale/wizard/internal_request_import.py:256
2413 #, python-format
2414 msgid "Line %s of the imported file: The header information must be on two columns : Column A for name of the field and column B for value."
2415 msgstr "Ligne %s du fichier importé : les informations de l'en-tête doivent être sur deux colonnes : La colonne A pour le nom du champ et la colonne B pour sa valeur."
2416@@ -9392,7 +9357,7 @@
2417 #. module: msf_supply_doc_export
2418 #: report:addons/msf_supply_doc_export/report/stock_initial_inventory_xls.mako:61
2419 msgid "Initial Average Cost"
2420-msgstr "Coût moyen initial"
2421+msgstr "Prix moyen initial"
2422
2423 #. module: base
2424 #: selection:res.config.users,context_tz:0
2425@@ -9419,7 +9384,7 @@
2426 #: code:addons/return_claim/return_claim.py:937
2427 #, python-format
2428 msgid "Events are not allowed for selected Claim Type."
2429-msgstr "Evénements non autorisés pour ce Type de Réclamation."
2430+msgstr "Événements non autorisés pour ce Type de Réclamation."
2431
2432 #. module: account_journal
2433 #: code:addons/account_journal/account_journal.py:378
2434@@ -9650,6 +9615,7 @@
2435 #: selection:stock.move,state:0
2436 #: selection:stock.move.memory.in,integrity_status_func_stock_memory_move:0
2437 #: selection:stock.move.memory.out,integrity_status_func_stock_memory_move:0
2438+#: code:addons/msf_outgoing/__init__.py:53
2439 msgid "Not Available"
2440 msgstr "Pas Disponible"
2441
2442@@ -9731,8 +9697,9 @@
2443 #: report:invoice:0
2444 #: report:packing.list:0
2445 #: report:picking.ticket:0
2446+#: report:addons/msf_outgoing/report/packing_list_xls.mako:380
2447 msgid "Transport mode:"
2448-msgstr "Transport mode:"
2449+msgstr "Mode transport:"
2450
2451 #. module: product
2452 #: view:product.product:0
2453@@ -10114,11 +10081,6 @@
2454 msgid "Unable to delete a test file: %s"
2455 msgstr "Impossible de supprimer un fichier de test: %s"
2456
2457-#. module: mission_stock
2458-#: view:mission.stock.wizard:0
2459-msgid "Product in stock"
2460-msgstr "Product in stock"
2461-
2462 #. module: account_mcdb
2463 #: code:addons/account_mcdb/report/account_mcdb_export.py:277
2464 #, python-format
2465@@ -10272,7 +10234,7 @@
2466 #. module: msf_outgoing
2467 #: report:empty.picking.ticket:0
2468 msgid "From pack"
2469-msgstr "From pack"
2470+msgstr "De colis"
2471
2472 #. module: base
2473 #: selection:res.config.users,context_tz:0
2474@@ -10305,7 +10267,7 @@
2475 #. module: stock_override
2476 #: report:internal.move:0
2477 msgid "Back Order of :"
2478-msgstr "Back Order of :"
2479+msgstr "Livraison en Attente du :"
2480
2481 #. modules: purchase, account, msf_outgoing, financing_contract, register_accounting, sale, product_expiry, stock, account_override
2482 #: view:account.bank.statement:0
2483@@ -10380,6 +10342,7 @@
2484 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:899
2485 #: report:po.follow.up_rml:0
2486 #: report:msf.report_reception_in:0
2487+#: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:888
2488 msgid "Qty received"
2489 msgstr "Qté reçue"
2490
2491@@ -10403,7 +10366,7 @@
2492 msgid "Import template"
2493 msgstr "Import template"
2494
2495-#. modules: account, msf_outgoing, finance, stock_override, msf_instance, purchase_override, sale, account_override, register_accounting, analytic_distribution, msf_supply_doc_export
2496+#. modules: account, msf_outgoing, finance, stock_override, msf_instance, purchase_override, sale, account_override, register_accounting, analytic_distribution, msf_order_date,purchase, msf_partner, msf_supply_doc_export
2497 #: selection:account.analytic.journal,type:0
2498 #: selection:account.journal,type:0
2499 #: field:account.account,has_partner_type_intermission:0
2500@@ -10423,6 +10386,14 @@
2501 #: selection:sale.donation.stock.moves,partner_type:0
2502 #: selection:sale.loan.stock.moves,partner_type:0
2503 #: selection:stock.picking,partner_type:0
2504+#: selection:sale.order,partner_type:0
2505+#: view:res.partner:0
2506+#: selection:res.partner,partner_type:0
2507+#: selection:purchase.order,partner_type:0
2508+#: selection:purchase.order.line,po_partner_type_stored:0
2509+#: selection:purchase.order.change.currency,partner_type:0
2510+#: selection:sale.order.change.currency,partner_type:0
2511+#: selection:stock.picking,partner_type_stock_picking:0
2512 #: code:addons/msf_supply_doc_export/wizard/supplier_performance_wizard.py:32
2513 #: field:supplier.performance.wizard,partner_type_intermission:0
2514 msgid "Intermission"
2515@@ -10563,6 +10534,8 @@
2516 #: selection:international.transport.cost.report,order_state:0
2517 #: view:local.transport.cost.report:0
2518 #: selection:local.transport.cost.report,order_state:0
2519+#: selection:sale.order.line,state_to_display:0
2520+#: selection:purchase.order.line,state_to_display:0
2521 #, python-format
2522 msgid "Confirmed"
2523 msgstr "Confirmé"
2524@@ -10588,12 +10561,13 @@
2525 #. module: procurement_request
2526 #: report:procurement.request.report:0
2527 msgid "Requested date :"
2528-msgstr "Requested date :"
2529+msgstr "Date souhaitée :"
2530
2531 #. module: msf_outgoing
2532 #: report:packing.list:0
2533+#: report:addons/msf_outgoing/report/packing_list_xls.mako:350
2534 msgid "Packing date:"
2535-msgstr "Packing date:"
2536+msgstr "Date Colisage:"
2537
2538 #. modules: account_corrections, account
2539 #: selection:account.journal.column,field:0
2540@@ -10680,6 +10654,7 @@
2541 #. modules: msf_outgoing, consumption_calculation, order_types
2542 #: view:expiry.quantity.report:0
2543 #: report:packing.list:0
2544+#: report:addons/msf_outgoing/report/packing_list_xls.mako:434
2545 #: report:order.type.donation.certificate:0
2546 msgid "Exp. Date"
2547 msgstr "Date Exp."
2548@@ -10700,6 +10675,7 @@
2549 #. module: msf_outgoing
2550 #: report:empty.picking.ticket:0
2551 #: report:packing.list:0
2552+#: report:addons/msf_outgoing/report/packing_list_xls.mako:317
2553 msgid "Consignee:"
2554 msgstr "Destinataire:"
2555
2556@@ -10760,12 +10736,17 @@
2557 msgid "Advanced Search (deprecated)"
2558 msgstr "Recherche avancée (obsolète)"
2559
2560-#. modules: analytic, account_mcdb
2561+#. modules: analytic, account_mcdb, account
2562 #: code:addons/account_mcdb/report/account_mcdb_export.py:184
2563 #: field:account.analytic.line,amount:0
2564+#: report:addons/account_mcdb/report/report_account_analytic_line_free_xls.mako:78
2565+#: report:account.analytic.line:0
2566+#: report:account.analytic.line_csv:0
2567+#: report:addons/account_mcdb/report/report_account_analytic_line_xls.mako:62
2568+#: report:addons/account/report/free_allocation_report.mako:223
2569 #, python-format
2570 msgid "Func. Amount"
2571-msgstr "Fonc. Montant"
2572+msgstr "Montant Fonc."
2573
2574 #. module: msf_doc_import
2575 #: code:addons/msf_doc_import/msf_import_export.py:537
2576@@ -10777,7 +10758,7 @@
2577 #: view:purchase.order:0
2578 #: view:purchase.order:0
2579 msgid "Imported filenames"
2580-msgstr "Imported filenames"
2581+msgstr "Noms des fichiers importés"
2582
2583 #. module: sale
2584 #: field:sale.order.line,cancel_split_ok:0
2585@@ -11004,7 +10985,6 @@
2586 msgstr "Annuler et Ressourcer"
2587
2588 #. modules: procurement, account, register_accounting, purchase, account_override, vertical_integration, msf_supply_doc_export
2589-#: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:914
2590 #: report:account.invoice2:0
2591 #: report:addons/account_override/report/open_invoices_xls.mako:340
2592 #: view:purchase.order.line:0
2593@@ -11015,6 +10995,7 @@
2594 #: field:procurement.order,origin:0
2595 #: field:purchase.order,origin:0
2596 #: field:wizard.account.invoice,origin:0
2597+#: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:914
2598 msgid "Source Document"
2599 msgstr "Document d'origine"
2600
2601@@ -11053,12 +11034,6 @@
2602 msgid "Original"
2603 msgstr "D´origine"
2604
2605-#. module: sales_followup
2606-#: model:ir.actions.act_window,name:sales_followup.action_ir_track_changes_wizard
2607-#: model:ir.ui.menu,name:sales_followup.menu_ir_track_changes
2608-msgid "IR Track Changes"
2609-msgstr "Suivi Changements Demandes Internes"
2610-
2611 #. module: account
2612 #: code:addons/account/wizard/account_subscription_generate.py:50
2613 #, python-format
2614@@ -11260,11 +11235,6 @@
2615 msgid "Groups (no group = global)"
2616 msgstr "Groupes (pas de groupe = global)"
2617
2618-#. module: mission_stock
2619-#: field:stock.mission.report.line,international_status:0
2620-msgid "International status"
2621-msgstr "International status"
2622-
2623 #. module: sync_client
2624 #: help:sync.client.sync_server_connection,automatic_patching:0
2625 msgid "Enable this if you want to automatically install patches during these hours."
2626@@ -11367,7 +11337,7 @@
2627 #: code:addons/msf_doc_import/wizard/wizard_delete_lines.py:78
2628 #, python-format
2629 msgid "No line to remove"
2630-msgstr "No line to remove"
2631+msgstr "Aucune ligne à supprimer"
2632
2633 #. modules: sale, purchase_override
2634 #: code:addons/purchase_override/wizard/split_order_line.py:85
2635@@ -11492,7 +11462,7 @@
2636 #. module: msf_outgoing
2637 #: report:invoice:0
2638 msgid "Ship ref:"
2639-msgstr "Exp réf:"
2640+msgstr "Réf. Exp.:"
2641
2642 #. module: account_period_closing_level
2643 #: view:account.period:0
2644@@ -11545,7 +11515,7 @@
2645 #. module: purchase_followup
2646 #: field:po.track.changes.wizard,po_id:0
2647 msgid "Purchase Order Ref."
2648-msgstr "Purchase Order Ref."
2649+msgstr "Ref commande"
2650
2651 #. module: account_mcdb
2652 #: report:addons/account_mcdb/report/report_account_analytic_line_free_xls.mako:78
2653@@ -11858,8 +11828,9 @@
2654 msgid "Flag that certify presence of extended ORM methods"
2655 msgstr "Flag that certify presence of extended ORM methods"
2656
2657-#. module: specific_rules
2658+#. module: specific_rules, msf_outgoing
2659 #: code:addons/specific_rules/wizard/stock_partial_picking.py:65
2660+#: code:addons/msf_outgoing/report/picking_ticket.py:199
2661 #, python-format
2662 msgid "dangerous goods"
2663 msgstr "marchandises dangereuses"
2664@@ -11879,7 +11850,7 @@
2665 #: report:addons/purchase_followup/report/purchase_follow_up_report_xls.mako:212
2666 #: report:purchase.follow.up.report_pdf:0
2667 msgid "STATE"
2668-msgstr "ÉTAT"
2669+msgstr "STATUT"
2670
2671 #. modules: base_setup, unifield_setup, base
2672 #: selection:base.setup.company,country_id:0
2673@@ -11938,7 +11909,7 @@
2674 #. module: product_attributes
2675 #: selection:product.product,closed_article:0
2676 msgid "Recommended"
2677-msgstr "Recommended"
2678+msgstr "Conseillé"
2679
2680 #. modules: msf_doc_import, tender_flow, sales_followup
2681 #: field:purchase.order.line,tender_line_id:0
2682@@ -12008,7 +11979,7 @@
2683 #. module: supplier_catalogue
2684 #: field:supplier.catalogue.line,rounding:0
2685 msgid "SoQ rounding"
2686-msgstr "Arrondi QS"
2687+msgstr "Arrondi QcS"
2688
2689 #. module: kit
2690 #: model:ir.model,name:kit.model_substitute
2691@@ -12266,7 +12237,7 @@
2692 #. module: msf_supply_doc_export
2693 #: model:ir.actions.report.xml,name:msf_supply_doc_export.report_stock_cost_reevaluation_xls
2694 msgid "Cost Reevaluation Excel Export"
2695-msgstr "Exportation en Excel de la réévaluation des coûts"
2696+msgstr "Expor Excel de la réévaluation des coûts"
2697
2698 #. module: stock
2699 #: view:stock.location:0
2700@@ -12284,12 +12255,6 @@
2701 msgid "# data not run"
2702 msgstr "# data not run"
2703
2704-#. module: stock
2705-#: code:addons/stock/stock.py:1729
2706-#, python-format
2707-msgid "is done."
2708-msgstr "est effectué."
2709-
2710 #. module: tender_flow
2711 #: code:addons/tender_flow/tender_flow.py:322
2712 #, python-format
2713@@ -12307,7 +12272,7 @@
2714 #: field:memory.additionalitems,picking_id:0
2715 #: field:stock.move.memory.shipment.additionalitems,picking_id:0
2716 msgid "PPL"
2717-msgstr "PPL"
2718+msgstr "LPC"
2719
2720 #. module: sourcing
2721 #: code:addons/sourcing/sale_order_line.py:1172
2722@@ -12441,7 +12406,7 @@
2723 #. module: stock_override
2724 #: report:delivery.order:0
2725 msgid "Expected Shipped Date :"
2726-msgstr "Date d'expédition prévue :"
2727+msgstr "Date d'expédition prévue:"
2728
2729 #. module: account_override
2730 #: help:res.company,additional_allocation:0
2731@@ -12451,7 +12416,7 @@
2732 #. module: specific_rules
2733 #: field:initial.stock.inventory.line,average_cost:0
2734 msgid "Initial average cost"
2735-msgstr "Coût moyen initial"
2736+msgstr "Prix moyen initial"
2737
2738 #. modules: account_override, register_accounting
2739 #: help:account.invoice,purchase_list:0
2740@@ -12553,7 +12518,7 @@
2741 #. module: purchase_followup
2742 #: report:purchase.follow.up.report_pdf:0
2743 msgid "PRODUCT"
2744-msgstr "PRODUCT"
2745+msgstr "PRODUIT"
2746
2747 #. module: base
2748 #: model:res.currency,currency_name:base.VUV
2749@@ -13038,7 +13003,7 @@
2750 #: field:export.report.stock.move,reason_type_ids:0
2751 #: code:addons/stock_override/report/report_stock_move.py:748
2752 msgid "Specific reason types"
2753-msgstr "Types de raison spécifiques"
2754+msgstr "Raison type spécifique"
2755
2756 #. module: report_webkit
2757 #: field:ir.header_webkit,orientation:0
2758@@ -13140,8 +13105,9 @@
2759 #. module: msf_outgoing, stock_override
2760 #: report:packing.list:0
2761 #: report:delivery.order:0
2762+#: report:addons/msf_outgoing/report/packing_list_xls.mako:313
2763 msgid "Your Ref.:"
2764-msgstr "Votre Ref.:"
2765+msgstr "Votre Réf.:"
2766
2767 #. module: purchase
2768 #: view:purchase.order:0
2769@@ -13443,7 +13409,7 @@
2770 #: model:ir.actions.act_window,name:specific_rules.action_unconsistent_stock_report
2771 #: model:ir.ui.menu,name:specific_rules.menu_unconsistent_stock_report
2772 msgid "Product Inconsistencies Report"
2773-msgstr "Product Inconsistencies Report"
2774+msgstr "Rapport d'incohérence des produits"
2775
2776 #. module: base
2777 #: field:ir.default,ref_table:0
2778@@ -13523,12 +13489,6 @@
2779 msgid "Not expense/income"
2780 msgstr "Not expense/income"
2781
2782-#. module: finance
2783-#: code:addons/finance/report/account_report_name.py:40
2784-#, python-format
2785-msgid "Partner Balance"
2786-msgstr "Partner Balance"
2787-
2788 #. module: account_hq_entries
2789 #: code:addons/account_hq_entries/hq_entries.py:398
2790 #, python-format
2791@@ -13543,7 +13503,7 @@
2792 #. module: purchase
2793 #: view:purchase.order.line.cancel.wizard:0
2794 msgid "Cancel Purchase Order line"
2795-msgstr "Cancel Purchase Order line"
2796+msgstr "Annuler ligne Bon de commande"
2797
2798 #. module: hr
2799 #: view:hr.job:0
2800@@ -13590,7 +13550,7 @@
2801 #. module: msf_doc_import
2802 #: view:wizard.delete.lines:0
2803 msgid "Select Qty=0 lines"
2804-msgstr "Select Qty=0 lines"
2805+msgstr "Sélectionner Qté=0 lignes"
2806
2807 #. module: msf_tools
2808 #: model:ir.actions.act_window,name:msf_tools.automated_import_action
2809@@ -13631,7 +13591,7 @@
2810 #: selection:wizard.import.po.simulation.screen.line,type_change:0
2811 #: selection:wizard.simu.import.po.line,change_type:0
2812 msgid "New"
2813-msgstr "New"
2814+msgstr "Nouveau"
2815
2816 #. modules: msf_doc_import, msf_supply_doc_export
2817 #: code:addons/msf_doc_import/wizard/__init__.py:34
2818@@ -13770,7 +13730,7 @@
2819 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:182
2820 #: report:sales.follow.up.report_pdf:0
2821 msgid "Order state:"
2822-msgstr "Order state:"
2823+msgstr "Statut de la commande:"
2824
2825 #. module: account
2826 #: view:account.account:0
2827@@ -13811,14 +13771,6 @@
2828 msgid "When doing real-time inventory valuation, counterpart Journal Items for all incoming stock moves will be posted in this account. If not set on the product, the one from the product category is used."
2829 msgstr "Lors de la valorisation en temps réel de l'inventaire, des lignes d'écritures du Journal de la contrepartie correspondantes à tous les mouvements d'entrée stock seront comptabilisées sous ce compte. Si la valorisation n'est pas établie sur le produit, alors celle de la catégorie du produit sera utilisée. "
2830
2831-#. modules: msf_doc_import, sale
2832-#: field:wizard.import.fo.line,fo_id:0
2833-#: field:wizard.import.ir.line,fo_id:0
2834-#: report:addons/sale/report/fo_allocation_report.mako:155
2835-#: report:sale.order.allocation.report:0
2836-msgid "Field Order"
2837-msgstr "Commande de Terrain"
2838-
2839 #. module: base
2840 #: field:res.config.users,action_id:0
2841 #: field:res.users,action_id:0
2842@@ -14047,7 +13999,7 @@
2843 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:162
2844 #: report:sales.follow.up.report_pdf:0
2845 msgid "Internal reference:"
2846-msgstr "Internal reference:"
2847+msgstr "Référence Interne:"
2848
2849 #. module: msf_budget
2850 #: report:addons/msf_budget/report/budget_criteria_xls.mako:749
2851@@ -14064,11 +14016,6 @@
2852 msgid "America/Aruba"
2853 msgstr "America/Aruba"
2854
2855-#. module: kit
2856-#: view:kit.mass.import:0
2857-msgid "Warning messages"
2858-msgstr "Messages d'alerte"
2859-
2860 #. module: msf_doc_import
2861 #: code:addons/msf_doc_import/account.py:245
2862 #, python-format
2863@@ -14414,9 +14361,10 @@
2864
2865 #. module: msf_outgoing, order_types
2866 #: report:packing.list:0
2867+#: report:addons/msf_outgoing/report/packing_list_xls.mako:432
2868 #: report:order.type.donation.certificate:0
2869 msgid "Total Qty."
2870-msgstr "Qté. Totale"
2871+msgstr "Qté Totale"
2872
2873 #. module: base
2874 #: view:ir.translation:0
2875@@ -14481,8 +14429,14 @@
2876 msgid "Display Employees?"
2877 msgstr "Afficher les Employés ?"
2878
2879-#. module: consumption_calculation
2880+#. module: consumption_calculation, return_claim,product_asset,msf_outgoing
2881 #: field:real.average.consumption.line,asset_check:0
2882+#: field:stock.move.memory.picking,asset_check:0
2883+#: field:stock.move.memory.ppl,asset_check:0
2884+#: field:stock.move.memory.returnproducts,asset_check:0
2885+#: field:stock.move.memory.in,asset_check:0
2886+#: field:stock.move.memory.out,asset_check:0
2887+#: field:claim.product.line,hidden_asset_claim_product_line:0
2888 msgid "Asset Check"
2889 msgstr "Vérification Actif"
2890
2891@@ -14581,7 +14535,7 @@
2892 #. module: stock_override
2893 #: report:internal.move:0
2894 msgid "INTERNAL MOVE"
2895-msgstr "INTERNAL MOVE"
2896+msgstr "MOUVEMENT INTERNE"
2897
2898 #. module: product
2899 #: field:product.packaging,weight:0
2900@@ -14733,6 +14687,7 @@
2901
2902 #. module: consumption_calculation
2903 #: report:expiry.report:0
2904+#: report:addons/consumption_calculation/report/expiry_report.mako:261
2905 msgid "ALL TOTAL"
2906 msgstr "Grand TOTAL"
2907
2908@@ -14799,7 +14754,7 @@
2909 #: code:addons/return_claim/return_claim.py:2656
2910 #, python-format
2911 msgid "The new %s Event %s has been created."
2912-msgstr "Le nouveau %s Evénement %s a été créé."
2913+msgstr "Le nouveau %s Événement %s a été créé."
2914
2915 #. modules: base, base_setup, unifield_setup
2916 #: model:res.country,name:base.mw
2917@@ -14998,7 +14953,7 @@
2918 #: code:addons/return_claim/return_claim.py:164
2919 #, python-format
2920 msgid "Previous event (%s) does not allow further event."
2921-msgstr "L'Evénement précédent (%s) ne permet pas d'autres événements"
2922+msgstr "L'Événement précédent (%s) ne permet pas d'autres événements"
2923
2924 #. module: account_mcdb
2925 #: view:account.mcdb:0
2926@@ -15115,7 +15070,7 @@
2927 #. module: specific_rules
2928 #: field:stock.cost.reevaluation.line,average_cost:0
2929 msgid "Average cost"
2930-msgstr "Coût moyen"
2931+msgstr "Prix moyen"
2932
2933 #. module: threshold_value
2934 #: help:threshold.value,safety_month:0
2935@@ -15213,6 +15168,8 @@
2936 #: report:purchase.order.merged:0
2937 #: report:msf.sale.order:0
2938 #: report:stock.forecast.report:0
2939+#: report:addons/consumption_calculation/report/expiry_report.mako:154
2940+#: report:addons/consumption_calculation/report/expiry_report.mako:207
2941 msgid "CODE"
2942 msgstr "CODE"
2943
2944@@ -15224,7 +15181,7 @@
2945 #. module: msf_doc_import
2946 #: view:real.average.consumption.line:0
2947 msgid "Real average consumption line to delete"
2948-msgstr "Real average consumption line to delete"
2949+msgstr "Ligne de Consommation moyenne réelle à supprimer"
2950
2951 #. modules: purchase, purchase_override
2952 #: field:purchase.order.merged.line,po_partner_type_stored:0
2953@@ -15264,7 +15221,7 @@
2954 #: code:addons/consumption_calculation/consumption_calculation.py:493
2955 #, python-format
2956 msgid "The RAC lines has been exported. Please click on Save As button to download the file"
2957-msgstr "The RAC lines has been exported. Please click on Save As button to download the file"
2958+msgstr "Les lignes de CMR ont été exportées. Cliquez sur le bouton 'Enregistrer sous' pour télécharger le fichier"
2959
2960 #. modules: account, account_voucher
2961 #: view:account.invoice.report:0
2962@@ -15654,6 +15611,7 @@
2963 #: selection:stock.move.processor,integrity_status:0
2964 #: selection:validate.move.processor,integrity_status:0
2965 #: selection:stock.move.in.processor,sequence_issue:0
2966+#: code:addons/msf_outgoing/__init__.py:56
2967 msgid "No Asset Needed"
2968 msgstr "Pas besoin d'Actif"
2969
2970@@ -15804,6 +15762,7 @@
2971 #. module: stock
2972 #: report:addons/stock/report/physical_inventory_counting_sheet_xls.mako:447
2973 #: report:addons/stock/report/physical_inventory_discrepancies_report_xls.mako:776
2974+#: report:physical_inventory_counting_sheet_pdf:0
2975 msgid "Item code"
2976 msgstr "Code Produit"
2977
2978@@ -15934,6 +15893,7 @@
2979 #: field:stock.batch.recall,expired_date:0
2980 #: view:stock.move:0
2981 #: report:destruction.location:0
2982+#: report:tracking.move.report:0
2983 msgid "Expired Date"
2984 msgstr "Date Expirée"
2985
2986@@ -16112,7 +16072,7 @@
2987 #: code:addons/consumption_calculation/report/expiry_calculation_report.py:35
2988 #, python-format
2989 msgid "RAC -- Real Average Consumption"
2990-msgstr "RAC -- Consommations Moyennes Réelles"
2991+msgstr "CMR -- Consommations Moyennes Réelles"
2992
2993 #. module: sales_followup
2994 #: model:ir.model,name:sales_followup.model_ir_track_changes_wizard
2995@@ -16359,7 +16319,7 @@
2996 #: code:addons/purchase/purchase_workflow.py:677
2997 #, python-format
2998 msgid "Line %s: Please choose a product before confirming the line"
2999-msgstr "Line %s: Please choose a product before confirming the line"
3000+msgstr "Ligne %s: Veuillez choisir un produit avant de confirmer la ligne"
3001
3002 #. module: base_setup
3003 #: view:base.setup.installer:0
3004@@ -16509,16 +16469,20 @@
3005 msgid "Check Lines"
3006 msgstr "Vérifier Lignes"
3007
3008-#. modules: purchase_compare_rfq, sync_client, sale, tender_flow, msf_partner
3009+#. modules: purchase_compare_rfq, sync_client, sale, tender_flow, msf_partner, msf_doc_import
3010 #: model:ir.actions.act_window,name:msf_partner.act_res_partner_2_sale_order
3011 #: code:addons/sale/sale_order.py:2527
3012 #: field:wizard.compare.rfq,sale_order_id:0
3013 #: model:ir.actions.report.xml,name:sale.report_sale_order
3014 #: selection:sync.client.log_sale_purchase,document:0
3015 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:531
3016+#: field:wizard.import.fo.line,fo_id:0
3017+#: field:wizard.import.ir.line,fo_id:0
3018+#: report:addons/sale/report/fo_allocation_report.mako:155
3019+#: report:sale.order.allocation.report:0
3020 #, python-format
3021 msgid "Field Order"
3022-msgstr "Commande Terrain"
3023+msgstr "Commande de Terrain"
3024
3025 #. modules: account, base, register_accounting, account_voucher, sale
3026 #: view:account.invoice:0
3027@@ -16568,7 +16532,7 @@
3028 #. module: msf_doc_import
3029 #: field:wizard.import.in.pack.simulation.screen,parcel_qty:0
3030 msgid "Parcel Qty"
3031-msgstr "Parcel Qty"
3032+msgstr "Qté Parcelle"
3033
3034 #. modules: procurement_auto, procurement_cycle
3035 #: help:stock.warehouse.automatic.supply,frequence_name:0
3036@@ -16744,6 +16708,22 @@
3037 msgid "Selected Origin must contain at least one stock move."
3038 msgstr "L'Origine sélectionnée doit contenir au minimum un mouvement de stock"
3039
3040+#. modules: msf_doc_import, msf_outgoing, sales_followup, msf_supply_doc_export
3041+#: report:addons/msf_doc_import/report/po_simulation_screen_xls_report.mako:136
3042+#: field:wizard.import.po.simulation.screen,imp_ready_to_ship_date:0
3043+#: field:wizard.import.po.simulation.screen,in_ready_to_ship_date:0
3044+#: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:144
3045+#: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:127
3046+#: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:296
3047+#: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:300
3048+#: report:ir.follow.up.location.report_pdf:0
3049+#: report:sales.follow.up.multi.report_pdf:0
3050+#: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:73
3051+#: report:addons/msf_outgoing/report/pre_packing_excel_report_xls.mako:233
3052+#, python-format
3053+msgid "RTS Date"
3054+msgstr "Date PàE"
3055+
3056 #. module: base
3057 #: field:ir.actions.server,trigger_name:0
3058 msgid "Trigger Name"
3059@@ -16754,12 +16734,6 @@
3060 msgid "Best before Date"
3061 msgstr "Date limite de consommation"
3062
3063-#. module: sales_followup, stock
3064-#: field:ir.followup.location.wizard,company_id:0
3065-#: field:stock.reception.wizard,company_id:0
3066-msgid "Company"
3067-msgstr "Entreprise"
3068-
3069 #. module: base
3070 #: selection:res.config.users,context_tz:0
3071 #: selection:res.users,context_tz:0
3072@@ -16867,7 +16841,7 @@
3073 #. module: msf_outgoing
3074 #: report:invoice:0
3075 msgid "Packing ref:"
3076-msgstr "Réf Packing:"
3077+msgstr "Réf Colisage:"
3078
3079 #. module: sync_client
3080 #: code:addons/sync_client/hq_monitor.py:82
3081@@ -16875,7 +16849,7 @@
3082 msgid "%s update%s"
3083 msgstr "%s update%s"
3084
3085-#. modules: msf_budget, sales_followup, account, product_attributes, register_accounting, unifield_setup, object_query, order_types, mission_stock, msf_accrual, procurement_report, msf_partner, res_currency_tables, salr, sourcing, tender_flow, msf_doc_import, finance, stock, product, stock_override
3086+#. modules: msf_budget, sales_followup, account, product_attributes, register_accounting, unifield_setup, object_query, order_types, mission_stock, msf_accrual, procurement_report, msf_partner, res_currency_tables, salr, sourcing, tender_flow, msf_doc_import, finance, msf_order_date, stock, product, stock_override
3087 #: view:account.state.open:0
3088 #: selection:mission.stock.wizard,split_stock:0
3089 #: selection:mission.stock.wizard,with_valuation:0
3090@@ -16922,6 +16896,10 @@
3091 #: selection:po.automation.config,name:0
3092 #: view:tender.cancel.wizard:0
3093 #: view:tender.line.cancel.wizard:0
3094+#: code:addons/msf_order_date/wizard/update_lines.py:95
3095+#: code:addons/msf_order_date/wizard/update_lines.py:109
3096+#: code:addons/msf_order_date/wizard/update_lines.py:92
3097+#: model:product.heat_sensitive,name:product_attributes.heat_no
3098 #: view:change.bn.ed.mandatory.wizard:0
3099 #: selection:product.mass.update,active_product:0
3100 #: selection:product.mass.update,dangerous_goods:0
3101@@ -17128,7 +17106,12 @@
3102 #: selection:return.claim,fake_state_return_claim:0
3103 #: selection:return.claim,state:0
3104 msgid "Validated - In progress"
3105-msgstr "Validated - In progress"
3106+msgstr "Validé - En cours"
3107+
3108+#. module: return_claim
3109+#: view:return.claim:0
3110+msgid "Validated - In Progress"
3111+msgstr "Validaté - En Cours"
3112
3113 #. module: msf_budget
3114 #: model:ir.actions.act_window,help:msf_budget.act_crossovered_budget_view
3115@@ -17234,7 +17217,7 @@
3116 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:357
3117 #, python-format
3118 msgid "Pack record node %s, wrong attribute %s"
3119-msgstr "Noeud record du Pack %s, mauvais attribut %s"
3120+msgstr "Noeud Pack %s, mauvais attribut %s"
3121
3122 #. modules: product, consumption_calculation, purchase_override, account_mcdb, sale
3123 #: report:account.analytic.line:0
3124@@ -17247,6 +17230,8 @@
3125 #: report:msf.purchase.quotation:0
3126 #: report:purchase.order.merged:0
3127 #: report:msf.sale.order:0
3128+#: report:addons/consumption_calculation/report/expiry_report.mako:155
3129+#: report:addons/consumption_calculation/report/expiry_report.mako:208
3130 msgid "DESCRIPTION"
3131 msgstr "DESCRIPTION"
3132
3133@@ -17618,7 +17603,7 @@
3134 #: selection:stock.picking,subtype:0
3135 #: selection:stock.move,picking_subtype:0
3136 msgid "PPL"
3137-msgstr "Liste de Pré-Colisage"
3138+msgstr "LPC"
3139
3140 #. modules: consumption_calculation, sale
3141 #: code:addons/consumption_calculation/consumption_calculation.py:280
3142@@ -17704,7 +17689,7 @@
3143 #. module: procurement_request
3144 #: report:procurement.request.report:0
3145 msgid "Order Reference :"
3146-msgstr "Order Reference :"
3147+msgstr "Référence de la Commande :"
3148
3149 #. module: base
3150 #: help:ir.attachment,res_model:0
3151@@ -17714,7 +17699,7 @@
3152 #. module: msf_outgoing
3153 #: report:empty.picking.ticket:0
3154 msgid "Qty Packed"
3155-msgstr "Qty Packed"
3156+msgstr "Qté Colisée"
3157
3158 #. module: product_attributes
3159 #: model:ir.model,name:product_attributes.model_product_cold_chain
3160@@ -17932,11 +17917,6 @@
3161 msgid "Africa/Bujumbura"
3162 msgstr "Africa/Bujumbura"
3163
3164-#. module: stock
3165-#: report:physical_inventory_counting_sheet_pdf:0
3166-msgid "Inventory reference"
3167-msgstr "Référence inventaire"
3168-
3169 #. module: sync_client
3170 #: model:ir.ui.menu,name:sync_client.ir_ui_menu_cron_synchro
3171 #: model:ir.ui.menu,name:sync_client.ir_ui_menu_cron_synchrobackup
3172@@ -18006,7 +17986,7 @@
3173 #. module: msf_supply_doc_export
3174 #: report:po.follow.up_rml:0
3175 msgid "PO Date To:"
3176-msgstr "Date BC jusqu' au:"
3177+msgstr "BdC jusqu'au:"
3178
3179 #. module: sale
3180 #: field:sale.order.cancelation.wizard,order_ids:0
3181@@ -18084,6 +18064,7 @@
3182
3183 #. module: consumption_calculation
3184 #: report:expiry.report:0
3185+#: report:addons/consumption_calculation/report/expiry_report.mako:151
3186 msgid "Products/batches already expired"
3187 msgstr "Produits/lots déjà expirés"
3188
3189@@ -18092,13 +18073,6 @@
3190 msgid "Financing Contract"
3191 msgstr "Contrat de Financement"
3192
3193-#. modules: account, msf_instance, account_hq_entries
3194-#: view:account.analytic.line:0
3195-#: view:hq.entries:0
3196-#: view:msf.instance:0
3197-msgid "General Information"
3198-msgstr "Information générale"
3199-
3200 #. modules: msf_doc_import, msf_supply_doc_export
3201 #: code:addons/msf_doc_import/wizard/__init__.py:31
3202 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:42
3203@@ -18235,7 +18209,7 @@
3204 #: field:process.to.consume.line,kit_creation_id_process_to_consume:0
3205 #, python-format
3206 msgid "Kitting Order"
3207-msgstr "Ordre d'assemblage de kits"
3208+msgstr "Commande d'assemblage de kit"
3209
3210 #. module: product_asset
3211 #: selection:product.asset.event,event_type:0
3212@@ -18248,9 +18222,10 @@
3213 msgid "Related Entries"
3214 msgstr "Ecritures associées"
3215
3216-#. module: msf_doc_import
3217+#. module: msf_doc_import, kit
3218 #: view:msf.import.export:0
3219 #: view:wizard.import.batch:0
3220+#: view:kit.mass.import:0
3221 msgid "Warning messages"
3222 msgstr "Messages d'avertissement"
3223
3224@@ -18378,7 +18353,7 @@
3225 #. module: msf_outgoing
3226 #: model:process.node,name:msf_outgoing.process_node_ppl_assigned
3227 msgid "PPL - available"
3228-msgstr "Liste de Pré-Colisage - dispon"
3229+msgstr "LPC - disponible"
3230
3231 #. module: analytic_distribution
3232 #: code:addons/analytic_distribution/analytic_distribution.py:108
3233@@ -18448,7 +18423,7 @@
3234 #. module: purchase
3235 #: view:purchase.order:0
3236 msgid "Confirm lines"
3237-msgstr "Confirm lines"
3238+msgstr "Confirmer lignes"
3239
3240 #. module: msf_doc_import
3241 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:362
3242@@ -18864,7 +18839,7 @@
3243 #. module: stock_override
3244 #: view:export.report.stock.move:0
3245 msgid "Reason Types"
3246-msgstr "Reason Types"
3247+msgstr "Types de raison"
3248
3249 #. modules: account, base, update_client
3250 #: field:account.journal.column,required:0
3251@@ -18898,7 +18873,7 @@
3252 #: selection:in.family.processor,integrity_status:0
3253 #: selection:ppl.family.processor,integrity_status:0
3254 msgid "Weight is missing"
3255-msgstr "Weight is missing"
3256+msgstr "Poids manquant"
3257
3258 #. module: msf_outgoing
3259 #: field:shipment,num_of_packs:0
3260@@ -18981,14 +18956,6 @@
3261 msgid "Asia/Atyrau"
3262 msgstr "Asia/Atyrau"
3263
3264-#. module: stock_override
3265-#: model:ir.actions.act_window,name:stock_override.export_report_stock_move_action
3266-#: model:ir.actions.report.xml,name:stock_override.report_stock_move_xls
3267-#: model:ir.ui.menu,name:stock_override.export_report_stock_move_menu
3268-#: code:addons/stock_override/report/report_stock_move.py:731
3269-msgid "IN & OUT Report"
3270-msgstr "Rapport sur IN & OUT"
3271-
3272 #. module: product
3273 #: help:product.supplierinfo,product_uom:0
3274 msgid "Choose here the Unit of Measure in which the prices and quantities are expressed below."
3275@@ -19019,6 +18986,8 @@
3276
3277 #. module: consumption_calculation
3278 #: model:ir.ui.menu,name:consumption_calculation.menu_product_history_consumption
3279+#: code:addons/consumption_calculation/history_consumption.py:481
3280+#, python-format
3281 msgid "Historical consumption"
3282 msgstr "Historique des Consommations"
3283
3284@@ -19064,6 +19033,11 @@
3285 #: report:account.partner.balance:0
3286 #: report:account.third_party_ledger:0
3287 #: report:account.third_party_ledger_other:0
3288+#: report:account.account.balance:0
3289+#: report:account.central.journal:0
3290+#: report:account.general.journal:0
3291+#: report:account.journal.period.print:0
3292+#: report:account.vat.declaration:0
3293 msgid "End Period"
3294 msgstr "Période de Fin"
3295
3296@@ -19111,7 +19085,7 @@
3297 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:826
3298 #, python-format
3299 msgid "The line cannot have both Line no. and Ext. Ref"
3300-msgstr "The line cannot have both Line no. and Ext. Ref"
3301+msgstr "La ligne ne peut pas avoir un n° de ligne ET une Réf. Ext."
3302
3303 #. modules: msf_instance, analytic, msf_audittrail, sync_so, analytic_override, analytic_distribution
3304 #: constraint:account.analytic.account:0
3305@@ -19226,6 +19200,7 @@
3306 #: view:audittrail.log.line:0
3307 #: report:msf.log.line:0
3308 #: view:audittrail.log.line:0
3309+#: report:addons/msf_audittrail/report/log_line_xls.mako:76
3310 msgid "Old value"
3311 msgstr "Ancienne valeur"
3312
3313@@ -19265,12 +19240,7 @@
3314 #. module: stock
3315 #: field:report.stock.move,product_qty_out:0
3316 msgid "Out Qty"
3317-msgstr "Qté OUT"
3318-
3319-#. module: product_asset
3320-#: field:product.asset,project_po:0
3321-msgid "Project PO"
3322-msgstr "Bon de Commande Terrain"
3323+msgstr "Qté Sortante"
3324
3325 #. modules: msf_supply_doc_export, account, msf_tools, account_mcdb
3326 #: field:output.currency.for.export,export_format:0
3327@@ -19298,7 +19268,7 @@
3328 #: report:empty.picking.ticket:0
3329 #: report:picking.ticket:0
3330 msgid "RTS Date:"
3331-msgstr "RTS Date:"
3332+msgstr "Date PàE:"
3333
3334 #. module: msf_config_locations
3335 #: field:stock.location,non_stockable_ok:0
3336@@ -19351,6 +19321,11 @@
3337 msgid "Comments"
3338 msgstr "Commentaires"
3339
3340+#. module: stock_override
3341+#: report:delivery.order:0
3342+msgid "Comments"
3343+msgstr "Comm."
3344+
3345 #. module: finance
3346 #: view:cash.request:0
3347 #: field:cash.request.commitment,cash_request_id:0
3348@@ -19981,12 +19956,6 @@
3349 msgid "Draft and Active"
3350 msgstr "Draft and Active"
3351
3352-#. module: sale
3353-#: code:addons/sale/wizard/delete_sale_order_line.py:79
3354-#, python-format
3355-msgid " and %s"
3356-msgstr " and %s"
3357-
3358 #. module: kit
3359 #: code:addons/kit/kit.py:474
3360 #, python-format
3361@@ -20096,7 +20065,7 @@
3362 #. module: delivery_mechanism
3363 #: field:stock.picking.processing.info,prepare_pick:0
3364 msgid "Prepare picking ticket"
3365-msgstr "Prepare picking ticket"
3366+msgstr "Préparation du bon de Picking"
3367
3368 #. module: account_override
3369 #: report:addons/account_override/report/open_invoices_xls.mako:307
3370@@ -20128,6 +20097,7 @@
3371
3372 #. module: sync_client
3373 #: help:operations.count,remote_id:0
3374+#: help:memory.usage,remote_id:0
3375 msgid "Holds the row id of rows imported from a remote instance. Unused except for de-duplicating during count centralization."
3376 msgstr "Conserve l'ID de la ligne des lignes importées d'une instance à distance. Non utilisé à l'exception de la déduplication lors de la centralisation du décompte."
3377
3378@@ -20165,6 +20135,7 @@
3379
3380 #. module: msf_instance
3381 #: field:msf.instance,reconcile_prefix:0
3382+#: field:msf.instance.cloud,reconcile_prefix:0
3383 msgid "Reconcilation prefix"
3384 msgstr "Préfixe de lettrage"
3385
3386@@ -20296,14 +20267,6 @@
3387 msgid "Sub-total"
3388 msgstr "Sous-total"
3389
3390-#. modules: tender_flow, purchase_compare_rfq
3391-#: field:wizard.compare.rfq,requested_date:0
3392-#: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:533
3393-#: field:tender,requested_date:0
3394-#: field:tender.line,date_planned:0
3395-msgid "Requested Date"
3396-msgstr "Date demandée"
3397-
3398 #. module: base
3399 #: field:multi_company.default,company_dest_id:0
3400 msgid "Default Company"
3401@@ -20465,12 +20428,6 @@
3402 msgid "Grant amount:"
3403 msgstr "Montant des Subventions:"
3404
3405-#. module: stock_override
3406-#: report:delivery.order:0
3407-#: report:internal.move:0
3408-msgid "Asset"
3409-msgstr "Bien"
3410-
3411 #. module: stock
3412 #: code:addons/stock/wizard/stock_change_product_qty.py:107
3413 #: model:ir.actions.act_window,name:stock.action_inventory_form
3414@@ -20783,11 +20740,6 @@
3415 msgid "Account Entries CSV Export"
3416 msgstr "Export sous format CSV d'Ecritures de Compte"
3417
3418-#. module: sales_followup
3419-#: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:278
3420-msgid "Customer ref"
3421-msgstr "Réf Client"
3422-
3423 #. modules: account_override, msf_processes, account, sale, msf_homere_interface
3424 #: model:ir.ui.menu,name:account.menu_finance
3425 #: model:process.node,name:account.process_node_accountingentries0
3426@@ -20834,6 +20786,7 @@
3427 #: field:wizard.import.in.line.simulation.screen,error_msg:0
3428 #: field:wizard.import.po.simulation.screen.line,error_msg:0
3429 #: field:internal.request.import.line,error_msg:0
3430+#: field:internal.request.import.error.line,line_message:0
3431 msgid "Error message"
3432 msgstr "Message d'erreur"
3433
3434@@ -20865,12 +20818,13 @@
3435 msgid "You receive heat sensitive products, please refer to the appropriate procedure."
3436 msgstr "Vous recevez des produits sensibles à la chaleur, merci de vous référer à la procédure appropriée."
3437
3438-#. modules: purchase, sourcing, sale
3439+#. modules: purchase, sourcing, sale, product_attributes
3440 #: field:purchase.order.line,name:0
3441 #: field:sale.order.line,name:0
3442 #: field:sale.order.line,product_name:0
3443+#: report:addons/product_attributes/report/standard_price_track_changes.mako:77
3444 msgid "Product description"
3445-msgstr "Product description"
3446+msgstr "Description produit"
3447
3448 #. module: msf_partner
3449 #: code:addons/msf_partner/partner.py:571
3450@@ -20881,7 +20835,7 @@
3451 #. module: product_attributes
3452 #: help:product.product,soq_quantity:0
3453 msgid "Standard Ordering Quantity. Quantity according to which the product should be ordered. The SoQ is usually determined by the typical packaging of the product."
3454-msgstr "Standard Ordering Quantity. Quantité à laquelle le produit devrait être commandé. La SoQ est habituellement déterminée par le packaging du produit."
3455+msgstr "Quantité de Commande Standard. Quantité à laquelle le produit devrait être commandé. La QcS est habituellement déterminée par le packaging du produit."
3456
3457 #. module: sync_client
3458 #: field:hq.monitor,not_run_data:0
3459@@ -21070,7 +21024,7 @@
3460 #: field:sale.order.line,soq_updated:0
3461 #: field:purchase.order.merged.line,soq_updated:0
3462 msgid "SoQ updated"
3463-msgstr "QS mis à jour"
3464+msgstr "QcS mise à jour"
3465
3466 #. module: msf_budget
3467 #: code:addons/msf_budget/msf_budget_tools.py:154
3468@@ -21126,6 +21080,8 @@
3469 #: field:physical.inventory.counting,is_cs:0
3470 #: view:physical.inventory.select.products:0
3471 #: report:destruction.location:0
3472+#: report:addons/msf_outgoing/report/packing_list_xls.mako:437
3473+#: report:addons/msf_outgoing/report/pre_packing_excel_report_xls.mako:223
3474 msgid "CS"
3475 msgstr "CS"
3476
3477@@ -21164,7 +21120,7 @@
3478 #. module: stock
3479 #: field:report.stock.move,product_qty_in:0
3480 msgid "In Qty"
3481-msgstr "Qté IN"
3482+msgstr "Qté Entrante"
3483
3484 #. module: base
3485 #: selection:res.config.users,context_tz:0
3486@@ -21412,6 +21368,7 @@
3487 #: selection:stock.move.in.processor,sequence_issue:0
3488 #: selection:stock.move.processor,integrity_status:0
3489 #: selection:validate.move.processor,integrity_status:0
3490+#: code:addons/msf_outgoing/__init__.py:51
3491 msgid "Selected Sequence is out of range"
3492 msgstr "Séquence Sélectionnée est hors limites"
3493
3494@@ -21454,7 +21411,7 @@
3495 #: code:addons/sale/sale_workflow.py:130
3496 #, python-format
3497 msgid "Line %s: Please define the nomenclature levels."
3498-msgstr "Line %s: Please define the nomenclature levels."
3499+msgstr "Ligne %s: Veuillez définir les niveaux de nomenclature."
3500
3501 #. module: product_nomenclature
3502 #: code:addons/product_nomenclature/product_nomenclature.py:146
3503@@ -21467,7 +21424,7 @@
3504 #: code:addons/consumption_calculation/expiry_calculation.py:682
3505 #, python-format
3506 msgid "There is not any product in expiry"
3507-msgstr "There is not any product in expiry"
3508+msgstr "Il n'y a aucun produit expiré"
3509
3510 #. module: report_webkit
3511 #: field:report.webkit.actions,open_action:0
3512@@ -21643,6 +21600,7 @@
3513 #: field:finance.sync.query,name:0
3514 #: report:empty.picking.ticket:0
3515 #: report:picking.ticket:0
3516+#: code:addons/mission_stock/mission_stock.py:52
3517 #, python-format
3518 msgid "Name"
3519 msgstr "Nom"
3520@@ -21799,7 +21757,7 @@
3521 #: view:product.asset:0
3522 #: view:product.asset.event:0
3523 msgid "Asset Form"
3524-msgstr "Bien - Formulaire"
3525+msgstr "Actif - Formulaire"
3526
3527 #. modules: msf_outgoing, stock
3528 #: code:addons/msf_outgoing/wizard/shipment.py:216
3529@@ -21918,8 +21876,9 @@
3530
3531 #. module: stock
3532 #: report:addons/stock/report/physical_inventory_counting_sheet_xls.mako:393
3533+#: report:physical_inventory_counting_sheet_pdf:0
3534 msgid "Inventory reference"
3535-msgstr "Référence de l'inventaire"
3536+msgstr "Référence inventaire"
3537
3538 #. module: msf_field_access_rights
3539 #: sql_constraint:msf_field_access_rights.field_access_rule_line:0
3540@@ -22156,9 +22115,10 @@
3541
3542 #. module: msf_outgoing
3543 #: code:addons/msf_outgoing/msf_outgoing.py:1267
3544+#: model:stock.location,name:msf_outgoing.stock_location_dispatch
3545 #, python-format
3546 msgid "Dispatch"
3547-msgstr "Dispatch"
3548+msgstr "Expédition"
3549
3550 #. module: base
3551 #: selection:res.config.users,context_tz:0
3552@@ -22504,7 +22464,13 @@
3553 #. module: consumption_calculation
3554 #: model:ir.actions.act_window,name:consumption_calculation.action_history_consumption
3555 msgid "History consumptions"
3556-msgstr "History consumptions"
3557+msgstr "Historique des consommations"
3558+
3559+# module: consumption_calculation
3560+#: code:addons/consumption_calculation/history_consumption.py:707
3561+#, python-format
3562+msgid "Av. %s"
3563+msgstr "%s Moy."
3564
3565 #. modules: base, base_setup, unifield_setup
3566 #: model:res.country,name:base.qa
3567@@ -22556,7 +22522,7 @@
3568 msgid "Fixed Location"
3569 msgstr "Zone Fixe"
3570
3571-#. modules: purchase, register_accounting, procurement_request, supplier_catalogue, sale, account_override, msf_doc_import
3572+#. modules: purchase, register_accounting, procurement_request, supplier_catalogue, sale, account_override, msf_doc_import, consumption_calculation
3573 #: view:account.invoice:0
3574 #: view:composition.kit:0
3575 #: view:initial.stock.inventory:0
3576@@ -22578,6 +22544,9 @@
3577 #: view:sale.order:0
3578 #: view:catalogue.import.lines:0
3579 #: view:supplier.catalogue:0
3580+#: view:monthly.review.consumption:0
3581+#: view:real.average.consumption:0
3582+#: model:ir.actions.act_window,name:procurement_request.action_open_wizard_import
3583 msgid "Import lines"
3584 msgstr "Importer des lignes"
3585
3586@@ -22906,11 +22875,6 @@
3587 msgid "Import file"
3588 msgstr "Importer le fichier"
3589
3590-#. module: base
3591-#: model:res.widget,title:base.google_maps_widget
3592-msgid "Google Maps"
3593-msgstr "Google Maps (Cartes Google)"
3594-
3595 #. module: account
3596 #: view:account.analytic.line:0
3597 msgid "Analytic Journal Items related to a sale journal."
3598@@ -23222,7 +23186,7 @@
3599 #. module: procurement_request
3600 #: report:procurement.request.report:0
3601 msgid "Total Purchase"
3602-msgstr "Total Purchase"
3603+msgstr "Total Achat"
3604
3605 #. module: stock
3606 #: code:addons/stock/stock.py:1726
3607@@ -23315,7 +23279,7 @@
3608 #. module: delivery_mechanism
3609 #: view:stock.picking.processing.info:0
3610 msgid "Processing status"
3611-msgstr "Processing status"
3612+msgstr "État du traitement"
3613
3614 #. module: base
3615 #: selection:res.config.users,context_tz:0
3616@@ -23369,7 +23333,7 @@
3617 #. module: stock_override
3618 #: view:stock.card.wizard:0
3619 msgid "Stock cards"
3620-msgstr "Stock cards"
3621+msgstr "Fiches de stock"
3622
3623 #. module: account
3624 #: code:addons/account/account.py:637
3625@@ -23573,11 +23537,6 @@
3626 msgid "To be defined"
3627 msgstr "To be defined"
3628
3629-#. module: stock
3630-#: view:stock.inventory:0
3631-msgid "Posted Inventory"
3632-msgstr "Inventaire Comptabilisé"
3633-
3634 #. module: register_accounting
3635 #: code:addons/register_accounting/wizard/cashbox_closing.py:43
3636 #, python-format
3637@@ -23617,7 +23576,7 @@
3638 #: field:sale.order,ready_to_ship_date:0
3639 #: field:purchase.order,ready_to_ship_date:0
3640 msgid "Ready To Ship Date"
3641-msgstr "Prêt à être Expédié - Date"
3642+msgstr "Prêt à Expédier - Date"
3643
3644 #. module: stock
3645 #: view:physical.inventory.generate.counting.sheet:0
3646@@ -23671,7 +23630,7 @@
3647 #. module: procurement_request
3648 #: report:procurement.request.report:0
3649 msgid "Order category :"
3650-msgstr "Order category :"
3651+msgstr "Catégorie de commande :"
3652
3653 #. module: unifield_setup
3654 #: model:ir.model,name:unifield_setup.model_res_country_restriction_memory
3655@@ -23935,7 +23894,7 @@
3656 #. module: stock_override
3657 #: field:stock.picking,incoming_id:0
3658 msgid "Incoming ref"
3659-msgstr "Ref. Réception"
3660+msgstr "Réf. Réception"
3661
3662 #. module: hr
3663 #: model:process.transition,name:hr.process_transition_employeeuser0
3664@@ -23966,11 +23925,6 @@
3665 msgid "Following entries have account/partner not compatible:"
3666 msgstr "Les écritures suivantes ont une association compte/partenaire non compatible :"
3667
3668-#. module: msf_outgoing
3669-#: view:return.shipment.processor:0
3670-msgid "Return Packs"
3671-msgstr "Renvoyer les colis"
3672-
3673 #. modules: purchase, register_accounting, analytic_distribution_supply, account_corrections, account_subscription, analytic_distribution, purchase_override, account_hq_entries
3674 #: help:wizard.journal.items.corrections.lines,analytic_distribution_state:0
3675 #: help:account.model.line,analytic_distribution_state:0
3676@@ -24311,7 +24265,7 @@
3677 #: field:purchase.order.followup,delivery_requested_date:0
3678 #: report:addons/msf_budget/report/order_impact_vs_budget.mako:212
3679 msgid "Delivery requested date"
3680-msgstr "Date de livraison demandée"
3681+msgstr "Date de livraison souhaitée"
3682
3683 #. module: msf_tools
3684 #: code:addons/msf_tools/automated_export.py:481
3685@@ -24326,8 +24280,12 @@
3686 msgstr "Europe/Prague"
3687
3688 #. modules: tender_flow, mission_stock
3689+#: code:addons/mission_stock/mission_stock.py:67
3690+#: code:addons/mission_stock/mission_stock.py:95
3691+#: code:addons/mission_stock/mission_stock.py:514
3692 #: report:addons/mission_stock/report/stock_mission_report_xls.mako:54
3693 #: field:tender.line,func_currency_id:0
3694+#, python-format
3695 msgid "Func. Cur."
3696 msgstr "Dev. fonc."
3697
3698@@ -24389,7 +24347,7 @@
3699 #. module: mission_stock
3700 #: view:mission.stock.wizard:0
3701 msgid "Open Consolidated XLS file"
3702-msgstr "Open Consolidated XLS file"
3703+msgstr "Ouvrir ficher XLS Consolidé"
3704
3705 #. module: msf_tools
3706 #: field:automated.import,ftp_ok:0
3707@@ -24438,7 +24396,7 @@
3708 #. module: product_asset
3709 #: model:ir.model,name:product_asset.model_product_asset_event
3710 msgid "Event for asset follow up"
3711-msgstr "Evénement pour le suivi de bien"
3712+msgstr "Événement pour le suivi de bien"
3713
3714 #. module: msf_config_locations
3715 #: view:stock.location.configuration.wizard:0
3716@@ -24520,6 +24478,7 @@
3717 #: report:stock.card.report:0
3718 #: report:addons/consumption_calculation/report/product_likely_expire_xls.mako:191
3719 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:222
3720+#: report:addons/stock_override/report/stock_card_report_xls.mako:136
3721 #, python-format
3722 msgid "Batch Number"
3723 msgstr "Numéro de Lot"
3724@@ -24541,6 +24500,7 @@
3725 #: selection:sale.report,state:0
3726 #: selection:sale.order.line,sale_order_state:0
3727 #: selection:stock.forecast.line,state:0
3728+#: selection:sale.order.line,state_to_display:0
3729 msgid "Validated-p"
3730 msgstr "Validé-p"
3731
3732@@ -24740,7 +24700,7 @@
3733 #: field:procurement.request.line.wizard,original_uom:0
3734 #: field:sale.order.line,original_uom:0
3735 msgid "Original UOM"
3736-msgstr "Original UOM"
3737+msgstr "UdM d'Origine"
3738
3739 #. modules: account, msf_instance, account_journal, financing_contract
3740 #: report:account.analytic.account.journal:0
3741@@ -24997,6 +24957,7 @@
3742 #: selection:shipment.processor,step:0
3743 #: code:addons/msf_outgoing/msf_outgoing.py:774
3744 #: code:addons/msf_outgoing/wizard/shipment.py:229
3745+#: view:return.shipment.processor:0
3746 #, python-format
3747 msgid "Return Packs"
3748 msgstr "Renvoyer colis"
3749@@ -25043,8 +25004,9 @@
3750
3751 #. module: msf_tools
3752 #: model:ir.actions.report.xml,name:msf_tools.report_stopped_products_xls
3753+#: report:addons/msf_tools/report/report_stopped_products_xls.mako:57
3754 msgid "Stopped products"
3755-msgstr "Stopped products"
3756+msgstr "Produits Stoppés"
3757
3758 #. modules: tender_flow, product_asset, update_client, register_accounting, return_claim, msf_doc_import, supplier_catalogue, purchase_compare_rfq, product_list, stock, reason_types_moves, stock_override, purchase_override, specific_rules, kit, base, msf_tools, sales_followup, account, msf_outgoing, order_nomenclature, msf_field_access_rights, sale, msf_button_access_rights, analytic_distribution, msf_supply_doc_export, consumption_calculation, procurement_request
3759 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:153
3760@@ -25147,6 +25109,7 @@
3761 #: field:internal.request.import.line,imp_comment:0
3762 #: field:internal.request.import.line,in_comment:0
3763 #: report:addons/msf_outgoing/report/pre_packing_excel_report_xls.mako:256
3764+#: report:addons/msf_outgoing/report/packing_list_xls.mako:431
3765 #, python-format
3766 msgid "Comment"
3767 msgstr "Commentaire"
3768@@ -25170,7 +25133,7 @@
3769 #. module: msf_supply_doc_export
3770 #: report:po.follow.up_rml:0
3771 msgid "IN unit price"
3772-msgstr "IN unit price"
3773+msgstr "Prix unitaire IN"
3774
3775 #. module: account_period_closing_level
3776 #: view:account.fiscalyear:0
3777@@ -25255,9 +25218,10 @@
3778 msgid "Social IDs"
3779 msgstr "Identité Sociale"
3780
3781-#. modules: account, register_accounting
3782-#: view:account.bank.statement:0
3783-#: view:account.bank.statement:0
3784+#. modules: account, register_accounting, product_attributes
3785+#: view:account.bank.statement:0
3786+#: view:account.bank.statement:0
3787+#: report:addons/product_attributes/report/standard_price_track_changes.mako:101
3788 msgid "Transaction"
3789 msgstr "Transactions"
3790
3791@@ -25282,7 +25246,7 @@
3792 msgid "Europe/Bucharest"
3793 msgstr "Europe/Bucharest"
3794
3795-#. modules: msf_budget, account, account_payment, product_attributes, register_accounting, unifield_setup, object_query, order_types, mission_stock, msf_accrual, procurement_report, stock, msf_partner, salr, sourcing, tender_flow, msf_doc_import, finance, msf_supply_doc_export, product, stock_override
3796+#. modules: msf_budget, account, account_payment, product_attributes, register_accounting, unifield_setup, object_query, order_types, mission_stock, msf_accrual, procurement_report, stock, msf_partner, salr, sourcing, tender_flow, msf_doc_import, finance, msf_supply_doc_export, product, stock_override, msf_order_date
3797 #: view:account.state.open:0
3798 #: view:account.payment.make.payment:0
3799 #: selection:mission.stock.wizard,split_stock:0
3800@@ -25322,6 +25286,9 @@
3801 #: selection:po.automation.config,name:0
3802 #: view:tender.cancel.wizard:0
3803 #: view:tender.line.cancel.wizard:0
3804+#: code:addons/msf_order_date/wizard/update_lines.py:94
3805+#: code:addons/msf_order_date/wizard/update_lines.py:108
3806+#: model:product.heat_sensitive,name:product_attributes.heat_yes
3807 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:177
3808 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:178
3809 #: report:addons/msf_supply_doc_export/report/report_pick_export_xls.mako:179
3810@@ -25512,7 +25479,7 @@
3811 msgid "The file should be in XML Spreadsheet 2003 format. The columns should be in this order :\n"
3812 " Product Code*, Product Description, Product UoM*, Min Quantity*, Unit Price*, SoQ Rounding, Min Order Qty, Comment."
3813 msgstr "Le fichier devrait être au format feuille XML 2003. Les colonnes doivent être dans cet ordre:\n"
3814-"Code Produit*, Description Produit, UdM Produit*, Quantité Min*, Arrondi QS, Qté Commande Min, Commentaire."
3815+"Code Produit*, Description Produit, UdM Produit*, Quantité Min*, Arrondi QcS, Qté Commande Min, Commentaire."
3816
3817 #. module: account_mcdb
3818 #: field:account.mcdb,description:0
3819@@ -25576,12 +25543,6 @@
3820 msgid "The instance code %s is not in the database!"
3821 msgstr "The instance code %s is not in the database!"
3822
3823-#. module: mission_stock
3824-#: field:stock.mission.report,move_ids:0
3825-#: field:stock.mission.report.line,move_ids:0
3826-msgid "Noves"
3827-msgstr "Noves"
3828-
3829 #. module: base
3830 #: model:res.currency,currency_name:base.FKP
3831 msgid "FALKLAND ISLANDS POUND"
3832@@ -25678,7 +25639,7 @@
3833 #: field:shipment,additional_items_ids:0
3834 #: field:shipment.wizard,product_moves_shipment_additionalitems:0
3835 msgid "Additional Items"
3836-msgstr "Elèments supplémentaires"
3837+msgstr "Eléments supplémentaires"
3838
3839 #. module: import_data
3840 #: field:import_category,import_mode:0
3841@@ -26000,11 +25961,12 @@
3842 msgid "America/Cambridge_Bay"
3843 msgstr "America/Cambridge_Bay"
3844
3845-#. modules: stock_forecast, msf_outgoing
3846+#. modules: stock_forecast, msf_outgoing, product_attributes
3847 #: field:stock.move,is_keep_cool:0
3848 #: field:stock.picking,is_keep_cool:0
3849 #: field:stock.forecast,keep_cool:0
3850 #: report:stock.forecast.report:0
3851+#: model:product.heat_sensitive,name:product_attributes.heat_2
3852 msgid "Keep Cool"
3853 msgstr "Garder Frais"
3854
3855@@ -26171,12 +26133,14 @@
3856 #: field:purchase.order.line,date_planned:0
3857 #: field:purchase.order.merged.line,date_planned:0
3858 #: report:addons/stock/report/stock_reception_report_xls.mako:232
3859+#: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:897
3860 #, python-format
3861 msgid "Delivery Requested Date"
3862 msgstr "Date de Livraison Souhaitée"
3863
3864-#. module: msf_supply_doc_export
3865+#. module: msf_supply_doc_export, msf_doc_import
3866 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:78
3867+#: code:addons/msf_doc_import/wizard/__init__.py:61
3868 msgid "External Ref"
3869 msgstr "Réf. Externe"
3870
3871@@ -26395,10 +26359,11 @@
3872 msgid "Account Tax Code"
3873 msgstr "Code Comptable Taxe"
3874
3875-#. module: product_attributes
3876+#. module: product_attributes, sale
3877 #: field:product.deactivation.error,error_lines:0
3878+#: field:internal.request.import,error_line_ids:0
3879 msgid "Error lines"
3880-msgstr "Error lines"
3881+msgstr "Lignes d'erreur"
3882
3883 #. module: msf_currency_revaluation
3884 #: code:addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py:930
3885@@ -26528,7 +26493,7 @@
3886 #: field:stock.incoming.processor,claim_replacement_picking_expected:0
3887 #: field:claim.event,replacement_picking_expected_claim_event:0
3888 msgid "Replacement expected for Claim ?"
3889-msgstr "Replacement expected for Claim ?"
3890+msgstr "Remplacement attendu pour la réclamation ?"
3891
3892 #. module: base
3893 #: field:ir.actions.server,write_id:0
3894@@ -26617,12 +26582,6 @@
3895 msgid "Line %s. The destination %s is not compatible with the account %s."
3896 msgstr "Ligne %s. La destination %s n'est pas compatible avec le compte %s."
3897
3898-#. module: msf_tools
3899-#: code:addons/msf_tools/automated_import_job.py:350
3900-#, python-format
3901-msgid "You cannot manually select a file to import if given source path is set on FTP server"
3902-msgstr "You cannot manually select a file to import if given source path is set on FTP server"
3903-
3904 #. module: account
3905 #: field:account.invoice.tax,tax_code_id:0
3906 #: field:account.tax,description:0
3907@@ -26950,6 +26909,8 @@
3908 #: selection:stock.location,location_category:0
3909 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
3910 #: model:stock.location,name:stock.stock_location_stock
3911+#: report:addons/consumption_calculation/report/expiry_report.mako:157
3912+#: report:addons/consumption_calculation/report/expiry_report.mako:210
3913 msgid "Stock"
3914 msgstr "Stock"
3915
3916@@ -27123,7 +27084,7 @@
3917 #: code:addons/product/product.py:772
3918 #, python-format
3919 msgid "The Cost Price must be greater than 0 !"
3920-msgstr "Le Prix de revient doit être supérieur à 0 !"
3921+msgstr "Le Prix doit être supérieur à 0 !"
3922
3923 #. module: account_hq_entries
3924 #: code:addons/account_hq_entries/wizard/hq_entries_split.py:327
3925@@ -27140,7 +27101,7 @@
3926 #: view:product.list:0
3927 #: field:product.list,old_product_ids:0
3928 msgid "Old Products"
3929-msgstr "Vieux Produits"
3930+msgstr "Anciens Produits"
3931
3932 #. module: account
3933 #: help:res.company,property_reserve_and_surplus_account:0
3934@@ -27179,6 +27140,7 @@
3935 #. module: msf_outgoing
3936 #: report:packing.list:0
3937 #: report:labels:0
3938+#: report:addons/msf_outgoing/report/packing_list_xls.mako:419
3939 msgid "Parcel No:"
3940 msgstr "No. Parcelle:"
3941
3942@@ -27539,7 +27501,7 @@
3943 msgid "Total Volume[dm³]"
3944 msgstr "Volume Total [dm³]"
3945
3946-#. modules: purchase, account, msf_outgoing, sales_followup, procurement_auto, sale, product, specific_rules, kit, account_override, purchase_allocation_report, sourcing, order_types, stock_override, tender_flow, return_claim, purchase_followup, msf_doc_import, purchase_followup, purchase_compare_rfq, kit, stock
3947+#. modules: purchase, account, msf_outgoing, sales_followup, procurement_auto, sale, product, specific_rules, kit, account_override, purchase_allocation_report, sourcing, order_types, stock_override, tender_flow, return_claim, purchase_followup, msf_doc_import, purchase_followup, purchase_compare_rfq, kit, stock_move_tracking, stock
3948 #: view:account.invoice.report:0
3949 #: field:account.invoice.report,product_qty:0
3950 #: field:wizard.split.invoice.lines,quantity:0
3951@@ -27594,6 +27556,7 @@
3952 #: field:stock.reserved.products,product_qty:0
3953 #: report:addons/specific_rules/report/report_stock_inventory_xls.mako:228
3954 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:221
3955+#: report:tracking.move.report:0
3956 #, python-format
3957 msgid "Qty"
3958 msgstr "Qté"
3959@@ -27642,6 +27605,7 @@
3960 #: field:wizard.import.po.simulation.screen.line,type_change:0
3961 #: field:wizard.simu.import.po.line,change_type:0
3962 #: view:purchase.order:0
3963+#: field:wizard.import.po.simulation.screen.line,chg_text:0
3964 msgid "CHG"
3965 msgstr "CHG"
3966
3967@@ -27770,7 +27734,7 @@
3968 #: field:product.asset,name:0
3969 #: field:product.asset.event,asset_id:0
3970 msgid "Asset Code"
3971-msgstr "Bien - Code"
3972+msgstr "Actif - Code"
3973
3974 #. modules: base, report_webkit
3975 #: view:res.company:0
3976@@ -27795,12 +27759,13 @@
3977 #: model:ir.ui.menu,name:mission_stock.mission_stock_wizard_menu
3978 #: view:mission.stock.wizard:0
3979 msgid "Mission stock"
3980-msgstr "Stock Mission"
3981+msgstr "Stock de Mission"
3982
3983 #. module: product_attributes
3984 #: field:standard.price.track.changes,old_standard_price:0
3985+#: report:addons/product_attributes/report/standard_price_track_changes.mako:95
3986 msgid "Old Cost Price"
3987-msgstr "Old Cost Price"
3988+msgstr "Ancien Prix"
3989
3990 #. module: account
3991 #: field:report.account.receivable,name:0
3992@@ -28057,18 +28022,22 @@
3993 #. module: return_claim
3994 #: view:add.event:0
3995 msgid "Add Event"
3996-msgstr "Ajouter Evénement"
3997+msgstr "Ajouter Événement"
3998
3999-#. modules: product, base, product_attributes
4000+#. module: base
4001 #: selection:ir.actions.act_window,view_type:0
4002 #: selection:ir.actions.act_window.view,view_mode:0
4003 #: view:ir.ui.view:0
4004 #: selection:ir.ui.view,type:0
4005 #: selection:wizard.ir.model.menu.create.line,view_type:0
4006+msgid "Form"
4007+msgstr "Formulaire"
4008+
4009+#. modules: product, product_attributes
4010 #: view:product.product:0
4011 #: field:product.product,form_value:0
4012 msgid "Form"
4013-msgstr "Formulaire"
4014+msgstr "Forme"
4015
4016 #. module: sales_followup
4017 #: model:ir.actions.act_window,name:sales_followup.action_sale_followup_multi_wizard
4018@@ -28169,14 +28138,14 @@
4019 #. module: msf_outgoing
4020 #: report:certificate.free.gift:0
4021 msgid "Shipment reference :"
4022-msgstr "Shipment reference :"
4023+msgstr "Référence d'expédition:"
4024
4025 #. module: stock_override
4026 #: code:addons/stock_override/wizard/change_dest_location.py:103
4027 #, python-format
4028 msgid "Line %s : The new destination location is the same as the source location of the move, so the destination location has not been changed for this move. \n"
4029 ""
4030-msgstr "Lligne %s : La nouvelle zone de destination est la même que la zone source du mouvement, la zone de destination a donc été changée pour ce mouvement. \n"
4031+msgstr "Ligne %s : La nouvelle zone de destination est la même que la zone source du mouvement, la zone de destination a donc été changée pour ce mouvement. \n"
4032 ""
4033
4034 #. module: base_setup
4035@@ -28397,7 +28366,7 @@
4036 #: selection:product.price.type,field:0
4037 #: field:product.product,soq_quantity:0
4038 msgid "SoQ Quantity"
4039-msgstr "Quantité QS"
4040+msgstr "Quantité QcS"
4041
4042 #. modules: register_accounting, finance
4043 #: field:cash.request.liquidity.bank,bank_statement_balance_functional:0
4044@@ -28423,7 +28392,7 @@
4045 #. module: consumption_calculation
4046 #: view:product.history.consumption:0
4047 msgid "Historical consumptions"
4048-msgstr "Historical consumptions"
4049+msgstr "Historique des consommations"
4050
4051 #. module: stock
4052 #: field:physical.inventory.select.products,recent_moves_months:0
4053@@ -28747,7 +28716,7 @@
4054 #. module: import_data
4055 #: view:update_product:0
4056 msgid "Update Datas"
4057-msgstr "Update Datas"
4058+msgstr "Mettre à jours des Données"
4059
4060 #. module: msf_outgoing
4061 #: field:pack.family.memory,from_pack:0
4062@@ -28786,7 +28755,7 @@
4063 #: field:stock.move.memory.shipment.returnpacks,ppl_id:0
4064 #: field:stock.move.memory.shipment.returnpacksfromshipment,ppl_id:0
4065 msgid "PPL Ref"
4066-msgstr "Réf. Liste de Pré-Colisage"
4067+msgstr "Réf. LPC"
4068
4069 #. module: account
4070 #: code:addons/account/invoice.py:1750
4071@@ -28804,7 +28773,7 @@
4072 #: report:addons/sales_followup/report/sale_follow_up_report_xls.mako:220
4073 #: report:sales.follow.up.report_pdf:0
4074 msgid "ORDERED QTY"
4075-msgstr "ORDERED QTY"
4076+msgstr "QTÉ COMMANDÉE"
4077
4078 #. module: account
4079 #: field:account.tax.code,code:0
4080@@ -28894,10 +28863,22 @@
4081 msgid "Translate"
4082 msgstr "Traduire"
4083
4084-#. modules: consumption_calculation, stock
4085+#. modules: consumption_calculation, stock, purchase,tender_flow,account,specific_rules,purchase_override,procurement
4086 #: report:addons/consumption_calculation/report/report_incoming_consumption_xls.mako:71
4087 #: code:addons/stock/physical_inventory.py:1240
4088 #: field:physical.inventory.counting,product_uom_id:0
4089+#: field:account.entries.report,product_uom_id:0
4090+#: view:analytic.entries.report:0
4091+#: field:analytic.entries.report,product_uom_id:0
4092+#: report:addons/consumption_calculation/report/report_real_consumption_xls.mako:71
4093+#: field:stock.warehouse.orderpoint,product_uom:0
4094+#: field:purchase.order.line,product_uom:0
4095+#: field:purchase.order.merged.line,product_uom:0
4096+#: field:initial.stock.inventory.line,product_uom:0
4097+#: field:stock.inventory.line,product_uom:0
4098+#: field:stock.move.consume,product_uom:0
4099+#: field:stock.move.scrap,product_uom:0
4100+#: field:tender.line,product_uom:0
4101 #, python-format
4102 msgid "Product UOM"
4103 msgstr "UDM du Produit"
4104@@ -29089,7 +29070,7 @@
4105 #. module: product_asset
4106 #: view:product.asset:0
4107 msgid "Asset Reference"
4108-msgstr "Bien - Référence"
4109+msgstr "Actif - Référence"
4110
4111 #. module: msf_field_access_rights
4112 #: help:msf_field_access_rights.field_access_rule_line,field:0
4113@@ -29178,14 +29159,18 @@
4114 msgid "Asia/Vladivostok"
4115 msgstr "Asia/Vladivostok"
4116
4117-#. modules: account, stock_override, stock
4118+#. module: account
4119 #: selection:account.aged.trial.balance,direction_selection:0
4120-#: view:report.stock.inventory:0
4121-#: view:stock.move:0
4122-#: view:stock.move:0
4123 msgid "Future"
4124 msgstr "Contrat à terme"
4125
4126+#. modules: stock_override, stock
4127+#: view:report.stock.inventory:0
4128+#: view:stock.move:0
4129+#: view:stock.move:0
4130+msgid "Future"
4131+msgstr "Futur"
4132+
4133 #. module: sale
4134 #: report:msf.freight_manifest:0
4135 msgid "Parcels damaged :"
4136@@ -29464,11 +29449,6 @@
4137 msgid "msr_in_progress"
4138 msgstr "msr_in_progress"
4139
4140-#. module: mission_stock
4141-#: field:mission.stock.wizard,export_ok:0
4142-msgid "XML Export ready"
4143-msgstr "XML Export ready"
4144-
4145 #. modules: account, register_accounting
4146 #: view:account.bank.statement:0
4147 #: view:account.bank.statement:0
4148@@ -29508,7 +29488,7 @@
4149 #. module: procurement_request
4150 #: report:procurement.request.report:0
4151 msgid "Functional Currency :"
4152-msgstr "Functional Currency :"
4153+msgstr "Devise Fonctionnelle :"
4154
4155 #. module: base
4156 #: model:res.currency,currency_name:base.DOP
4157@@ -29534,7 +29514,7 @@
4158 #. module: msf_doc_import
4159 #: view:wizard.import.in.simulation.screen:0
4160 msgid "Incoming shipment information"
4161-msgstr "Incoming shipment information"
4162+msgstr "Informations de Livraison entrante"
4163
4164 #. module: sync_client
4165 #: model:ir.actions.act_window,name:sync_client.message_sent_action
4166@@ -29575,11 +29555,6 @@
4167 msgid "procurement.request.sourcing.document"
4168 msgstr "procurement.request.sourcing.document"
4169
4170-#. module: mission_stock
4171-#: report:addons/mission_stock/report/stock_mission_report_xls.mako:71
4172-msgid "In Pipe Qty"
4173-msgstr "In Pipe Qty"
4174-
4175 #. module: account
4176 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
4177 msgid "This view can be used by accountants in order to quickly record entries in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account. OpenERP will propose to you automatically the Tax related to this account and the counterpart \"Account Payable\"."
4178@@ -29589,7 +29564,7 @@
4179 #: view:sale.order:0
4180 #: view:sale.order:0
4181 msgid "Validate Lines"
4182-msgstr "Validate Lines"
4183+msgstr "Valider Lignes"
4184
4185 #. module: financing_contract
4186 #: field:financing.contract.format.line,account_destination_ids:0
4187@@ -29848,7 +29823,7 @@
4188 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:76
4189 #, python-format
4190 msgid "Delivery confirmed date"
4191-msgstr "Date confirmée de livraison"
4192+msgstr "Date de Livraison Confirmée"
4193
4194 #. module: reason_types_moves
4195 #: model:stock.reason.type,name:reason_types_moves.reason_type_damage
4196@@ -29889,13 +29864,28 @@
4197 msgid "Fiscal Position Template"
4198 msgstr "Modèle de Position Fiscale"
4199
4200-#. modules: account, finance, account_override
4201+#. modules: account, finance, account_override, res_currency_tables
4202 #: field:account.partner.balance,period_to:0
4203 #: field:account.partner.ledger,period_to:0
4204 #: field:wizard.account.partner.balance.tree,period_to:0
4205 #: field:integrity.finance.wizard,period_to:0
4206+#: field:account.aged.trial.balance,period_to:0
4207+#: field:account.balance.report,period_to:0
4208+#: field:account.bs.report,period_to:0
4209+#: field:account.central.journal,period_to:0
4210+#: field:account.common.account.report,period_to:0
4211+#: field:account.common.journal.report,period_to:0
4212+#: field:account.common.partner.report,period_to:0
4213+#: field:account.common.report,period_to:0
4214+#: field:account.general.journal,period_to:0
4215+#: field:account.pl.report,period_to:0
4216+#: field:account.print.journal,period_to:0
4217+#: field:account.report.general.ledger,period_to:0
4218+#: field:account.vat.declaration,period_to:0
4219+#: field:wizard.report.currency.table,end_period_id:0
4220+#: field:wizard.report.rates.table,end_period_id:0
4221 msgid "End period"
4222-msgstr "Période de fin"
4223+msgstr "Période de Fin"
4224
4225 #. module: base
4226 #: selection:ir.property,type:0
4227@@ -29905,7 +29895,7 @@
4228 #. module: supplier_catalogue
4229 #: model:ir.actions.server,name:supplier_catalogue.action_create_new_catalogue
4230 msgid "New Catalogue"
4231-msgstr "New Catalogue"
4232+msgstr "Nouveau Catalogue"
4233
4234 #. module: vertical_integration
4235 #: report:addons/vertical_integration/report/open_invoices_xls.mako:271
4236@@ -29927,7 +29917,7 @@
4237 msgid "Settings"
4238 msgstr "Paramètres"
4239
4240-#. modules: threshold_value, purchase, account, resource, account_payment, msf_homere_interface, procurement_auto, sales_followup, account_override, procurement, base, product_list, stock, procurement_cycle, res_currency_functional, purchase_compare_rfq, partner_modification
4241+#. modules: threshold_value, purchase, account, resource, account_payment, msf_homere_interface, procurement_auto, sales_followup, account_override, procurement, base, product_list, stock, procurement_cycle, res_currency_functional, purchase_compare_rfq, partner_modification, msf_instance,account_hq_entries
4242 #: view:account.account:0
4243 #: view:account.account.template:0
4244 #: view:account.journal:0
4245@@ -29952,6 +29942,9 @@
4246 #: view:stock.inventory:0
4247 #: view:stock.picking:0
4248 #: view:threshold.value:0
4249+#: view:account.analytic.line:0
4250+#: view:hq.entries:0
4251+#: view:msf.instance:0
4252 msgid "General Information"
4253 msgstr "Information Générale"
4254
4255@@ -30044,7 +30037,7 @@
4256 #: help:stock.move.processor,cost:0
4257 #: help:validate.move.processor,cost:0
4258 msgid "Unit Cost for this product line"
4259-msgstr "Coût Unitaire pour cette ligne de produits"
4260+msgstr "Prix Unitaire pour cette ligne de produits"
4261
4262 #. module: account
4263 #: view:res.partner:0
4264@@ -30269,20 +30262,26 @@
4265 msgid "Certificate attached ?"
4266 msgstr "Certificat attaché ?"
4267
4268-#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export
4269+#. modules: msf_supply_doc_export, sourcing, consumption_calculation, sale, sales_followup, msf_supply_doc_export, purchase
4270 #: field:po.follow.up,closed_ok:0
4271 #: selection:real.average.consumption,state:0
4272 #: selection:po.follow.up,state:0
4273 #: selection:sale.order.leave.close,order_state:0
4274 #: field:ir.followup.location.wizard,closed_ok:0
4275 #: selection:sale.order.line,sale_order_state:0
4276+#: selection:sale.order.line,state_to_display:0
4277+#: selection:purchase.order.line,state_to_display:0
4278+#: code:addons/sale/report/sale_loan_stock_moves_report.py:119
4279+#: code:addons/sale/report/sale_loan_stock_moves_report.py:140
4280+#: code:addons/sale/report/sale_loan_stock_moves_report.py:142
4281 msgid "Closed"
4282 msgstr "Fermé"
4283
4284 #. module: msf_outgoing
4285 #: report:packing.list:0
4286+#: report:addons/msf_outgoing/report/packing_list_xls.mako:324
4287 msgid "Our Ref.:"
4288-msgstr "Our Ref.:"
4289+msgstr "Notre Réf.:"
4290
4291 #. module: sale
4292 #: field:sale.loan.stock.moves,remove_completed:0
4293@@ -30350,8 +30349,9 @@
4294
4295 #. module: specific_rules
4296 #: model:ir.actions.report.xml,name:specific_rules.report_unconsistent_stock_xls
4297+#: report:addons/specific_rules/report/unconsistent_stock_report_xls.mako:68
4298 msgid "Unconsistent stock"
4299-msgstr "Unconsistent stock"
4300+msgstr "Incohérences stock"
4301
4302 #. modules: financing_contract, reason_types_moves, consumption_calculation, procurement_report, product_attributes
4303 #: field:product.likely.expire.report,consumption_type:0
4304@@ -30416,7 +30416,7 @@
4305 #. module: msf_outgoing
4306 #: model:ir.actions.report.xml,name:msf_outgoing.report_packing_list_xls
4307 msgid "Packing List (xls)"
4308-msgstr "Packing List (xls)"
4309+msgstr "Liste de Colisage (xls)"
4310
4311 #. module: purchase
4312 #: help:purchase.order,invoice_method:0
4313@@ -30690,6 +30690,7 @@
4314 #: report:addons/msf_supply_doc_export/report/report_validated_purchase_order_xls.mako:178
4315 #: view:purchase.order:0
4316 #: view:purchase.order:0
4317+#: field:purchase.order,related_sourcing_id:0
4318 msgid "Sourcing group"
4319 msgstr "Groupe de Sourcing"
4320
4321@@ -30844,7 +30845,7 @@
4322 #: view:stock.picking.processor:0
4323 #: view:validate.picking.processor:0
4324 msgid "Move lines"
4325-msgstr "Move lines"
4326+msgstr "Lignes de mouvement"
4327
4328 #. module: base
4329 #: model:res.currency,currency_name:base.BIF
4330@@ -30916,8 +30917,9 @@
4331
4332 #. module: msf_outgoing
4333 #: report:packing.list:0
4334+#: report:addons/msf_outgoing/report/packing_list_xls.mako:420
4335 msgid "Parcel"
4336-msgstr "Parcel"
4337+msgstr "Parcelle"
4338
4339 #. modules: return_claim, stock, kit
4340 #: view:substitute:0
4341@@ -31082,7 +31084,7 @@
4342 #: code:addons/msf_outgoing/report/picking_ticket.py:205
4343 #, python-format
4344 msgid "You are about to pick %s%s%s products, please refer to the appropriate procedures"
4345-msgstr "Vous êtes sur le point de prélever %s%s%s produits, veuillez vous référer aux procédures adéquates"
4346+msgstr "Vous êtes sur le point de prélever des %s%s%s, veuillez vous référer aux procédures adéquates"
4347
4348 #. module: account_voucher
4349 #: field:account.voucher.line,type:0
4350@@ -31122,22 +31124,6 @@
4351 msgid "Repeat every x."
4352 msgstr "Répéter tous les x."
4353
4354-#. modules: account, supplier_catalogue, product, product_asset, mission_stock, msf_doc_import, return_claim
4355-#: selection:report.account.receivable,type:0
4356-#: view:stock.mission.report.line:0
4357-#: selection:stock.mission.report.line,subtype:0
4358-#: code:addons/msf_doc_import/wizard/__init__.py:68
4359-#: code:addons/msf_doc_import/wizard/__init__.py:73
4360-#: code:addons/msf_doc_import/wizard/__init__.py:78
4361-#: view:product.product:0
4362-#: view:product.asset:0
4363-#: selection:product.template,subtype:0
4364-#: view:return.claim:0
4365-#: view:supplier.catalogue.line:0
4366-#, python-format
4367-msgid "Asset"
4368-msgstr "Actifs"
4369-
4370 #. module: specific_rules
4371 #: code:addons/specific_rules/wizard/stock_partial_picking.py:41
4372 #, python-format
4373@@ -31171,7 +31157,7 @@
4374 #: code:addons/msf_doc_import/wizard/wizard_import_picking_line.py:292
4375 #, python-format
4376 msgid "Line %s in the Excel file was added to the file of the lines with error, an error is occurred. Details : %s"
4377-msgstr "Line %s in the Excel file was added to the file of the lines with error, an error is occurred. Details : %s"
4378+msgstr "La ligne %s du fichier Excel a été ajouté au fichier des erreurs, suite à l'apparition d'une erreur. Détails : %s"
4379
4380 #. module: base
4381 #: view:base.module.upgrade:0
4382@@ -31473,6 +31459,8 @@
4383 #: report:addons/stock/report/stock_reception_report_xls.mako:166
4384 #: report:addons/stock/report/stock_expired_damaged_report_xls.mako:170
4385 #: field:stock.expired.damaged.report,name:0
4386+#: report:addons/stock_override/report/report_stock_move_xls.mako:125
4387+#: report:addons/specific_rules/report/report_stock_inventory_xls.mako:132
4388 #: report:addons/stock/report/products_situation_report_xls.mako:140
4389 #: field:products.situation.report,report_date:0
4390 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:187
4391@@ -31632,6 +31620,7 @@
4392 #: selection:validate.move.processor,integrity_status:0
4393 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1637
4394 #: selection:stock.move.in.processor,sequence_issue:0
4395+#: code:addons/msf_outgoing/__init__.py:38
4396 #, python-format
4397 msgid "Expiry Date is Missing"
4398 msgstr "Date d'Expiration Manquante"
4399@@ -32326,8 +32315,9 @@
4400
4401 #. module: msf_outgoing
4402 #: report:packing.list:0
4403+#: report:addons/msf_outgoing/report/packing_list_xls.mako:421
4404 msgid "Total volume"
4405-msgstr "Total volume"
4406+msgstr "Volume total"
4407
4408 #. module: hr
4409 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
4410@@ -32481,7 +32471,7 @@
4411 #: code:addons/msf_outgoing/wizard/return_shipment_processor.py:80
4412 #, python-format
4413 msgid "You must select a quantity to return before performing the return."
4414-msgstr "You must select a quantity to return before performing the return."
4415+msgstr "Vous devez sélectionner une quantité avant de procéder au retour."
4416
4417 #. module: product
4418 #: help:product.category,sequence:0
4419@@ -32685,7 +32675,7 @@
4420 #: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:1386
4421 #, python-format
4422 msgid "UoM not found in database"
4423-msgstr "UdM non trouvé dans la base de données"
4424+msgstr "UdM non trouvée dans la base de données"
4425
4426 #. module: product_attributes
4427 #: field:product.product,new_code:0
4428@@ -32703,11 +32693,6 @@
4429 msgid "For Tax Type percent enter % ratio between 0-1."
4430 msgstr "Pour le Type de pourcentage de Taxe saisir le ratio % entre 0-1."
4431
4432-#. module: msf_budget
4433-#: report:msf.pdf.budget.monthly:0
4434-msgid "Jan"
4435-msgstr "Janvier"
4436-
4437 #. modules: object_query, msf_partner
4438 #: model:ir.module.module,shortdesc:msf_partner.module_meta_information
4439 #: model:ir.module.module,shortdesc:object_query.module_meta_information
4440@@ -32756,7 +32741,7 @@
4441 #: field:sale.order.line,created_by_rfq:0
4442 #: field:tender.line,created_by_rfq:0
4443 msgid "Created by RfQ"
4444-msgstr "Created by RfQ"
4445+msgstr "Créé par DdD"
4446
4447 #. module: account
4448 #: field:account.tax.template,description:0
4449@@ -32807,8 +32792,8 @@
4450 #, python-format
4451 msgid "SoQ quantity value (%s) is not consistent with UoM rounding value.\n"
4452 " The SoQ quantity has been automatically rounded to consistent value (%s)"
4453-msgstr "La valeur quantité (%s) QS ne correspond pas à la valeur UdM arrondie.\n"
4454-"La quantité QS a été automatiquement arrondie à une valeur correspondante (%s)"
4455+msgstr "La valeur quantité (%s) QcS ne correspond pas à la valeur UdM arrondie.\n"
4456+"La quantité QcS a été automatiquement arrondie à une valeur correspondante (%s)"
4457
4458 #. module: msf_outgoing
4459 #: code:addons/msf_outgoing/msf_outgoing.py:3112
4460@@ -32840,6 +32825,7 @@
4461 #. modules: purchase, purchase_override
4462 #: selection:purchase.order.line,state:0
4463 #: selection:purchase.order.merged.line,state:0
4464+#: selection:purchase.order.line,state_to_display:0
4465 msgid "Validated-n"
4466 msgstr "Validé-n"
4467
4468@@ -32853,7 +32839,17 @@
4469 #: report:kit.report:0
4470 #: report:procurement.request.report:0
4471 msgid "Creation Date :"
4472-msgstr "Creation Date :"
4473+msgstr "Date de Création :"
4474+
4475+#. module: kit
4476+#: report:kit.report:0
4477+msgid "THEORETICAL KIT COMPOSITION"
4478+msgstr "COMPOSITION DE KIT THÉORIQUE"
4479+
4480+#. module: kit
4481+#: report:kit.report:0
4482+msgid "KIT COMPOSITION LIST"
4483+msgstr "LISTE DE COMPOSITION DE KIT"
4484
4485 #. module: account_mcdb
4486 #: code:addons/account_mcdb/report/account_mcdb_export.py:57
4487@@ -32871,7 +32867,7 @@
4488 #. module: sales_followup
4489 #: report:sales.follow.up.multi.report_pdf:0
4490 msgid "Req. Delivery date:"
4491-msgstr "Req. Delivery date:"
4492+msgstr "Date Livraison Souhaité:"
4493
4494 #. module: stock_schedule
4495 #: selection:stock.frequence,name:0
4496@@ -33130,6 +33126,8 @@
4497 #: field:stock.warehouse,company_id:0
4498 #: field:stock.picking,company_id2:0
4499 #: field:tender,company_id:0
4500+#: field:ir.followup.location.wizard,company_id:0
4501+#: field:stock.reception.wizard,company_id:0
4502 msgid "Company"
4503 msgstr "Société"
4504
4505@@ -33477,6 +33475,7 @@
4506
4507 #. module: product_attributes, product
4508 #: selection:product.product,state_ud:0
4509+#: model:product.status,name:product_attributes.status_2
4510 #: selection:product.mass.update,product_state:0
4511 msgid "Phase Out"
4512 msgstr "Élimination"
4513@@ -33531,19 +33530,16 @@
4514
4515 #. module: consumption_calculation
4516 #: field:real.average.consumption.line,rac_id:0
4517+#: code:addons/consumption_calculation/history_consumption.py:707
4518+#: report:addons/consumption_calculation/report/weekly_forecast_report_xls.mako:104
4519+#, python-format
4520 msgid "RAC"
4521-msgstr "RAC (Consommations Moyennes Réelles) "
4522-
4523-#. module: tender_flow
4524-#: view:tender:0
4525-#: field:tender,sale_order_id:0
4526-msgid "Sale Order"
4527-msgstr "Document source"
4528+msgstr "CMR"
4529
4530 #. module: specific_rules
4531 #: field:stock.production.lot,src_product_id:0
4532 msgid "By product"
4533-msgstr "By product"
4534+msgstr "Par produit"
4535
4536 #. module: sale
4537 #: report:msf.product_list:0
4538@@ -33697,7 +33693,7 @@
4539 #. module: msf_budget
4540 #: report:msf.pdf.engagement:0
4541 msgid "Functional currency:"
4542-msgstr "Functional currency:"
4543+msgstr "Devise fonctionnelle:"
4544
4545 #. module: account_payment
4546 #: selection:payment.order,date_prefered:0
4547@@ -33765,7 +33761,7 @@
4548 " Stock mission report.\n"
4549 " "
4550 msgstr "\n"
4551-" Stock mission report.\n"
4552+" Rapport Stock de mission.\n"
4553 " "
4554
4555 #. module: msf_instance
4556@@ -34050,11 +34046,6 @@
4557 msgid "The number of days between Creation Date and Delivery Expected Date (%s) is less than the supplier lead-time (%s)."
4558 msgstr "Le nombre de jours entre Date de Création et Date de Livraison Souhaitée (%s) est inférieur à ceux du délai de livraison du fournisseur (%s)."
4559
4560-#. module: msf_config_locations
4561-#: view:stock.remove.location.wizard:0
4562-msgid "Inactivate the location"
4563-msgstr "Zone inactive"
4564-
4565 #. modules: account, account_override
4566 #: field:account.move.line,invoice_partner_link:0
4567 #: selection:account.journal.column,field:0
4568@@ -34081,9 +34072,10 @@
4569 " Specific Management Rules\n"
4570 " "
4571
4572-#. modules: procurement, product_list
4573+#. modules: procurement, product_list, product_attributes
4574 #: view:procurement.order:0
4575 #: selection:product.list,creator:0
4576+#: model:product.international.status,name:product_attributes.int_5
4577 msgid "Temporary"
4578 msgstr "Temporaire"
4579
4580@@ -34102,11 +34094,11 @@
4581 " and one category.\n"
4582 " If option \"Requirements by Order\" is set, the system will create a PO\n"
4583 " that merge lines coming from the same FO/IR."
4584-msgstr "Quand l'option \"Tous les pré-requis\" est définie pour un fournisseur donné, le système créera un BdC qui fusionnera tous les pré-requis pour ce fournisseur.\n"
4585-"Si l'option \"Pré-requis par projet\" est définie, les BdC seront créés par requérant intial (client du SO d'origin), c'est à dire que le ystème crée un BdC par projet pour ce fournisseur.\n"
4586-"Si l'option \"Pré-requis par Catégorie\" est définie, le système créera un BdC qui fusionnera tous les pré-requis par catégorie pour ce fournisseur.\n"
4587-"Si l'option \"Pré-requis par Catégorie et Projet\" est définie, le système créera un BdC qui fusionnera seulement les pré-requis d'un client et d'une catégorie.\n"
4588-"Si l'option \"Pré-requis par Commande\" est définie, le système créera un BdC qui fusionnera les lignes venant d'une seule commande (Interne ou Terrain)."
4589+msgstr "Quand l'option \"Tous les critères\" est définie pour un fournisseur donné, le système créera un BdC qui fusionnera tous les pré-requis pour ce fournisseur.\n"
4590+"Si l'option \"Critères par projet\" est définie, les BdC seront créés par requérant intial (client du SO d'origin), c'est à dire que le ystème crée un BdC par projet pour ce fournisseur.\n"
4591+"Si l'option \"Critères par Catégorie\" est définie, le système créera un BdC qui fusionnera tous les pré-requis par catégorie pour ce fournisseur.\n"
4592+"Si l'option \"Critères par Catégorie et Projet\" est définie, le système créera un BdC qui fusionnera seulement les pré-requis d'un client et d'une catégorie.\n"
4593+"Si l'option \"Critères par Commande\" est définie, le système créera un BdC qui fusionnera les lignes venant d'une seule commande (Interne ou Terrain)."
4594
4595 #. module: financing_contract
4596 #: field:financing.contract.format,actual_line_ids:0
4597@@ -34122,7 +34114,7 @@
4598 #: view:msf_field_access_rights.field_access_rule:0
4599 #: field:msf_field_access_rights.field_access_rule,domain_text:0
4600 msgid "Advanced Filter"
4601-msgstr "Advanced Filter"
4602+msgstr "Filtres Avancés"
4603
4604 #. module: update_client
4605 #: code:addons/update_client/wizard.py:70
4606@@ -34260,7 +34252,7 @@
4607 #: code:addons/return_claim/return_claim.py:1988
4608 #, python-format
4609 msgid "%s Event %s has been processed."
4610-msgstr "%s Evénement %s a été traité."
4611+msgstr "%s Événement %s a été traité."
4612
4613 #. module: sync_client
4614 #: view:sync.client.message_received:0
4615@@ -34296,8 +34288,9 @@
4616 msgid "A problem occurred: More than one register have this one as previous register!"
4617 msgstr "Un problème est survenu: Il y a plus d'un registre qui ait celui-ci comme registre précédent!"
4618
4619-#. module: specific_rules
4620+#. module: specific_rules, msf_outgoing
4621 #: code:addons/specific_rules/wizard/stock_partial_picking.py:63
4622+#: code:addons/msf_outgoing/report/picking_ticket.py:197
4623 #, python-format
4624 msgid "heat sensitive"
4625 msgstr "produits sensibles à la chaleur"
4626@@ -34308,11 +34301,6 @@
4627 msgid "Batchs"
4628 msgstr "Lots"
4629
4630-#. module: account_period_closing_level
4631-#: view:account.period:0
4632-msgid "Donation"
4633-msgstr "Donation"
4634-
4635 #. module: msf_config_locations
4636 #: model:stock.location,name:msf_config_locations.stock_location_view_all_stock
4637 msgid "All Stocks"
4638@@ -34418,7 +34406,6 @@
4639 #: model:ir.ui.menu,name:base.menu_sales
4640 #: selection:board.note,type:0
4641 #: model:process.process,name:sale.process_process_salesprocess0
4642-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
4643 msgid "Sales"
4644 msgstr "Commandes"
4645
4646@@ -34441,6 +34428,12 @@
4647 msgid "Line %s, column %s, float expected, found %s"
4648 msgstr "Line %s, column %s, float expected, found %s"
4649
4650+#. module: msf_doc_import
4651+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:980
4652+#, python-format
4653+msgid "Line %s of the Excel file: %s"
4654+msgstr "Ligne %s du fichier Excel: %s"
4655+
4656 #. module: base
4657 #: help:res.config.users,email:0
4658 #: help:res.users,email:0
4659@@ -34453,14 +34446,15 @@
4660
4661 #. module: product_attributes
4662 #: code:addons/product_attributes/product_attributes.py:1282
4663+#: report:addons/product_attributes/report/standard_price_track_changes.mako:104
4664 #, python-format
4665 msgid "Product creation"
4666-msgstr "Product creation"
4667+msgstr "Création du produit"
4668
4669 #. module: msf_budget
4670 #: report:msf.pdf.engagement:0
4671 msgid "Delivery confirmed date:"
4672-msgstr "Date confirmée de Livraison:"
4673+msgstr "Date de Livraison confirmée:"
4674
4675 #. module: base
4676 #: view:ir.module.module:0
4677@@ -34669,7 +34663,7 @@
4678 #. module: kit
4679 #: report:kit.report:0
4680 msgid "Product :"
4681-msgstr "Product :"
4682+msgstr "Produit :"
4683
4684 #. module: msf_doc_import
4685 #: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:325
4686@@ -34730,7 +34724,7 @@
4687 #. module: product_attributes
4688 #: view:product.deactivation.error:0
4689 msgid "Error documents"
4690-msgstr "Error documents"
4691+msgstr "Documents en erreur"
4692
4693 #. module: stock_override
4694 #: field:stock.location,check_cd:0
4695@@ -34843,16 +34837,6 @@
4696 msgid "Antarctica"
4697 msgstr "Antarctique"
4698
4699-#. modules: sales_followup, msf_doc_import, purchase_followup, sale, stock_schedule
4700-#: field:stock.frequence,calculated_end_date:0
4701-#: field:stock.frequence,end_date_ok:0
4702-#: field:msf.import.export,end_date:0
4703-#: field:po.track.changes.wizard,end_date:0
4704-#: field:sale.loan.stock.moves,end_date:0
4705-#: field:ir.track.changes.wizard,end_date:0
4706-msgid "End date"
4707-msgstr "Date de Fin"
4708-
4709 #. module: sale
4710 #: field:sale.order.line,product_uom_qty:0
4711 msgid "Quantity (UoM)"
4712@@ -34936,6 +34920,7 @@
4713 #: selection:wizard.advance.line,analytic_distribution_state:0
4714 #: selection:res.currency.table,state:0
4715 #: selection:purchase.order.merged.line,analytic_distribution_state:0
4716+#: model:product.status,name:product_attributes.status_1
4717 #: selection:product.mass.update,product_state:0
4718 msgid "Valid"
4719 msgstr "Valide"
4720@@ -35035,7 +35020,7 @@
4721 #: field:stock.warehouse.order.cycle.line,required_date:0
4722 #: field:threshold.value.line,required_date:0
4723 msgid "Required by date"
4724-msgstr "Required by date"
4725+msgstr "Requis pour la date du"
4726
4727 #. module: msf_outgoing
4728 #: code:addons/msf_outgoing/msf_outgoing.py:1955
4729@@ -35234,6 +35219,7 @@
4730 #: selection:stock.move.in.processor,sequence_issue:0
4731 #: selection:stock.move.processor,integrity_status:0
4732 #: selection:validate.move.processor,integrity_status:0
4733+#: code:addons/msf_outgoing/__init__.py:41
4734 msgid "Need Expiry Date (Internal) not Batch Number (Standard)"
4735 msgstr "Mention nécessaire d'une date d'expiration (Interne) mais pas d'un numéro de lot (Standard)"
4736
4737@@ -35418,7 +35404,6 @@
4738 #. modules: sales_followup, purchase, tender_flow, msf_partner, procurement_request
4739 #: model:ir.actions.act_window,name:msf_partner.act_res_partner_2_purchase_order
4740 #: model:ir.actions.wizard,name:procurement_request.wizard_request_to_order
4741-#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
4742 #: model:ir.actions.act_window,name:purchase.purchase_form_action
4743 #: model:ir.ui.menu,name:purchase.menu_purchase_form_action
4744 #: view:purchase.order:0
4745@@ -35537,7 +35522,7 @@
4746 msgid "Michigan"
4747 msgstr "Michigan"
4748
4749-#. modules: financing_contract, account_override, product_attributes, res_currency_tables, stock_override, analytic, purchase_followup, msf_supply_doc_export, stock, product, reason_types_moves, msf_homere_interface, msf_instance, base, msf_tools, msf_budget, sales_followup, account, msf_outgoing, resource, sale, analytic_distribution
4750+#. modules: financing_contract, account_override, product_attributes, res_currency_tables, stock_override, analytic, purchase_followup, msf_supply_doc_export, stock, product, reason_types_moves, msf_homere_interface, msf_instance, base, msf_tools, msf_budget, sales_followup, account, msf_outgoing, resource, sale, analytic_distribution, specific_rules
4751 #: field:account.account,code:0
4752 #: report:account.account.balance:0
4753 #: field:account.account.template,code:0
4754@@ -35596,6 +35581,10 @@
4755 #: report:sales.follow.up.multi.report_pdf:0
4756 #: field:stock.incoterms,code:0
4757 #: report:stock.card.report:0
4758+#: report:addons/msf_outgoing/report/packing_list_xls.mako:429
4759+#: report:addons/stock_override/report/stock_card_report_xls.mako:132
4760+#: report:addons/specific_rules/report/unconsistent_stock_report_xls.mako:92
4761+#: report:addons/msf_tools/report/report_stopped_products_xls.mako:79
4762 #: report:addons/stock/report/products_situation_report_xls.mako:216
4763 #: field:products.situation.report,p_code:0
4764 #, python-format
4765@@ -36079,7 +36068,7 @@
4766 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
4767 #: view:board.board:0
4768 msgid "Sales Manager Dashboard"
4769-msgstr "Tableau de bord du Gérant des commandes"
4770+msgstr "Tableau de bord des Commandes"
4771
4772 #. module: supplier_catalogue
4773 #: view:res.partner:0
4774@@ -36202,7 +36191,7 @@
4775 msgid "cancel_voucher - (account.voucher)"
4776 msgstr "cancel_voucher - (account.voucher)"
4777
4778-#. modules: sales_followup, msf_homere_interface, msf_field_access_rights, consumption_calculation, sale, update_client, product_attributes, purchase_followup, sf_doc_import, register_accounting, finance, msf_supply_doc_export, product_nomenclature, account_mcdb, product
4779+#. modules: sales_followup, msf_homere_interface, msf_field_access_rights, consumption_calculation, sale, update_client, product_attributes, purchase_followup, sf_doc_import, register_accounting, finance, msf_supply_doc_export, product_nomenclature, account_mcdb, product, hr, account_override, procurement, msf_accrual, sync_client, product_nomenclature, account_mcdb
4780 #: field:cash.request.liquidity,status:0
4781 #: field:cash.request.liquidity.bank,status:0
4782 #: field:cash.request.liquidity.cash,status:0
4783@@ -36236,6 +36225,16 @@
4784 #: field:product.nomenclature,status:0
4785 #: report:addons/account_mcdb/report/combined_journals_report.mako:273
4786 #: report:combined.journals.report.pdf:0
4787+#: field:account.move,status:0
4788+#: view:hr.employee:0
4789+#: field:msf.accrual.line,state:0
4790+#: view:hr.employee:0
4791+#: view:procurement.order:0
4792+#: view:product.product:0
4793+#: view:product.template:0
4794+#: field:product.template,state:0
4795+#: field:account.bank.statement.line,state:0
4796+#: field:sync.monitor,status:0
4797 #: field:product.mass.update,product_state:0
4798 #: field:product.mass.update,state:0
4799 #: report:addons/msf_supply_doc_export/report/supplier_performance_report_xls.mako:235
4800@@ -36564,7 +36563,7 @@
4801 #. module: msf_outgoing
4802 #: field:return.pack.shipment.family.processor,return_from:0
4803 msgid "Return from"
4804-msgstr "Return from"
4805+msgstr "Retourner à partir de"
4806
4807 #. module: analytic_distribution
4808 #: code:addons/analytic_distribution/wizard/analytic_distribution_wizard.py:1019
4809@@ -36760,7 +36759,7 @@
4810 #: field:product.asset,invo_date:0
4811 #: field:sale.make.invoice,invoice_date:0
4812 msgid "Invoice Date"
4813-msgstr "Date de Facture"
4814+msgstr "Date de Facturation"
4815
4816 #. modules: supplier_catalogue, msf_doc_import, order_line_number
4817 #: constraint:supplier.catalogue:0
4818@@ -37079,7 +37078,7 @@
4819 #: report:addons/sales_followup/report/ir_follow_up_location_report_xls.mako:292
4820 #: report:addons/sales_followup/report/sale_follow_up_multi_report_xls.mako:290
4821 msgid "UoM delivered"
4822-msgstr "UdM livré"
4823+msgstr "UdM livrée"
4824
4825 #. module: product
4826 #: field:product.supplierinfo,product_uom:0
4827@@ -37089,7 +37088,7 @@
4828 #. module: purchase
4829 #: view:purchase.order.line.manually.confirmed.wizard:0
4830 msgid "Confirm Purchase Order line"
4831-msgstr "Confirm Purchase Order line"
4832+msgstr "Confirmation des lignes de BdC"
4833
4834 #. module: purchase
4835 #: report:purchase.order:0
4836@@ -37176,7 +37175,8 @@
4837 " - Min. Order Qty\n"
4838 " - Comment\n"
4839 ""
4840-msgstr "Vous pouvez utiliser le modèle d'export pour le format dont vous avez besoin. Le fichier doit être au format feuille XML 2003.\n"
4841+msgstr "\n"
4842+"Vous pouvez utiliser le modèle d'export pour le format dont vous avez besoin. Le fichier doit être au format feuille XML 2003.\n"
4843 "Les colonnes doivent être dans cet ordre (* indique que le champs ne doit pas être vide):\n"
4844 " - Code Produit*\n"
4845 " - Description Produit\n"
4846@@ -37184,7 +37184,7 @@
4847 " - UdM*\n"
4848 " - Qté Min.*\n"
4849 " - Prix Unitaire*\n"
4850-" - Arrondi QS\n"
4851+" - Arrondi QcS\n"
4852 " - Qté Comamnde Min.\n"
4853 " - Commentaire\n"
4854 ""
4855@@ -37197,7 +37197,7 @@
4856 #. module: partner_modification
4857 #: selection:res.partner,po_by_project:0
4858 msgid "All requirements"
4859-msgstr "Tous les besoins"
4860+msgstr "Tous les critères"
4861
4862 #. module: base_report_designer
4863 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
4864@@ -37314,8 +37314,9 @@
4865
4866 #. module: msf_outgoing
4867 #: report:packing.list:0
4868+#: report:addons/msf_outgoing/report/packing_list_xls.mako:318
4869 msgid "Dispatch:"
4870-msgstr "Dispatch:"
4871+msgstr "Expédition:"
4872
4873 #. module: account_voucher
4874 #: field:account.voucher,analytic_id:0
4875@@ -37435,11 +37436,6 @@
4876 msgid "Spanish (UY) / Español (UY)"
4877 msgstr "Spanish (UY) / Español (UY)"
4878
4879-#. module: msf_budget
4880-#: report:msf.pdf.budget.monthly:0
4881-msgid "Jul"
4882-msgstr "Juillet"
4883-
4884 #. module: vertical_integration
4885 #: view:ocb.export.wizard:0
4886 #: view:ocba.export.wizard:0
4887@@ -37452,17 +37448,7 @@
4888 msgid "Export to HQ system"
4889 msgstr "Export au système HQ"
4890
4891-#. module: msf_instance
4892-#: field:msf.instance.cloud,reconcile_prefix:0
4893-msgid "Reconcilation prefix"
4894-msgstr "Reconcilation prefix"
4895-
4896-#. module: msf_outgoing
4897-#: selection:stock.picking,line_state:0
4898-msgid "Partially available"
4899-msgstr "Partiellement disponible"
4900-
4901-#. modules: product, account, base, finance, useability_dashboard_and_menu, account_mcdb
4902+#. modules: product, account, base, finance, useability_dashboard_and_menu, account_mcdb, msf_partners
4903 #: field:account.partner.ledger,partner_ids:0
4904 #: model:ir.ui.menu,name:account.next_id_22
4905 #: view:res.partner:0
4906@@ -37473,6 +37459,7 @@
4907 #: field:wizard.account.partner.balance.tree,partner_ids:0
4908 #: field:product.template,seller_ids:0
4909 #: model:ir.ui.menu,name:useability_dashboard_and_menu.menu_partner
4910+#: model:ir.actions.act_window,name:msf_partner.partner_normal_action
4911 msgid "Partners"
4912 msgstr "Partenaires"
4913
4914@@ -37523,7 +37510,7 @@
4915 #. module: msf_supply_doc_export
4916 #: report:po.follow.up_rml:0
4917 msgid "Report Run Date:"
4918-msgstr "Rapport généré le"
4919+msgstr "Date de génération:"
4920
4921 #. module: account_payment
4922 #: view:payment.order:0
4923@@ -37606,7 +37593,7 @@
4924 #. module: msf_outgoing
4925 #: report:empty.picking.ticket:0
4926 msgid "Total Qty to pack"
4927-msgstr "Total Qty to pack"
4928+msgstr "Qté totale à coliser"
4929
4930 #. module: account
4931 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
4932@@ -37742,7 +37729,7 @@
4933 " WARNING: The requested date of this purchase order is in the past.\n"
4934 " "
4935 msgstr "\n"
4936-" WARNING: The requested date of this purchase order is in the past.\n"
4937+" ATTENTION: La Date de Livraison Souhaitée est déjà passée.\n"
4938 " "
4939
4940 #. modules: base, unifield_setup
4941@@ -37852,7 +37839,7 @@
4942 #: view:product.asset.type:0
4943 #: field:product.template,asset_type_id:0
4944 msgid "Asset Type"
4945-msgstr "Bien - Type"
4946+msgstr "Actif - Type"
4947
4948 #. module: analytic_distribution
4949 #: view:mass.reallocation.wizard:0
4950@@ -37870,7 +37857,7 @@
4951 msgid "On Multiple Doc."
4952 msgstr "Sur Plusieurs Documents"
4953
4954-#. modules: tender_flow, financing_contract, product_asset, account_corrections, product_attributes, msf_accrual, analytic_override, sync_client, account_mcdb, res_currency_tables, procurement_request, stock_forecast, board, stock_override, msf_doc_import, stock, finance, msf_homere_interface, account_voucher, base, kit, stock_schedule, account, msf_outgoing, resource, msf_audittrail
4955+#. modules: tender_flow, financing_contract, product_asset, account_corrections, product_attributes, msf_accrual, analytic_override, sync_client, account_mcdb, res_currency_tables, procurement_request, stock_forecast, board, stock_override, msf_doc_import, stock, finance, msf_homere_interface, account_voucher, base, kit, stock_schedule, account, msf_outgoing, resource, msf_audittrail, stock_move_tracking
4956 #: selection:account.aged.trial.balance,filter:0
4957 #: report:account.analytic.account.journal:0
4958 #: field:account.bank.statement,date:0
4959@@ -37984,6 +37971,9 @@
4960 #: report:addons/tender_flow/report/tender_rfq_comparison_xls.mako:658
4961 #: report:empty.picking.ticket:0
4962 #: report:picking.ticket:0
4963+#: report:addons/product_attributes/report/standard_price_track_changes.mako:89
4964+#: report:addons/msf_audittrail/report/log_line_xls.mako:72
4965+#: report:tracking.move.report:0
4966 #: code:addons/msf_doc_import/wizard/wizard_import_ppl_to_create_ship.py:71
4967 #, python-format
4968 msgid "Date"
4969@@ -38069,7 +38059,7 @@
4970 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:68
4971 #, python-format
4972 msgid "Product Qty"
4973-msgstr "Product Qty"
4974+msgstr "Qté Produit"
4975
4976 #. module: purchase_double_validation
4977 #: view:purchase.double.validation.installer:0
4978@@ -38109,6 +38099,7 @@
4979 #: field:supplier.catalogue,period_from:0
4980 #: field:supplier.historical.catalogue,from_date:0
4981 #: field:stock.expired.damaged.report,date_from:0
4982+#: report:addons/stock_override/report/stock_card_report_xls.mako:112
4983 #: code:addons/stock_override/report/report_stock_move.py:739
4984 msgid "From"
4985 msgstr "De"
4986@@ -38147,7 +38138,7 @@
4987 msgid "Macau"
4988 msgstr "Macao"
4989
4990-#. modules: purchase, account, finance, account_mcdb, procurement_request, purchase_override, sale, account_override, purchase_allocation_report, register_accounting, msf_supply_doc_export
4991+#. modules: purchase, account, finance, account_mcdb, procurement_request, purchase_override, sale, account_override, purchase_allocation_report, register_accounting, msf_supply_doc_export, sales_followup
4992 #: field:account.invoice.line,price_subtotal:0
4993 #: report:account.partner.balance:0
4994 #: report:addons/account_mcdb/report/report_account_analytic_line_free_xls.mako:98
4995@@ -38178,6 +38169,7 @@
4996 #: report:account.third_party_ledger:0
4997 #: report:account.third_party_ledger_other:0
4998 #: report:addons/account/report/account_partner_ledger.mako:364
4999+#: report:addons/sales_followup/report/ir_track_changes_report_xls.mako:235
5000 msgid "Subtotal"
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches