Merge lp:~openerp-dev/openobject-addons/trunk-eval-action-context-pna into lp:openobject-addons

[Pinakin Nayi (OpenERP)]

Hello Sir,

I fixed issue regarding filter on fiscal year in CoA tree.I also improved CoA wizard so if user select future fiscal year then set starting period of that FY and leave end period field as empty.

To Reproduce :
 Create 2 fiscal years ex. 2013,2014. Now create invoices both in 2013 and 2014 FY and validate. Now go to chart of account and open for any fiscal year(suppose 2014), select any account(click on account that will display all list of journal items of that account), now if we notice it will get all the journal items of all fiscal years(including 2013 FY).

Expected : Only related fiscal year(2014) journal items should display of that account.

Thanks,
pna

[lp:~openerp-dev/openobject-addons/trunk-eval-action-context-pna]

9257. By Pinakin Nayi (OpenERP) on 2014-04-08

[IMP]improve code as per suggestion

9258. By Pinakin Nayi (OpenERP) on 2014-04-08

[IMP]reduce code

9259. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-23

[MERGE] from trunk

Unmerged revisions

9259. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-23

[MERGE] from trunk

9258. By Pinakin Nayi (OpenERP) on 2014-04-08

[IMP]reduce code

9257. By Pinakin Nayi (OpenERP) on 2014-04-08

[IMP]improve code as per suggestion

9256. By Pinakin Nayi (OpenERP) on 2014-04-08

[Merge]with trunk

9255. By Pinakin Nayi (OpenERP) on 2014-04-03

[MERGE]with trunk

9254. By Pinakin Nayi (OpenERP) on 2014-04-03

[IMP]account_chart: onchange of fiscalyear in coa if there is future fiscal year then pass only starting period

9253. By Pinakin Nayi (OpenERP) on 2014-04-01

[MERGE]with main

9252. By Pinakin Nayi (OpenERP) on 2014-04-01

[MERGE]with main

9251. By Pinakin Nayi (OpenERP) on 2014-03-27

[Merge]with trunk

9250. By Pinakin Nayi (OpenERP) on 2014-03-27

[FIX]Accounting: filter on fiscal year in CoA tree

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2014-01-15 21:44:54 +0000
+++ account/account_move_line.py	2014-04-23 10:26:35 +0000
@@ -724,6 +724,8 @@
     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('fiscalyear', False):
+            args.append(('period_id.fiscalyear_id', '=', context.get('fiscalyear', False)))
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.list_partners_to_reconcile(cr, uid, context=context)

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2014-04-18 11:59:13 +0000
+++ account/account_view.xml	2014-04-23 10:26:35 +0000
@@ -351,7 +351,7 @@
         <act_window
             id="action_account_items"
             name="Journal Items"
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id], 'fiscalyear': context.get('fiscalyear')}"
             res_model="account.move.line"
             src_model="account.account"
             key2="tree_but_open"/>

=== modified file 'account/wizard/account_chart.py'
--- account/wizard/account_chart.py	2013-10-27 12:31:04 +0000
+++ account/wizard/account_chart.py	2014-04-23 10:26:35 +0000
@@ -62,9 +62,10 @@
                                ORDER BY p.date_stop DESC
                                LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id))
             periods =  [i[0] for i in cr.fetchall()]
-            if periods and len(periods) > 1:
+            if periods:
                 start_period = periods[0]
-                end_period = periods[1]
+                if len(periods) > 1:
+                    end_period = periods[1]
             res['value'] = {'period_from': start_period, 'period_to': end_period}
         else:
             res['value'] = {'period_from': False, 'period_to': False}