Unifield Server

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

  1. US-6707
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5561
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-6707
Merge into: lp:unifield-server
Diff against target: 37 lines (+3/-2)
3 files modified
bin/addons/msf_doc_import/purchase_order.py (+1/-0)
bin/addons/msf_tools/views/automated_export_view.xml (+1/-1)
bin/addons/msf_tools/views/automated_import_view.xml (+1/-1)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-6707
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+375491@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/msf_doc_import/purchase_order.py'
2--- bin/addons/msf_doc_import/purchase_order.py 2019-10-28 19:53:53 +0000
3+++ bin/addons/msf_doc_import/purchase_order.py 2019-11-13 14:34:46 +0000
4@@ -388,6 +388,7 @@
5 msg = _('No PO to export !')
6 self.infolog(cr, uid, msg)
7 context.update({'po_not_found': True})
8+ return [], [], ['PO id', 'PO name']
9
10 processed, rejected = [], []
11 cr.execute('select id from purchase_order where id in %s for update skip locked', (tuple(po_ids),))
12
13=== modified file 'bin/addons/msf_tools/views/automated_export_view.xml'
14--- bin/addons/msf_tools/views/automated_export_view.xml 2018-04-03 07:48:09 +0000
15+++ bin/addons/msf_tools/views/automated_export_view.xml 2019-11-13 14:34:46 +0000
16@@ -8,7 +8,7 @@
17 <field name="type">search</field>
18 <field name="arch" type="xml">
19 <search string="Automated exports">
20- <filter name="active" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
21+ <filter name="inactive" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
22 <field name="name" />
23 <field name="function_id" />
24 </search>
25
26=== modified file 'bin/addons/msf_tools/views/automated_import_view.xml'
27--- bin/addons/msf_tools/views/automated_import_view.xml 2018-04-03 07:43:14 +0000
28+++ bin/addons/msf_tools/views/automated_import_view.xml 2019-11-13 14:34:46 +0000
29@@ -8,7 +8,7 @@
30 <field name="type">search</field>
31 <field name="arch" type="xml">
32 <search string="Automated imports">
33- <filter name="active" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
34+ <filter name="inactive" domain="[('active', '=', False)]" string="Inactive" icon="gtk-undo" />
35 <field name="name" />
36 <field name="function_id" />
37 </search>

Subscribers

People subscribed via source and target branches