Unifield Server

Merge lp:~fabien-morin/unifield-server/fm-us-2579 into lp:unifield-server

  1. fm-us-2579
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4327
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-2579
Merge into: lp:unifield-server
Diff against target: 52 lines (+7/-4)
2 files modified
bin/addons/mission_stock/mission_stock.py (+6/-3)
bin/addons/mission_stock/wizard/mission_stock_wizard.py (+1/-1)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-2579
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+320188@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/mission_stock/mission_stock.py'
2--- bin/addons/mission_stock/mission_stock.py 2017-02-13 11:31:10 +0000
3+++ bin/addons/mission_stock/mission_stock.py 2017-04-06 09:41:30 +0000
4@@ -103,7 +103,7 @@
5 GET_EXPORT_REQUEST = '''SELECT
6 l.product_id AS product_id,
7 l.default_code as default_code,
8- pt.name as pt_name,
9+ COALESCE(trans.value, pt.name) as pt_name,
10 pu.name as pu_name,
11 trim(to_char(l.internal_qty, '999999999999.999')) as l_internal_qty,
12 trim(to_char(l.wh_qty, '999999999999.999')) as l_wh_qty,
13@@ -123,6 +123,8 @@
14 LEFT JOIN product_template pt ON pp.product_tmpl_id = pt.id
15 LEFT JOIN product_uom pu ON pt.uom_id = pu.id
16 LEFT JOIN res_currency rc ON pp.currency_id = rc.id
17+ LEFT JOIN ir_translation trans ON trans.res_id = pt.id AND
18+ trans.name='product.template,name' AND lang = %s
19 WHERE l.mission_report_id = %s
20 ORDER BY l.default_code'''
21
22@@ -439,7 +441,7 @@
23 return
24
25 logging.getLogger('MSR').info("""____________________ Start the update process of MSR, at %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
26- self.update(cr, uid, ids=[], context=None)
27+ self.update(cr, uid, ids=[], context=context)
28 msr_in_progress._delete_all(cr, uid, context)
29 cr.commit()
30 logging.getLogger('MSR').info("""____________________ Finished the update process of MSR, at %s""" % time.strftime('%Y-%m-%d %H:%M:%S'))
31@@ -772,7 +774,8 @@
32
33 for report_id in ids:
34 logger.info('___ Start export SQL request...')
35- cr.execute(GET_EXPORT_REQUEST, (report_id, ))
36+ lang = context.get('lang')
37+ cr.execute(GET_EXPORT_REQUEST, (lang, report_id))
38 request_result = cr.dictfetchall()
39
40 logger.info('___ Start CSV and XLS generation...')
41
42=== modified file 'bin/addons/mission_stock/wizard/mission_stock_wizard.py'
43--- bin/addons/mission_stock/wizard/mission_stock_wizard.py 2016-12-06 13:04:22 +0000
44+++ bin/addons/mission_stock/wizard/mission_stock_wizard.py 2017-04-06 09:41:30 +0000
45@@ -248,6 +248,6 @@
46 def update(self, cr, uid, ids, context=None):
47 msr_obj = self.pool.get('stock.mission.report')
48 ids = msr_obj.search(cr, uid, [], context=context)
49- return msr_obj.background_update(cr, uid, ids)
50+ return msr_obj.background_update(cr, uid, ids, context=context)
51
52 mission_stock_wizard()

Subscribers

People subscribed via source and target branches