Sanjay Gohel (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons11-account-apa-analytic-journal-sgo
into lp:openobject-addons.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-account-apa-analytic-journal-sgo/+merge/126945
Hello sir,
I have improve wizard for report of analytic journal.
Thank You.
SGO
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-account-apa-analytic-journal-sgo/+merge/126945
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons11-account-apa-analytic-journal-sgo.
=== modified file 'account/account.py'
--- account/account.py 2012-09-24 16:26:45 +0000
+++ account/account.py 2012-09-28 12:23:26 +0000
@@ -1286,7 +1286,7 @@
'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
- 'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
+ 'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount, store=True),
'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True),
'narration':fields.text('Internal Note'),
'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
=== modified file 'account/project/project.py'
--- account/project/project.py 2011-01-14 00:11:01 +0000
+++ account/project/project.py 2012-09-28 12:23:26 +0000
@@ -21,6 +21,7 @@
from osv import fields
from osv import osv
+import time
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'
@@ -49,5 +50,4 @@
}
account_journal()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml 2012-09-10 20:14:08 +0000
+++ account/project/project_view.xml 2012-09-28 12:23:26 +0000
@@ -114,9 +114,6 @@
</field>
</record>
- <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
- name="Analytic" parent="account.menu_finance_generic_reporting"
- sequence="4"/>
<record id="view_account_analytic_line_form" model="ir.ui.view">
<field name="name">account.analytic.line.form</field>
@@ -346,21 +343,11 @@
action="action_account_analytic_journal_open_form"
id="account_analytic_journal_entries"
parent="menu_finance_entries"/>
-
+
#
# Reporting
#
- <record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
- <field name="name">Print Analytic Journals</field>
- <field name="res_model">account.analytic.journal</field>
- <field name="view_type">tree</field>
- <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
- </record>
- <menuitem groups="analytic.group_analytic_accounting"
- action="action_account_analytic_journal_tree"
- id="account_analytic_journal_print" parent="account.next_id_40"/>
-
<record id="view_account_journal_1" model="ir.ui.view">
<field name="name">account.journal.form.1</field>
<field name="model">account.journal</field>
@@ -377,7 +364,7 @@
<field name="model">account.analytic.account</field>
<field name="arch" type="xml">
<graph string="Analytic Account Statistics" type="bar">
- <field name="complete_name"/>
+ <field name="name"/>
<field name="balance" operator="+"/>
</graph>
</field>
=== modified file 'account/project/wizard/account_analytic_journal_report.py'
--- account/project/wizard/account_analytic_journal_report.py 2011-04-29 08:49:48 +0000
+++ account/project/wizard/account_analytic_journal_report.py 2012-09-28 12:23:26 +0000
@@ -29,6 +29,7 @@
_columns = {
'date1': fields.date('Start of period', required=True),
'date2': fields.date('End of period', required=True),
+ 'analytic_account_journal_id': fields.many2many('account.analytic.journal', 'account_analytic_journal_name', 'journal_line_id', 'journal_print_id', 'Analytic Journals', required=True),
}
_defaults = {
@@ -40,8 +41,15 @@
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
+ ids_list = []
+ if context.get('active_id',False):
+ ids_list.append(context.get('active_id',False))
+ else:
+ record = self.browse(cr,uid,ids[0],context=context)
+ for analytic_record in record.analytic_account_journal_id:
+ ids_list.append(analytic_record.id)
datas = {
- 'ids': context.get('active_ids',[]),
+ 'ids': ids_list,
'model': 'account.analytic.journal',
'form': data
}
@@ -50,6 +58,14 @@
'report_name': 'account.analytic.journal',
'datas': datas,
}
+
+ def default_get(self, cr, uid, fields, context=None):
+ if context is None:
+ context = {}
+ res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
+ if 'analytic_account_journal_id' in fields:
+ res.update({'analytic_account_journal_id': context.get('active_ids',[])})
+ return res
account_analytic_journal_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'account/project/wizard/account_analytic_journal_report_view.xml'
--- account/project/wizard/account_analytic_journal_report_view.xml 2012-08-09 09:21:13 +0000
+++ account/project/wizard/account_analytic_journal_report_view.xml 2012-09-28 12:23:26 +0000
@@ -7,15 +7,16 @@
<field name="model">account.analytic.journal.report</field>
<field name="arch" type="xml">
<form string="Select Period" version="7.0">
- <header>
- <button name="check_report" string="Print" type="object" class="oe_highlight"/>
- or
- <button string="Cancel" class="oe_link" special="cancel"/>
- </header>
<group col="4">
<field name="date1"/>
<field name="date2"/>
+ <field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1"/>
</group>
+ <footer>
+ <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+ or
+ <button string="Cancel" class="oe_link" special="cancel"/>
+ </footer>
</form>
</field>
</record>
@@ -38,6 +39,13 @@
<field name="key">action</field>
<field name="model">account.analytic.journal</field>
</record>
+
+ <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
+ name="Analytic" parent="account.menu_finance_generic_reporting"
+ sequence="4"/>
+ <menuitem groups="analytic.group_analytic_accounting"
+ action="account.action_account_analytic_journal"
+ id="account_analytic_journal_print" parent="account.next_id_40"/>
</data>
</openerp>
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py 2012-09-24 16:26:45 +0000
+++ analytic/analytic.py 2012-09-28 12:23:26 +0000
@@ -151,7 +151,7 @@
'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'),
'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'),
'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'),
- 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
+ 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account'),store=True),
'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
