Unifield Server

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

  1. us-1125
  2. Merge into trunk
Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4034
Proposed branch: lp:~unifield-team/unifield-server/us-1125
Merge into: lp:unifield-server
Diff against target: 967 lines (+298/-22)
38 files modified
bin/addons/delivery_mechanism/delivery_mechanism.py (+8/-2)
bin/addons/msf_outgoing/msf_outgoing.py (+4/-2)
bin/addons/msf_outgoing/msf_outgoing_view.xml (+7/-2)
bin/addons/msf_outgoing/report/empty_picking_ticket.rml (+100/-1)
bin/addons/msf_outgoing/report/packing_list.rml (+1/-1)
bin/addons/msf_outgoing/report/packing_list_xls.mako (+1/-1)
bin/addons/msf_outgoing/report/picking_ticket.py (+1/-0)
bin/addons/msf_outgoing/report/picking_ticket.rml (+1/-1)
bin/addons/msf_outgoing/wizard/create_picking_processor.py (+12/-0)
bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py (+22/-0)
bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/internal_move_processor.py (+12/-0)
bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py (+12/-0)
bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/picking_processor.py (+14/-1)
bin/addons/msf_outgoing/wizard/picking_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/ppl_processor.py (+12/-0)
bin/addons/msf_outgoing/wizard/ppl_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/return_ppl_processor.py (+12/-0)
bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml (+1/-0)
bin/addons/msf_outgoing/wizard/validate_picking_processor.py (+12/-0)
bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml (+1/-0)
bin/addons/msf_printed_documents/report/report_reception.rml (+1/-1)
bin/addons/msf_profile/i18n/fr_MF.po (+12/-0)
bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako (+2/-0)
bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv (+3/-3)
bin/addons/purchase_compare_rfq/wizard/compare_rfq.py (+1/-0)
bin/addons/purchase_override/purchase.py (+3/-2)
bin/addons/sale_override/sale.py (+1/-0)
bin/addons/sourcing/procurement_order.py (+3/-0)
bin/addons/stock_override/report/delivery_order.rml (+8/-2)
bin/addons/stock_override/report/internal_move.rml (+8/-2)
bin/addons/stock_override/stock_view.xml (+5/-0)
bin/addons/sync_so/picking.py (+9/-1)
bin/addons/sync_so/purchase.py (+1/-0)
bin/addons/tender_flow/tender_flow.py (+2/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1125
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+309869@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/delivery_mechanism/delivery_mechanism.py'
2--- bin/addons/delivery_mechanism/delivery_mechanism.py 2016-08-23 12:54:03 +0000
3+++ bin/addons/delivery_mechanism/delivery_mechanism.py 2016-11-09 08:29:21 +0000
4@@ -783,6 +783,7 @@
5 'prodlot_id': line.prodlot_id and line.prodlot_id.id or False,
6 'asset_id': line.asset_id and line.asset_id.id or False,
7 'change_reason': line.change_reason,
8+ 'comment': line.comment or move.comment,
9 # Values from incoming wizard
10 'direct_incoming': line.wizard_id.direct_incoming,
11 # Values for Direct Purchase Order
12@@ -850,7 +851,7 @@
13
14 if wizard.dest_type != 'to_cross_docking':
15 values['direct_incoming'] = wizard.direct_incoming
16-
17+
18 return values
19
20 def update_processing_info(self, cr, uid, picking_id, prog_id=False, values=None, context=None):
21@@ -1598,13 +1599,14 @@
22 # give the purchase order line a link to corresponding procurement
23 procurement = kwargs['procurement']
24 line.update({'procurement_id': procurement.id, })
25+
26 # for Internal Request (IR) on make_to_order we update PO line data according to the data of the IR (=sale_order)
27 sale_order_line_ids = sale_obj.search(cr, uid, [('procurement_id', '=', procurement.id)], context=context)
28 for sol in sale_obj.browse(cr, uid, sale_order_line_ids, context=context):
29 if (sol.order_id.procurement_request or procurement.supplier.partner_type == 'esc') and not sol.product_id and sol.comment:
30 line.update({'product_id': False,
31 'name': 'Description: %s' % sol.comment,
32- 'comment': sol.comment,
33+ 'comment': procurement.tender_line_id and procurement.tender_line_id.comment or sol.comment,
34 'product_qty': sol.product_uom_qty,
35 'price_unit': sol.price_unit,
36 'date_planned': sol.date_planned,
37@@ -1619,6 +1621,10 @@
38 'nomen_sub_3': sol.nomen_sub_3.id or False,
39 'nomen_sub_4': sol.nomen_sub_4.id or False,
40 'nomen_sub_5': sol.nomen_sub_5.id or False})
41+
42+ if procurement.tender_line_id and procurement.tender_line_id.purchase_order_line_id and procurement.tender_line_id.purchase_order_line_id.comment:
43+ line['comment'] = procurement.tender_line_id.purchase_order_line_id.comment
44+
45 return line
46
47 procurement_order()
48
49=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
50--- bin/addons/msf_outgoing/msf_outgoing.py 2016-10-25 07:49:35 +0000
51+++ bin/addons/msf_outgoing/msf_outgoing.py 2016-11-09 08:29:21 +0000
52@@ -4931,14 +4931,15 @@
53 '_name'::varchar(5) as name,
54 min(pl.currency_id) as currency_id,
55 sum(sol.price_unit * m.product_qty) as total_amount,
56- bool_and(m.not_shipped) as not_shipped
57+ bool_and(m.not_shipped) as not_shipped,
58+ m.comment as comment
59 from stock_picking p
60 inner join stock_move m on m.picking_id = p.id and m.state != 'cancel' and m.product_qty > 0
61 left join sale_order so on so.id = p.sale_id
62 left join sale_order_line sol on sol.id = m.sale_line_id
63 left join product_pricelist pl on pl.id = so.pricelist_id
64 where p.shipment_id is not null
65- group by p.shipment_id, p.description_ppl, to_pack, sale_id, p.subtype, p.id, p.previous_step_id
66+ group by p.shipment_id, p.description_ppl, to_pack, sale_id, p.subtype, p.id, p.previous_step_id, m.comment
67 )
68 ''')
69
70@@ -5033,6 +5034,7 @@
71 'total_volume': fields.function(_vals_get, method=True, type='float', string=u'Total Volume[dm³]', multi='get_vals',),
72 'description_ppl': fields.char('Description', size=256),
73 'not_shipped': fields.boolean(string='Not shipped'),
74+ 'comment': fields.char(string='Comment', size=1024)
75 }
76
77 _defaults = {
78
79=== modified file 'bin/addons/msf_outgoing/msf_outgoing_view.xml'
80--- bin/addons/msf_outgoing/msf_outgoing_view.xml 2016-05-30 07:12:04 +0000
81+++ bin/addons/msf_outgoing/msf_outgoing_view.xml 2016-11-09 08:29:21 +0000
82@@ -227,6 +227,7 @@
83 <tree string="Stock Moves" noteditable="fake_state in ('assigned', 'cancel')" hide_new_button="context.get('from_wkf')" hide_delete_button="True"
84 colors="red: inactive_product==True">
85 <field name="product_id" context="{'available_for_restriction': 'picking', 'search_default_not_restricted': 1}"/>
86+ <field name="comment" />
87 <field name="composition_list_id" />
88 <field name="product_qty" string="Qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
89 <field name="product_uom" string="UoM"/>
90@@ -279,6 +280,7 @@
91 domain="[('uom_by_product', '=', product_id)]"
92 />
93 <field name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4" invisible="1" />
94+ <field name="comment" colspan="4" />
95 </group>
96 <group colspan="2" col="2">
97 <separator string="Locations" colspan="2" />
98@@ -612,6 +614,7 @@
99 <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines and [move_lines[-1]] or [], 'address_out_id': address_id}" attrs="{'readonly': [ ('from_wkf', '=', True),('state','in',['draft','confirmed','assigned']) ]}" >
100 <tree string="Stock Moves" hide_new_button="True" colors="red: inactive_product==True">
101 <field name="product_id" context="{'available_for_restriction': 'picking', 'search_default_not_restricted': 1}" />
102+ <field name="comment" />
103 <field name="composition_list_id" />
104 <field name="product_qty" string="Qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
105 <field name="product_uom" string="UoM"/>
106@@ -649,9 +652,10 @@
107 <field name="composition_list_id" invisible="True" />
108 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
109 <field name="product_uom" string="Unit Of Measure" colspan="2" domain="[('uom_by_product', '=', product_id)]"/>
110- <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" />
111- <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" />
112+ <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" />
113+ <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="2" />
114 <field name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4" invisible="1" />
115+ <field name="comment" colspan="4" />
116 </group>
117 <group colspan="2" col="2">
118 <separator string="Locations" colspan="2" />
119@@ -1267,6 +1271,7 @@
120 <field name="location_id" />
121 <field name="location_dest_id" />
122 <field name="state" />
123+ <field name="comment" />
124 <field name="move_lines" nolabel="True" colspan="4" mode="tree" readonly="True">
125 <tree colors="red: inactive_product==True">
126 <field name="name" />
127
128=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
129--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml 2016-07-28 12:34:28 +0000
130+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml 2016-11-09 08:29:21 +0000
131@@ -58,6 +58,17 @@
132 <blockBackground colorName="#c0c0c0" start="0,1" stop="-1,-1" />
133 <lineStyle kind="OUTLINE" colorName="black" start="-5,0" stop="-1,0" />
134 <lineStyle kind="GRID" colorName="black" start="0,1" stop="-1,-1" />
135+ <blockSpan start="0,1" stop="0,-1" />
136+ <blockSpan start="3,1" stop="3,-1" />
137+ <blockSpan start="4,1" stop="4,-1" />
138+ <blockSpan start="5,1" stop="5,-1" />
139+ <blockSpan start="6,1" stop="6,-1" />
140+ <blockSpan start="7,1" stop="7,-1" />
141+ <blockSpan start="8,1" stop="8,-1" />
142+ <blockSpan start="9,1" stop="9,-1" />
143+ <blockSpan start="10,1" stop="10,-1" />
144+ <blockSpan start="11,1" stop="11,-1" />
145+ <blockSpan start="12,1" stop="12,-1" />
146 </blockTableStyle>
147
148 <blockTableStyle id="LinesValues">
149@@ -251,6 +262,50 @@
150 <para style="LineHeader">(w x l x h) (cm)</para>
151 </td>
152 </tr>
153+ <tr>
154+ <td>
155+ <para style="LineHeader"></para>
156+ </td>
157+ <td>
158+ <para style="LineHeaderLeft"></para>
159+ </td>
160+ <td>
161+ <para style="LineHeaderLeft">Comment</para>
162+ </td>
163+ <td>
164+ <para style="LineHeader"></para>
165+ </td>
166+ <td>
167+ <para style="LineHeader"></para>
168+ </td>
169+ <td>
170+ <para style="LineHeader"></para>
171+ </td>
172+ <td>
173+ <para style="LineHeader"></para>
174+ </td>
175+ <td>
176+ <para style="LineHeader"></para>
177+ </td>
178+ <td>
179+ <para style="LineHeader"></para>
180+ </td>
181+ <td>
182+ <para style="LineHeader"></para>
183+ </td>
184+ <td>
185+ <para style="LineHeader"></para>
186+ </td>
187+ <td>
188+ <para style="LineHeader"></para>
189+ </td>
190+ <td>
191+ <para style="LineHeader"></para>
192+ </td>
193+ <td>
194+ <para style="LineHeader"></para>
195+ </td>
196+ </tr>
197 </blockTable>
198
199 <pto>
200@@ -344,6 +399,50 @@
201 <para style="LineHeader">Size (w x l x h) (cm)</para>
202 </td>
203 </tr>
204+ <tr>
205+ <td>
206+ <para style="LineHeader"></para>
207+ </td>
208+ <td>
209+ <para style="LineHeaderLeft"></para>
210+ </td>
211+ <td>
212+ <para style="LineHeaderLeft">Comment</para>
213+ </td>
214+ <td>
215+ <para style="LineHeader"></para>
216+ </td>
217+ <td>
218+ <para style="LineHeader"></para>
219+ </td>
220+ <td>
221+ <para style="LineHeader"></para>
222+ </td>
223+ <td>
224+ <para style="LineHeader"></para>
225+ </td>
226+ <td>
227+ <para style="LineHeader"></para>
228+ </td>
229+ <td>
230+ <para style="LineHeader"></para>
231+ </td>
232+ <td>
233+ <para style="LineHeader"></para>
234+ </td>
235+ <td>
236+ <para style="LineHeader"></para>
237+ </td>
238+ <td>
239+ <para style="LineHeader"></para>
240+ </td>
241+ <td>
242+ <para style="LineHeader"></para>
243+ </td>
244+ <td>
245+ <para style="LineHeader"></para>
246+ </td>
247+ </tr>
248 </blockTable>
249 </pto_header>
250
251@@ -409,7 +508,7 @@
252 <para style="LineValue"></para>
253 </td>
254 <td>
255- <para style="LineValue"></para>
256+ <para style="LineValueLeft">[[ m.comment ]]</para>
257 </td>
258 <td>
259 <para style="LineValue"></para>
260
261=== modified file 'bin/addons/msf_outgoing/report/packing_list.rml'
262--- bin/addons/msf_outgoing/report/packing_list.rml 2016-03-22 08:24:13 +0000
263+++ bin/addons/msf_outgoing/report/packing_list.rml 2016-11-09 08:29:21 +0000
264@@ -252,7 +252,7 @@
265 <para style="ParcelLineValue">[[ m.product_id.name ]]</para>
266 </td>
267 <td>
268- <para style="ParcelLineValue">[[ m.sale_line_id and m.sale_line_id.notes or '' ]]</para>
269+ <para style="ParcelLineValue">[[ m.comment or '' ]]</para>
270 </td>
271 <td>
272 <para style="ParcelLineValue">[[ formatLang(m.product_qty or 0.00) ]] [[ m.product_uom.name ]]</para>
273
274=== modified file 'bin/addons/msf_outgoing/report/packing_list_xls.mako'
275--- bin/addons/msf_outgoing/report/packing_list_xls.mako 2016-03-22 08:24:13 +0000
276+++ bin/addons/msf_outgoing/report/packing_list_xls.mako 2016-11-09 08:29:21 +0000
277@@ -441,7 +441,7 @@
278 <Cell ss:StyleID="s134"><Data ss:Type="Number">${(m.line_number)|x}</Data></Cell>
279 <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.default_code)|x}</Data></Cell>
280 <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.name)|x}</Data></Cell>
281- <Cell ss:StyleID="s134" ss:MergeAcross="2"><Data ss:Type="String">${(m.sale_line_id and m.sale_line_id.notes or '')|x}</Data></Cell>
282+ <Cell ss:StyleID="s134" ss:MergeAcross="2"><Data ss:Type="String">${(m.comment or '')|x}</Data></Cell>
283 <Cell ss:StyleID="s134"><Data ss:Type="String">${(formatLang(m.product_qty or 0.00))|x} ${(m.product_uom.name)|x}</Data></Cell>
284 <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.prodlot_id.name or '')|x}</Data></Cell>
285 % if m.prodlot_id.life_date and m.prodlot_id.life_date not in (False, 'False'):
286
287=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.py'
288--- bin/addons/msf_outgoing/report/picking_ticket.py 2016-07-28 12:32:01 +0000
289+++ bin/addons/msf_outgoing/report/picking_ticket.py 2016-11-09 08:29:21 +0000
290@@ -36,6 +36,7 @@
291 self.sale_line_id = move.sale_line_id
292 self.product_uom = move.product_id.uom_id
293 self.state = move.state
294+ self.comment = move.comment
295 self.product_qty = 0.00
296 self.prodlot_id = None
297 self.kc_check = False
298
299=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
300--- bin/addons/msf_outgoing/report/picking_ticket.rml 2016-07-28 12:32:01 +0000
301+++ bin/addons/msf_outgoing/report/picking_ticket.rml 2016-11-09 08:29:21 +0000
302@@ -414,7 +414,7 @@
303 <para style="LineValue"></para>
304 </td>
305 <td>
306- <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.notes or '' ]]</para>
307+ <para style="LineValueLeft">[[ m.comment or '' ]]</para>
308 </td>
309 <td>
310 <para style="LineValueLeft">[[ m.sale_line_id and m.sale_line_id.product_id != m.product_id and '[%s] %s' % (m.product_id.default_code, m.product_id.name) or '' ]]</para>
311
312=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor.py'
313--- bin/addons/msf_outgoing/wizard/create_picking_processor.py 2016-03-08 15:48:47 +0000
314+++ bin/addons/msf_outgoing/wizard/create_picking_processor.py 2016-11-09 08:29:21 +0000
315@@ -103,6 +103,18 @@
316 help="Expected product to receive",
317 multi='move_info',
318 ),
319+ 'comment': fields.function(
320+ _get_move_info,
321+ method=True,
322+ string='Comment',
323+ type='text',
324+ store={
325+ 'create.picking.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
326+ },
327+ readonly=True,
328+ help="Comment of the move",
329+ multi='move_info',
330+ ),
331 'ordered_uom_id': fields.function(
332 _get_move_info,
333 method=True,
334
335=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml'
336--- bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml 2016-03-17 08:30:04 +0000
337+++ bin/addons/msf_outgoing/wizard/create_picking_processor_view.xml 2016-11-09 08:29:21 +0000
338@@ -46,6 +46,7 @@
339 <!-- Visible fields -->
340 <field name="line_number" string="Line" />
341 <field name="product_id" string="Product" />
342+ <field name="comment" readonly="1" />
343 <button name="open_change_product_wizard"
344 type="object"
345 icon="gtk-convert"
346
347=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
348--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py 2016-07-25 08:20:05 +0000
349+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py 2016-11-09 08:29:21 +0000
350@@ -488,6 +488,15 @@
351 res[id] = False
352 return res
353
354+ def _set_comment(self, cr, uid, ml_id, name=None, value=None, fnct_inv_arg=None, context=None):
355+ """
356+ Just used to not break default OpenERP behaviour
357+ """
358+ if name and value:
359+ sql = "UPDATE "+ self._table + " SET " + name + " = %s WHERE id = %s"
360+ cr.execute(sql, (value, ml_id))
361+ return True
362+
363 _columns = {
364 # Parent wizard
365 'wizard_id': fields.many2one(
366@@ -512,6 +521,19 @@
367 help="Expected product to receive",
368 multi='move_info',
369 ),
370+ 'comment': fields.function(
371+ _get_move_info,
372+ fnct_inv=_set_comment,
373+ method=True,
374+ string='Comment',
375+ type='text',
376+ store={
377+ 'stock.move.in.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
378+ },
379+ readonly=True,
380+ help="Comment of the move",
381+ multi='move_info',
382+ ),
383 'ordered_uom_id': fields.function(
384 _get_move_info,
385 method=True,
386
387=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml'
388--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2016-03-17 08:30:04 +0000
389+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor_view.xml 2016-11-09 08:29:21 +0000
390@@ -111,6 +111,7 @@
391 <!-- Visible fields -->
392 <field name="line_number" string="Line" />
393 <field name="product_id" string="Product" />
394+ <field name="comment" readonly="1" />
395 <field name="batch_location_ids" invisible="1" />
396 <button name="open_change_product_wizard"
397 type="object"
398
399=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor.py'
400--- bin/addons/msf_outgoing/wizard/internal_move_processor.py 2016-03-08 15:48:47 +0000
401+++ bin/addons/msf_outgoing/wizard/internal_move_processor.py 2016-11-09 08:29:21 +0000
402@@ -402,6 +402,18 @@
403 help="Expected product to receive",
404 multi='move_info',
405 ),
406+ 'comment': fields.function(
407+ _get_move_info,
408+ method=True,
409+ string='Comment',
410+ type='text',
411+ store={
412+ 'internal.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
413+ },
414+ readonly=True,
415+ help="Comment of the move",
416+ multi='move_info',
417+ ),
418 'ordered_uom_id': fields.function(
419 _get_move_info,
420 method=True,
421
422=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml'
423--- bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml 2016-03-17 08:37:36 +0000
424+++ bin/addons/msf_outgoing/wizard/internal_move_processor_view.xml 2016-11-09 08:29:21 +0000
425@@ -66,6 +66,7 @@
426 <!-- Visible fields -->
427 <field name="line_number" string="Line" />
428 <field name="product_id" string="Product" />
429+ <field name="comment" readonly="1" />
430 <button name="open_change_product_wizard"
431 type="object"
432 icon="gtk-convert"
433
434=== modified file 'bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py'
435--- bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py 2016-03-08 15:48:47 +0000
436+++ bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py 2016-11-09 08:29:21 +0000
437@@ -190,6 +190,18 @@
438 help="Expected product to receive",
439 multi='move_info',
440 ),
441+ 'comment': fields.function(
442+ _get_move_info,
443+ method=True,
444+ string='Comment',
445+ type='text',
446+ store={
447+ 'outgoing.delivery.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
448+ },
449+ readonly=True,
450+ help="Comment of the move",
451+ multi='move_info',
452+ ),
453 'ordered_uom_id': fields.function(
454 _get_move_info,
455 method=True,
456
457=== modified file 'bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml'
458--- bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml 2016-03-17 08:37:36 +0000
459+++ bin/addons/msf_outgoing/wizard/outgoing_delivery_processor_view.xml 2016-11-09 08:29:21 +0000
460@@ -46,6 +46,7 @@
461 <!-- Visible fields -->
462 <field name="line_number" string="Line" />
463 <field name="product_id" string="Product" />
464+ <field name="comment" readonly="1" />
465 <button name="open_change_product_wizard"
466 type="object"
467 icon="gtk-convert"
468
469=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor.py'
470--- bin/addons/msf_outgoing/wizard/picking_processor.py 2016-08-18 08:32:03 +0000
471+++ bin/addons/msf_outgoing/wizard/picking_processor.py 2016-11-09 08:29:21 +0000
472@@ -238,7 +238,7 @@
473
474 for line in self.browse(cr, uid, ids, context=context):
475 # Return an error if the move has no product defined
476- if not line.move_id.product_id:
477+ if not line.move_id or not line.move_id.product_id:
478 raise osv.except_osv(
479 _('Data Error'),
480 _('The move you are trying to process has no product defined - Please set a product on it before process it.')
481@@ -268,6 +268,7 @@
482 'location_id': location_id,
483 'location_supplier_customer_mem_out': loc_supplier or loc_cust or valid_pt,
484 'type_check': line.move_id.picking_id.type,
485+ 'comment': line.move_id.comment,
486 }
487
488 return res
489@@ -452,6 +453,18 @@
490 help="Expected product to receive",
491 multi='move_info',
492 ),
493+ 'comment': fields.function(
494+ _get_move_info,
495+ method=True,
496+ string='Comment',
497+ type='text',
498+ store={
499+ 'stock.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
500+ },
501+ readonly=True,
502+ help="Comment of the move",
503+ multi='move_info',
504+ ),
505 'quantity': fields.float(
506 string='Quantity',
507 digits_compute=dp.get_precision('Product UoM'),
508
509=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor_view.xml'
510--- bin/addons/msf_outgoing/wizard/picking_processor_view.xml 2016-03-17 08:37:36 +0000
511+++ bin/addons/msf_outgoing/wizard/picking_processor_view.xml 2016-11-09 08:29:21 +0000
512@@ -46,6 +46,7 @@
513 <!-- Visible fields -->
514 <field name="line_number" string="Line" />
515 <field name="product_id" string="Product" />
516+ <field name="comment" readonly="1" />
517 <button name="open_change_product_wizard"
518 type="object"
519 icon="gtk-convert"
520
521=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor.py'
522--- bin/addons/msf_outgoing/wizard/ppl_processor.py 2016-08-18 08:32:03 +0000
523+++ bin/addons/msf_outgoing/wizard/ppl_processor.py 2016-11-09 08:29:21 +0000
524@@ -440,6 +440,18 @@
525 help="Expected product to receive",
526 multi='move_info',
527 ),
528+ 'comment': fields.function(
529+ _get_move_info,
530+ method=True,
531+ string='Comment',
532+ type='text',
533+ store={
534+ 'ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
535+ },
536+ readonly=True,
537+ help="Comment of the move",
538+ multi='move_info',
539+ ),
540 'ordered_uom_id': fields.function(
541 _get_move_info,
542 method=True,
543
544=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor_view.xml'
545--- bin/addons/msf_outgoing/wizard/ppl_processor_view.xml 2016-03-17 08:37:36 +0000
546+++ bin/addons/msf_outgoing/wizard/ppl_processor_view.xml 2016-11-09 08:29:21 +0000
547@@ -66,6 +66,7 @@
548 string="Product"
549 readonly="1"
550 />
551+ <field name="comment" readonly="1" />
552 <field name="asset_id" readonly="1" />
553 <field name="composition_list_id" readonly="1" />
554 <field name="quantity"
555
556=== modified file 'bin/addons/msf_outgoing/wizard/return_ppl_processor.py'
557--- bin/addons/msf_outgoing/wizard/return_ppl_processor.py 2016-03-08 15:48:47 +0000
558+++ bin/addons/msf_outgoing/wizard/return_ppl_processor.py 2016-11-09 08:29:21 +0000
559@@ -142,6 +142,18 @@
560 help="Expected product to receive",
561 multi='move_info',
562 ),
563+ 'comment': fields.function(
564+ _get_move_info,
565+ method=True,
566+ string='Comment',
567+ type='text',
568+ store={
569+ 'return.ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
570+ },
571+ readonly=True,
572+ help="Comment of the move",
573+ multi='move_info',
574+ ),
575 'ordered_uom_id': fields.function(
576 _get_move_info,
577 method=True,
578
579=== modified file 'bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml'
580--- bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml 2016-03-17 08:37:36 +0000
581+++ bin/addons/msf_outgoing/wizard/return_ppl_processor_view.xml 2016-11-09 08:29:21 +0000
582@@ -47,6 +47,7 @@
583 string="Product"
584 readonly="1"
585 />
586+ <field name="comment" readonly="1" />
587 <field name="asset_id" readonly="1" />
588 <field name="composition_list_id" readonly="1" />
589 <field name="ordered_quantity" readonly="1" />
590
591=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor.py'
592--- bin/addons/msf_outgoing/wizard/validate_picking_processor.py 2016-03-08 15:48:47 +0000
593+++ bin/addons/msf_outgoing/wizard/validate_picking_processor.py 2016-11-09 08:29:21 +0000
594@@ -197,6 +197,18 @@
595 help="Expected product to receive",
596 multi='move_info',
597 ),
598+ 'comment': fields.function(
599+ _get_move_info,
600+ method=True,
601+ string='Comment',
602+ type='text',
603+ store={
604+ 'validate.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['move_id'], 20),
605+ },
606+ readonly=True,
607+ help="Comment of the move",
608+ multi='move_info',
609+ ),
610 'ordered_uom_id': fields.function(
611 _get_move_info,
612 method=True,
613
614=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml'
615--- bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml 2016-03-17 08:37:36 +0000
616+++ bin/addons/msf_outgoing/wizard/validate_picking_processor_view.xml 2016-11-09 08:29:21 +0000
617@@ -52,6 +52,7 @@
618 string="Change Product"
619 attrs="{'invisible': [('type_check', '!=', 'in')]}"
620 />
621+ <field name="comment" readonly="1" />
622 <field name="asset_id"
623 domain="[('product_id', '=', product_id)]"
624 attrs="{'readonly': [('asset_check', '=', False)], 'required': [('location_supplier_customer_mem_out', '=', True), ('asset_check', '=', True)]}"
625
626=== modified file 'bin/addons/msf_printed_documents/report/report_reception.rml'
627--- bin/addons/msf_printed_documents/report/report_reception.rml 2016-03-22 08:24:13 +0000
628+++ bin/addons/msf_printed_documents/report/report_reception.rml 2016-11-09 08:29:21 +0000
629@@ -575,7 +575,7 @@
630 </tr>
631 <tr>
632 <td>
633- <para style="TextInformationN" alignment="LEFT">-</para>
634+ <para style="TextInformation" alignment="LEFT">[[ line.comment or '-' ]]</para>
635 </td>
636 <td>
637 <para style="TextInformationN" alignment="LEFT">-</para>
638
639=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
640--- bin/addons/msf_profile/i18n/fr_MF.po 2016-10-25 09:13:52 +0000
641+++ bin/addons/msf_profile/i18n/fr_MF.po 2016-11-09 08:29:21 +0000
642@@ -18099,6 +18099,7 @@
643 #: report:addons/msf_supply_doc_export/report/report_purchase_order_xls.mako:77
644 #: report:addons/msf_supply_doc_export/report/report_request_for_quotation_xls.mako:76
645 #: report:addons/msf_supply_doc_export/report/report_sale_order_xls.mako:77
646+#: report:addons/msf_supply_doc_export/report/report_internal_move_xls.mako:70
647 #: field:purchase.order.line,comment:0
648 #: field:purchase.order.merged.line,comment:0
649 #: field:sale.order.line,comment:0
650@@ -74689,3 +74690,14 @@
651 msgid "You can't search on this object without using at least one exact search term (precede your search with the character '=')."
652 msgstr "Vous ne pouvez pas exécuter de recherche sur cet objet sans utiliser au moins une recherche exacte (ajoutez le caractère = devant votre filtre)."
653
654+#. module: msf_instance
655+#: code:addons/msf_instance/analytic.py:45
656+#, python-format
657+msgid "Domain %s not suported"
658+msgstr "Domaine %s non supporté"
659+
660+#. module: msf_instance
661+#: code:addons/msf_instance/analytic.py:48
662+#, python-format
663+msgid "Operator '%s' not suported"
664+msgstr "Opérateur '%s' non supporté"
665
666=== modified file 'bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako'
667--- bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako 2013-06-26 09:00:06 +0000
668+++ bin/addons/msf_supply_doc_export/report/report_internal_move_xls.mako 2016-11-09 08:29:21 +0000
669@@ -67,6 +67,7 @@
670 <Row>
671 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Code')}</Data></Cell>
672 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Product Description')}</Data></Cell>
673+ <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Comment')}</Data></Cell>
674 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Quantity')}</Data></Cell>
675 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('UoM')}</Data></Cell>
676 <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Kit')}</Data></Cell>
677@@ -80,6 +81,7 @@
678 <Row>
679 <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.product_id.default_code or '')|x}</Data></Cell>
680 <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.product_id.name or '')|x}</Data></Cell>
681+ <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.comment or '')|x}</Data></Cell>
682 <Cell ss:StyleID="line" ><Data ss:Type="Number">${(move.product_qty or '')|x}</Data></Cell>
683 <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.product_uom.name or '')|x}</Data></Cell>
684 <Cell ss:StyleID="line" ><Data ss:Type="String">${(move.composition_list_id.composition_reference or '')|x}</Data></Cell>
685
686=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv'
687--- bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv 2016-10-25 08:35:46 +0000
688+++ bin/addons/msf_sync_data_server/data/sync_server.message_rule.csv 2016-11-09 08:29:21 +0000
689@@ -10,9 +10,9 @@
690 fo_updates_po_ref,TRUE,TRUE,"['name','state','client_order_ref']","['&','&','&',('partner_type','!=','external'),('client_order_ref','!=',False),('split_type_sale_order','=','original_sale_order'),'!',('client_order_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,purchase.order.update_fo_ref,sale.order,FO updates PO ref,9,Valid
691 update_in_ref,TRUE,TRUE,"['name','shipment_ref']","['&',('shipment_ref','!=',False),'!',('shipment_ref', 'like', 'invalid_by_recovery')]",partner_id,MISSION,stock.picking.update_in_ref,stock.picking,IN updates ref to OUT SHIP,10,Valid
692 canceled_fo_cancels_po,TRUE,TRUE,"['name','state', 'client_order_ref']","[('state', '=', 'cancel'), ('client_order_ref', '!=', '')]",partner_id,MISSION,purchase.order.canceled_fo_cancel_po,sale.order,Canceled FO cancels PO,18,Valid
693-partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage']","['&','&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False), ('claim', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
694-moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
695-dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'fake_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
696+partial_shipped_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/location_dest_id/usage', 'move_lines/comment']","['&','&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['standard', 'packing']), ('state', '=', 'done'), ('already_shipped', '=', True), ('do_not_sync', '=', False), ('claim', '=', False)]",partner_id,MISSION,stock.picking.partial_shipped_fo_updates_in_po,stock.picking,Partial shipped at Coordo updates IN at Project,19,Valid
697+moves_from_dpo_closed_coordo_updates_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'subtype', 'partner_type_stock_picking', 'shipment_id/name', 'min_date', 'note', 'move_lines/processed_stock_move', 'move_lines/id', 'move_lines/state','move_lines/original_qty_partial', 'move_lines/line_number', 'move_lines/name', 'move_lines/change_reason', 'move_lines/product_id/id', 'move_lines/product_id/name', 'move_lines/product_qty', 'move_lines/prodlot_id/id','move_lines/prodlot_id/name','move_lines/prodlot_id/life_date', 'move_lines/expired_date', 'move_lines/asset_id/id','move_lines/product_uom/id', 'move_lines/product_uom/name', 'move_lines/date', 'move_lines/date_expected', 'move_lines/note', 'move_lines/dpo_line_id', 'move_lines/comment']","['&', '&', '&', ('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'), ('subtype', 'in', ['picking', 'standard']), ('dpo_out', '=', True)]",partner_id,MISSION,stock.picking.partial_shippped_dpo_updates_in_po,stock.picking,Moves from DPO closed at Coordo updates IN at Project,20,Valid
698+dpo_service_lines_update_in_at_project,FALSE,TRUE,"['order_id/name', 'order_id/delivery_confirmed_date', 'fake_id', 'origin', 'confirmed_delivery_date', 'name', 'product_uom/id', 'product_uom/name', 'link_sol_id/line_number', 'notes', 'product_qty', 'product_id/name', 'product_id/id', 'comment']","[('dest_partner_id.partner_type', '=', 'internal'), ('order_id.order_type', '=', 'direct'), ('order_id.state', 'in', ['approved', 'done']), ('product_id.type', 'in', ['service', 'service_recep'])]",dest_partner_id,MISSION,purchase.order.line.confirmed_dpo_service_lines_update_in_po,purchase.order.line,DPO service lines update IN at Project,21,Valid
699 cancel_out_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'standard'),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled OUT at Coordo cancels IN at Project,22,Valid
700 cancel_pick_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin']","['&','&','&','&','&',('partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('subtype', '=', 'picking'),('backorder_id', '=', False),('do_not_sync', '=', False)]",partner_id,MISSION,stock.picking.cancel_out_pick_cancel_in,stock.picking,Canceled PICK at Coordo cancels IN at Project,23,Valid
701 cancel_stock_move_at_coordo_cancels_in_at_project,TRUE,TRUE,"['name', 'state', 'origin', 'date_cancel']","['&','&','&','&','&','&',('picking_id.partner_type_stock_picking', '!=', 'external'), ('type', '=', 'out'),('state', '=', 'cancel'),('picking_id.state', '=', 'done'),('picking_id.do_not_sync', '=', False),('to_be_sent', '=', True), '&', '|', ('picking_id.subtype', '=', 'picking'), ('picking_id.subtype', '=', 'standard'), ('picking_id.already_shipped', '=', False)]",partner_id,MISSION,stock.picking.cancel_stock_move_of_pick_cancel_in,stock.move,Canceled stock move cancels IN,24,Valid
702
703=== modified file 'bin/addons/purchase_compare_rfq/wizard/compare_rfq.py'
704--- bin/addons/purchase_compare_rfq/wizard/compare_rfq.py 2016-07-21 10:12:49 +0000
705+++ bin/addons/purchase_compare_rfq/wizard/compare_rfq.py 2016-11-09 08:29:21 +0000
706@@ -343,6 +343,7 @@
707 pol_id = wl_brw.rfq_line_id and wl_brw.rfq_line_id.id or False
708 tl_obj.write(cr, uid, [wl_brw.tender_line_id.id], {
709 'purchase_order_line_id': pol_id,
710+ 'comment': wl_brw.rfq_line_id.comment or '',
711 }, context=context)
712
713 # UF-733: if all tender lines have been compared (have PO Line id),
714
715=== modified file 'bin/addons/purchase_override/purchase.py'
716--- bin/addons/purchase_override/purchase.py 2016-10-26 07:22:24 +0000
717+++ bin/addons/purchase_override/purchase.py 2016-11-09 08:29:21 +0000
718@@ -2148,7 +2148,7 @@
719 pick_obj = self.pool.get('stock.picking')
720 if pick_obj.search_exist(cr, uid, [('purchase_id', 'in', [order.id])], context=context):
721 return
722-
723+
724 picking_id = self.pool.get('stock.picking').create(cr, uid, picking_values, context=context)
725 todo_moves = []
726 for order_line in order.order_line:
727@@ -2196,6 +2196,7 @@
728 'date': order_line.confirmed_delivery_date,
729 'date_expected': order_line.confirmed_delivery_date,
730 'line_number': order_line.line_number,
731+ 'comment': order_line.comment,
732 }
733
734 if reason_type_id:
735@@ -3066,7 +3067,7 @@
736
737 # utp-518:we write the comment from the sale.order.line on the PO line through the procurement (only for the create!!)
738 po_procurement_id = vals.get('procurement_id', False)
739- if po_procurement_id:
740+ if po_procurement_id and not vals.get('comment'):
741 sale_id = sol_obj.search(cr, uid, [('procurement_id', '=', po_procurement_id)], context=context)
742 if sale_id:
743 comment_so = sol_obj.read(cr, uid, sale_id, ['comment'], context=context)[0]['comment']
744
745=== modified file 'bin/addons/sale_override/sale.py'
746--- bin/addons/sale_override/sale.py 2016-08-22 13:55:25 +0000
747+++ bin/addons/sale_override/sale.py 2016-11-09 08:29:21 +0000
748@@ -1911,6 +1911,7 @@
749 'price_currency_id': order.procurement_request and order.functional_currency_id.id or order.pricelist_id.currency_id.id,
750 'price_unit': order.procurement_request and line.cost_price or line.price_unit,
751 'line_number': line.line_number,
752+ 'comment': line.comment,
753 }
754
755 if line.order_id.procurement_request and line.order_id.location_requestor_id.usage == 'customer' and not line.product_id and line.comment:
756
757=== modified file 'bin/addons/sourcing/procurement_order.py'
758--- bin/addons/sourcing/procurement_order.py 2016-08-22 13:55:25 +0000
759+++ bin/addons/sourcing/procurement_order.py 2016-11-09 08:29:21 +0000
760@@ -124,6 +124,9 @@
761 if procurement.po_cft in ('cft', 'rfq') and procurement.price_unit:
762 line.update({'price_unit': procurement.price_unit})
763
764+ if procurement.tender_line_id and procurement.tender_line_id.comment:
765+ line['comment'] = procurement.tender_line_id
766+
767 if not line.get('price_unit', False):
768 cur_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
769 if 'pricelist' in kwargs:
770
771=== modified file 'bin/addons/stock_override/report/delivery_order.rml'
772--- bin/addons/stock_override/report/delivery_order.rml 2016-07-28 12:21:46 +0000
773+++ bin/addons/stock_override/report/delivery_order.rml 2016-11-09 08:29:21 +0000
774@@ -177,7 +177,7 @@
775
776
777 <section>
778- <blockTable colWidths="25.0,70.0,120.0,60.0,45.0,40.0,70.0,70.0,70.0,80.0,80.0,80.0" style="LineHeader" repeatRows="1">
779+ <blockTable colWidths="20.0,70.0,120.0,50.0,60.0,45.0,40.0,70.0,70.0,70.0,65.0,65.0,65.0" style="LineHeader" repeatRows="1">
780 <tr>
781 <td>
782 <para style="LHeader">Line</para>
783@@ -189,6 +189,9 @@
784 <para style="LHeader">Product Name</para>
785 </td>
786 <td>
787+ <para style="LHeader">CommentS</para>
788+ </td>
789+ <td>
790 <para style="LHeader">Kit</para>
791 </td>
792 <td>
793@@ -229,6 +232,9 @@
794 <para style="Line">[[ line.product_id.name ]]</para>
795 </td>
796 <td>
797+ <para style="Line">[[ line.comment ]]</para>
798+ </td>
799+ <td>
800 <para style="Line">[[ line.composition_list_id.name ]]</para>
801 </td>
802 <td>
803@@ -253,7 +259,7 @@
804 <para style="Line">[[ line.location_dest_id.name ]]</para>
805 </td>
806 <td>
807- <para style="Line">[[ formatLang(line.date, date_time=True) ]]</para>
808+ <para style="Line">[[ formatLang(line.date[:10], date=True) ]]</para>
809 </td>
810 </tr>
811 </blockTable>
812
813=== modified file 'bin/addons/stock_override/report/internal_move.rml'
814--- bin/addons/stock_override/report/internal_move.rml 2015-03-02 17:03:58 +0000
815+++ bin/addons/stock_override/report/internal_move.rml 2016-11-09 08:29:21 +0000
816@@ -180,7 +180,7 @@
817 <setNextTemplate name="second" />
818
819 <section>
820- <blockTable colWidths="25.0,70.0,120.0,60.0,45.0,40.0,70.0,70.0,70.0,80.0,80.0,80.0" style="LineHeader" repeatRows="1">
821+ <blockTable colWidths="20.0,70.0,120.0,50.0,60.0,45.0,40.0,70.0,70.0,70.0,65.0,65.0,65.0" style="LineHeader" repeatRows="1">
822 <tr>
823 <td>
824 <para style="LHeader">Line</para>
825@@ -192,6 +192,9 @@
826 <para style="LHeader">Product Name</para>
827 </td>
828 <td>
829+ <para style="LHeader">Comment</para>
830+ </td>
831+ <td>
832 <para style="LHeader">Kit</para>
833 </td>
834 <td>
835@@ -231,6 +234,9 @@
836 <para style="Line">[[ line.product_id.name ]]</para>
837 </td>
838 <td>
839+ <para style="Line">[[ line.comment ]]</para>
840+ </td>
841+ <td>
842 <para style="Line">[[ line.composition_list_id.name ]]</para>
843 </td>
844 <td>
845@@ -255,7 +261,7 @@
846 <para style="Line">[[ line.location_dest_id.name ]]</para>
847 </td>
848 <td>
849- <para style="Line">[[ formatLang(line.date, date_time=True) ]]</para>
850+ <para style="Line">[[ formatLang(line.date[:10], date=True) ]]</para>
851 </td>
852 </tr>
853 </blockTable>
854
855=== modified file 'bin/addons/stock_override/stock_view.xml'
856--- bin/addons/stock_override/stock_view.xml 2016-08-03 12:08:12 +0000
857+++ bin/addons/stock_override/stock_view.xml 2016-11-09 08:29:21 +0000
858@@ -335,6 +335,7 @@
859 <tree colors="grey:scrapped == True; red: inactive_product or to_correct_ok or expired_lot" string="Stock Moves" noteditable="fake_state=='assigned'" hide_new_button="context.get('from_wkf')" hide_delete_button="context.get('from_wkf')">
860 <field name="line_number"/>
861 <field name="product_id" />
862+ <field name="comment" />
863 <field name="composition_list_id"/>
864 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
865 <field name="product_uom" string="UoM"/>
866@@ -405,6 +406,7 @@
867 invisible="1"
868 />
869 <field name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4" invisible="1"/>
870+ <field name="comment" colspan="4" />
871 </group>
872
873 <group colspan="2" col="2">
874@@ -594,6 +596,7 @@
875 <field name="line_number"/>
876 <field name="product_id" context="{'available_for_restriction': 'consumption', 'search_default_not_restricted': 1}" />
877 <field name="inactive_product" invisible="1" />
878+ <field name="comment" />
879 <field name="product_qty"/>
880 <field name="product_uom" string="UoM"/>
881 <field name="scrapped" invisible="1"/>
882@@ -644,6 +647,7 @@
883 attrs="{'readonly': [('from_wkf_line', '=', True)]}"
884 colspan="2"
885 domain="[('uom_by_product', '=', product_id)]"/>
886+ <field name="comment" colspan="4" />
887 <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" colspan="4" invisible="1"/>
888 <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" colspan="4" invisible="1"/>
889 <field name="product_packaging" domain="[('product_id','=',product_id)]" colspan="4" invisible="1" />
890@@ -879,6 +883,7 @@
891 <tree colors="grey:scrapped==True; red: inactive_product == True or product_tbd == True" string="Stock Moves" noteditable="fake_state in ('assigned', 'cancel')" hide_new_button="context.get('from_wkf')" hide_delete_button="True">
892 <field name="line_number"/>
893 <field name="product_id" context="{'available_for_restriction': 'picking', 'search_default_not_restricted': 1}"/>
894+ <field name="comment" />
895 <field name="composition_list_id"/>
896 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
897 <field name="product_uom" string="UoM"/>
898
899=== modified file 'bin/addons/sync_so/picking.py'
900--- bin/addons/sync_so/picking.py 2016-08-23 12:54:03 +0000
901+++ bin/addons/sync_so/picking.py 2016-11-09 08:29:21 +0000
902@@ -201,6 +201,7 @@
903 'name': data['name'],
904 'quantity': data['product_qty'] or 0.0,
905 'note': data['note'],
906+ 'comment': data.get('comment'),
907 }
908 return result
909
910@@ -337,6 +338,7 @@
911 ln = data.get('line_number')
912 # UF-2148: if the line contains 0 qty, just ignore it!
913 qty = data.get('quantity', 0)
914+ comment = data.get('comment', False)
915 if qty == 0:
916 message = "Line number " + str(ln) + " with quantity 0 is ignored!"
917 self._logger.info(message)
918@@ -453,10 +455,16 @@
919 (line.prodlot_id and line.prodlot_id.id == data.get('prodlot_id')) or (not line.prodlot_id and not data.get('prodlot_id')) and \
920 (line.asset_id and line.asset_id.id == data.get('asset_id')) or (not line.asset_id and not data.get('asset_id')):
921 move_proc.write(cr, uid, [line.id], data, context=context)
922+ if data.get('comment'):
923+ move_proc.write(cr, uid, line.id, {
924+ 'comment': data['comment']
925+ }, context=context)
926 break
927 else:
928 data['ordered_quantity'] = data['quantity']
929- move_proc.create(cr, uid, data, context=context)
930+ move_proc_id = move_proc.create(cr, uid, data, context=context)
931+ if data.get('comment'):
932+ move_proc.write(cr, uid, move_proc_id, {'comment': data['comment']}, context=context)
933 #US-1294: Add this move and quantity as already shipped, since it's added to the wizard for processing
934 self._add_to_shipped_moves(already_shipped_moves, move_id, data['quantity'])
935
936
937=== modified file 'bin/addons/sync_so/purchase.py'
938--- bin/addons/sync_so/purchase.py 2016-10-24 15:41:52 +0000
939+++ bin/addons/sync_so/purchase.py 2016-11-09 08:29:21 +0000
940@@ -74,6 +74,7 @@
941 'date': line_dict.get('confirmed_delivery_date', time.strftime('%Y-%m-%d %H:%M:%S')),
942 'change_reason': False,
943 'product_id': line_dict.get('product_id'),
944+ 'comment': line_dict.get('comment'),
945 }],
946 }
947
948
949=== modified file 'bin/addons/tender_flow/tender_flow.py'
950--- bin/addons/tender_flow/tender_flow.py 2016-08-18 08:32:03 +0000
951+++ bin/addons/tender_flow/tender_flow.py 2016-11-09 08:29:21 +0000
952@@ -375,6 +375,7 @@
953 'notes': line.product_id.description_purchase,
954 'order_id': po_id,
955 'tender_line_id': line.id,
956+ 'comment': line.comment,
957 }
958 # create purchase order line
959 pol_id = pol_obj.create(cr, uid, values, context=context)
960@@ -651,6 +652,7 @@
961 'date_planned': line.date_planned,
962 'move_dest_id': False,
963 'notes': line.product_id.description_purchase,
964+ 'comment': line.comment,
965 }))
966
967 # fill data corresponding to po creation

Subscribers

People subscribed via source and target branches

to all changes: