Unifield Server

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

  1. US-4197
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4867
Proposed branch: lp:~julie-w/unifield-server/US-4197
Merge into: lp:unifield-server
Diff against target: 27 lines (+3/-1)
2 files modified
bin/addons/account/project/project_view.xml (+1/-0)
bin/addons/account_mcdb/account_view.xml (+2/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4197
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+343870@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/project/project_view.xml'
2--- bin/addons/account/project/project_view.xml 2017-10-27 08:56:09 +0000
3+++ bin/addons/account/project/project_view.xml 2018-04-24 07:17:07 +0000
4@@ -249,6 +249,7 @@
5 <group>
6 <field name="amount" select="1"/>
7 <field name="amount_currency"/>
8+ <field name="currency_id" domain="[('active', '=', True)]"/>
9 </group>
10 </group>
11 <newline/>
12
13=== modified file 'bin/addons/account_mcdb/account_view.xml'
14--- bin/addons/account_mcdb/account_view.xml 2017-09-12 13:46:40 +0000
15+++ bin/addons/account_mcdb/account_view.xml 2018-04-24 07:17:07 +0000
16@@ -178,9 +178,10 @@
17 <field name="journal_type"/>
18 </group>
19 <newline/>
20- <group col="2" colspan="4">
21+ <group col="6" colspan="4">
22 <field name="balance" string="Debit/Credit Fonctional" select='1'/>
23 <field name="balance_currency" string="Debit/Credit Booking" select='1'/>
24+ <field name="currency_id" help="" domain="[('active', '=', True)]"/>
25 </group>
26 <newline/>
27 <group expand="0" string="Group By..." colspan="4" col="20">

Subscribers

People subscribed via source and target branches