nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,331 Commits 401 Branches 1,698 Tags
f00a6f6c59f910cd857e258a47719085fa0acf0d
Commit Graph

47331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
f00a6f6c59 fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242) (#39266) 
fix: skip rate validation for return `DN Items` with `Moving Average` valuation

(cherry picked from commit e0ad52b500)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 22:02:20 +05:30
mergify[bot]
78c65f27b0 fix: Duplicate Closing Stock Balance (backport #39262) (#39264) 
fix: Duplicate Closing Stock Balance

(cherry picked from commit b15795392b)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 20:37:38 +05:30
Raffael Meyer
a326876cc5 Merge pull request #39258 from frappe/mergify/bp/version-15-hotfix/pr-39158 
fix: add read permission to Buying Settings (backport #39158)
 2024-01-09 13:34:56 +01:00
mergify[bot]
9f793b9b28 fix: incorrect indicator title for portal sales order (backport #39247) (#39255) 
fix: incorrect indicator title for portal sales order (#39247)

(cherry picked from commit 2d2ff7cf52)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:42:27 +05:30
mergify[bot]
bb6025ca26 fix: TypeError is pricing rules (backport #39252) (#39260) 
fix: TypeError is pricing rules (#39252)

(cherry picked from commit 274c65c451)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:41:53 +05:30
ruthra kumar
4ad61fc3a5 Merge pull request #39253 from frappe/mergify/bp/version-15-hotfix/pr-39251 
fix: update status on manual allocation (backport #39251)
 2024-01-09 16:36:35 +05:30
s-aga-r
e62dd0d7cb fix: add read permission to Buying Settings 
(cherry picked from commit e05bf9d32a)
 2024-01-09 10:44:21 +00:00
ruthra kumar
a147e2954f fix: update status on manual allocation 
(cherry picked from commit d32a407e08)
 2024-01-09 10:29:36 +00:00
mergify[bot]
0898ea5d92 fix: BOM replace tool does not update exploded items of root (backport #39244) (#39250) 
fix: BOM replace tool does not update exploded items of root (#39244)

(cherry picked from commit 5e0d017497)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 15:59:12 +05:30
ruthra kumar
d0688e7a55 Merge pull request #39241 from frappe/mergify/bp/version-15-hotfix/pr-39237 
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order (backport #39237)
 2024-01-09 14:40:24 +05:30
ruthra kumar
756c062733 fix: total allocated percentage for sales team issue 
(cherry picked from commit b498094a97)
 2024-01-09 07:39:28 +00:00
ruthra kumar
ec7a60bd02 Merge pull request #39234 from frappe/mergify/bp/version-15-hotfix/pr-39196 
fix: bank transaction status upon reconciliation (backport #39196)
 2024-01-09 11:57:50 +05:30
ruthra kumar
53eb6129ea refactor: remove 'Bank Trasaction' logic from status_update 
(cherry picked from commit cf988434e9)
 2024-01-09 05:51:38 +00:00
ruthra kumar
277aa7bc2b fix: bank transction status upon reconciliation 
(cherry picked from commit 6de8c18f98)
 2024-01-09 05:51:37 +00:00
Nabin Hait
97a51487c1 Merge pull request #39219 from frappe/mergify/bp/version-15-hotfix/pr-39209 
fix: Introduced company field to show amounts in company currency (backport #39209)
 2024-01-08 21:53:16 +05:30
Nabin Hait
1d2e831846 fix: Introduced company field to show amounts in company currency 
(cherry picked from commit eab22eb282)
 2024-01-08 16:09:42 +00:00
mergify[bot]
abc99f84e9 fix: FG Item incorrect qty in the work order (backport #39200) (#39211) 
fix: FG Item incorrect qty in the work order (#39200)

(cherry picked from commit 466625213b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-08 18:18:32 +05:30
mergify[bot]
3caf462c6b fix: flaky demo test case (backport #39135) (#39198) 
fix: flaky demo test case

(cherry picked from commit 5b1571879c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-08 17:44:24 +05:30
Shariq Ansari
58357f8891 Merge pull request #39206 from frappe/mergify/bp/version-15-hotfix/pr-39204 
fix: add expected_start_date in sort by (backport #39204)
 2024-01-08 16:37:37 +05:30
Shariq Ansari
8cc9ddaebd chore: linter fix 2024-01-08 16:30:26 +05:30
Shariq Ansari
1f64b8fcd8 chore: linter fix 2024-01-08 16:30:03 +05:30
Shariq Ansari
80a2b79bba chore: linter fix 2024-01-08 16:29:13 +05:30
Shariq Ansari
b064944753 fix: add expected_start_date in sort by 
(cherry picked from commit 3d54fd8389)
 2024-01-08 10:40:20 +00:00
mergify[bot]
672e6d6d06 fix: duplicate entry for serial / batch creation (backport #39188) (#39192) 
fix: duplicate entry for serial / batch creation (#39188)

(cherry picked from commit b96c063c93)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-08 14:21:04 +05:30
mergify[bot]
926850d1f6 fix: update Maintenance Schedule status on Maintenance Visit submit (backport #39167) (#39186) 
* fix: make `Sales Person` non-mandatory

(cherry picked from commit 4d56f725fe)

* fix: update Maintenance Schedule status on Maintenance Visit submit

(cherry picked from commit cd293a5173)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-08 13:23:12 +05:30
ruthra kumar
83288fedf1 Merge pull request #39187 from ruthra-kumar/backport_37613 
fix: possible key error in Financial Ratio's report
 2024-01-08 12:08:13 +05:30
ruthra kumar
16269b0730 fix: possible key error on Financial ratios report 2024-01-08 11:50:13 +05:30
ruthra kumar
f1d25700a8 Merge pull request #39183 from frappe/mergify/bp/version-15-hotfix/pr-39161 
refactor: allow sales invoice in Bank Reconciliation tool (backport #39161)
 2024-01-08 11:09:42 +05:30
ruthra kumar
00d36d14fb refactor: allow sales invoice in Bank Reconciliation tool 
(cherry picked from commit b69cdeb4a6)
 2024-01-08 05:02:30 +00:00
ruthra kumar
c912e4c99d Merge pull request #39182 from frappe/mergify/bp/version-15-hotfix/pr-39165 
fix: incorrect outstanding amt validation on advance as liability (backport #39165)
 2024-01-08 10:31:17 +05:30
ruthra kumar
1eee52c59c Merge pull request #39181 from frappe/mergify/bp/version-15-hotfix/pr-39159 
refactor: prevent permission error by always processing bulk transaction in background (backport #39159)
 2024-01-08 10:30:48 +05:30
ruthra kumar
51d8a7a0c1 fix: incorrect outstanding amt validation on advance as liability 
(cherry picked from commit 4cc3c1b765)
 2024-01-08 04:45:03 +00:00
ruthra kumar
f0bc0aa676 refactor: prevent permissions by always processing in background 
(cherry picked from commit 15dc5c7e99)
 2024-01-08 04:43:11 +00:00
mergify[bot]
f3882a854f fix: don't set rate for non-stock item in Internal Transfer (backport #39140) (#39169) 
* fix: don't set rate for non-stock item in Internal Transfer

(cherry picked from commit e1b0fffd0c)

* test: internal transfer for non-stock item

(cherry picked from commit 57b6a98703)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-06 11:03:24 +05:30
Aulia Bismar
5e4693763a fix: Creating Asset Activity while Importing Asset (#39113) 
* fix: import asset not working on activity

* chore: fix linting issue in asset_activity.py

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2024-01-05 10:46:31 +05:30
mergify[bot]
82b96d3688 fix: inventory dimension negative stock validation (backport #39149) (#39151) 
fix: inventory dimension negative stock validation (#39149)

(cherry picked from commit bae7c64964)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-05 05:04:28 +05:30
Raffael Meyer
0454dede92 Merge pull request #39148 from frappe/mergify/bp/version-15-hotfix/pr-39126 
fix(Employee): treeview (backport #39126)
 2024-01-04 15:24:43 +01:00
Raffael Meyer
6020c8e8f7 fix(Employee): treeview (#39126) 
(cherry picked from commit e912e9597d)
 2024-01-04 12:34:52 +00:00
mergify[bot]
b192ddd13b feat: provision to close SCO (backport #39127) (#39144) 
* feat: provision to close SCO

(cherry picked from commit 5e2669f4b6)

* fix: don't allow to submit/cancel SCR against a closed SCO

(cherry picked from commit 9e973476b2)

* fix: don't allow to submit/cancel SE against a closed SCO

(cherry picked from commit 5bc2035bd0)

* fix(ux): filter closed SCO in `Get Items From` dialog

(cherry picked from commit bb839b2924)

* fix: don't close PO on SCO close

(cherry picked from commit 0d01bd8a5a)

* fix: update qty on SCO status change

(cherry picked from commit 245effcccd)

* fix: don't allow to reopen SCO if PO is closed

(cherry picked from commit 784b6dcfea)

* fix: auto close and reopen SCO based on PO status

(cherry picked from commit 0819675fce)

* fix(text): test_update_status

(cherry picked from commit cdd5441435)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-04 17:22:58 +05:30
mergify[bot]
2db1e1a737 fix: serial / batch barcode scanner (backport #39114) (#39143) 
fix: serial / batch barcode scanner (#39114)

(cherry picked from commit f09e2130a1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-04 16:02:29 +05:30
Deepesh Garg
7a5a4be02f Merge pull request #39137 from frappe/mergify/bp/version-15-hotfix/pr-39125 
fix: ignore cancelled payments in Sales/Purchase Register (#39125)
 2024-01-04 11:25:39 +05:30
Deepesh Garg
b834abbd4f Merge pull request #39139 from frappe/mergify/bp/version-15-hotfix/pr-39138 
fix: Subscription update patch (#39138)
 2024-01-04 11:25:21 +05:30
Deepesh Garg
7640feaaa7 fix: Subscription update patch 
(cherry picked from commit 277dade9f9)
 2024-01-04 05:54:51 +00:00
ruthra kumar
9e1b443857 fix: ignore cancelled payments in Sales/Purchase Register 
(cherry picked from commit 0f1be03faf)
 2024-01-04 05:45:52 +00:00
Deepesh Garg
18575e137c Merge pull request #39129 from monolithonadmin/version-15-hotfix 
fix: Add name to Hungary - Chart of Accounts for Microenterprises json
 2024-01-04 08:42:03 +05:30
Monolithonadmin
0784488eec fix: Add name to Hungary - Chart of Accounts for Microenterprises json 2024-01-03 20:52:30 +01:00
ruthra kumar
bc529b51dc Merge pull request #39122 from frappe/mergify/bp/version-15-hotfix/pr-39116 
fix: typerror on multi select dialog (backport #39116)
 2024-01-03 21:06:06 +05:30
ruthra kumar
54a0df5164 fix: typerror on multi select dialog 
(cherry picked from commit 7da9ffa3bd)
 2024-01-03 15:25:24 +00:00
mergify[bot]
40ec5ff90f fix(UX): dont override framework's permission check messages (backport #39118) (#39120) 
fix(UX): dont override framework's permission check messages (#39118)

(cherry picked from commit e84c9f7c51)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-03 20:32:52 +05:30
Ankush Menat
aad39cf686 fix: Ignore UP on "allowed to transact with" (#39103) 
If a customer is allowed to transact with some company it usually
doesn't imply that customer is somehow "linked with" that company.
 2024-01-03 13:13:24 +05:30