openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #02993
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
Meera Trambadia (OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#600547 Invoice totals not updated when a line is moved (store={...} bug?)
https://bugs.launchpad.net/bugs/600547
#690895 copy account.move crash
https://bugs.launchpad.net/bugs/690895
#694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
https://bugs.launchpad.net/bugs/694144
#695632 [RC1]Two same fields creating problem in web-client
https://bugs.launchpad.net/bugs/695632
#695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
https://bugs.launchpad.net/bugs/695960
#702805 an employee shouldn't be able to see expenses and holidays of others employee
https://bugs.launchpad.net/bugs/702805
#703836 [Trunk] hr_expense: Invoice button not working
https://bugs.launchpad.net/bugs/703836
#705766 Wrong Picked Widget in Sale Order in OpenERP v6.0.1
https://bugs.launchpad.net/bugs/705766
#707144 [6.0] hr_payroll 'C/D' versus 'D/C'
https://bugs.launchpad.net/bugs/707144
#708603 Miscalculation of parent_store data when moving multiple records under same parent
https://bugs.launchpad.net/bugs/708603
#711533 v6 hr_attendance - time is rounded to hour
https://bugs.launchpad.net/bugs/711533
#712960 [Trunk] - increase size of col. date in payment order pdf
https://bugs.launchpad.net/bugs/712960
#715269 [TRUNK] Residual Amount is Wrong referenced and wrong calculated.
https://bugs.launchpad.net/bugs/715269
#715365 account_payment error when adding lines to bank statement
https://bugs.launchpad.net/bugs/715365
#716300 context not passed in tree_but_action
https://bugs.launchpad.net/bugs/716300
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/49375
[FIX] account:context is correctly passed in 'Chart of Accounts' --fixes lp:716300
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/49375
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2011-02-07 10:36:45 +0000
+++ account/account_move_line.py 2011-02-11 11:36:19 +0000
@@ -678,6 +678,13 @@
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
if context is None:
context = {}
+ if context and context.get('chart_of_account', False):
+ if context.get('periods', False):
+ args.append(('period_id', 'in', context['periods']))
+ if context.get('state', False) and context['state'] == 'posted':
+ args.append(('state', '=', 'valid'))
+ if context.get('fiscalyear', False):
+ args.append(('period_id.fiscalyear_id.id', '=', context['fiscalyear']))
if context and context.get('next_partner_only', False):
if not context.get('partner_id', False):
partner = self.get_next_partner_only(cr, uid, offset, context)
=== modified file 'account/wizard/account_chart_view.xml'
--- account/wizard/account_chart_view.xml 2011-01-14 00:11:01 +0000
+++ account/wizard/account_chart_view.xml 2011-02-11 11:36:19 +0000
@@ -31,6 +31,7 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_account_chart"/>
<field name="target">new</field>
+ <field name="context">{'chart_of_account': 1}</field>
<field name="help">Display your company chart of accounts per fiscal year and filter by period. Have a complete tree view of all journal items per account code by clicking on an account.</field>
</record>