ledger

1 files changed, 22 insertions, 3 deletions

diff --git a/indoteknik_custom/models/account_report_general_ledger.py b/indoteknik_custom/models/account_report_general_ledger.py
index 11881f39..4e909872 100644
--- a/indoteknik_custom/models/account_report_general_ledger.py
+++ b/indoteknik_custom/models/account_report_general_ledger.py
@@ -161,13 +161,14 @@ class AccountReportGeneralLedger(models.TransientModel):
         sheet.write('M11', _("Debit"), format2)
         sheet.write('N11', _("Credit"), format2)
         sheet.write('O11', _("Balance"), format2)
-        sheet.write('P11', _("Debit Sum"), format2)
+        sheet.write('P11', _("Debit Month"), format2)
+        sheet.write('Q11', _("Credit Month"), format2)
+        sheet.write('R11', _("Balance Month"), format2)
         accounts = self.env['account.account'].search([])
         row_number = 11
         col_number = 0
         for account in accounts:
             for values in report_obj:
-
                 if account['name'] == values['name'] and account['company_id'].id == values['company_id']:
                     sheet.write(row_number, col_number, account['code'], format3)
                     sheet.merge_range(row_number, col_number + 1, row_number, col_number + 11, account['name'], format6)
@@ -195,11 +196,29 @@ class AccountReportGeneralLedger(models.TransientModel):
                                             format4)
                         sheet.merge_range(row_number, col_number + 8, row_number, col_number + 11, lines['lname'],
                                             format4)
-                        sheet.write(row_number, col_number + 12, "{:,.2f}".format(lines['debit']), format5)
+                        sheet.write(row_number, col_number + 12, "{:,}".format(lines['debit']), format5)
                         sheet.write(row_number, col_number + 13, "{:,.2f}".format(lines['credit']), format5)
                         sheet.write(row_number, col_number + 14, "{:,.2f}".format(lines['balance']), format5)
                         
+                        if lines['lname'] == 'Initial Balance':
+                            debit_value = lines.get('debit', 0.0) 
+                            value_debit = values.get('debit', 0.0) 
+                            total_debit = value_debit - debit_value
+                            debit_month = "{:,.2f}".format(total_debit)
+
+                            credit_value = lines.get('credit', 0.0) 
+                            value_credit = values.get('credit', 0.0) 
+                            total_credit = value_credit - credit_value
+                            credit_month = "{:,.2f}".format(total_credit)
+
+                            total_balance = total_debit - total_credit
+                            balance_month = "{:,.2f}".format(total_balance)
+                            sheet.write(row_number, col_number + 15, debit_month, format5)
+                            sheet.write(row_number, col_number + 16, credit_month, format5)
+                            sheet.write(row_number, col_number + 17, balance_month, format5)
+                            
                         row_number += 1
+                        
 
         workbook.close()
         output.seek(0)