nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,415 Commits 474 Branches 1,756 Tags
e1afcb39dbf5d50c0e70a9169e2f2341fe92a3ca
Commit Graph

1815 Commits

Author SHA1 Message Date
khushi8112
97147a484d fix: resolve conflicts 2025-10-23 19:09:30 +05:30
khushi8112
d8eddbfd03 fix: set status to Draft for auto-created assets from Purchase Receipt 
(cherry picked from commit 20c2cb40d1)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/patches.txt
 2025-10-23 13:03:17 +00:00
mergify[bot]
11eab0c852 Merge pull request #49946 from frappe/mergify/bp/version-15-hotfix/pr-49721 
feat: add company links to Email Account and Communication (backport #49721)
 2025-10-07 17:01:37 +05:30
ravibharathi656
9d34eb686c fix: run config with force 
(cherry picked from commit e8288a2f63)
 2025-09-01 09:13:04 +00:00
ruthra kumar
4af814dc3b chore: resolve conflicts 2025-08-19 11:06:23 +05:30
l0gesh29
a853010537 fix: add patch 
(cherry picked from commit 3cf765d985)

# Conflicts:
#	erpnext/patches.txt
 2025-08-19 05:19:00 +00:00
ruthra kumar
faba523086 chore: resolve conflict 2025-08-11 11:41:10 +05:30
Dany Robert
9df6424a20 fix(regional-uae): mark export items as zero rated 
(cherry picked from commit b8224693c4)

# Conflicts:
#	erpnext/patches.txt
 2025-08-11 06:06:06 +00:00
Asmita Hase
5f2725f61f chore: trigger create_advance_payment_ledger_records patch 
(cherry picked from commit 6d908f44a5)
 2025-08-08 07:29:33 +00:00
mergify[bot]
5a984de697 fix: failing subcontracting patch (backport #48940) (#48961) 
* fix: failing subcontracting patch

(cherry picked from commit 14b47e81ce)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-08-05 06:37:20 +00:00
Ravibharathi
8259a748f6 Merge pull request #48575 from aerele/company-payment-gateway 
feat(payment gateway account): add company

(cherry picked from commit 02380c3eab)
 2025-08-05 10:12:39 +05:30
ravibharathi656
ad56177234 fix: include child doctypes in allow_on_submit patch for accounting dimensions 
(cherry picked from commit 1e37fd8991)
 2025-08-04 09:14:13 +05:30
mergify[bot]
cb0addc122 fix: multiple fixes for advance payment accounting (backport #48341) (#48896) 
* fix: multiple fixes for advance payment accounting

(cherry picked from commit e70caedddc)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
#	erpnext/accounts/doctype/payment_entry/payment_entry.py
#	erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
#	erpnext/accounts/utils.py
#	erpnext/controllers/accounts_controller.py
#	erpnext/patches/v15_0/create_advance_payment_ledger_records.py

* chore: resolve conflicts

* fix: do not execute patch if no advance doctypes

---------

Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
Co-authored-by: ljain112 <ljain112@gmail.com>
 2025-08-01 15:30:30 +05:30
Mihir Kandoi
ed927a2147 chore: add date so patch can rerun 2025-07-31 16:00:35 +05:30
Mihir Kandoi
f0f8666baa Merge pull request #48682 from frappe/mergify/bp/version-15-hotfix/pr-48680 
fix: patch to set default buying price list in material request (backport #48680)
 2025-07-29 13:23:16 +05:30
l0gesh29
ebda396518 fix: update subscription details patch 
(cherry picked from commit c7b1379a7f)
 2025-07-29 06:38:09 +00:00
mergify[bot]
18b007dbf2 Merge pull request #48805 from frappe/mergify/bp/version-15-hotfix/pr-48676 
fix: missing account in GL entries (subcontracting) (backport #48676)
 2025-07-29 11:48:12 +05:30
diptanilsaha
bf5b6a540f fix: patch to enable fetch_valuation_rate_for_internal_transaction 2025-07-28 18:25:16 +05:30
Mihir Kandoi
fd1c213a8d fix: patch to set default buying price list in material request (#48680) 
* fix: patch to set default buying price list in material request

(cherry picked from commit 446264e496)
 2025-07-18 11:14:15 +00:00
Diptanil Saha
65efc7e950 fix: sales partner in pos invoice (#48670) 
* Merge pull request #48667 from diptanilsaha/fix_pos_sales_partner

fix: sales partner on pos invoice

* fix: remove incorrect report conditions and unset sales partner on consolidated sales invoice (#48669)

* fix: undo query changes for sales partner related reports

* fix: patch to remove sales partner from consolidated sales invoice
 2025-07-18 11:09:32 +05:30
Mihir Kandoi
d8212d98ca chore: resolve conflicts 2025-07-14 17:20:28 +05:30
Mihir Kandoi
ee6ef03e24 fix: field name of price_list in material request 
(cherry picked from commit adb9a6bc15)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/material_request/material_request.py
#	erpnext/stock/doctype/packed_item/packed_item.py
 2025-07-14 11:14:53 +00:00
mergify[bot]
26db582499 fix: add company field on POS Invoice Merge Log (backport #48357) (#48414) 
* fix: add company field on POS Invoice Merge Log

(cherry picked from commit 109658731b)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json

* fix: patch for updating company name on existing pos merge log records

(cherry picked from commit d46b68230c)

# Conflicts:
#	erpnext/patches.txt

* fix: pass company on create_merge_logs

(cherry picked from commit b4b473185f)

* test: test company fetching from POS Closing Entry

(cherry picked from commit 9548f341bf)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py

* chore: remove conflicts

---------

Co-authored-by: Kavin <78342682+kavin0411@users.noreply.github.com>
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2025-07-06 15:25:59 +05:30
mergify[bot]
8f47505604 fix: better integration of Pick List with Delivery Note (backport #47831) (#48158) 
* fix: better integration of Pick List with Delivery Note (#47831)

Co-authored-by: priyanshshah2442 <priyanshshah2442@gmail.com>
(cherry picked from commit 527cfe9c7d)

# Conflicts:
#	erpnext/patches.txt
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
#	erpnext/stock/doctype/pick_list/pick_list.py
#	erpnext/stock/doctype/pick_list_item/pick_list_item.json

* chore: resolve conflicts

* fix: setting status correctly as per v15 utility

* fix: get items from Pick List to DN even if not linked to Sales Order

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
Co-authored-by: Priyansh Shah <108476017+priyanshshah2442@users.noreply.github.com>
 2025-06-26 18:25:53 +05:30
Karuppasamy
cb58d05777 Merge pull request #47898 from aerele/pegged-currency 
Pegged currency

(cherry picked from commit cec0ffad06)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json
#	erpnext/patches.txt
#	erpnext/setup/install.py
 2025-06-17 15:32:36 +05:30
Sagar Vora
5237ff8d94 fix: changes to report and patch 
(cherry picked from commit daad6137f8)
 2025-06-10 06:04:07 +00:00
priyanshshah2442
b3eb49d39d feat: report to verify discount amount mismatch 
(cherry picked from commit 62dd6df24f)
 2025-06-10 06:04:07 +00:00
mergify[bot]
3879cbd86d fix: improved indexing for SLE queries. (backport #47194) (#47822) 
* fix: improved indexing for SLE queries. (#47194)

(cherry picked from commit b49a835b4c)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-30 15:36:51 +05:30
mergify[bot]
4fd1af2118 fix: patch to set status cancelled for already cancelled pos invoices (backport #47725) (#47759) 
* fix: patch to set status cancelled for already cancelled pos invoices (#47725)

(cherry picked from commit 4d1d66e579)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-05-27 15:55:40 +05:30
ruthra kumar
c09b258d57 chore: resolve conflicts 2025-05-26 17:48:11 +05:30
ruthra kumar
d5d1a51b92 refactor: patch old contract with full party name 
(cherry picked from commit 8e2221178b)

# Conflicts:
#	erpnext/patches.txt
 2025-05-26 12:11:31 +00:00
mergify[bot]
a137944955 fix: patch to rename group_by filter in custom reports (backport #47709) (#47730) 
* fix: patch to rename group_by filter in custom reports

(cherry picked from commit 0d19c18c06)

# Conflicts:
#	erpnext/patches.txt

* fix: using python instead of sql query

(cherry picked from commit 48eccb1f73)

* chore: resolve conflict

---------

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2025-05-26 13:29:41 +05:30
ruthra kumar
7f55d59a7b chore: drop redundant patch 2025-05-13 14:45:51 +05:30
mergify[bot]
f4551bb918 feat!: configure which rate is used to auto-update price list (backport #47417) 
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
 2025-05-06 17:00:03 +05:30
ruthra kumar
f69b8d7e2d refactor: set default for fetch methods 
(cherry picked from commit ca1e81e1b5)
 2025-05-05 10:14:49 +00:00
mergify[bot]
85a8adf804 fix: renaming group by fieldname and value in reports (backport #47352) (#47360) 
* fix: renaming group by fieldname and value in reports (#47352)

* fix: renaming in general ledger report

* fix: renaming in supplier quotation comparison report

* fix: renaming group by to categorize by in process statement of accounts

* fix: added patch

* fix: patch update to all documents

* chore: added patches to patch.txt

* chore: removing patch from v14

(cherry picked from commit 13a84e7f82)

# Conflicts:
#	erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

* chore: resolve conflict

---------

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-04-30 17:19:43 +05:30
ruthra kumar
288206bdcd Merge pull request #46634 from frappe/mergify/bp/version-15-hotfix/pr-46627 
fix: date added to wrong patch (backport #46627)
 2025-03-25 18:45:21 +05:30
ruthra kumar
b3c3733286 chore: resolve conflict 2025-03-25 17:53:29 +05:30
Sugesh393
c3221c4e93 fix: add patch to update base_outstanding and base_paid_amount 
(cherry picked from commit 7e92e4967a)
 2025-03-24 06:14:41 +00:00
Mihir Kandoi
2bfaf64fff fix: date added to wrong patch 
(cherry picked from commit dc45c3b39c)

# Conflicts:
#	erpnext/patches.txt
 2025-03-20 18:26:02 +00:00
rohitwaghchaure
5b802ae527 chore: fix conflicts 2025-03-19 15:35:26 +05:30
Mihir Kandoi
56bc26aecc fix: set landed cost based on purchase invoice rate 
(cherry picked from commit 75ab5f2bd0)

# Conflicts:
#	erpnext/patches.txt
 2025-03-19 09:52:27 +00:00
Nabin Hait
24678b0e24 chore: conflicts 2025-03-12 10:38:26 +05:30
Mihir Kandoi
5edbd8851a fix: rename sla fields patch (#46465) 
* fix: rename sla fields patch

* fix: rerun patch

(cherry picked from commit 8bce42e633)

# Conflicts:
#	erpnext/patches.txt
 2025-03-12 05:04:52 +00:00
mergify[bot]
6c1ceff8ee fix: exclude already consumed purchase receipt items from asset capitalization (backport #46329) (#46336) 
* fix: exclude already consumed purchase receipt items from asset capitalization (#46329)

* feat: link purchase receipt row item to capitalization

* fix: avoid fetching already consumed stock and asset items during capitalization

* fix(patch): added patch to link purchase receipt item to stock item child table

* fix: added nosemgrep

* refactor: rename  to

(cherry picked from commit f50d479bfd)

# Conflicts:
#	erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
#	erpnext/patches.txt

* fix: resolved conflicts

* fix: resolved conflicts

---------

Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
 2025-03-05 18:07:14 +05:30
Mihir Kandoi
fe8c9a3605 chore: resolve conflicts 2025-03-05 14:54:40 +05:30
Mihir Kandoi
941d67a0b6 chore: resolve conflicts 2025-03-05 14:48:41 +05:30
Mihir Kandoi
8f2fdcae88 fix: patch 
(cherry picked from commit 1230127d24)

# Conflicts:
#	erpnext/patches.txt
 2025-03-05 09:02:36 +00:00
Mihir Kandoi
a09c57f0d1 fix: revert last commit 
(cherry picked from commit 154e9813c4)

# Conflicts:
#	erpnext/patches.txt
 2025-03-05 09:02:35 +00:00
Mihir Kandoi
fdaf5fafda fix: set landed cost based on purchase invoice rate 
(cherry picked from commit 17d415b105)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
#	erpnext/patches.txt
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 2025-03-05 09:02:34 +00:00