Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,792 Commits 3 Branches 0 Tags
Commit Graph

47792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Frappe PR Bot
290397172e chore(release): Bumped to Version 15.9.1 
## [15.9.1](https://github.com/frappe/erpnext/compare/v15.9.0...v15.9.1) (2024-01-03)

### Bug Fixes

* typerror on multi select dialog ([5ee6cc4](5ee6cc4bac))
 2024-01-03 15:37:59 +00:00
ruthra kumar
e3c473482b
Merge pull request #39124 from frappe/mergify/bp/version-15/pr-39116 
fix: typerror on multi select dialog (backport #39116)
 2024-01-03 21:06:50 +05:30
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
5ee6cc4bac fix: typerror on multi select dialog 
(cherry picked from commit 7da9ffa3bd072fbfc9627e6eb5afb3dd3078f560)
 2024-01-03 15:26:21 +00: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
Frappe PR Bot
3eac0e907e chore(release): Bumped to Version 15.9.0 
# [15.9.0](https://github.com/frappe/erpnext/compare/v15.8.3...v15.9.0) (2024-01-03)

### Bug Fixes

* auto fetch not working if bundle exists (backport [#39002](https://github.com/frappe/erpnext/issues/39002)) ([#39004](https://github.com/frappe/erpnext/issues/39004)) ([2e91934](2e919344df))
* **DX:** capture tracebacks with context (backport [#39060](https://github.com/frappe/erpnext/issues/39060)) ([#39063](https://github.com/frappe/erpnext/issues/39063)) ([8ad7faf](8ad7fafe2a))
* enqueue demo data setup on setup complete (backport [#39043](https://github.com/frappe/erpnext/issues/39043)) ([#39044](https://github.com/frappe/erpnext/issues/39044)) ([d8cf994](d8cf994e94))
* incorrect total when Accumulating values ([7c7c3c9](7c7c3c932f))
* Multiple subscription fixes ([#39005](https://github.com/frappe/erpnext/issues/39005)) ([5158884](5158884dc9))
* non stock uom validation for serial and batch (backport [#39018](https://github.com/frappe/erpnext/issues/39018)) ([#39026](https://github.com/frappe/erpnext/issues/39026)) ([89d1069](89d1069472))
* not able to cancel sales invoice (backport [#38979](https://github.com/frappe/erpnext/issues/38979)) ([#38980](https://github.com/frappe/erpnext/issues/38980)) ([f8625f3](f8625f3eb7))
* on cancellation of document cancel the serial and batch bundle (backport [#39076](https://github.com/frappe/erpnext/issues/39076)) ([#39082](https://github.com/frappe/erpnext/issues/39082)) ([2e0abbd](2e0abbd274))
* Opening balance in bank reconciliation tool ([#38977](https://github.com/frappe/erpnext/issues/38977)) ([e0755f9](e0755f9a9a))
* purchase return without item code not working (backport [#39014](https://github.com/frappe/erpnext/issues/39014)) ([#39015](https://github.com/frappe/erpnext/issues/39015)) ([2a390ac](2a390ac2de))
* remove bad defaults (backport [#38986](https://github.com/frappe/erpnext/issues/38986)) ([#38988](https://github.com/frappe/erpnext/issues/38988)) ([46035ed](46035ed9ca))
* select options should dynamically load dimensions ([21f9001](21f90011bc))
* serial and batch bundle company mandatory error (backport [#38994](https://github.com/frappe/erpnext/issues/38994)) ([#38999](https://github.com/frappe/erpnext/issues/38999)) ([d2580be](d2580be4fd))
* take quantity into account when setting asset's gross purchase amt (backport [#39056](https://github.com/frappe/erpnext/issues/39056)) ([#39058](https://github.com/frappe/erpnext/issues/39058)) ([2e93275](2e932754e0))
* Unable to save Sales Invoice ([#39059](https://github.com/frappe/erpnext/issues/39059)) ([73c0f37](73c0f3703c))
* undefined error in Budget Variance and Profitability report ([9fdf5c8](9fdf5c8091))
* undefined error in consolidated financial report ([49f93f9](49f93f9fa1))
* use `Stock Qty` while getting `POS Reserved Qty` (backport [#38962](https://github.com/frappe/erpnext/issues/38962)) ([#38965](https://github.com/frappe/erpnext/issues/38965)) ([76c6b50](76c6b501f9))
* Validate account in Sales/Purchase Taxes and Charges Template ([#39013](https://github.com/frappe/erpnext/issues/39013)) ([f3254c2](f3254c2010))
* work order with multi level, fetch operting cost from sub-assembly (backport [#38992](https://github.com/frappe/erpnext/issues/38992)) ([#39028](https://github.com/frappe/erpnext/issues/39028)) ([3a7506e](3a7506ecbc))

### Features

* Against voucher filter in General Ledger ([#39102](https://github.com/frappe/erpnext/issues/39102)) ([458064f](458064f8a1))
* group by Asset in Asset Depreciations and Balances report (backport [#38923](https://github.com/frappe/erpnext/issues/38923)) ([#39066](https://github.com/frappe/erpnext/issues/39066)) ([d85dad7](d85dad7198))
* Merge taxes from mapped docs ([#38346](https://github.com/frappe/erpnext/issues/38346)) ([4e23048](4e2304818b))
* voucher subtype for general ledger ([#38822](https://github.com/frappe/erpnext/issues/38822)) ([e5d73c7](e5d73c780b))

### Performance Improvements

* index item_code in bom explosion item (backport [#39085](https://github.com/frappe/erpnext/issues/39085)) ([#39088](https://github.com/frappe/erpnext/issues/39088)) ([57bcf9f](57bcf9f568))
 2024-01-03 06:01:15 +00:00
Deepesh Garg
d2fdce007e
Merge pull request #39090 from frappe/version-15-hotfix 
chore: release v15
 2024-01-03 11:29:39 +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
f3088e08bb
Merge pull request #39072 from frappe/mergify/bp/version-15-hotfix/pr-39067 
fix: undefined error in Budget Variance and Profitability report (backport #39067)
 2024-01-01 17:42:45 +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
7539623fb9
Merge pull request #39069 from frappe/mergify/bp/version-15-hotfix/pr-39023 
refactor(perf): replace account subquery with 'in' condition (backport #39023)
 2024-01-01 16:29:25 +05:30
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
12c5f0b6b5
Merge pull request #38996 from frappe/mergify/bp/version-15/pr-38995 
fix: undefined error in consolidated financial report (backport #38995)
 2023-12-28 17:45:35 +05:30
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
d2fe221bc7
Merge pull request #38990 from frappe/mergify/bp/version-15-hotfix/pr-38969 
fix: incorrect net profit in Profit and Loss Statement (backport #38969)
 2023-12-28 17:09:43 +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
mergify[bot]
46035ed9ca
fix: remove bad defaults (backport #38986) (#38988) 
fix: remove bad defaults (#38986)

Child tables can't have a default.

(cherry picked from commit b71b0d599775cd445acb555f7df6f849056a7a9b)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-28 14:22:18 +05:30
Frappe PR Bot
7e7eb95934 chore(release): Bumped to Version 15.8.1 
## [15.8.1](https://github.com/frappe/erpnext/compare/v15.8.0...v15.8.1) (2023-12-28)

### Bug Fixes

* not able to cancel sales invoice (backport [#38979](https://github.com/frappe/erpnext/issues/38979)) (backport [#38980](https://github.com/frappe/erpnext/issues/38980)) ([#38981](https://github.com/frappe/erpnext/issues/38981)) ([83e62bb](83e62bbaad))
 2023-12-28 05:55:23 +00:00
mergify[bot]
83e62bbaad
fix: not able to cancel sales invoice (backport #38979) (backport #38980) (#38981) 
fix: not able to cancel sales invoice (backport #38979) (#38980)

fix: not able to cancel sales invoice (#38979)

(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-12-28 11:24:16 +05:30
mergify[bot]
f8625f3eb7
fix: not able to cancel sales invoice (backport #38979) (#38980) 
fix: not able to cancel sales invoice (#38979)

(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-28 11:21:51 +05:30
mergify[bot]
4e2304818b
feat: Merge taxes from mapped docs (#38346) 
feat: Merge taxes from mapped docs (#38346)

* feat: Merge taxes from mapped docs

* chore: ci failures

(cherry picked from commit 9b1c22250f1da37a563ba0885fbbd732b176816c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-28 08:28:02 +05:30