jegomez/odoo14-dev-environment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ADD] Patches Vendor account module - New Account field

Browse Source
This commit is contained in:
Jorge Enrique Gómez Gómez 2023-07-13 13:25:59 -05:00
parent ff136e371f
commit da1f140b89
2 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apply_patches.sh
View File

@ -36,7 +36,7 @@ pt_core ()
# Already applied: # Already applied:
#git apply $OPTIONS $SRC/patches/20210603_auth-oauth_redirects-to-root.patch #git apply $OPTIONS $SRC/patches/20210603_auth-oauth_redirects-to-root.patch
#git apply $OPTIONS $SRC/patches/20220131_purchase-requisition_match-variant.patch #git apply $OPTIONS $SRC/patches/20220131_purchase-requisition_match-variant.patch
git apply $OPTIONS $SRC/patches/20230309_ir-attachment_allow-portal-users-attachment-access.patch #git apply $OPTIONS $SRC/patches/20230309_ir-attachment_allow-portal-users-attachment-access.patch
# Included in 2023-03-09 patch: # Included in 2023-03-09 patch:
#git apply $OPTIONS $SRC/patches/20230206_ir-attachment_allow-portal-users-attachment-access.patch #git apply $OPTIONS $SRC/patches/20230206_ir-attachment_allow-portal-users-attachment-access.patch
# Reverted in https://github.com/odoo/odoo/commit/8d1d62a8c0746abb30f97290304b761f74111a89: # Reverted in https://github.com/odoo/odoo/commit/8d1d62a8c0746abb30f97290304b761f74111a89:
@ -58,7 +58,9 @@ pt_vendor ()
pushd $DEST pushd $DEST
# Included upstream: # Included upstream:
# git apply $OPTIONS $SRC/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch # git apply $OPTIONS $SRC/patches/20211209_hr-avancys_delete-without-sql-in-holiday-book.patch
git apply $OPTIONS $SRC/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch # Already applied:
# git apply $OPTIONS $SRC/patches/20211210_hr-avancys_fixes--payment-date-on-payslip.patch
git apply $OPTIONS $SRC/patches/20230713_account-avancys_adds-account-field.patch
popd popd
} }

77
patches/20230713_account-avancys_adds-account-field.patch Normal file
View File

@ -0,0 +1,77 @@
diff --git a/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py b/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py
index aa6705b..b5ce435 100644
--- a/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py
+++ b/account_avancys/wizards/account_financial_reports/account_financial_report_assistant_wizard.py
@@ -382,38 +382,40 @@ class AccountFinancialReportAssistantWizard(models.TransientModel):
ws.write(4,1,str(datetime.now()))
# EXCEL FIELDS
ws.write(6, 0, 'Fecha', bold2)
- ws.write(6, 1, 'Diario',bold2)
- ws.write(6, 2, 'Referencia', bold2)
- ws.write(6, 3, 'Tercero', bold2)
- ws.write(6, 4, 'Ref1',bold2)
- ws.write(6, 5, 'Asiento', bold2)
- ws.write(6, 6, 'Linea', bold2)
- ws.write(6, 7, 'Saldo Inicial', bold2)
- ws.write(6, 8, 'Debito', bold2)
- ws.write(6, 9, 'Credito', bold2)
- ws.write(6, 10, 'Saldo Final', bold2)
+ ws.write(6, 1, 'Cuenta',bold2)
+ ws.write(6, 2, 'Diario',bold2)
+ ws.write(6, 3, 'Referencia', bold2)
+ ws.write(6, 4, 'Tercero', bold2)
+ ws.write(6, 5, 'Ref1',bold2)
+ ws.write(6, 6, 'Asiento', bold2)
+ ws.write(6, 7, 'Linea', bold2)
+ ws.write(6, 8, 'Saldo Inicial', bold2)
+ ws.write(6, 9, 'Debito', bold2)
+ ws.write(6, 10, 'Credito', bold2)
+ ws.write(6, 11, 'Saldo Final', bold2)
row = 7
col = 0
# LINES
for line in report_lines:
- ws.merge_range(row, col, row, col + 5, line.get('code') + ' ' + line.get('name'),bold3)
- ws.write(row, col+7, line.get('amount_initial'),bold3)
- ws.write(row, col+8, line.get('debit'),bold3)
- ws.write(row, col+9, line.get('credit'),bold3)
- ws.write(row, col+10, line.get('balance'),bold3)
+ ws.merge_range(row, col, row, col + 6, line.get('code') + ' ' + line.get('name'),bold3)
+ ws.write(row, col+8, line.get('amount_initial'),bold3)
+ ws.write(row, col+9, line.get('debit'),bold3)
+ ws.write(row, col+10, line.get('credit'),bold3)
+ ws.write(row, col+11, line.get('balance'),bold3)
for move_line in line.get('move_lines'):
row+=1
ws.write(row, col, str(move_line.get('ldate')),date_format)
- ws.write(row, col + 1, move_line.get('lcode'))
- ws.write(row, col + 2, move_line.get('ref_num'))
- ws.write(row, col + 3, move_line.get('partner_name'))
- ws.write(row, col + 4, move_line.get('lref'))
- ws.write(row, col + 5, move_line.get('move_name'))
- ws.write(row, col + 6, move_line.get('lname'))
- ws.write(row, col + 7, 0,money_format)
- ws.write(row, col + 8, move_line.get('debit'),money_format)
- ws.write(row, col + 9, move_line.get('credit'),money_format)
- ws.write(row, col + 10, move_line.get('balance'),money_format)
+ ws.write(row, col + 1, line.get('code') + ' ' + line.get('name'))
+ ws.write(row, col + 2, move_line.get('lcode'))
+ ws.write(row, col + 3, move_line.get('ref_num'))
+ ws.write(row, col + 4, move_line.get('partner_name'))
+ ws.write(row, col + 5, move_line.get('lref'))
+ ws.write(row, col + 6, move_line.get('move_name'))
+ ws.write(row, col + 7, move_line.get('lname'))
+ ws.write(row, col + 8, 0,money_format)
+ ws.write(row, col + 9, move_line.get('debit'),money_format)
+ ws.write(row, col + 10, move_line.get('credit'),money_format)
+ ws.write(row, col + 11, move_line.get('balance'),money_format)
row += 1
# CLOSE IO AND GENERATE FILE
wb.close()
@@ -445,4 +447,4 @@ class AccountFinancialReportAssistantWizard(models.TransientModel):
return (
self.env["ir.actions.report"].search([("report_name", "=", 'account_avancys.report_assistant_pdf'),
("report_type", "=", 'qweb-pdf')],limit=1,).report_action(self, data=data)
- )
\ No newline at end of file
+ )