nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 07:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,263 Commits 622 Branches 1,804 Tags
b132e3f22a6da31432c0962428c710decab215e6
Commit Graph

45461 Commits

Author SHA1 Message Date
kavin-114
b132e3f22a fix(stock): fetch batch wise valuation rate in get_items 
(cherry picked from commit c5df570262)
 2026-02-03 14:47:52 +00:00
ruthra kumar
670fd79e38 Merge pull request #52377 from frappe/mergify/bp/version-16-hotfix/pr-52314 
fix(journal-entry): normalize exchange rate to float (backport #52314)
 2026-02-03 20:10:03 +05:30
rohitwaghchaure
3bc348d6f0 Merge pull request #52376 from frappe/mergify/bp/version-16-hotfix/pr-52375 
fix: zero valuation rate if returning from different warehouse (backport #52369) (backport #52375)
 2026-02-03 20:04:39 +05:30
Dharanidharan2813
3f0032d793 fix(journal-entry): normalize exchange rate to float 
(cherry picked from commit be0040ddc7)
 2026-02-03 14:17:24 +00:00
ruthra kumar
163b848455 Merge pull request #52368 from frappe/mergify/bp/version-16-hotfix/pr-52320 
fix: correct Sales Tax Template sidebar link to proper DocType (backport #52320)
 2026-02-03 19:44:26 +05:30
Rohit Waghchaure
8ce51b2f80 fix: zero valuation rate if returning from different warehouse 
(cherry picked from commit 28929df0e8)
(cherry picked from commit eb2119e292)
 2026-02-03 13:59:59 +00:00
Luis Mendoza
4c14e74a12 fix: correct Sales Tax Template sidebar link to proper DocType 
(cherry picked from commit 06a7c85c93)
 2026-02-03 12:05:37 +00:00
ravibharathi656
28e8c40bfc fix(profit and loss statement): exclude non period columns 
(cherry picked from commit 6180e5eb53)
 2026-02-03 12:00:00 +00:00
ruthra kumar
660fc8f76a Merge pull request #52365 from frappe/mergify/bp/version-16-hotfix/pr-52160 
fix(stock): remove is_return condition on pos batch qty calculation (backport #52160)
 2026-02-03 17:19:50 +05:30
kavin-114
76e0eb00a5 test: add unit test case for pos reserved with return qty 
(cherry picked from commit 12ec997027)
 2026-02-03 11:11:50 +00:00
kavin-114
9dcaf38142 fix(stock): remove is_return condition on pos batch qty calculation 
(cherry picked from commit 2c19c1fd06)
 2026-02-03 11:11:50 +00:00
Dharanidharan2813
6048add4c0 feat(delivery-note): add status indicator when document is partially billed 
(cherry picked from commit 7767000ccf)
 2026-02-03 10:59:20 +00:00
rohitwaghchaure
0552b48328 Merge pull request #52356 from frappe/mergify/bp/version-16-hotfix/pr-52338 
fix: negative stock for purchase return (backport #52338)
 2026-02-03 16:16:28 +05:30
Rohit Waghchaure
220a528d7f fix: negative stock for purchase return 
(cherry picked from commit 77893933a2)
 2026-02-03 10:25:10 +00:00
sokumon
e264d8e2d6 chore: rename icons 
(cherry picked from commit 2d312bcfe8)
 2026-02-03 10:02:54 +00:00
Sudharsanan11
f425f89a26 fix(stock): ignore packing slip while cancelling the sales invoice 
(cherry picked from commit c58887b44a)
 2026-02-03 08:25:04 +00:00
ruthra kumar
e3bf84c572 Merge pull request #52321 from frappe/mergify/bp/version-16-hotfix/pr-50592 
feat(Transaction Deletion Record): Editable "DocTypes To Delete" List with CSV import/export (backport #50592)
 2026-02-03 13:50:00 +05:30
ravibharathi656
e755a4ad98 fix: include credit notes in project gross margin calculation 
(cherry picked from commit a378fee8e0)
 2026-02-03 06:07:49 +00:00
ruthra kumar
d2ea428030 chore: resolve conflict 2026-02-03 10:38:39 +05:30
Sudharsanan11
a3190dd556 test(subcontracting): add test for consumed_qty calculation with similar finished goods 
(cherry picked from commit 4d9412181c)
 2026-02-03 03:40:18 +00:00
Sudharsanan11
95c4b8de06 fix(subcontracting): include item bom in supplied items grouping key 
(cherry picked from commit 0d372a62a1)
 2026-02-03 03:40:18 +00:00
Henning Wendtland
4963261dc8 feat(Transaction Deletion Record): Editable "DocTypes To Delete" List with CSV import/export (#50592) 
* feat: add editable DocTypes To Delete list with import/export

Add user control over transaction deletion with reviewable and reusable deletion templates.

- New "DocTypes To Delete" table allows users to review and customize what will be deleted before submission
- Import/Export CSV templates for reusability across environments
- Company field rule: only filter by company if field is specifically named "company", otherwise delete all records
- Child tables (istable=1) automatically excluded from selection
- "Remove Zero Counts" helper button to clean up list
- Backward compatible with existing deletion records

* refactor: improve Transaction Deletion Record code quality

- Remove unnecessary chatty comments from AI-generated code
- Add concise docstrings to all new methods
- Remove redundant @frappe.whitelist() decorators from internal methods
- Improve CSV import validation (header check, child table filtering)
- Add better error feedback with consolidated skip messages
- Reorder form fields: To Delete list now appears before Excluded list
- Add conditional visibility for Summary table (legacy records only)
- Improve architectural clarity: single API entry point per feature

Technical improvements:
- export_to_delete_template_method and import_to_delete_template_method
  are now internal helpers without whitelist decorators
- CSV import now validates format and provides detailed skip reasons
- Summary table only shows for submitted records without To Delete list
- Maintains backward compatibility for existing deletion records

* fix: field order

* test: fix broken tests and add new ones

* fix: adapt create_transaction_deletion_request

* test: fix assertRaises trigger

* fix: conditionally execute Transaction Deletion pre-tasks based on selected DocTypes

* refactor: replace boolean task flags with status fields

* fix: remove UI comment

* fix: don't allow virtual doctype selection and improve protected Doctype List

* fix: replace outdated frappe.db.sql by frappe.qb

* feat: add support for multiple company fields

* fix: autofill comapny field, add docstrings, filter for company_field

* fix: add edge case handling for update_naming_series and add tests for prefix extraction

* fix: use redis for running deletion validation, check per doctype instead of company

(cherry picked from commit 0fb37ad792)

# Conflicts:
#	erpnext/patches.txt
 2026-02-03 00:49:04 +00:00
mergify[bot]
81e65757ee fix: duplicate account number (Indonesia COA) (backport #52080) (#52317) 
Co-authored-by: Apriliansyah Idris <apriliansyahidris@gmail.com>
fix: duplicate account number (Indonesia COA) (#52080)
 2026-02-02 19:09:22 +00:00
Rohit Waghchaure
2a3642b55a fix: batch selector not working if Use Legacy (Client side) Reactivity disabled 
(cherry picked from commit d1cba1073f)
 2026-02-02 16:32:18 +00:00
Mihir Kandoi
9997185071 Merge pull request #52246 from mihir-kandoi/st58765 
(cherry picked from commit 135a433018)
 2026-02-02 15:15:38 +00:00
Mihir Kandoi
681c0b5917 Merge pull request #52308 from frappe/mergify/bp/version-16-hotfix/pr-52304 
fix: populate contact fields when creating quotation from customer (backport #52304)
 2026-02-02 20:36:19 +05:30
Mihir Kandoi
55129e697d fix: populate contact fields when creating quotation from customer 
(cherry picked from commit 75b2c2c83d)
 2026-02-02 14:46:36 +00:00
kavin-114
f9a8fc1f2d fix(stock): add stock recon opening stock condition 
(cherry picked from commit f3eb6c7078)
 2026-02-02 14:37:36 +00:00
Mihir Kandoi
024e7b01ac fix: reset incoming rate in selling controller if there are changes in item 
(cherry picked from commit 2d6b43fd54)
 2026-02-02 14:18:20 +00:00
Tamal Majumdar
7e5eab261c fix: journal auditing voucher print date to use posting_date 
(cherry picked from commit 43e2495df8)
 2026-02-02 07:21:36 +00:00
nivithamerlin
c80b554cd7 fix: correct spelling of Payment Reconciliation in Accounting 
(cherry picked from commit 35e53d28df)
 2026-02-02 07:09:54 +00:00
Mihir Kandoi
42d873f1d9 test: over ordering of quotation items 
(cherry picked from commit 53e58f6678)
 2026-02-02 04:38:13 +00:00
MochaMind
19c1dcc3dd chore: update POT file (#52264) 2026-02-01 15:07:28 +01:00
Mihir Kandoi
23e027b6be Merge pull request #52230 from frappe/mergify/bp/version-16-hotfix/pr-52222 
fix: validate over ordering of quotation (backport #52222)
 2026-01-31 20:26:44 +05:30
Mihir Kandoi
a29df7be67 chore: resolve conflicts 2026-01-31 20:13:26 +05:30
Mihir Kandoi
dbe5846908 fix: make item name editable in RFQ 
(cherry picked from commit d9998a977c)
 2026-01-31 14:34:24 +00:00
Mihir Kandoi
b8ab55fee8 fix: better fix for aac39b2671 
(cherry picked from commit b24ae5e9a2)
 2026-01-31 14:21:27 +00:00
Rohit Waghchaure
a2d302b3fa fix: validation when more than one FG items in repack stock entry 
(cherry picked from commit 6423ce2fa7)
 2026-01-31 07:16:45 +00:00
UmakanthKaspa
af167f91fe fix: item code not showing in report view 
(cherry picked from commit b20f57321f)
 2026-01-30 16:46:26 +00:00
Mihir Kandoi
e74389f01c fix: test cases 
(cherry picked from commit 36f1e3572c)
 2026-01-30 14:00:52 +00:00
Mihir Kandoi
e7ace8e620 fix: validate over ordering of quotation 
(cherry picked from commit 4cc306d2d8)

# Conflicts:
#	erpnext/patches.txt
 2026-01-30 14:00:52 +00:00
Mihir Kandoi
136b2cfba5 fix: failing test cases 
(cherry picked from commit d3f44a425c)
 2026-01-30 12:18:10 +00:00
Mihir Kandoi
3b3738577d Merge pull request #52225 from frappe/mergify/bp/version-16-hotfix/pr-51433 2026-01-30 17:30:01 +05:30
Mihir Kandoi
02e6c49130 test: add test case 
(cherry picked from commit e2c3d0fa94)
 2026-01-30 11:41:46 +00:00
Mihir Kandoi
e9fa725030 chore: make feature opt in 
(cherry picked from commit b8d4522ea1)
 2026-01-30 11:41:46 +00:00
Mihir Kandoi
b03494bb67 feat: document naming rule will now use posting date of the document 
(cherry picked from commit 22fd1a1cfd)
 2026-01-30 11:41:45 +00:00
Mihir Kandoi
f7b915dfe6 fix: allow sales invoice to be renamed 
(cherry picked from commit 95fdbe55f9)
 2026-01-30 11:33:20 +00:00
Mihir Kandoi
0a5aac9ce7 Merge pull request #52218 from frappe/mergify/bp/version-16-hotfix/pr-52209 
fix: add precision to rejected batch no qty calculation (backport #52209)
 2026-01-30 12:21:50 +05:30
Mihir Kandoi
b365444027 fix: add precision to rejected batch no qty calculation 
(cherry picked from commit 838d245215)
 2026-01-30 06:35:59 +00:00
Mihir Kandoi
0d1c30f3f0 fix: hide close button on WO if WO is completed 
(cherry picked from commit 6e17ccf499)
 2026-01-30 06:29:32 +00:00