Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons11-account-apa-accounting-fka
into lp:~openerp-dev/openobject-addons/trunk-addons11-account-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-account-apa-accounting-fka/+merge/126170
Hello sir,
- solve keyerror : amount in Journal Entries in "Graph" view
- solve AssertionError: Fields in 'groupby' must be regular database-persisted
fields (no function or related fields), or function fields with store=True
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons11-account-apa-accounting-fka/+merge/126170
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons11-account-apa.
=== modified file 'account/account.py'
--- account/account.py 2012-09-24 16:26:45 +0000
+++ account/account.py 2012-09-25 06:45: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_view.xml'
--- account/project/project_view.xml 2012-09-10 20:14:08 +0000
+++ account/project/project_view.xml 2012-09-25 06:45:26 +0000
@@ -377,7 +377,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 'analytic/analytic.py'
--- analytic/analytic.py 2012-09-24 16:26:45 +0000
+++ analytic/analytic.py 2012-09-25 06:45: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
