unifield-wm

Merge lp:~unifield-team/unifield-wm/us-927 into lp:unifield-wm

  1. us-927
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2767
Proposed branch: lp:~unifield-team/unifield-wm/us-927
Merge into: lp:unifield-wm
Diff against target: 43 lines (+4/-4)
2 files modified
register_accounting/account_view.xml (+3/-3)
register_accounting/wizard/register_creation.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-927
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+285724@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 'register_accounting/account_view.xml'
2--- register_accounting/account_view.xml 2016-01-21 15:07:12 +0000
3+++ register_accounting/account_view.xml 2016-02-11 14:02:18 +0000
4@@ -19,7 +19,7 @@
5 <field name="name" select="1" readonly="0" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
6 <field name="journal_id" domain="[('type', '=', 'bank'),('is_current_instance','=',True)]" on_change="onchange_journal_id(journal_id)" select="1"/>
7 <newline/>
8- <field name="period_id" domain="[('state', '=', 'draft')]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
9+ <field name="period_id" domain="[('state', '=', 'draft'),('special', '!=', True)]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
10 <field name="currency" readonly="1"/>
11 <newline/>
12 <field name="prev_reg_id" invisible="1"/>
13@@ -180,7 +180,7 @@
14 <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash'),('is_current_instance','=',True)]" select="1"/>
15 <newline/>
16
17- <field name="period_id" select="1" domain="[('state', '=', 'draft')]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
18+ <field name="period_id" select="1" domain="[('state', '=', 'draft'),('special', '!=', True)]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
19 <field name="currency" readonly="1"/>
20 <field name="virtual_id" invisible="1" readonly="1"/>
21 </group>
22@@ -698,7 +698,7 @@
23 <field name="journal_id" domain="[('type', '=', 'cheque'),('is_current_instance','=',True)]" on_change="onchange_journal_id(journal_id)" select="1"/>
24 <newline/>
25 <field name="date" select="1" on_change="onchange_date(date)" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
26- <field name="period_id" domain="[('state', '=', 'draft')]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
27+ <field name="period_id" domain="[('state', '=', 'draft'),('special', '!=', True)]" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('prev_reg_id', '!=', False)]}"/>
28 <field name="currency" readonly="1"/>
29 <field name='company_id' widget="selection" groups="base.group_multi_company" invisible="1"/>
30 <field name="virtual_id" invisible="1" readonly="1"/>
31
32=== modified file 'register_accounting/wizard/register_creation.xml'
33--- register_accounting/wizard/register_creation.xml 2014-06-02 09:00:32 +0000
34+++ register_accounting/wizard/register_creation.xml 2016-02-11 14:02:18 +0000
35@@ -11,7 +11,7 @@
36 <form string="Register creation wizard">
37 <label string="Choose a period then click on 'Confirm period' to display all register that could be created." colspan="4" align="0.0"/>
38 <group col="6" colspan="4">
39- <field name="period_id" colspan="2" domain="[('state', '=', 'draft'), ('number', '&lt;=', 12.0)]"/>
40+ <field name="period_id" colspan="2" domain="[('state', '=', 'draft'), ('special', '!=', True)]"/>
41 <field name="instance_id" colspan="2" />
42 <button name="button_confirm_period" type="object" string="Confirm period" icon="gtk-execute" colspan="1"/>
43 <label string="" colspan="1"/>

Subscribers

People subscribed via source and target branches