Merge lp:~therp-nl/openobject-addons/8.0-lp1220156-aged_partner_balance_selection_of_partners into lp:openobject-addons

[Stefan Rijnhart (Opener)]

[lp:~therp-nl/openobject-addons/8.0-lp1220156-aged_partner_balance_selection_of_partners]

8874. By Stefan Rijnhart (Opener) on 2013-09-03

[FIX] Remove debug statement

8875. By Stefan Rijnhart (Opener) on 2013-09-03

[FIX] Don't show 'Unknown Partner' line if run on a selection of partners

Unmerged revisions

8875. By Stefan Rijnhart (Opener) on 2013-09-03

[FIX] Don't show 'Unknown Partner' line if run on a selection of partners

8874. By Stefan Rijnhart (Opener) on 2013-09-03

[FIX] Remove debug statement

8873. By Stefan Rijnhart (Opener) on 2013-09-03

[IMP] Print aged partner balance on a selection of partners

=== modified file 'account/report/account_aged_partner_balance.py'
--- account/report/account_aged_partner_balance.py	2013-06-14 21:36:02 +0000
+++ account/report/account_aged_partner_balance.py	2013-09-03 10:24:26 +0000
@@ -57,6 +57,7 @@
             self.ACCOUNT_TYPE = ['payable']
         else:
             self.ACCOUNT_TYPE = ['payable','receivable']
+        self.partner_ids = ids if data.get('model') == 'res.partner' else False
         return super(aged_trial_report, self).set_context(objects, data, ids, report_type=report_type)
 
     def _get_lines(self, form):
@@ -64,6 +65,15 @@
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
+        query_params = [
+            tuple(move_state), tuple(self.ACCOUNT_TYPE),
+            self.date_from, self.date_from]
+        if self.partner_ids:
+            partner_query = ' AND res_partner.id IN %s '
+            query_params.append(tuple(self.partner_ids))
+        else:
+            partner_query = ''
+
         self.cr.execute('SELECT DISTINCT res_partner.id AS id,\
                     res_partner.name AS name \
                 FROM res_partner,account_move_line AS l, account_account, account_move am\
@@ -76,8 +86,8 @@
                        OR (reconcile_id IN (SELECT recon.id FROM account_move_reconcile AS recon WHERE recon.create_date > %s )))\
                     AND (l.partner_id=res_partner.id)\
                     AND (l.date <= %s)\
-                    AND ' + self.query + ' \
-                ORDER BY res_partner.name', (tuple(move_state), tuple(self.ACCOUNT_TYPE), self.date_from, self.date_from,))
+                    AND ' + self.query + partner_query + ' \
+                ORDER BY res_partner.name', tuple(query_params))
         partners = self.cr.dictfetchall()
         ## mise a 0 du total
         for i in range(7):
@@ -224,6 +234,8 @@
         return res
 
     def _get_lines_with_out_partner(self, form):
+        if self.partner_ids:
+            return []
         res = []
         move_state = ['draft','posted']
         if self.target_move == 'posted':

=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py	2013-04-15 10:23:49 +0000
+++ account/wizard/account_report_aged_partner_balance.py	2013-09-03 10:24:26 +0000
@@ -49,6 +49,8 @@
             context = {}
 
         data = self.pre_print_report(cr, uid, ids, data, context=context)
+        data['ids'] = context.get('active_ids', [])
+        data['model'] = context.get('active_model', 'ir.ui.menu')
         data['form'].update(self.read(cr, uid, ids, ['period_length', 'direction_selection'])[0])
 
         period_length = data['form']['period_length']
@@ -78,8 +80,6 @@
                 }
                 start = stop + relativedelta(days=1)
         data['form'].update(res)
-        if data.get('form',False):
-            data['ids']=[data['form'].get('chart_account_id',False)]
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.aged_trial_balance',

=== modified file 'account/wizard/account_report_aged_partner_balance_view.xml'
--- account/wizard/account_report_aged_partner_balance_view.xml	2013-07-15 02:52:12 +0000
+++ account/wizard/account_report_aged_partner_balance_view.xml	2013-09-03 10:24:26 +0000
@@ -41,6 +41,13 @@
              <field name="target">new</field>
        </record>
 
+       <record model="ir.values" id="ir_values_account_aged_partner_balance">
+           <field name="key2" eval="'client_print_multi'"/>
+           <field name="model" eval="'res.partner'"/>
+           <field name="name">Print Aged Partner Balance</field>
+           <field name="value" eval="'ir.actions.act_window,%d'%action_account_aged_balance_view"/>
+       </record>
+
         <menuitem icon="STOCK_PRINT"
             name="Aged Partner Balance"
             action="action_account_aged_balance_view"