unifield-wm

Merge lp:~unifield-team/unifield-wm/UTP_840 into lp:unifield-wm

  1. UTP_840
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 1772
Proposed branch: lp:~unifield-team/unifield-wm/UTP_840
Merge into: lp:unifield-wm
Diff against target: 154 lines (+21/-11)
6 files modified
account_mcdb/report/account_mcdb_export.py (+4/-3)
account_mcdb/report/report_account_analytic_line.rml (+8/-2)
account_mcdb/report/report_account_analytic_line_xls.mako (+6/-3)
account_mcdb/report/report_account_move_line.rml (+1/-1)
account_mcdb/report/report_account_move_line_xls.mako (+1/-1)
account_override/account_move_line.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UTP_840
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+185068@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 'account_mcdb/report/account_mcdb_export.py'
2--- account_mcdb/report/account_mcdb_export.py 2013-07-17 07:48:41 +0000
3+++ account_mcdb/report/account_mcdb_export.py 2013-09-11 14:39:06 +0000
4@@ -119,7 +119,7 @@
5 #reconcile_total_partial_id
6 csv_line.append(ml.reconcile_total_partial_id and ml.reconcile_total_partial_id.name and ml.reconcile_total_partial_id.name.encode('utf-8') or '')
7 #state
8- csv_line.append(field_sel(cr, uid, ml, 'state', context).encode('utf-8'))
9+ csv_line.append(field_sel(cr, uid, ml, 'move_state', context).encode('utf-8'))
10 # Write line
11 writer.writerow(csv_line)
12
13@@ -156,6 +156,7 @@
14 raise osv.except_osv(_('Error'), _('An error occured. Please contact an administrator to resolve this problem.'))
15 # Prepare some value
16 currency_name = ""
17+ field_sel = self.pool.get('ir.model.fields').get_browse_selection
18 if currency_id:
19 currency_obj = self.pool.get('res.currency')
20 currency_name = currency_obj.read(cr, uid, [currency_id], ['name'], context=context)[0].get('name', False)
21@@ -172,7 +173,7 @@
22 head += [_('Func. Amount'), _('Func. Currency')]
23 else:
24 head += [_('Output Amount'), _('Output Currency')]
25- head+= [_('Reversal Origin')]
26+ head+= [_('Reversal Origin'), _('Entry status')]
27 writer.writerow(map(lambda x: x.encode('utf-8'), head))
28 # Sort items
29 ids.sort()
30@@ -224,6 +225,7 @@
31 #output currency
32 csv_line.append(currency_name.encode('utf-8') or '')
33 csv_line.append(al.reversal_origin and al.reversal_origin.name and al.reversal_origin.name.encode('utf-8') or '')
34+ csv_line.append(al.move_state and field_sel(cr, uid, al, 'move_state', context).encode('utf-8') or '')
35 # Write Line
36 writer.writerow(csv_line)
37 return True
38@@ -240,7 +242,6 @@
39 if not writer:
40 raise osv.except_osv(_('Error'), _('An error occured. Please contact an administrator to resolve this problem.'))
41
42- field_sel = self.pool.get('ir.model.fields').get_browse_selection
43 # Prepare some value
44 currency_name = ""
45 field_sel = self.pool.get('ir.model.fields').get_browse_selection
46
47=== modified file 'account_mcdb/report/report_account_analytic_line.rml'
48--- account_mcdb/report/report_account_analytic_line.rml 2013-06-26 15:01:26 +0000
49+++ account_mcdb/report/report_account_analytic_line.rml 2013-09-11 14:39:06 +0000
50@@ -22,8 +22,8 @@
51 <blockAlignment value="LEFT"/>
52 <blockValign value="TOP"/>
53 <lineStyle kind="GRID" colorName="#000000" start="0,0" stop="-1,0"/>
54- <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="19,-1"/>
55- <lineStyle kind="INNERGRID" colorName="gray" start="0,1" stop="19,-1" thickness="0.5"/>
56+ <lineStyle kind="OUTLINE" colorName="black" start="0,0" stop="20,-1"/>
57+ <lineStyle kind="INNERGRID" colorName="gray" start="0,1" stop="20,-1" thickness="0.5"/>
58 <blockBackground colorName="#e6e6e6" start="0,0" stop="-1,0"/>
59 </blockTableStyle>
60 <initialize>
61@@ -118,6 +118,9 @@
62 <td>
63 <para style="P3">Reversal Origin</para>
64 </td>
65+ <td>
66+ <para style="P3">Entry status</para>
67+ </td>
68 </tr>
69 <tr>
70 <td>
71@@ -181,6 +184,9 @@
72 <td>
73 <para style="P3">[[ o.reversal_origin and o.reversal_origin.move_id and o.reversal_origin.move_id.name or '' ]]</para>
74 </td>
75+ <td>
76+ <para style="P3">[[ o.move_state and getSel(o, 'move_state') or '' ]]</para>
77+ </td>
78 </tr>
79 </blockTable>
80 <section>
81
82=== modified file 'account_mcdb/report/report_account_analytic_line_xls.mako'
83--- account_mcdb/report/report_account_analytic_line_xls.mako 2013-06-26 15:01:26 +0000
84+++ account_mcdb/report/report_account_analytic_line_xls.mako 2013-09-11 14:39:06 +0000
85@@ -50,9 +50,9 @@
86 </Styles>
87 <Worksheet ss:Name="Sheet">
88 <%
89- max = 18
90+ max = 19
91 if data and data.get('context') and data.get('context').get('display_fp'):
92- max = 20
93+ max = 21
94 %>
95 <Table ss:ExpandedColumnCount="${max}" ss:ExpandedRowCount="${len(objects)+1}" x:FullColumns="1"
96 x:FullRows="1">
97@@ -60,7 +60,7 @@
98 <Column ss:AutoFitWidth="1" ss:Width="70" />
99 % endfor
100 <Row>
101-% for header in [_('Proprietary Instance'), _('Journal Code'), _('Entry Sequence'), _('Description'), _('Ref.'), _('Document Date'), _('Posting Date'), _('Period'), _('G/L Account'), _('Ana. Account'), _('Third Party'), _('Book. Amount'), _('Book. Currency'), _('Func. Amount'), _('Func. Currency'), _('Output Amount'), _('Output Currency'), _('Reversal Origin')]:
102+% for header in [_('Proprietary Instance'), _('Journal Code'), _('Entry Sequence'), _('Description'), _('Ref.'), _('Document Date'), _('Posting Date'), _('Period'), _('G/L Account'), _('Ana. Account'), _('Third Party'), _('Book. Amount'), _('Book. Currency'), _('Func. Amount'), _('Func. Currency'), _('Output Amount'), _('Output Currency'), _('Reversal Origin'), _('Entry status')]:
103 % if header == _('Ana. Account') and data.get('context') and data.get('context').get('display_fp'):
104 <Cell ss:StyleID="ssH"><Data ss:Type="String">${_('Destination')}</Data></Cell>
105 <Cell ss:StyleID="ssH"><Data ss:Type="String">${_('Cost Center')}</Data></Cell>
106@@ -146,6 +146,9 @@
107 <Cell ss:StyleID="ssBorder">
108 <Data ss:Type="String">${(o.reversal_origin and o.reversal_origin.name or '')|x}</Data>
109 </Cell>
110+<Cell ss:StyleID="ssBorder">
111+ <Data ss:Type="String">${(o.move_state and getSel(o, 'move_state') or '')|x}</Data>
112+</Cell>
113 </Row>
114 % endfor
115 </Table>
116
117=== modified file 'account_mcdb/report/report_account_move_line.rml'
118--- account_mcdb/report/report_account_move_line.rml 2013-06-26 15:01:26 +0000
119+++ account_mcdb/report/report_account_move_line.rml 2013-09-11 14:39:06 +0000
120@@ -166,7 +166,7 @@
121 <para style="P3">[[ o.reconcile_total_partial_id and o.reconcile_total_partial_id.name or '' ]]</para>
122 </td>
123 <td>
124- <para style="P3">[[getSel(o, 'state')]]</para>
125+ <para style="P3">[[ o.move_state and getSel(o, 'move_state') or '' ]]</para>
126 </td>
127 </tr>
128 </blockTable>
129
130=== modified file 'account_mcdb/report/report_account_move_line_xls.mako'
131--- account_mcdb/report/report_account_move_line_xls.mako 2013-06-26 15:01:26 +0000
132+++ account_mcdb/report/report_account_move_line_xls.mako 2013-09-11 14:39:06 +0000
133@@ -125,7 +125,7 @@
134 <Data ss:Type="String">${(o.reconcile_total_partial_id and reconcile_name(o.reconcile_total_partial_id.id) or '')|x}</Data>
135 </Cell>
136 <Cell ss:StyleID="ssBorder">
137- <Data ss:Type="String">${getSel(o,'state')}</Data>
138+ <Data ss:Type="String">${(o.move_state and getSel(o,'move_state') or '')|x}</Data>
139 </Cell>
140 </Row>
141 % endfor
142
143=== modified file 'account_override/account_move_line.py'
144--- account_override/account_move_line.py 2013-08-30 13:00:25 +0000
145+++ account_override/account_move_line.py 2013-09-11 14:39:06 +0000
146@@ -168,7 +168,7 @@
147
148 _columns = {
149 'source_date': fields.date('Source date', help="Date used for FX rate re-evaluation"),
150- 'move_state': fields.related('move_id', 'state', string="Move state", type="selection", selection=[('draft', 'Draft'), ('posted', 'Posted')],
151+ 'move_state': fields.related('move_id', 'state', string="Move state", type="selection", selection=[('draft', 'Unposted'), ('posted', 'Posted')],
152 help="This indicates the state of the Journal Entry."),
153 'is_addendum_line': fields.boolean('Is an addendum line?', readonly=True,
154 help="This inform account_reconciliation module that this line is an addendum line for reconciliations."),

Subscribers

People subscribed via source and target branches