unifield-wm

Merge lp:~unifield-team/unifield-wm/UF-2216 into lp:unifield-wm

  1. UF-2216
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2192
Proposed branch: lp:~unifield-team/unifield-wm/UF-2216
Merge into: lp:unifield-wm
Diff against target: 95 lines (+11/-13)
4 files modified
financing_contract/report/financing_contract.rml (+8/-8)
register_accounting/account_bank_statement.py (+1/-1)
register_accounting/account_cheque_register.py (+2/-2)
register_accounting/account_view.xml (+0/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UF-2216
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+221674@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 'financing_contract/report/financing_contract.rml'
2--- financing_contract/report/financing_contract.rml 2013-03-08 16:08:08 +0000
3+++ financing_contract/report/financing_contract.rml 2014-06-02 07:11:40 +0000
4@@ -290,10 +290,10 @@
5 <para style="P16" alignment="LEFT">Line Type</para>
6 </td>
7 <td>
8- <para style="P16" alignment="RIGHT">Funded - Budget</para>
9+ <para style="P16" alignment="RIGHT">[[ (o.reporting_type=='all') and 'Funded' or '' ]]</para>
10 </td>
11 <td>
12- <para style="P17" alignment="RIGHT">Total project - Budget</para>
13+ <para style="P17" alignment="RIGHT">[[ (o.reporting_type=='all' or o.reporting_type=='project') and 'Total Project' or '' ]][[ (o.reporting_type=='allocated') and 'Funded' or '' ]]</para>
14 </td>
15 </tr>
16 </blockTable>
17@@ -314,13 +314,13 @@
18 <para style="P15" alignment="LEFT">[[ (line['line_type'] == 'View' and line['line_type']) or removeParentNode('para') ]]</para>
19 </td>
20 <td>
21- <para style="P12" alignment="RIGHT">[[ (line['line_type'] != 'View' and formatLang(line['allocated_budget'], digits=0, grouping=True)) or removeParentNode('para') ]]</para>
22- <para style="P15" alignment="RIGHT">[[ (line['line_type'] == 'View' and formatLang(line['allocated_budget'], digits=0, grouping=True)) or removeParentNode('para') ]]</para>
23+ <para style="P12" alignment="RIGHT">[[ o.reporting_type=='all' and line['line_type'] != 'View' and formatLang(line['allocated_budget'], digits=0, grouping=True) or '' ]]</para>
24+ <para style="P15" alignment="RIGHT">[[ o.reporting_type=='all' and line['line_type'] == 'View' and formatLang(line['allocated_budget'], digits=0, grouping=True) or '' ]]</para>
25
26 </td>
27 <td>
28- <para style="P12" alignment="RIGHT">[[ (line['line_type'] != 'View' and formatLang(line['project_budget'], digits=0, grouping=True)) or removeParentNode('para') ]]</para>
29- <para style="P15" alignment="RIGHT">[[ (line['line_type'] == 'View' and formatLang(line['project_budget'], digits=0, grouping=True)) or removeParentNode('para') ]]</para>
30+ <para style="P12" alignment="RIGHT">[[ (o.reporting_type=='all' or o.reporting_type=='project') and line['line_type'] != 'View' and formatLang(line['project_budget'], digits=0, grouping=True) or '' ]] [[ o.reporting_type=='allocated' and line['line_type'] != 'View' and formatLang(line['allocated_budget'], digits=0, grouping=True) or '' ]] </para>
31+ <para style="P15" alignment="RIGHT">[[ (o.reporting_type=='all' or o.reporting_type=='project') and line['line_type'] == 'View' and formatLang(line['project_budget'], digits=0, grouping=True) or '' ]] [[ o.reporting_type=='allocated' and line['line_type'] == 'View' and formatLang(line['allocated_budget'], digits=0, grouping=True) or '' ]] </para>
32
33 </td>
34 </tr>
35@@ -349,10 +349,10 @@
36
37 </td>
38 <td>
39- <para style="P15" alignment="RIGHT">[[ formatLang( get_totals(o.actual_line_ids)[0], digits=0, grouping=True) ]] </para>
40+ <para style="P15" alignment="RIGHT">[[ o.reporting_type=='all' and formatLang( get_totals(o.actual_line_ids)[0], digits=0, grouping=True) or '']] </para>
41 </td>
42 <td>
43- <para style="P15" alignment="RIGHT">[[ formatLang( get_totals(o.actual_line_ids)[1], digits=0, grouping=True) ]]</para>
44+ <para style="P15" alignment="RIGHT">[[ (o.reporting_type=='all' or o.reporting_type=='project') and formatLang( get_totals(o.actual_line_ids)[1], digits=0, grouping=True) or '']][[ o.reporting_type=='allocated' and formatLang( get_totals(o.actual_line_ids)[0], digits=0, grouping=True) or '']] </para>
45
46
47
48
49=== modified file 'register_accounting/account_bank_statement.py'
50--- register_accounting/account_bank_statement.py 2014-05-05 10:24:38 +0000
51+++ register_accounting/account_bank_statement.py 2014-06-02 07:11:40 +0000
52@@ -186,7 +186,7 @@
53 'responsible_ids': fields.many2many('res.users', 'bank_statement_users_rel', 'statement_id', 'user_id', 'Responsible'),
54 }
55
56- _order = 'state asc, period_number desc'
57+ _order = 'state asc, period_number asc'
58
59 _defaults = {
60 'balance_start': lambda *a: 0.0,
61
62=== modified file 'register_accounting/account_cheque_register.py'
63--- register_accounting/account_cheque_register.py 2014-03-07 11:05:37 +0000
64+++ register_accounting/account_cheque_register.py 2014-06-02 07:11:40 +0000
65@@ -61,8 +61,8 @@
66 _inherit = "account.bank.statement"
67
68 _columns = {
69- 'display_type': fields.selection([('reconciled', 'Display Reconciled'), ('not_reconciled', 'Display Not Reconciled'), ('all', 'All')], \
70- string="Display type", states={'draft': [('readonly', True)]}),
71+ 'display_type': fields.selection([('not_reconciled', 'Outstanding cheques only'), ('all', 'All cheques')], \
72+ string="Display type", required=True, states={'draft': [('readonly', True)]}),
73 'line_ids': one2many_register('account.bank.statement.line', 'statement_id', 'Statement lines', \
74 states={'partial_close':[('readonly', True)], 'confirm':[('readonly', True)], 'draft': [('readonly', True)]}),
75 }
76
77=== modified file 'register_accounting/account_view.xml'
78--- register_accounting/account_view.xml 2014-04-29 15:57:29 +0000
79+++ register_accounting/account_view.xml 2014-06-02 07:11:40 +0000
80@@ -768,7 +768,6 @@
81 </notebook>
82 <group col="8" colspan="4">
83 <field name="state" readonly="1"/>
84- <field name="balance_end" readonly="1"/>
85 <button name="button_open_cheque" states="draft" string="Open Cheque Register" type="object" icon="gtk-go-forward"/>
86 <button name="button_confirm_cheque" states="open" string="Close Register" type="object" icon="terp-camera_test"/>
87 </group>
88@@ -789,7 +788,6 @@
89 <field name="period_id"/>
90 <field name="currency"/>
91 <field name="journal_id"/>
92- <field name="balance_end" />
93 <field name="state"/>
94 <button name="button_open_cheque" states="draft" string="Open Cheque Register" type="object" icon="terp-gtk-go-back-rtl"/>
95 <button name="button_confirm_cheque" states="open" string="Close Register" type="object" icon="terp-camera_test"/>

Subscribers

People subscribed via source and target branches