[IMP] account: Central journal report update with osv memory (ref: PAP)

bzr revid: mra@mra-laptop-20100625123906-92ngclf892sywvuo

addons/account/report/central_journal.py

@@ -45,8 +45,9 @@ class journal_print(report_sxw.rml_parse):
                         self.cr.execute('select a.code, a.name, sum(debit) as debit, sum(credit) as credit from account_move_line l left join account_account a on (l.account_id=a.id) where l.period_id=%s and l.journal_id=%s and l.state<>\'draft\' group by a.id, a.code, a.name, l.journal_id, l.period_id', (period, journal))
                         res = self.cr.dictfetchall()
                         a = {'journal':self.pool.get('account.journal').browse(self.cr, self.uid, journal),'period':self.pool.get('account.period').browse(self.cr, self.uid, period)}
-                        res[0].update(a)
-                        ids_final.append(res)
+                        if res:
+                            res[0].update(a)
+                            ids_final.append(res)
             return ids_final
         self.cr.execute('select a.code, a.name, sum(debit) as debit, sum(credit) as credit from account_move_line l left join account_account a on (l.account_id=a.id) where l.period_id=%s and l.journal_id=%s and l.state<>\'draft\' group by a.id, a.code, a.name', (period_id, journal_id))
         res = self.cr.dictfetchall()

addons/account/report/wizard_central_journal.rml

@@ -123,7 +123,8 @@
     <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
   </stylesheet>
   <images/>
-  <story>
+  <story> 
+  <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
     <!--blockTable colWidths="180.0,180.0,180.0" style="Table_header_Content">
       <tr>
         <td>
@@ -145,9 +146,12 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
-    <para style="terp_default_8">[[ repeatIn(lines(data['form']['period_id'][0][2],data['form']['journal_id'][0][2]), 'line') ]]</para>
+   
+  
+	<section> 		
     <blockTable colWidths="180.0,180.0,180.0" style="Table_Sub_Header_Content">
+	<para style="terp_default_8">[[ repeatIn(lines(data['form']['periods'],data['form']['journal_ids']), 'line') ]]</para>      
+  	<condPageBreak height="1"/>
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Journal Code</para>
@@ -214,17 +218,13 @@
 	          <para style="terp_default_Bold_9_Right">[[ formatLang(sum_credit(line[0]['period'].id, line[0]['journal'].id)) ]]</para>
 	        </td>
 	      </tr>
-	    </blockTable>
-      </td>
-      </tr>
-
-      <tr>
+	      <tr>
       <td>
 	      <blockTable colWidths="80.0,272.0,94.0,87.0" style="Table_Journal_Line_Content">
-	       <para style="terp_default_8">[[repeatIn(line,'l')]]</para>
 	        <tr>
+	         <para style="terp_default_8">[[repeatIn(line,'l')]]</para>
 	          <td>
-	            <para style="terp_default_9">[[ l['code'] ]]</para>
+	            <para style="terp_default_9">d[[ l['code'] ]]</para>
 	          </td>
 	          <td>
 	            <para style="terp_default_9">[[ l['name'] ]]</para>
@@ -237,9 +237,16 @@
 	          </td>
 	        </tr>
 	      </blockTable>
+	      
    	  </td>
    	  </tr>
+	    </blockTable>
+      </td>
+      </tr>
    	 </blockTable>
+   	 <pageBreak/>
+   	 </section>
+   	  	
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>

addons/account/wizard/account_central_journal.py

@@ -24,36 +24,31 @@ from tools.translate import _
 class account_central_journal(osv.osv_memory):
     _name = 'account.central.journal'
     _description = 'Account Central Journal'
+    _inherit = "account.common.report"
+    _defaults={
+               'filter': 'filter_period'
+               }
 
-    _columns = {
-        'journal_id': fields.many2many('account.journal', 'account_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
-        'period_id': fields.many2many('account.period', 'account_period_rel', 'account_id', 'period_id', 'Periods',  required=True),
-        }
-
-    def check_data(self, cr, uid, ids, context={}):
-        obj_jperiod = self.pool.get('account.journal.period')
-        datas = {}
-        datas['ids'] = []
-        datas['model'] = 'account.journal.period'
-        datas['form'] = self.read(cr, uid, ids)[0]
-        period_id = datas['form']['period_id']
-        journal_id = datas['form']['journal_id']
-
-        if isinstance(period_id, list):
-            ids_final = []
-            for journal in journal_id:
-                for period in period_id:
-                    ids_journal_period = obj_jperiod.search(cr,uid, [('journal_id','=',journal),('period_id','=',period)], context=context)
-                    if ids_journal_period:
-                        ids_final.append(ids_journal_period)
-                if not ids_final:
-                    raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'account.central.journal',
-            'datas': datas,
-            'nodestroy':True,
-            }
+    def _print_report(self, cr, uid, ids, data, query_line, context=None):
+            periods = [x[0] for x in data['form']['periods'][1]]
+            data['form']['periods'] = periods
+            data['ids'] = ids
+            obj_jperiod = self.pool.get('account.journal.period')
+            if isinstance(periods, list):
+                ids_final = []
+                for journal in data['form']['journal_ids']:
+                    for period in periods:
+                        ids_journal_period = obj_jperiod.search(cr,uid, [('journal_id','=',journal),('period_id','=',period)], context=context)
+                        if ids_journal_period:
+                            ids_final.append(ids_journal_period)
+                    if not ids_final:
+                        raise osv.except_osv(_('No Data Available'), _('No records found for your selection!'))
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.central.journal.wiz',
+                'datas': data,
+                'nodestroy':True,
+                }
 
 account_central_journal()
 

addons/account/wizard/account_central_journal_view.xml

@@ -8,15 +8,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Print Central Journal">
-			    <group col="4" colspan="6">
-				    <field name="journal_id"/>
-				    <field name="period_id"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-print"/>
+			    <group>
+					<separator string="Journals"/><newline/>
+					    <field name="journal_ids" nolabel="1"/><newline/>
+					<separator string="Periods"/><newline/>
+					<group>
+						<field name="period_from"/>
+					    <field name="period_to"/>
+					</group>
 				</group>
+				<newline/>
+				    <group>
+			    	<separator/><newline/>
+			    	<group>
+ 	            	<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+ 	            	<button name="check_report" string="Print" type="object" icon="gtk-ok"/>
+					</group>
+				</group>			    		
 			</form>
             </field>
         </record>