37062 Commits

Author SHA1 Message Date
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 4d56f725fe23495fa2392be01545c5d2fa8889b3)

* fix: update Maintenance Schedule status on Maintenance Visit submit

(cherry picked from commit cd293a5173aaec693afee23e9b874b1db649a267)

---------

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
00d36d14fb refactor: allow sales invoice in Bank Reconciliation tool
(cherry picked from commit b69cdeb4a6c881642fd2e3a081f13b65191d44bc)
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
51d8a7a0c1 fix: incorrect outstanding amt validation on advance as liability
(cherry picked from commit 4cc3c1b76529b99e1f0ed2594c0edc3152cc6534)
2024-01-08 04:45:03 +00:00
ruthra kumar
f0bc0aa676 refactor: prevent permissions by always processing in background
(cherry picked from commit 15dc5c7e9966e3bf06ec0aa951d7185fb6cf6d0e)
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 e1b0fffd0c934d376562e3ba8707b38426ea09a1)

* test: internal transfer for non-stock item

(cherry picked from commit 57b6a987034522266caca853d4ee26316526e526)

---------

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 bae7c6496402466df3af15c6bffcf51b97ae2037)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-05 05:04:28 +05:30
Raffael Meyer
6020c8e8f7 fix(Employee): treeview (#39126)
(cherry picked from commit e912e9597dbd83724afbcd00f3b2acd75b50a8f0)
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 5e2669f4b6e8ed917cc8e882b49a4a617a854464)

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

(cherry picked from commit 9e973476b2a925d4557b3a6b17517e46d652ac20)

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

(cherry picked from commit 5bc2035bd082001e2552138a5df55554f2e6f8de)

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

(cherry picked from commit bb839b2924c2dd4c2a06b087d7624ca7aac08f04)

* fix: don't close PO on SCO close

(cherry picked from commit 0d01bd8a5a49f5bba80ef797d5823f762e0fc86a)

* fix: update qty on SCO status change

(cherry picked from commit 245effcccd3866bac2974023d37cd48b89849aeb)

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

(cherry picked from commit 784b6dcfea2aa9eb3fe557bb4f87cdc1f7341560)

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

(cherry picked from commit 0819675fce1cffe3a930fe2cbd015998e4e7c00d)

* fix(text): test_update_status

(cherry picked from commit cdd5441435ee448d3efb2155a93865ec29bbf8ab)

---------

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 f09e2130a1a3ca999247f89f76c20efcc003b450)

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
7640feaaa7 fix: Subscription update patch
(cherry picked from commit 277dade9f9a0a439d435dd6a53474aae67cd8f24)
2024-01-04 05:54:51 +00:00
ruthra kumar
9e1b443857 fix: ignore cancelled payments in Sales/Purchase Register
(cherry picked from commit 0f1be03faf96aaf83063e28dc57a5e016944683c)
2024-01-04 05:45:52 +00:00
Monolithonadmin
0784488eec fix: Add name to Hungary - Chart of Accounts for Microenterprises json 2024-01-03 20:52:30 +01:00
ruthra kumar
54a0df5164 fix: typerror on multi select dialog
(cherry picked from commit 7da9ffa3bd072fbfc9627e6eb5afb3dd3078f560)
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 e84c9f7c51fc6e8c5c631c74131f9290624b2a05)

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
Deepesh Garg
458064f8a1
feat: Against voucher filter in General Ledger (#39102) 2024-01-03 10:51:34 +05:30
rohitwaghchaure
56d510b878
Merge branch 'version-15' into version-15-hotfix 2024-01-02 17:34:56 +05:30
mergify[bot]
57bcf9f568
perf: index item_code in bom explosion item (backport #39085) (#39088)
perf: index item_code in bom explosion item (#39085)

(cherry picked from commit 739434b72779fe12aed86a0a61d352948c81b680)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-02 14:43:10 +05:30
mergify[bot]
2e0abbd274
fix: on cancellation of document cancel the serial and batch bundle (backport #39076) (#39082)
fix: on cancellation of document cancel the serial and batch bundle (#39076)

(cherry picked from commit 6e5484ea031027de4e6a897b02bd0f2e7b8adda9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-02 13:28:43 +05:30
mergify[bot]
73c0f3703c
fix: Unable to save Sales Invoice (#39059)
fix: Unable to save Sales Invoice (#39059)

(cherry picked from commit bacf2b74312a4dfeb95ccc697047df2bc4d5f92e)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2024-01-01 19:28:29 +05:30
ruthra kumar
21f90011bc fix: select options should dynamically load dimensions
(cherry picked from commit 1a9e091d12f9149638f3774b9def0fa80370b59b)
2024-01-01 12:08:10 +00:00
ruthra kumar
9fdf5c8091 fix: undefined error in Budget Variance and Profitability report
'Budget' and 'Budget Account' doesn't have support for dynamic
dimension. It only supports hard-coded ones -  Project and Cost Center

(cherry picked from commit 92bc962f60adb3967a2ef378511822d53ff2f4a8)
2024-01-01 12:08:10 +00:00
ruthra kumar
cbaa617d20 refactor(perf): replace account subquery with 'in' condition
(cherry picked from commit a517125d64a48b61a9b2d943b3a01bfe8ae87f41)
2024-01-01 10:13:51 +00:00
mergify[bot]
d85dad7198
feat: group by Asset in Asset Depreciations and Balances report (backport #38923) (#39066)
feat: group by Asset in Asset Depreciations and Balances report (#38923)

feat: group by asset in asset depreciations and balances report
(cherry picked from commit a9576f0cf6c7c2eb0711c3c8ffb0e1095c6da69e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2024-01-01 15:05:04 +05:30
mergify[bot]
e5d73c780b
feat: voucher subtype for general ledger (#38822)
* feat: voucher subtype for general ledger (#38822)

* feat: add voucher subtype column to gle

* feat: add logic to set voucher subtypes

* feat: fetch voucher subtype in ledger report

* fix: order of conditions

(cherry picked from commit 47f7b65058e860e91c58dd12da6e48bd70ae60f6)

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

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2024-01-01 13:30:29 +05:30
mergify[bot]
8ad7fafe2a
fix(DX): capture tracebacks with context (backport #39060) (#39063)
fix(DX): capture tracebacks with context (#39060)

(cherry picked from commit 510fdf7bf651788e549184c23d89c2387c1c2f10)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-01 13:12:07 +05:30
mergify[bot]
2e932754e0
fix: take quantity into account when setting asset's gross purchase amt (backport #39056) (#39058)
fix: take quantity into account when setting asset's gross purchase amt (#39056)

fix: take quantity into account when setting asset's gross purchase amount
(cherry picked from commit 0346f47c1d25e1d60de21dd0dc04e8c7c0b23938)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2024-01-01 11:27:55 +05:30
mergify[bot]
d8cf994e94
fix: enqueue demo data setup on setup complete (backport #39043) (#39044)
fix: enqueue demo data setup on setup complete (#39043)

(cherry picked from commit 877cc7255dfc80cbdd0dab971bcde81f5ebf57ba)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
2023-12-31 18:25:15 +05:30
mergify[bot]
89d1069472
fix: non stock uom validation for serial and batch (backport #39018) (#39026)
fix: non stock uom validation for serial and batch (#39018)

* fix: non stock uom validation for serial and batch

* test: delivery note for batch with non stock uom

(cherry picked from commit 0c6de4ecb299daf5359fcd51041942a26f94693d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-29 20:54:49 +05:30
mergify[bot]
3a7506ecbc
fix: work order with multi level, fetch operting cost from sub-assembly (backport #38992) (#39028)
fix: work order with multi level, fetch operting cost from sub-assembly (#38992)

(cherry picked from commit 70abedc57ad2147719c23537ab9aaf348d6e9182)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-29 20:54:26 +05:30
mergify[bot]
f3254c2010
fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013)
fix: Validate account in Sales/Purchase Taxes and Charges Template (#39013)

(cherry picked from commit cd37fd790b9d7a28b9df8697c9b40c5477a580ec)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-12-29 16:16:02 +05:30
mergify[bot]
2a390ac2de
fix: purchase return without item code not working (backport #39014) (#39015)
fix: purchase return without item code not working (#39014)

(cherry picked from commit f983e09f92c6fb179e8e8a972b1cb969b40c8fd5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-29 13:07:38 +05:30
mergify[bot]
5158884dc9
fix: Multiple subscription fixes (#39005)
fix: Multiple subscription fixes (#39005)

(cherry picked from commit 3b4b2275de7a49ba48b09f7229bee45f1e890ac9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-12-29 12:52:41 +05:30
Frappe PR Bot
ec436c18a3 chore(release): Bumped to Version 15.8.3
## [15.8.3](https://github.com/frappe/erpnext/compare/v15.8.2...v15.8.3) (2023-12-28)

### Bug Fixes

* auto fetch not working if bundle exists (backport [#39002](https://github.com/frappe/erpnext/issues/39002)) (backport [#39004](https://github.com/frappe/erpnext/issues/39004)) ([#39006](https://github.com/frappe/erpnext/issues/39006)) ([17bae5a](17bae5a5a1))
* serial and batch bundle company mandatory error (backport [#38994](https://github.com/frappe/erpnext/issues/38994)) (backport [#38999](https://github.com/frappe/erpnext/issues/38999)) ([#39003](https://github.com/frappe/erpnext/issues/39003)) ([027a75b](027a75bcb0))
2023-12-28 13:31:04 +00:00
mergify[bot]
17bae5a5a1
fix: auto fetch not working if bundle exists (backport #39002) (backport #39004) (#39006)
fix: auto fetch not working if bundle exists (backport #39002) (#39004)

fix: auto fetch not working if bundle exists (#39002)

(cherry picked from commit b5340c5ec0d418dcf764efa961f743f88b660a24)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2e919344df8cd9018b2fff6d70b49c8db6ba0d8c)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-28 18:59:38 +05:30
mergify[bot]
027a75bcb0
fix: serial and batch bundle company mandatory error (backport #38994) (backport #38999) (#39003)
fix: serial and batch bundle company mandatory error (backport #38994) (#38999)

fix: serial and batch bundle company mandatory error (#38994)

(cherry picked from commit 10074e9980c8f2a1473827c61c888d970da4b73a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit d2580be4fd0a08aeddbdbf9b87d99b71a45d7820)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-28 18:59:20 +05:30
mergify[bot]
2e919344df
fix: auto fetch not working if bundle exists (backport #39002) (#39004)
fix: auto fetch not working if bundle exists (#39002)

(cherry picked from commit b5340c5ec0d418dcf764efa961f743f88b660a24)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-28 18:54:38 +05:30
mergify[bot]
d2580be4fd
fix: serial and batch bundle company mandatory error (backport #38994) (#38999)
fix: serial and batch bundle company mandatory error (#38994)

(cherry picked from commit 10074e9980c8f2a1473827c61c888d970da4b73a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-28 18:22:14 +05:30
mergify[bot]
e0755f9a9a
fix: Opening balance in bank reconciliation tool (#38977)
fix: Opening balance in bank reconciliation tool (#38977)

(cherry picked from commit bbee9b56377f24109217515360789558566f6aa1)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-12-28 17:53:44 +05:30
Frappe PR Bot
c4794c95df chore(release): Bumped to Version 15.8.2
## [15.8.2](https://github.com/frappe/erpnext/compare/v15.8.1...v15.8.2) (2023-12-28)

### Bug Fixes

* undefined error in consolidated financial report ([0a3e378](0a3e378f5e))
2023-12-28 12:16:55 +00:00
ruthra kumar
0a3e378f5e fix: undefined error in consolidated financial report
(cherry picked from commit 49f93f9fa1ce17838c66873771f9b943a4575102)
2023-12-28 12:13:20 +00:00
ruthra kumar
1b399e83be
Merge pull request #38995 from ruthra-kumar/undefined_error_in_consolidated_report
fix: undefined error in consolidated financial report
2023-12-28 17:42:18 +05:30
ruthra kumar
49f93f9fa1 fix: undefined error in consolidated financial report 2023-12-28 17:36:00 +05:30
ruthra kumar
a3cecb892a test: profit and loss report output
(cherry picked from commit 855561729544770d77106bc1e4e4a964884377ea)
2023-12-28 10:54:27 +00:00
ruthra kumar
7c7c3c932f fix: incorrect total when Accumulating values
(cherry picked from commit d54f8318fba2b60eaad4a93a811a5b569c3344dc)
2023-12-28 10:54:27 +00:00