nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,028 Commits 400 Branches 1,698 Tags
f27e591d88c19c0fe7e7a922b5d4e19d43986ece
Commit Graph

52028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Khushi Rawat
b9f12ed4c7 Merge pull request #47576 from frappe/mergify/bp/version-15-hotfix/pr-47573 
fix: alias 'name' and 'parent' to prevent child row mapping issues (backport #47573)
 2025-05-16 15:52:37 +05:30
Mihir Kandoi
80c76618ae feat: add checbox for validating time logs in job card 
(cherry picked from commit 2d9a6a4de8)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 2025-05-16 10:05:52 +00:00
Khushi Rawat
073d06c44f fix: removed invalid child param to prevent callback failure 
(cherry picked from commit 1ca51e4f14)
 2025-05-16 10:05:51 +00:00
Khushi Rawat
612fa7c672 fix: alias name and parent to prevent child row mapping issues 
(cherry picked from commit a418e377f4)
 2025-05-16 10:05:51 +00:00
marination
e7dc31191c Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-46214 2025-05-15 18:50:58 +02:00
mergify[bot]
926c0c5cf4 fix: POS Invoice can't use Loyalty Points when Global Rounded Total is Disabled (backport #47491) (#47564) 
fix: POS Invoice can't use Loyalty Points when Global Rounded Total is Disabled (#47491)

(cherry picked from commit b541b536c3)

Co-authored-by: Kitti U. @ Ecosoft <kittiu@gmail.com>
 2025-05-15 19:35:03 +05:30
ljain112
52cab02a5c fix: set no_copy to party_balance field in Payment Entry 2025-05-15 18:03:25 +05:30
mergify[bot]
f225e1986e fix: validation message format (backport #47542) (#47549) 
fix: validation message format (#47542)

(cherry picked from commit a18e1cffa7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-15 10:31:28 +05:30
mergify[bot]
9355782397 fix: allow FG as RM by default (backport #47543) (#47550) 
fix: allow FG as RM by default (#47543)

(cherry picked from commit 4241bfd4bc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-05-15 10:31:12 +05:30
mergify[bot]
30ec69c977 fix: mapping of dispatch address when creating PO from SO (backport #47552) (#47553) 
fix: mapping of dispatch address when creating PO from SO (#47552)

* fix: mapping of dispatch address when creating PO from SO

* fix: add to default supplier function as well

(cherry picked from commit 82161e9cb5)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-14 20:52:04 +05:30
ruthra kumar
b22831bd94 Merge pull request #47541 from ljain112/fix-cls 
fix: correct expense amount in party ledger summary.
 2025-05-14 17:56:22 +05:30
mergify[bot]
5a3eff05a1 fix: pos item group filter fetching wrong items (backport #47545) (#47546) 
fix: pos item group filter fetching wrong items (#47545)

(cherry picked from commit 5c28e01590)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-05-14 17:41:36 +05:30
ljain112
09a46fcf0e fix: correct expense amount in party ledger summary. 2025-05-14 12:38:38 +05:30
marination
37f4cf5367 fix: Linter (due to conflicts resolved on gh) 2025-05-13 17:18:40 +02:00
marination
f95a3f5b8b fix(portal): User cannot create 0 qty SQ from RFQ 
- The portal uses `create_supplier_quotation` for SQ creation which excludes 0 qty items
 2025-05-13 17:13:41 +02:00
marination
0286788e97 chore: Relabel according to review changes 2025-05-13 17:13:41 +02:00
marination
8891f46a22 fix: Relabel unit price settings for more clarity 2025-05-13 17:13:41 +02:00
Marica
890ce4a676 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-46214 2025-05-13 17:07:43 +02:00
Marica
2960d0dce1 Merge pull request #47537 from frappe/mergify/bp/version-15-hotfix/pr-38530 
refactor: Consolidate duplicate zero-quantity Items checks for transactions. (backport #38530)
 2025-05-13 16:55:54 +02:00
mergify[bot]
56d0357f6f feat: add routing/sequencing to work order operations (backport #46975) (#47534) 
* feat: add routing/sequencing to work order operations (#46975)

* feat: add routing/sequencing to work order operations

* fix: add validation and remove reorderin for non sequence id operations

* chore: readability

* fix: logical error

* fix: logical error

* chore: added row number in error message

(cherry picked from commit f1159b6ea6)

# Conflicts:
#	erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-13 19:02:01 +05:30
marination
5b50d5abf2 fix: Broken test + use super() appropriately 
- test: Remove `test_bom_qty`. It had invalid code. Its been removed from develop. There wasn't a strong case being tested.
 2025-05-13 14:42:57 +02:00
marination
9cede83de1 fix: Conflicts 2025-05-13 14:26:54 +02:00
Bernd Oliver Sünderhauf
a8b982dd0a chore: Adapt translations to reworded message. 
(cherry picked from commit 3688d9412e)

# Conflicts:
#	erpnext/translations/tr.csv
 2025-05-13 12:13:56 +00:00
Bernd Oliver Sünderhauf
cf45ffdabe refactor: Consolidate duplicate zero-quantity transaction Items checks. 
(cherry picked from commit 4918aeb4c6)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:47 +00:00
Bernd Oliver Sünderhauf
e91a0acbb3 test: Add, expand and refine test-cases for zero-quantity transactions. 
(cherry picked from commit b2d8a44199)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:46 +00:00
Khushi Rawat
fbbae80f92 Merge pull request #47533 from frappe/mergify/bp/version-15-hotfix/pr-47530 
feat: non depreciable asset category (backport #47530)
 2025-05-13 17:23:09 +05:30
Khushi Rawat
dcfae61a7a fix: resolved conflicts 2025-05-13 17:07:14 +05:30
marination
3deb11e5b2 fix: Merge conflicts 2025-05-13 13:35:19 +02:00
Khushi Rawat
242a119f95 fix: only depreciable category assets are allowed for depreciation 
(cherry picked from commit d715db1226)
 2025-05-13 11:34:35 +00:00
Khushi Rawat
a75931c90f fix: do not mandate depreciation accounts for non depreciable asset category 
(cherry picked from commit 32cb7d6388)
 2025-05-13 11:34:35 +00:00
Khushi Rawat
96d3bfd2d9 feat: add non depreciable category checkbox in asset category 
(cherry picked from commit fbbfd6531b)

# Conflicts:
#	erpnext/assets/doctype/asset_category/asset_category.json
 2025-05-13 11:34:35 +00:00
ruthra kumar
165a4fcef6 Merge pull request #47527 from frappe/mergify/bp/version-15-hotfix/pr-47520 
fix: ignore "Account Closing Balance" doctype on Period Closing Voucher cancellation (backport #47520)
 2025-05-13 15:10:13 +05:30
ruthra kumar
29b35d6eb0 Merge pull request #47522 from frappe/mergify/bp/version-15-hotfix/pr-47468 
fix(payment-reconciliation): use reconciliation_takes_effect_on from company (backport #47468)
 2025-05-13 15:03:59 +05:30
ljain112
39c029133f fix: ignore "Account Closing Balance" doctype on Period Closing Voucher cancellation 
(cherry picked from commit d6602d63fc)
 2025-05-13 09:21:31 +00:00
ruthra kumar
7f55d59a7b chore: drop redundant patch 2025-05-13 14:45:51 +05:30
ruthra kumar
95f21e5ecd Merge pull request #47523 from frappe/mergify/bp/version-15-hotfix/pr-47521 
fix: condition for advance_account assignment (backport #47521)
 2025-05-13 14:31:29 +05:30
Bhavan23
bafd9ed15e chore: simplify repeated condition checks 
(cherry picked from commit 7bc62cedc6)
 2025-05-13 14:14:13 +05:30
Bhavan23
25fabda40a fix(payment-reconciliation): use reconciliation_takes_effect_on from company 
(cherry picked from commit 19f1ffbdc2)
 2025-05-13 14:14:10 +05:30
ljain112
b6e5e3347d fix: condition for advance_account assignment 
(cherry picked from commit ded46ce3d8)
 2025-05-13 08:43:18 +00:00
ruthra kumar
2868446292 Merge pull request #47517 from frappe/mergify/bp/version-15-hotfix/pr-47367 
fix: Use `Currency` instead of `Float` in GL report to show details (backport #47367)
 2025-05-13 13:08:32 +05:30
Abdeali Chharchhodawala
811fe4fee6 Merge pull request #47367 from Abdeali099/gl-report-field-float-to-currency 
fix: Use `Currency` instead of `Float` in GL report to show details
(cherry picked from commit e4e0bb68ec)
 2025-05-13 05:57:49 +00:00
mergify[bot]
b6bf13ff02 refactor: available serial no report (backport #47333) (#47500) 
* refactor: available serial no report

(cherry picked from commit 74eb611563)

* chore: further optimizations

(cherry picked from commit 653e0a2e3a)

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-12 23:29:51 +05:30
ruthra kumar
b82e2585d5 Merge pull request #47508 from frappe/mergify/bp/version-15-hotfix/pr-47243 
fix: accumulate values for all the fiscal years in Profit And Loss Statement (backport #47243)
 2025-05-12 17:09:57 +05:30
ruthra kumar
9ca96a63c3 refactor(test): don't default to accumulate 
(cherry picked from commit 54e4e7918e)
 2025-05-12 16:54:14 +05:30
ruthra kumar
98cb9c6b96 test: accumulate filter on P&L report 
(cherry picked from commit afff6b84ce)
 2025-05-12 16:54:09 +05:30
ruthra kumar
d61a85e316 fix: typo 
(cherry picked from commit 61d13ce232)
 2025-05-12 11:17:32 +00:00
ljain112
6dbdc36af9 fix: accumulate values for all the fiscal years in Profit And Loss Statement 
(cherry picked from commit 6851322361)
 2025-05-12 11:17:32 +00:00
mergify[bot]
b18692c120 fix: POS non-stock item mistakenly hidden as unavailable (backport #47493) (#47506) 
fix: POS non-stock item mistakenly hidden as unavailable (#47493)

(cherry picked from commit 57f3489dfa)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-05-12 15:10:11 +05:30
mergify[bot]
309ea7b9cf fix: added PR/PI overbilling validation (backport #47385) (#47497) 
* fix: added PR/PI overbilling validation

(cherry picked from commit f4ffc57b51)

* test: added test

(cherry picked from commit b406ec724b)

* fix: linter error

(cherry picked from commit 27e842ba02)

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2025-05-11 14:31:46 +05:30
Mihir Kandoi
775b2432ab Merge pull request #47494 from frappe/mergify/bp/version-15-hotfix/pr-47481 
fix: timesheet portal showing total billing hours (backport #47481)
 2025-05-10 12:04:04 +05:30