Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: failing test case of payment entry (backport #2835) #2841

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

The get_advance_payment_entries_for_regional function was failing because ERPNext passes an additional parameter called default_advance_account

erpnext pr : #44545

Huly®: IC-2968

(cherry picked from commit 3051b0e)

# Conflicts:
#	.releaserc
#	README.md
#	india_compliance/__init__.py
#	india_compliance/audit_trail/overrides/test_account_settings.py
#	india_compliance/audit_trail/overrides/test_customize_form.py
#	india_compliance/audit_trail/overrides/test_property_setter.py
#	india_compliance/audit_trail/overrides/test_version.py
#	india_compliance/gst_india/client_scripts/e_waybill_actions.js
#	india_compliance/gst_india/client_scripts/e_waybill_applicability.js
#	india_compliance/gst_india/client_scripts/sales_invoice.js
#	india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.json
#	india_compliance/gst_india/doctype/bill_of_entry/test_bill_of_entry.py
#	india_compliance/gst_india/doctype/bill_of_entry_item/bill_of_entry_item.json
#	india_compliance/gst_india/doctype/e_invoice_applicable_company/e_invoice_applicable_company.json
#	india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json
#	india_compliance/gst_india/doctype/e_invoice_log/test_e_invoice_log.py
#	india_compliance/gst_india/doctype/e_waybill_log/e_waybill_log.json
#	india_compliance/gst_india/doctype/e_waybill_log/test_e_waybill_log.py
#	india_compliance/gst_india/doctype/gst_account/gst_account.json
#	india_compliance/gst_india/doctype/gst_credential/gst_credential.json
#	india_compliance/gst_india/doctype/gst_hsn_code/gst_hsn_code.json
#	india_compliance/gst_india/doctype/gst_hsn_code/test_gst_hsn_code.py
#	india_compliance/gst_india/doctype/gst_inward_supply/gst_inward_supply.json
#	india_compliance/gst_india/doctype/gst_inward_supply/test_gst_inward_supply.py
#	india_compliance/gst_india/doctype/gst_inward_supply_item/gst_inward_supply_item.json
#	india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
#	india_compliance/gst_india/doctype/gst_return_log/test_gst_return_log.py
#	india_compliance/gst_india/doctype/gst_settings/test_gst_settings.py
#	india_compliance/gst_india/doctype/gst_uom_map/gst_uom_map.json
#	india_compliance/gst_india/doctype/gstin/test_gstin.py
#	india_compliance/gst_india/doctype/gstr_1_beta/test_gstr_1_beta.py
#	india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.json
#	india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py
#	india_compliance/gst_india/doctype/gstr_3b_report/test_gstr_3b_report.py
#	india_compliance/gst_india/doctype/gstr_import_log/gstr_import_log.json
#	india_compliance/gst_india/doctype/gstr_import_log/test_gstr_import_log.py
#	india_compliance/gst_india/doctype/pan/test_pan.py
#	india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.css
#	india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.json
#	india_compliance/gst_india/doctype/purchase_reconciliation_tool/test_purchase_reconciliation_tool.py
#	india_compliance/gst_india/overrides/payment_entry.py
#	india_compliance/gst_india/overrides/purchase_invoice.py
#	india_compliance/gst_india/overrides/purchase_receipt.py
#	india_compliance/gst_india/overrides/subcontracting_transaction.py
#	india_compliance/gst_india/overrides/test_advance_payment_entry.py
#	india_compliance/gst_india/overrides/test_company.py
#	india_compliance/gst_india/overrides/test_ineligible_itc.py
#	india_compliance/gst_india/overrides/test_item_tax_template.py
#	india_compliance/gst_india/overrides/test_party.py
#	india_compliance/gst_india/overrides/test_purchase_invoice.py
#	india_compliance/gst_india/overrides/test_sales_invoice.py
#	india_compliance/gst_india/overrides/test_subcontracting_transaction.py
#	india_compliance/gst_india/overrides/test_transaction.py
#	india_compliance/gst_india/overrides/test_transaction_data.py
#	india_compliance/gst_india/overrides/transaction.py
#	india_compliance/gst_india/report/gst_sales_register_beta/test_sales_register_beta.py
#	india_compliance/gst_india/report/gstr_1/gstr_1.py
#	india_compliance/gst_india/report/gstr_1/test_gstr_1.py
#	india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py
#	india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
#	india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/test_hsn_wise_summary_of_outward_supplies.py
#	india_compliance/gst_india/utils/__init__.py
#	india_compliance/gst_india/utils/e_waybill.py
#	india_compliance/gst_india/utils/gstr_1/test_gstr_1_json_map.py
#	india_compliance/gst_india/utils/gstr_2/test_gstr_2a.py
#	india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v3_0.py
#	india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v4_0.py
#	india_compliance/gst_india/utils/test_e_invoice.py
#	india_compliance/gst_india/utils/test_e_waybill.py
#	india_compliance/gst_india/utils/test_gstin_info.py
#	india_compliance/gst_india/utils/test_utils.py
#	india_compliance/gst_india/utils/transaction_data.py
#	india_compliance/hooks.py
#	india_compliance/income_tax_india/constants/__init__.py
#	india_compliance/income_tax_india/data/tds_details.json
#	india_compliance/public/js/utils.js
#	india_compliance/setup_wizard.py
#	india_compliance/test_patches.py
#	india_compliance/tests/__init__.py
#	india_compliance/tests/test_records.json
#	india_compliance/vat_india/doctype/c_form/c_form.json
#	india_compliance/vat_india/doctype/c_form_invoice_detail/c_form_invoice_detail.json
@mergify mergify bot added the conflicts label Dec 12, 2024
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of 3051b0e has failed:

On branch mergify/bp/version-15-hotfix/pr-2835
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 3051b0ea.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .github/workflows/initiate_release.yml
	new file:   codecov.yml
	new file:   india_compliance/gst_india/overrides/test_setup_wizard.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      .releaserc
	both added:      README.md
	both added:      india_compliance/__init__.py
	both added:      india_compliance/audit_trail/overrides/test_account_settings.py
	both added:      india_compliance/audit_trail/overrides/test_customize_form.py
	both added:      india_compliance/audit_trail/overrides/test_property_setter.py
	both added:      india_compliance/audit_trail/overrides/test_version.py
	both added:      india_compliance/gst_india/client_scripts/e_waybill_actions.js
	both added:      india_compliance/gst_india/client_scripts/e_waybill_applicability.js
	both added:      india_compliance/gst_india/client_scripts/sales_invoice.js
	both added:      india_compliance/gst_india/doctype/bill_of_entry/bill_of_entry.json
	both added:      india_compliance/gst_india/doctype/bill_of_entry/test_bill_of_entry.py
	both added:      india_compliance/gst_india/doctype/bill_of_entry_item/bill_of_entry_item.json
	both added:      india_compliance/gst_india/doctype/e_invoice_applicable_company/e_invoice_applicable_company.json
	both added:      india_compliance/gst_india/doctype/e_invoice_log/e_invoice_log.json
	both added:      india_compliance/gst_india/doctype/e_invoice_log/test_e_invoice_log.py
	both added:      india_compliance/gst_india/doctype/e_waybill_log/e_waybill_log.json
	both added:      india_compliance/gst_india/doctype/e_waybill_log/test_e_waybill_log.py
	both added:      india_compliance/gst_india/doctype/gst_account/gst_account.json
	both added:      india_compliance/gst_india/doctype/gst_credential/gst_credential.json
	both added:      india_compliance/gst_india/doctype/gst_hsn_code/gst_hsn_code.json
	both added:      india_compliance/gst_india/doctype/gst_hsn_code/test_gst_hsn_code.py
	both added:      india_compliance/gst_india/doctype/gst_inward_supply/gst_inward_supply.json
	both added:      india_compliance/gst_india/doctype/gst_inward_supply/test_gst_inward_supply.py
	both added:      india_compliance/gst_india/doctype/gst_inward_supply_item/gst_inward_supply_item.json
	both added:      india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
	both added:      india_compliance/gst_india/doctype/gst_return_log/test_gst_return_log.py
	both added:      india_compliance/gst_india/doctype/gst_settings/test_gst_settings.py
	both added:      india_compliance/gst_india/doctype/gst_uom_map/gst_uom_map.json
	both added:      india_compliance/gst_india/doctype/gstin/test_gstin.py
	both added:      india_compliance/gst_india/doctype/gstr_1_beta/test_gstr_1_beta.py
	both added:      india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.json
	both added:      india_compliance/gst_india/doctype/gstr_3b_report/gstr_3b_report.py
	both added:      india_compliance/gst_india/doctype/gstr_3b_report/test_gstr_3b_report.py
	both added:      india_compliance/gst_india/doctype/gstr_import_log/gstr_import_log.json
	both added:      india_compliance/gst_india/doctype/gstr_import_log/test_gstr_import_log.py
	both added:      india_compliance/gst_india/doctype/pan/test_pan.py
	both added:      india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.css
	both added:      india_compliance/gst_india/doctype/purchase_reconciliation_tool/purchase_reconciliation_tool.json
	both added:      india_compliance/gst_india/doctype/purchase_reconciliation_tool/test_purchase_reconciliation_tool.py
	both added:      india_compliance/gst_india/overrides/payment_entry.py
	both added:      india_compliance/gst_india/overrides/purchase_invoice.py
	both added:      india_compliance/gst_india/overrides/purchase_receipt.py
	both added:      india_compliance/gst_india/overrides/subcontracting_transaction.py
	both added:      india_compliance/gst_india/overrides/test_advance_payment_entry.py
	both added:      india_compliance/gst_india/overrides/test_company.py
	both added:      india_compliance/gst_india/overrides/test_ineligible_itc.py
	both added:      india_compliance/gst_india/overrides/test_item_tax_template.py
	both added:      india_compliance/gst_india/overrides/test_party.py
	both added:      india_compliance/gst_india/overrides/test_purchase_invoice.py
	both added:      india_compliance/gst_india/overrides/test_sales_invoice.py
	both added:      india_compliance/gst_india/overrides/test_subcontracting_transaction.py
	both added:      india_compliance/gst_india/overrides/test_transaction.py
	both added:      india_compliance/gst_india/overrides/test_transaction_data.py
	both added:      india_compliance/gst_india/overrides/transaction.py
	both added:      india_compliance/gst_india/report/gst_sales_register_beta/test_sales_register_beta.py
	both added:      india_compliance/gst_india/report/gstr_1/gstr_1.py
	both added:      india_compliance/gst_india/report/gstr_1/test_gstr_1.py
	both added:      india_compliance/gst_india/report/gstr_3b_details/gstr_3b_details.py
	both added:      india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
	both added:      india_compliance/gst_india/report/hsn_wise_summary_of_outward_supplies/test_hsn_wise_summary_of_outward_supplies.py
	both added:      india_compliance/gst_india/utils/__init__.py
	both added:      india_compliance/gst_india/utils/e_waybill.py
	both added:      india_compliance/gst_india/utils/gstr_1/test_gstr_1_json_map.py
	both added:      india_compliance/gst_india/utils/gstr_2/test_gstr_2a.py
	both added:      india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v3_0.py
	both added:      india_compliance/gst_india/utils/gstr_2/test_gstr_2b_v4_0.py
	both added:      india_compliance/gst_india/utils/test_e_invoice.py
	both added:      india_compliance/gst_india/utils/test_e_waybill.py
	both added:      india_compliance/gst_india/utils/test_gstin_info.py
	both added:      india_compliance/gst_india/utils/test_utils.py
	both added:      india_compliance/gst_india/utils/transaction_data.py
	both added:      india_compliance/hooks.py
	both added:      india_compliance/income_tax_india/constants/__init__.py
	both added:      india_compliance/income_tax_india/data/tds_details.json
	both added:      india_compliance/public/js/utils.js
	both added:      india_compliance/setup_wizard.py
	both added:      india_compliance/test_patches.py
	both added:      india_compliance/tests/__init__.py
	both added:      india_compliance/tests/test_records.json
	both added:      india_compliance/vat_india/doctype/c_form/c_form.json
	both added:      india_compliance/vat_india/doctype/c_form_invoice_detail/c_form_invoice_detail.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@vorasmit vorasmit closed this Dec 12, 2024
@sagarvora sagarvora deleted the mergify/bp/version-15-hotfix/pr-2835 branch December 12, 2024 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants