Skip to content

Commit apr 25th to may 15th#86

Merged
aasif-patel merged 17 commits intopre-prod-developfrom
commit_APR_25th_to_MAY_15th
Jun 13, 2025
Merged

Commit apr 25th to may 15th#86
aasif-patel merged 17 commits intopre-prod-developfrom
commit_APR_25th_to_MAY_15th

Conversation

@hrishikesh8848
Copy link
Copy Markdown

Tiltle :

Sync India Compliance Code Changes from Apr 25th to May 15th

Scenario Covered

This PR includes code changes merged into india_compliance between Apr 25th and May 15th. The following commits have been included:

fix: Update Implementation for HSN_B2B and HSN_B2C Bifurcation (resilient-tech#3222)
chore: resolved conflicts
fix: correct pending_boe_qty on cancellation of BOE
fix: updated patch for setting pending_boe_qty
fix: change to long queue due to timeout
fix: prefer tradename for GST Registrations of HUF
fix: date comparison in cancel_e_waybill_e_invoice function
chore: resolve conflicts
fix: proper filtering of PI for Bill Of Entry
fix: add validation for selection of PI in BOE
fix: return data directly from fetch_pending_boe_invoices function
chore: nosemgrep for assigning self.company_currency
feat: update ship_from in buying_address to dispatch_address in e-waybill constants
fix: update required version for ERPNext to 15.60.0
fix: update tds details for financial year 2025-26 (resilient-tech#3370)
fix: insert account with ignoring mandatory fields
chore(release): Bumped to Version 15.18.0

Technical Details

Modules Affected: Core modules within the India Compliance

Linked Issue
None

PR Reference
None

Copy link
Copy Markdown
Collaborator

@aasif-patel aasif-patel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Satya8848 approved from my side, please check

@aasif-patel aasif-patel merged commit dfa5ccd into pre-prod-develop Jun 13, 2025
@aasif-patel aasif-patel deleted the commit_APR_25th_to_MAY_15th branch June 13, 2025 06:18
@aasif-patel
Copy link
Copy Markdown
Collaborator

@hrishikesh8848 patches are getting failed please resolve and raise the new PR for it
`Migrating postgres-project-site.8848digitalerp.com
Updating DocTypes for frappe : [========================================] 100%
Updating DocTypes for erpnext : [========================================] 100%
Updating DocTypes for assets : [========================================] 100%
Updating DocTypes for erpnext_crm : [========================================] 100%
Updating DocTypes for projects : [========================================] 100%
Updating DocTypes for sales_commission: [========================================] 100%
Updating DocTypes for payments : [========================================] 100%
Updating DocTypes for india_compliance: [========================================] 100%
Executing india_compliance.patches.v14.set_pending_boe_qty #1 in postgres-project-site.8848digitalerp.com (_037066e14dd8c71e)
'Syntax error in query:\nUPDATE "tabPurchase Invoice Item" JOIN "tabPurchase Invoice" ON "tabPurchase Invoice Item"."parent"="tabPurchase Invoice"."name" LEFT JOIN (SELECT "pi_detail",SUM("qty") "qty" FROM "tabBill of Entry Item" WHERE "docstatus"= '1' GROUP BY "pi_detail") "sq0" ON "tabPurchase Invoice Item"."name"="sq0"."pi_detail" SET "pending_boe_qty"="tabPurchase Invoice Item"."qty"-coalesce("sq0"."qty",0) WHERE "tabPurchase Invoice"."docstatus"= '1' AND "tabPurchase Invoice"."gst_category"=%(param1)s {'param1': 'Overseas'}'
Queued rebuilding of search index for postgres-project-site.8848digitalerp.com

Traceback (most recent call last):
File "/usr/lib/python3.10/runpy.py", line 196, in _run_module_as_main
return _run_code(code, main_globals, None,
File "/usr/lib/python3.10/runpy.py", line 86, in _run_code
exec(code, run_globals)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 114, in
main()
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/utils/bench_helper.py", line 20, in main
click.Group(commands=commands)(prog_name="bench")
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/core.py", line 1161, in call
return self.main(*args, **kwargs)
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/core.py", line 1082, in main
rv = self.invoke(ctx)
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/core.py", line 1697, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/core.py", line 1697, in invoke
return _process_result(sub_ctx.command.invoke(sub_ctx))
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/core.py", line 1443, in invoke
return ctx.invoke(self.callback, **ctx.params)
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/core.py", line 788, in invoke
return __callback(*args, **kwargs)
File "/home/ubuntu/frappe-bench/env/lib/python3.10/site-packages/click/decorators.py", line 33, in new_func
return f(get_current_context(), *args, **kwargs)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/commands/init.py", line 29, in _func
ret = f(frappe._dict(ctx.obj), *args, **kwargs)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/commands/site.py", line 681, in migrate
SiteMigration(
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/migrate.py", line 188, in run
self.run_schema_updates()
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/migrate.py", line 52, in wrapper
raise e
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/migrate.py", line 44, in wrapper
ret = method(*args, **kwargs)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/migrate.py", line 121, in run_schema_updates
frappe.modules.patch_handler.run_all(
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 76, in run_all
run_patch(patch)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 62, in run_patch
if not run_single(patchmodule=patch):
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 152, in run_single
return execute_patch(patchmodule, method, methodargs)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/modules/patch_handler.py", line 188, in execute_patch
_patch()
File "/home/ubuntu/frappe-bench/apps/india_compliance/india_compliance/patches/v14/set_pending_boe_qty.py", line 29, in execute
.run()
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/query_builder/utils.py", line 87, in execute_query
result = frappe.db.sql(query, params, *args, **kwargs) # nosemgrep
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/database/postgres/database.py", line 326, in sql
return super().sql(modify_query(query), modify_values(values), *args, **kwargs)
File "/home/ubuntu/frappe-bench/apps/frappe/frappe/database/database.py", line 236, in sql
self._cursor.execute(query, values)
psycopg2.errors.SyntaxError: syntax error at or near "JOIN"
LINE 1: UPDATE "tabPurchase Invoice Item" JOIN "tabPurchase Invoice"...`

@aasif-patel aasif-patel mentioned this pull request Jun 13, 2025
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants