Skip to content

Commit c771903

Browse files
sle-odoosle-odoo
committed
[IMP] account* reports: removed rml, added qweb template, changed the wizard to return qweb actions
bzr revid: [email protected]
1 parent cf311bd commit c771903

File tree

115 files changed

+3166
-11508
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+3166
-11508
lines changed

‎addons/account/__openerp__.py

+19-2
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,24 @@
126126
'account_pre_install.yml',
127127

128128
'views/report_vat.xml',
129+
'views/report_invoice.xml',
130+
'views/report_trialbalance.xml',
131+
'views/report_centraljournal.xml',
132+
'views/report_overdue.xml',
133+
'views/report_generaljournal.xml',
134+
'views/report_journal.xml',
135+
'views/report_salepurchasejournal.xml',
136+
'views/report_partnerbalance.xml',
137+
'views/report_agedpartnerbalance.xml',
138+
'views/report_partnerledger.xml',
139+
'views/report_partnerledgerother.xml',
140+
'views/report_financial.xml',
141+
'views/report_generalledger.xml',
142+
'project/views/report_analyticbalance.xml',
143+
'project/views/report_analyticjournal.xml',
144+
'project/views/report_analyticcostledgerquantity.xml',
145+
'project/views/report_analyticcostledger.xml',
146+
'project/views/report_invertedanalyticbalance.xml',
129147
],
130148
'js': [
131149
'static/src/js/account_move_reconciliation.js',
@@ -157,13 +175,12 @@
157175
'test/account_period_close.yml',
158176
'test/account_use_model.yml',
159177
'test/account_validate_account_move.yml',
160-
#'test/account_bank_statement.yml',
161-
#'test/account_cash_statement.yml',
162178
'test/test_edi_invoice.yml',
163179
'test/account_report.yml',
164180
'test/account_fiscalyear_close.yml', #last test, as it will definitively close the demo fiscalyear
165181
],
166182
'installable': True,
167183
'auto_install': False,
168184
}
185+
169186
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

‎addons/account/account_invoice.py

+1-11
Original file line numberDiff line numberDiff line change
@@ -409,17 +409,7 @@ def invoice_print(self, cr, uid, ids, context=None):
409409
'''
410410
assert len(ids) == 1, 'This option should only be used for a single id at a time.'
411411
self.write(cr, uid, ids, {'sent': True}, context=context)
412-
datas = {
413-
'ids': ids,
414-
'model': 'account.invoice',
415-
'form': self.read(cr, uid, ids[0], context=context)
416-
}
417-
return {
418-
'type': 'ir.actions.report.xml',
419-
'report_name': 'account.invoice',
420-
'datas': datas,
421-
'nodestroy' : True
422-
}
412+
return self.pool['report'].get_action(cr, uid, ids, 'account.report_invoice', context=context)
423413

424414
def action_invoice_sent(self, cr, uid, ids, context=None):
425415
'''

‎addons/account/account_report.xml

+149-26
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,168 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<openerp>
33
<data>
4-
<report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
5-
<report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger_landscape.rml" string="General Ledger"/>
6-
<report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
7-
<report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
8-
<report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>
9-
<report auto="False" id="account_3rdparty_account_balance" menu="False" model="account.account" name="account.partner.balance" rml="account/report/account_partner_balance.rml" string="Partner Balance"/>
10-
<report auto="False" id="account_central_journal" model="account.journal.period" name="account.central.journal" rml="account/report/account_central_journal.rml" string="Central Journal" header="False"/>
11-
<report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journal" header="False"/>
12-
<report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
13-
<report auto="False" id="account_journal_sale_purchase" model="account.journal.period" name="account.journal.period.print.sale.purchase" rml="account/report/account_journal_sale_purchase.rml" string="Sale/Purchase Journal" header="False"/>
14-
<report id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments" parser="account.report.account_print_overdue.Overdue"/>
4+
<report
5+
id="account_transfers"
6+
model="account.transfer"
7+
name="account.transfer"
8+
string="Transfers"
9+
xml="account/report/transfer.xml"
10+
xsl="account/report/transfer.xsl"
11+
/>
12+
1513
<report
1614
auto="False"
15+
id="account_intracom"
16+
menu="False"
17+
model="account.move.line"
18+
name="account.intracom"
19+
string="IntraCom"
20+
/>
21+
22+
<!-- QWeb Reports -->
23+
<report
24+
id="action_report_vat"
25+
model="account.tax.code"
26+
report_type="qweb-pdf"
27+
string="Account tax"
28+
name="account.report_vat"
29+
file="account.report_vat"
30+
/>
31+
32+
<report
1733
id="account_invoices"
1834
model="account.invoice"
19-
name="account.invoice"
20-
rml="account/report/account_print_invoice.rml"
2135
string="Invoices"
22-
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
36+
report_type="qweb-pdf"
37+
name="account.report_invoice"
38+
file="account.report_invoice"
2339
attachment_use="True"
24-
usage="default"
25-
/>
26-
<report id="account_transfers" model="account.transfer" name="account.transfer" string="Transfers" xml="account/report/transfer.xml" xsl="account/report/transfer.xsl"/>
27-
<report auto="False" id="account_intracom" menu="False" model="account.move.line" name="account.intracom" string="IntraCom"/>
40+
attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')"
41+
/>
42+
43+
<report
44+
id="action_report_trial_balance"
45+
model="account.balance.report"
46+
string="Trial Balance"
47+
report_type="qweb-pdf"
48+
name="account.report_trialbalance"
49+
file="account.report_trialbalance"
50+
/>
51+
52+
<report
53+
id="action_report_central_journal"
54+
model="account.journal.period"
55+
string="Central Journal"
56+
report_type="qweb-pdf"
57+
name="account.report_centraljournal"
58+
file="account.report_centraljournal"
59+
/>
60+
61+
<report
62+
id="action_report_print_overdue"
63+
model="res.partner"
64+
report_type="qweb-pdf"
65+
string="Overdue Payments"
66+
name="account.report_overdue"
67+
file="account.report_overdue"
68+
/>
69+
70+
<report
71+
id="action_report_general_journal"
72+
model="account.journal.period"
73+
string="General Journal"
74+
report_type="qweb-pdf"
75+
name="account.report_generaljournal"
76+
file="account.report_generaljournal"
77+
menu="False"
78+
/>
79+
80+
<report
81+
id="action_report_account_journal"
82+
model="account.journal.period"
83+
string="Journal"
84+
report_type="qweb-pdf"
85+
name="account.report_journal"
86+
file="account.report_journal"
87+
/>
88+
89+
<report
90+
id="action_report_account_salepurchasejournal"
91+
model="account.journal.period"
92+
string="Journal"
93+
report_type="qweb-pdf"
94+
name="account.report_salepurchasejournal"
95+
file="account.report_salepurchasejournal"
96+
/>
97+
98+
<report
99+
id="action_account_3rdparty_account_balance"
100+
model="account.account"
101+
string="Partner Balance"
102+
report_type="qweb-pdf"
103+
name="account.report_partnerbalance"
104+
file="account.report_partnerbalance"
105+
menu="False"
106+
/>
107+
108+
<report
109+
id="action_report_aged_partner_balance"
110+
model="res.partner"
111+
string="Aged Partner Balance"
112+
report_type="qweb-pdf"
113+
name="account.report_agedpartnerbalance"
114+
file="account.report_agedpartnerbalance"
115+
menu="False"
116+
/>
28117

29118
<report
30-
id="action_report_vat"
31-
model="account.tax.code"
32-
report_type="qweb-pdf"
33-
string="Account tax"
34-
name="account.report_vat"
35-
file="account.report_vat"
119+
id="action_report_partner_ledger"
120+
model="res.partner"
121+
string="Partner Ledger"
122+
report_type="qweb-pdf"
123+
name="account.report_partnerledger"
124+
file="account.report_partnerledger"
125+
menu="False"
36126
/>
37127

128+
<report
129+
id="action_report_partner_ledger_other"
130+
model="res.partner"
131+
string="Partner Ledger"
132+
report_type="qweb-pdf"
133+
name="account.report_partnerledgerother"
134+
file="account.report_partnerledgerother"
135+
menu="False"
136+
/>
137+
138+
<report
139+
id="action_report_financial"
140+
model="account.financial.report"
141+
string="Financial report"
142+
report_type="qweb-pdf"
143+
name="account.report_financial"
144+
file="account.report_financial"
145+
menu="False"
146+
/>
147+
148+
<report
149+
id="action_report_general_ledger"
150+
model="account.report.general.ledger"
151+
string="General Ledger"
152+
report_type="qweb-pdf"
153+
name="account.report_generalledger"
154+
file="account.report_generalledger"
155+
menu="False"
156+
auto="False"
157+
/>
158+
159+
<!-- Menu items -->
38160
<menuitem
39161
id="menu_tax_report"
40162
name="Taxes"
41163
groups="group_account_user,group_account_manager"
42-
parent="account.menu_finance_generic_reporting" sequence="3"/>
43-
164+
parent="account.menu_finance_generic_reporting"
165+
sequence="3"
166+
/>
44167
</data>
45168
</openerp>

‎addons/account/project/project_report.xml

+45-20
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,54 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<openerp>
33
<data>
4-
<report auto="False" id="analytic_journal_print" menu="False"
5-
model="account.analytic.journal" name="account.analytic.account.journal"
6-
rml="account/project/report/analytic_journal.rml" string="Analytic Journal"/>
4+
<report
5+
id="action_account_analytic_account_inverted_balance"
6+
model="account.analytic.account"
7+
string="Inverted Analytic Balance"
8+
report_type="qweb-pdf"
9+
name="account.report_invertedanalyticbalance"
10+
file="account.report_invertedanalyticbalance"
11+
menu="False"
12+
/>
713

8-
<report auto="False" id="account_analytic_account_balance" menu="False"
9-
model="account.analytic.account" name="account.analytic.account.balance"
10-
rml="account/project/report/analytic_balance.rml" string="Analytic Balance"/>
14+
<report
15+
id="action_report_analytic_journal"
16+
model="account.analytic.journal"
17+
string="Analytic Journal"
18+
report_type="qweb-pdf"
19+
name="account.report_analyticjournal"
20+
file="account.report_analyticjournal"
21+
menu="False"
22+
/>
1123

12-
<report auto="False" id="account_analytic_account_inverted_balance"
13-
menu="False" model="account.analytic.account"
14-
name="account.analytic.account.inverted.balance"
15-
rml="account/project/report/inverted_analytic_balance.rml"
16-
string="Inverted Analytic Balance"/>
24+
<report
25+
id="action_report_analytic_balance"
26+
model="account.analytic.account"
27+
string="Analytic Balance"
28+
report_type="qweb-pdf"
29+
name="account.report_analyticbalance"
30+
file="account.report_analyticbalance"
31+
menu="False"
32+
/>
1733

18-
<report auto="False" id="account_analytic_account_cost_ledger" menu="False"
19-
model="account.analytic.account" name="account.analytic.account.cost_ledger"
20-
rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/>
21-
22-
<report auto="False" id="account_analytic_account_quantity_cost_ledger"
23-
menu="False" model="account.analytic.account"
24-
name="account.analytic.account.quantity_cost_ledger"
25-
rml="account/project/report/quantity_cost_ledger.rml"
26-
string="Cost Ledger (Only quantities)"/>
34+
<report
35+
id="action_report_cost_ledger"
36+
model="account.analytic.account"
37+
report_type="qweb-pdf"
38+
string="Cost Ledger"
39+
name="account.report_analyticcostledger"
40+
file="account.report_analyticcostledger"
41+
menu="False"
42+
/>
2743

44+
<report
45+
id="action_report_cost_ledgerquantity"
46+
model="account.analytic.account"
47+
report_type="qweb-pdf"
48+
string="Cost Ledger (Only quantities)"
49+
name="account.report_analyticcostledgerquantity"
50+
file="account.report_analyticcostledgerquantity"
51+
menu="False"
52+
/>
2853
</data>
2954
</openerp>

0 commit comments

Comments
 (0)