Merge lp:~unifield-team/unifield-addons/UF_1711 into lp:unifield-addons

[jftempo]

[lp:~unifield-team/unifield-addons/UF_1711]

4596. By Sean Carroll <sean@sean-msf> on 2013-11-18

UF_1711: [WIP] WIP commit for JF.

4597. By Sean Carroll <sean@sean-msf> on 2013-11-19

UF_1711: [WIP] WIP added profit_loss_xls.mako

4598. By Sean Carroll <sean@sean-msf> on 2013-11-20

UF_1711: [IMP] Added XLS report

4599. By Sean Carroll <sean@sean-msf> on 2013-11-27

UF_1711: [IMP] Mods to xls report

Unmerged revisions

4599. By Sean Carroll <sean@sean-msf> on 2013-11-27

UF_1711: [IMP] Mods to xls report

4598. By Sean Carroll <sean@sean-msf> on 2013-11-20

UF_1711: [IMP] Added XLS report

4597. By Sean Carroll <sean@sean-msf> on 2013-11-19

UF_1711: [WIP] WIP added profit_loss_xls.mako

4596. By Sean Carroll <sean@sean-msf> on 2013-11-18

UF_1711: [WIP] WIP commit for JF.

4595. By Sean Carroll on 2013-10-31

UF-1711: [FIX] removed debugging info

4594. By Sean Carroll on 2013-10-31

UF_1711: [IMP] added code to convert currencies at account line move level

4593. By Sean Carroll on 2013-10-23

UF-1711: [IMP] Added currency selection and conversion for P&L

=== modified file 'account/account.py'
--- account/account.py	2013-09-30 15:03:30 +0000
+++ account/account.py	2013-11-27 20:02:46 +0000
@@ -227,6 +227,8 @@
 
     def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
                   query='', query_params=()):
+        # Jira-1711: Added cnvt_currency to context. If it exists then balances will be converted
+        # TODO This method needs review during refactoring. 
         """ compute the balance, debit and/or credit for the provided
         account ids
         Arguments:
@@ -268,12 +270,13 @@
             # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
             # ON l.account_id = tmp.id
             # or make _get_children_and_consol return a query and join on that
-            request = ("SELECT l.account_id as id, " +\
+            # Jira 1711 - added posting_date and document_date to query
+            request = ("SELECT l.account_id as id, l.currency_id as currency_id, l.date as posting_date, l.document_date as document_date, " +\
                        ', '.join(map(mapping.__getitem__, field_names)) +
                        " FROM account_move_line l" \
                        " WHERE l.account_id IN %s " \
                             + filters +
-                       " GROUP BY l.account_id")
+                       " GROUP BY l.account_id, l.currency_id, l.date, l.document_date")
             params = (tuple(children_and_consolidated),) + query_params
             cr.execute(request, params)
             self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
@@ -281,6 +284,23 @@
 
             for res in cr.dictfetchall():
                 accounts[res['id']] = res
+               
+            # If the 'cnvt_to_curr' context variable is set with a currency id, then convert to this currency
+            if context['cnvt_to_curr']:
+                functional_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+                for account,dct in accounts.items():
+                    if dct[field_names[0]] == 0.0:
+                        pass
+                    else:
+                        date_context = {'date': dct['posting_date']} 
+                        converted_amount = self.pool.get('res.currency').compute(cr,
+                                                                  uid,
+                                                                  functional_currency_id,
+                                                                  context['cnvt_to_curr'], 
+                                                                  dct[field_names[0]] or 0.0,
+                                                                  round=True,
+                                                                  context=date_context) 
+                        accounts[account][field_names[0]] = converted_amount 
 
             # consolidate accounts with direct children
             children_and_consolidated.reverse()
@@ -300,16 +320,30 @@
                 brs.pop(0)
                 for fn in field_names:
                     sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0)
+                    #sums.setdefault(current.id, {})['posting_date'] = accounts.get(current.id, {}).get('posting_date')
                     for child in current.child_id:
-                        if child.company_id.currency_id.id == current.company_id.currency_id.id:
-                            sums[current.id][fn] += sums[child.id][fn]
-                        else:
-                            sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
+                        # Jira 1711 - if 'cnvt_to_curr' is in the context it is used to convert sums earlier in this method
+                        if context['cnvt_to_curr']:
+                            pass
+                        else:    
+                            if child.company_id.currency_id.id == current.company_id.currency_id.id:
+                                sums[current.id][fn] += sums[child.id][fn]
+                            else:
+                                sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
         res = {}
         null_result = dict((fn, 0.0) for fn in field_names)
         for id in ids:
             res[id] = sums.get(id, null_result)
         return res
+    
+    #def get_converted_account_line(self, cr, uid, from_currency, to_currency, amount, posting_date):
+    #    db_pool = pooler.get_pool(self.cr.dbname)#
+
+    #    rate_pool = db_pool.get('res.currency_rate')
+    #    from_rate = rate_pool.browse(cr, uid, from_currency, context=None)
+    #    to_rate = rate_pool.browse(cr, uid, to_currency, context=None)
+    #    return amount * (from_rate / to_rate)
+
 
     def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}

=== modified file 'account/account_report.xml'
--- account/account_report.xml	2011-01-18 18:01:02 +0000
+++ account/account_report.xml	2013-11-27 20:02:46 +0000
@@ -11,6 +11,17 @@
         <report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journal" header="False"/>
         <report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
         <report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments"/>
+        
+        <report id="pl_account_xls"
+            name="pl.account_xls"
+            model="account.account"
+            file="account/report/profit_loss_xls.mako"
+            report_type="webkit"
+            string="Account Balance (xls)"
+            auto="False"
+            menu="False"
+          />
+     
         <report
             auto="False"
             id="account_invoices"

=== modified file 'account/report/__init__.py'
--- account/report/__init__.py	2011-01-14 00:11:01 +0000
+++ account/report/__init__.py	2013-11-27 20:02:46 +0000
@@ -42,5 +42,6 @@
 import account_balance_sheet
 import account_profit_loss
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account/report/account_profit_horizontal.rml'
--- account/report/account_profit_horizontal.rml	2011-06-29 05:29:28 +0000
+++ account/report/account_profit_horizontal.rml	2013-11-27 20:02:46 +0000
@@ -148,9 +148,10 @@
       <font color="white"> </font>
     </para>
 	 	<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
-      <blockTable colWidths="250.0,100.0,150.0,120.0,150.0" style="Table2_header">
+      <blockTable colWidths="200.0,50.0,100.0,150.0,120.0,150.0" style="Table2_header">
       <tr>
       	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+      	<td><para style="terp_tblheader_General_Centre">Currency</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display Account</para></td>
@@ -158,6 +159,7 @@
       </tr>
 	<tr>
 	   <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
+	   <td><para style="terp_default_Centre_8">[[ get_currency(data).name ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
         <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
         	<blockTable colWidths="70.0,70.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
@@ -213,7 +215,7 @@
           <td>
             <para style="terp_default_9">
 
-              <font face="Times-Roman">[[ repeatIn(get_lines(),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
+              <font face="Times-Roman">[[ repeatIn(get_lines(data),'a' ) ]] </font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'}))  or removeParentNode('font') ]]</font>
             </para>
           </td>
           <td>
@@ -222,7 +224,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a['balance'])) ]]</font></para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -235,7 +237,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]]</font></para>
+            <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]]</font><font>[[(a['code1'] and a['name1']) and  formatLang(abs(a['balance1'])) or removeParentNode('font') ]]</font></para>
           </td>
         </tr>
       </blockTable>
@@ -248,7 +250,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold"> [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] </para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
@@ -257,9 +259,9 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and '' ]]</para>
         </td>
-      </tr>
+      </tr>t
     </blockTable>
 
     <blockTable colWidths="290.16,100.32,290.16,100.32" style="Table_Net_Profit_Loss">
@@ -268,13 +270,13 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ get_currency(data).name ]] [[ formatLang(abs(sum_dr())) ]] </u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ get_currency(data).name ]] [[ formatLang(abs(sum_cr())) ]] </u></para>
         </td>
       </tr>
     </blockTable>

=== modified file 'account/report/account_profit_horizontal.sxw'
Binary files account/report/account_profit_horizontal.sxw	2011-06-29 05:29:28 +0000 and account/report/account_profit_horizontal.sxw	2013-11-27 20:02:46 +0000 differ
=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py	2011-06-29 05:29:28 +0000
+++ account/report/account_profit_loss.py	2013-11-27 20:02:46 +0000
@@ -21,8 +21,14 @@
 import time
 import pooler
 from report import report_sxw
+from report_webkit.webkit_report import WebKitParser
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
 from common_report_header import common_report_header
 from tools.translate import _
+from osv import osv
+import cgi
+
+
 
 class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
 
@@ -34,10 +40,13 @@
         self.result = {}
         self.result_temp = []
         self.localcontext.update( {
+            'currency_sum_dr': self.currency_sum_dr,
+            'currency_sum_cr': self.currency_sum_cr,
             'time': time,
             'get_lines': self.get_lines,
             'get_lines_another': self.get_lines_another,
             'get_currency': self._get_currency,
+            'get_display_account': self.get_display_account,
             'get_data': self.get_data,
             'sum_dr': self.sum_dr,
             'sum_cr': self.sum_cr,
@@ -53,6 +62,7 @@
             'get_end_date':self._get_end_date,
             'get_company':self._get_company,
             'get_target_move': self._get_target_move,
+            'get_currency': self.get_currency,
         })
         self.context = context
 
@@ -78,17 +88,47 @@
         if self.res_pl['type'] == _('Net Loss'):
             self.result_sum_cr += self.res_pl['balance']
         return self.result_sum_cr
-
+    
+    def currency_sum_dr(self,data):
+        output = self.get_currency(data).name + ' ' + str(self.result_sum_dr)
+        print 'sfc: ', output
+        return output
+    
+    def currency_sum_cr(self,data):
+        return self.get_currency(data).name + ' ' + str(self.result_sum_cr)
+        
+    
+    def get_currency(self,data):
+        cr, uid = self.cr, self.uid
+        ctx = self.context.copy()
+        db_pool = pooler.get_pool(self.cr.dbname)
+        currency_pool = db_pool.get('res.currency')
+        
+        currency_id = data['form']['currency_id']
+        currency = currency_pool.browse(cr, uid, currency_id, context=ctx)
+        
+        return currency
+    
+    def get_display_account(self,data):
+        display_account = 'With balance is not equal to 0'
+        if data['form']['display_account']=='bal_all':
+            display_account = 'All'
+        if data['form']['display_account']=='bal_movement':
+            display_account = 'With movements'
+        return display_account
+    
     def get_data(self, data):
         cr, uid = self.cr, self.uid
         db_pool = pooler.get_pool(self.cr.dbname)
 
         account_pool = db_pool.get('account.account')
         currency_pool = db_pool.get('res.currency')
+        res_currency_obj = self.pool.get('res.currency')
 
         types = [
             'expense',
             'income'
+            
                 ]
 
         ctx = self.context.copy()
@@ -99,26 +139,38 @@
         elif data['form']['filter'] == 'filter_date':
             ctx['date_from'] = data['form'].get('date_from', False)
             ctx['date_to'] =  data['form'].get('date_to', False)
-
+            
+      
         cal_list = {}
         account_id = data['form'].get('chart_account_id', False)
         account_ids = account_pool._get_children_and_consol(cr, uid, account_id, context=ctx)
         accounts = account_pool.browse(cr, uid, account_ids, context=ctx)
+        
+        rpt_currency_id = data['form']['currency_id']
+        rpt_currency = currency_pool.browse(cr, uid, rpt_currency_id, context=ctx)
+        ctx['cnvt_to_curr'] = rpt_currency_id
+
 
         for typ in types:
             accounts_temp = []
             for account in accounts:
                 if (account.user_type.report_type) and (account.user_type.report_type == typ):
                     currency = account.currency_id and account.currency_id or account.company_id.currency_id
-                    if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_dr += abs(account.debit - account.credit)
-                    if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
-                        self.result_sum_cr += abs(account.debit - account.credit)
+                        
+        #            if currency == rpt_currency:
+                    account_debit = account.debit
+                    account_credit = account.credit
+                    account_balance = account.balance
+                        
+                    if typ == 'expense' and account.type <> 'view' and (account_debit <> account_credit):
+                        self.result_sum_dr += abs(account_debit - account_credit)
+                    if typ == 'income' and account.type <> 'view' and (account_debit <> account_credit):
+                        self.result_sum_cr += abs(account_debit - account_credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if (not currency_pool.is_zero(self.cr, self.uid, currency, account.credit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account.debit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account.balance)):
+                        if (not currency_pool.is_zero(self.cr, self.uid, currency, account_credit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account_debit)) or (not currency_pool.is_zero(self.cr, self.uid, currency, account_balance)):
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
+                        if not currency_pool.is_zero(self.cr, self.uid, currency, account_balance):
                             accounts_temp.append(account)
                     else:
                         accounts_temp.append(account)
@@ -172,16 +224,26 @@
                         self.result_temp.append(temp)
         return None
 
-    def get_lines(self):
+    def get_lines(self,data):
+        if data['form']['export_format'] == 'xls':
+            for row in self.result_temp:
+                for key in ('name', 'name1'):
+                    if key not in row:
+                        continue
+                    row[key] = cgi.escape(row[key]) 
         return self.result_temp
+    
+        
 
     def get_lines_another(self, group):
         return self.result.get(group, [])
-
+    
+    
+ 
+        
 report_sxw.report_sxw('report.pl.account.horizontal', 'account.account',
     'addons/account/report/account_profit_horizontal.rml',parser=report_pl_account_horizontal, header='internal landscape')
 
-report_sxw.report_sxw('report.pl.account', 'account.account',
-    'addons/account/report/account_profit_loss.rml',parser=report_pl_account_horizontal, header='internal')
+SpreadsheetReport('report.pl.account_xls','account.account','addons/account/report/profit_loss_xls.mako',parser=report_pl_account_horizontal)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/report/account_profit_loss.rml'
--- account/report/account_profit_loss.rml	2011-06-29 05:29:28 +0000
+++ account/report/account_profit_loss.rml	2013-11-27 20:02:46 +0000
@@ -219,7 +219,7 @@
           </para>
         </td>
          <td>
-          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ currency_id.symbol ]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -232,7 +232,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -242,7 +242,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ currency.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -274,7 +274,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a.level&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'}))  or removeParentNode('font') ]]</font><font>[[ formatLang(abs(a.balance)) ]] [[ currency_id.symbol ]]</font></para>
         </td>
       </tr>
     </blockTable>
@@ -287,7 +287,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -297,7 +297,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ company.currency_id.symbol ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_cr())) ]] [[ currency_id.symbol ]]</u></para>
         </td>
       </tr>
     </blockTable>

=== modified file 'account/report/account_profit_loss.sxw'
Binary files account/report/account_profit_loss.sxw	2011-06-29 05:29:28 +0000 and account/report/account_profit_loss.sxw	2013-11-27 20:02:46 +0000 differ
=== added file 'account/report/profit_loss_xls.mako'
--- account/report/profit_loss_xls.mako	1970-01-01 00:00:00 +0000
+++ account/report/profit_loss_xls.mako	2013-11-27 20:02:46 +0000
@@ -0,0 +1,347 @@
+<?xml version="1.0"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>MSFUser</Author>
+  <LastAuthor>Sean Carroll</LastAuthor>
+  <Revision>0</Revision>
+  <TotalTime>0</TotalTime>
+  <Created>2012-06-18T15:46:09Z</Created>
+  <Version>14.0</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>7820</WindowHeight>
+  <WindowWidth>21540</WindowWidth>
+  <WindowTopX>0</WindowTopX>
+  <WindowTopY>0</WindowTopY>
+  <TabRatio>385</TabRatio>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font x:Family="Swiss"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="s35">
+   <Alignment ss:Vertical="Bottom"/>
+   <Font ss:FontName="Lohit Hindi" x:Family="Swiss"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection ss:Protected="0"/>
+  </Style>
+  <Style ss:ID="s36" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s37" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+  </Style>
+  <Style ss:ID="s38" ss:Parent="s35">
+   <Font x:Family="Swiss"/>
+  </Style>
+  <Style ss:ID="s39" ss:Parent="s35">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+   <NumberFormat ss:Format="d\-m\-yy"/>
+  </Style>
+  <Style ss:ID="s40" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s41" ss:Parent="s35">
+   <Alignment ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="3"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="3"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="3"/>
+   </Borders>
+   <Font x:Family="Swiss" ss:Color="#FFFFFF" ss:Bold="1"/>
+   <Interior ss:Color="#DD0806" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s42" ss:Parent="s35">
+   <Alignment ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="3"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="3"/>
+   </Borders>
+   <Font x:Family="Swiss" ss:Color="#FFFFFF" ss:Bold="1"/>
+   <Interior ss:Color="#DD0806" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s44" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="3"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+   <Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s45" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+  </Style>
+  <Style ss:ID="s46" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s47" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+   <Interior ss:Color="#FFFFFF" ss:Pattern="Solid"/>
+   <NumberFormat ss:Format="Standard"/>
+  </Style>
+  <Style ss:ID="s48" ss:Parent="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font x:Family="Swiss"/>
+   <NumberFormat ss:Format="0.0\%"/>
+  </Style>
+  <Style ss:ID="s91">
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s92">
+   <Borders>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s93">
+   <Borders>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font x:Family="Swiss" ss:Bold="1"/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="Profit and Loss">
+  <Table ss:ExpandedColumnCount="7"  x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="53" ss:DefaultRowHeight="12">
+   <Column ss:Width="99"/>
+   <Column ss:Width="70"/>
+   <Column ss:Width="57"/>
+   <Column ss:Width="59"/>
+   <Column ss:Width="60"/>
+   <Column ss:AutoFitWidth="0" ss:Width="101"/>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s36"><Data ss:Type="String">PROFIT AND LOSS</Data></Cell>
+    <Cell ss:StyleID="s37"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Report date:</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${time.strftime('%Y-%m-%d')|n}</Data></Cell> 
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Index="4" ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Chart of Accounts:</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${get_account(data)}</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Currency:</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${get_currency(data).name}</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Fiscal Year:</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${get_fiscalyear(data) or ''}</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Filter</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${get_filter(data) or 'No Filter'}</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Display Account:</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${get_display_account(data)}</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Target:</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${get_target_move(data) or ''}</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="13">
+    <Cell ss:StyleID="s45"><Data ss:Type="String"></Data></Cell>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="27">
+    <Cell ss:StyleID="s41"><Data ss:Type="String">Code</Data></Cell>
+    <Cell ss:StyleID="s42"><Data ss:Type="String">Particular</Data></Cell>
+    <Cell ss:StyleID="s42"><Data ss:Type="String">Balance</Data></Cell>
+    <Cell ss:StyleID="s41"><Data ss:Type="String">Code</Data></Cell>
+    <Cell ss:StyleID="s42"><Data ss:Type="String">Particular</Data></Cell>
+    <Cell ss:StyleID="s42"><Data ss:Type="String">Balance</Data></Cell>
+    <Cell ss:StyleID="s38"/>
+   </Row>
+   
+<% 
+get_data(data)
+rows = get_lines(data) 
+fin = final_result()
+%>
+% for row in rows:
+ <Row ss:Height="14">
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${row['code'] or ''}</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${row['name'] or ''}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">${row['balance'] or ''}</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${row['code1'] or ''}</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${row['name1'] or ''}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">${row['balance1'] or ''}</Data></Cell>
+</Row>
+% endfor   
+
+  <Row>
+    <Cell ss:Index="2" ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+   </Row>
+
+ <Row ss:Height="14">
+    <Cell ss:StyleID="s45"><Data ss:Type="String"></Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${fin['type'] if fin['type'] == 'Net Profit' else ''}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">${fin['balance'] if fin['type'] == 'Net Profit' else ''}</Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String"></Data></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">${fin['type'] if fin['type'] == 'Net Loss' else ''}</Data></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">${fin['balance'] if fin['type'] == 'Net Loss' else ''}</Data></Cell>
+</Row>
+
+   <Row>
+    <Cell ss:Index="2" ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+    <Cell ss:StyleID="s91"/>
+   </Row>
+   <Row>
+    <Cell ss:StyleID="s92"/>
+    <Cell ss:StyleID="s93"><Data ss:Type="String">Total</Data></Cell>
+    <Cell ss:StyleID="s93"><Data ss:Type="String">${currency_sum_dr(data)}</Data></Cell>
+    <Cell ss:StyleID="s93"/>
+    <Cell ss:StyleID="s93"><Data ss:Type="String">Total</Data></Cell>
+    <Cell ss:StyleID="s93"><Data ss:Type="String">${currency_sum_cr(data)}</Data></Cell>
+   </Row>
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:StartPageNumber="1"/>
+    <Header x:Margin="0.78749999999999998"
+     x:Data="&amp;C&amp;&quot;Times New Roman,Regular&quot;&amp;12&amp;A"/>
+    <Footer x:Margin="0.78749999999999998"
+     x:Data="&amp;C&amp;&quot;Times New Roman,Regular&quot;&amp;12Page &amp;P"/>
+    <PageMargins x:Bottom="1.05277777777778" x:Left="0.78749999999999998"
+     x:Right="0.78749999999999998" x:Top="1.05277777777778"/>
+   </PageSetup>
+   <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <HorizontalResolution>-4</HorizontalResolution>
+    <VerticalResolution>-4</VerticalResolution>
+   </Print>
+   <Zoom>125</Zoom>
+   <PageLayoutZoom>125</PageLayoutZoom>
+   <Selected/>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>18</ActiveRow>
+     <ActiveCol>9</ActiveCol>
+     <RangeSelection>R18C10:R19C10</RangeSelection>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

=== modified file 'account/wizard/account_report_profit_loss.py'
--- account/wizard/account_report_profit_loss.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_profit_loss.py	2013-11-27 20:02:46 +0000
@@ -20,6 +20,9 @@
 ##############################################################################
 
 from osv import osv, fields
+import pooler
+import time
+
 
 class account_pl_report(osv.osv_memory):
     """
@@ -30,31 +33,41 @@
     _description = "Account Profit And Loss Report"
     _columns = {
         'display_type': fields.boolean("Landscape Mode"),
+        'currency_id': fields.many2one('res.currency', required=True, readonly=False, string='Currency'),
+        'export_format': fields.selection([('xls', 'Excel'), ('pdf', 'PDF')], string="Export format", required=True),
     }
 
     _defaults = {
         'display_type': True,
         'journal_ids': [],
-        'target_move': False
+        'target_move': False,
+        'export_format': lambda *a: 'pdf',
+        'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,
     }
+    
+    
 
     def _print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['display_type'])[0])
-        if data['form']['display_type']:
+        #data = {'code': 'code1', 'particular': 'particular1', 'bal': 'bal1'}
+     
+        
+        data['form'].update(self.read(cr, uid, ids, ['display_type', 'currency_id','export_format'])[0])   
+        if data['form']['export_format'] == 'pdf':
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'pl.account.horizontal',
                 'datas': data,
             }
-        else:
+        if data['form']['export_format'] == 'xls':
             return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'pl.account',
+                'type': 'ir.actions.report.xml', 
+                'report_name': 'pl.account_xls', 
                 'datas': data,
             }
+            
 
 account_pl_report()
 

=== modified file 'account/wizard/account_report_profit_loss_view.xml'
--- account/wizard/account_report_profit_loss_view.xml	2011-01-14 00:11:01 +0000
+++ account/wizard/account_report_profit_loss_view.xml	2013-11-27 20:02:46 +0000
@@ -22,6 +22,8 @@
             <xpath expr="//field[@name='fiscalyear_id']" position="after">
                    <field name="display_account"/>
                    <field name="display_type"/>
+                   <field name="export_format"/>
+                   <field name="currency_id"/>
             </xpath>
             </data>
             </field>
@@ -36,6 +38,9 @@
              <field name="view_id" ref="account_pl_report_view"/>
              <field name="target">new</field>
        </record>
+       
+       
+       
 
        <menuitem
             parent="account.menu_finance_legal_statement"