Unifield Server

Merge lp:~julie-w/unifield-server/US-4873-4880 into lp:unifield-server

  1. US-4873-4880
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5033
Proposed branch: lp:~julie-w/unifield-server/US-4873-4880
Merge into: lp:unifield-server
Diff against target: 74 lines (+16/-8)
4 files modified
bin/addons/account_mcdb/account_view.xml (+0/-3)
bin/addons/msf_homere_interface/hr_view.xml (+2/-0)
bin/addons/res_currency_functional/account_move_line_view.xml (+5/-0)
bin/osv/orm.py (+9/-5)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4873-4880
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+352981@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/account_mcdb/account_view.xml'
2--- bin/addons/account_mcdb/account_view.xml 2018-04-20 14:30:11 +0000
3+++ bin/addons/account_mcdb/account_view.xml 2018-08-13 14:06:50 +0000
4@@ -281,9 +281,6 @@
5 <field name="credit" sum="Total Func. Credit"/>
6 <field name="functional_currency_id"/>
7 <field name="reconcile_total_partial_id"/>
8- <field name="reconcile_date" invisible="1"/>
9- <field name="unreconcile_date" invisible="1"/>
10- <field name="unreconcile_txt" invisible="1"/>
11 <field name="state"/>
12 </tree>
13 </field>
14
15=== modified file 'bin/addons/msf_homere_interface/hr_view.xml'
16--- bin/addons/msf_homere_interface/hr_view.xml 2018-05-16 09:36:25 +0000
17+++ bin/addons/msf_homere_interface/hr_view.xml 2018-08-13 14:06:50 +0000
18@@ -24,6 +24,8 @@
19 <newline/>
20 <field name="department_id" widget="selection" attrs="{'readonly': [('employee_type', '=', 'local'), ('allow_edition', '=', False)]}"/>
21 <field name="parent_id"/>
22+ <field name="homere_id_unique" invisible="1"/>
23+ <field name="homere_codeterrain" invisible="1"/>
24 </group>
25 <group colspan="4" col="8">
26 <field name="destination_id" context="{'search_default_active': 1, 'hide_inactive': 1}"/>
27
28=== modified file 'bin/addons/res_currency_functional/account_move_line_view.xml'
29--- bin/addons/res_currency_functional/account_move_line_view.xml 2017-09-22 09:51:11 +0000
30+++ bin/addons/res_currency_functional/account_move_line_view.xml 2018-08-13 14:06:50 +0000
31@@ -61,6 +61,11 @@
32 <newline />
33 <field name="document_date"/>
34 <field name="date"/>
35+ <field name="reconcile_date" invisible="1"/>
36+ <field name="unreconcile_date" invisible="1"/>
37+ <field name="unreconcile_txt" invisible="1"/>
38+ <field name="invoice" invisible="1"/>
39+ <field name="cheque_number" invisible="1"/>
40 </group>
41
42 <group col="6" colspan="4">
43
44=== modified file 'bin/osv/orm.py'
45--- bin/osv/orm.py 2018-08-06 13:07:33 +0000
46+++ bin/osv/orm.py 2018-08-13 14:06:50 +0000
47@@ -668,18 +668,22 @@
48 else:
49 break
50 else:
51+ if isinstance(r, browse_record):
52+ obj = self.pool.get(r._table_name)
53+ else:
54+ obj = self
55 r = r[f[i]]
56 # To display external name of selection field when its exported
57 cols = False
58- if f[i] in self._columns.keys():
59- cols = self._columns[f[i]]
60- elif f[i] in self._inherit_fields.keys():
61- cols = selection_field(self._inherits)
62+ if f[i] in obj._columns.keys():
63+ cols = obj._columns[f[i]]
64+ elif f[i] in obj._inherit_fields.keys():
65+ cols = selection_field(obj._inherits)
66 if cols and cols._type == 'selection' and not sync_context:
67 # if requested, translate the fields.selection values
68 translated_selection = False
69 if context.get('translate_selection_field', False) and r and f:
70- fields_get_res = self.fields_get(cr, uid, f, context=context)
71+ fields_get_res = obj.fields_get(cr, uid, f, context=context)
72 if f[0] in fields_get_res and 'selection' in fields_get_res[f[0]]:
73 r = dict(fields_get_res[f[0]]['selection'])[r]
74 translated_selection = True

Subscribers

People subscribed via source and target branches