nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,289 Commits 401 Branches 1,700 Tags
b834abbd4f516c3fa57795d7ea6d166d6880e7be
Commit Graph

47289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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 739434b727)

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 6e5484ea03)

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

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 1a9e091d12)
 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 92bc962f60)
 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 a517125d64)
 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 a9576f0cf6)

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 47f7b65058)

# 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 510fdf7bf6)

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 0346f47c1d)

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 877cc7255d)

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 0c6de4ecb2)

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 70abedc57a)

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

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

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 3b4b2275de)

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))
v15.8.3 		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 b5340c5ec0)

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

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 10074e9980)

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

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

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 10074e9980)

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

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))
v15.8.2 		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 49f93f9fa1)
 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 8555617295)
 2023-12-28 10:54:27 +00:00
ruthra kumar
7c7c3c932f fix: incorrect total when Accumulating values 
(cherry picked from commit d54f8318fb)
 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 b71b0d5997)

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))
v15.8.1 		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 a117ef3cb8)

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

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

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 9b1c22250f)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-28 08:28:02 +05:30
mergify[bot]
3caabf23a5 fix : correct logic for overlap error (backport #38967) (#38968) 
fix : correct logic for overlap error (#38967)

fixing overlap error logic with taking care of sequential time job cards in overlap job card list

(cherry picked from commit fe77b9d633)

Co-authored-by: VihangT <151990347+VihangT@users.noreply.github.com>
 2023-12-27 20:40:03 +05:30
mergify[bot]
76c6b501f9 fix: use Stock Qty while getting POS Reserved Qty (backport #38962) (#38965) 
fix: use `Stock Qty` while getting `POS Reserved Qty`

(cherry picked from commit 7223106417)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-27 15:31:58 +05:30
Frappe PR Bot
f3ab5a33c7 chore(release): Bumped to Version 15.8.0 
# [15.8.0](https://github.com/frappe/erpnext/compare/v15.7.0...v15.8.0) (2023-12-27)

### Bug Fixes

* `Reserved Stock` report (backport [#38922](https://github.com/frappe/erpnext/issues/38922)) ([#38924](https://github.com/frappe/erpnext/issues/38924)) ([8f643f0](8f643f0df8))
* allow to set rate manually for service item in BOM (backport [#38880](https://github.com/frappe/erpnext/issues/38880)) (backport [#38882](https://github.com/frappe/erpnext/issues/38882)) ([#38885](https://github.com/frappe/erpnext/issues/38885)) ([74606dc](74606dc927))
* do not make serial batch bundle for zero qty (backport [#38949](https://github.com/frappe/erpnext/issues/38949)) ([#38954](https://github.com/frappe/erpnext/issues/38954)) ([a41cf62](a41cf62437))
* do not reset the basic rate for the material receipt stock entry (backport [#38896](https://github.com/frappe/erpnext/issues/38896)) ([#38899](https://github.com/frappe/erpnext/issues/38899)) ([f6eb2b5](f6eb2b521d))
* incorrect price list in customer-wise item price report ([e0dbb57](e0dbb573b1))
* incorrect qty in serial batch bundle against pick list (backport [#38964](https://github.com/frappe/erpnext/issues/38964)) ([#38966](https://github.com/frappe/erpnext/issues/38966)) ([5874be0](5874be0f79))
* local reference error in BOM (backport [#38850](https://github.com/frappe/erpnext/issues/38850)) ([#38877](https://github.com/frappe/erpnext/issues/38877)) ([e3be9c1](e3be9c1da4))
* min order qty optional in production plan (backport [#38956](https://github.com/frappe/erpnext/issues/38956)) ([#38958](https://github.com/frappe/erpnext/issues/38958)) ([ab9fce3](ab9fce333d))
* not able to import serial batch bundle using csv (backport [#38950](https://github.com/frappe/erpnext/issues/38950)) ([#38955](https://github.com/frappe/erpnext/issues/38955)) ([0e48ef7](0e48ef7ace))
* reposting not fixing valuation rate for sales return using movin… (backport [#38895](https://github.com/frappe/erpnext/issues/38895)) (backport [#38897](https://github.com/frappe/erpnext/issues/38897)) ([#38901](https://github.com/frappe/erpnext/issues/38901)) ([eabb956](eabb956aca))
* reset the incoming rate on changing of the warehouse (backport [#38925](https://github.com/frappe/erpnext/issues/38925)) ([#38926](https://github.com/frappe/erpnext/issues/38926)) ([82960e3](82960e3312))
* **test:** expect account currency when party account is specified. ([2d9a0a8](2d9a0a8e2e))
* typeerror on pos order summary to new order screen ([bf98a8f](bf98a8f855))
* typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport [#38870](https://github.com/frappe/erpnext/issues/38870)) ([#38871](https://github.com/frappe/erpnext/issues/38871)) ([d75ac13](d75ac136d7))
* use party account currency when party account is specified ([32d3d4e](32d3d4e571))
* **ux:** make PR and PI Item rate field readonly based on `Maintain Same Rate` (backport [#38942](https://github.com/frappe/erpnext/issues/38942)) ([#38944](https://github.com/frappe/erpnext/issues/38944)) ([f704ccb](f704ccbb59))

### Features

* in_party_currency option for AR/AP reports ([a65bc77](a65bc77b02))
* provision to add items in Stock Reservation dialog (backport [#38558](https://github.com/frappe/erpnext/issues/38558)) ([#38920](https://github.com/frappe/erpnext/issues/38920)) ([8c2c90f](8c2c90f77a))
* total_asset_cost field (backport [#38879](https://github.com/frappe/erpnext/issues/38879)) ([#38887](https://github.com/frappe/erpnext/issues/38887)) ([58f1df5](58f1df5004))

### Performance Improvements

* Drop unused/duplicate/sub-optimal indexes (backport [#38884](https://github.com/frappe/erpnext/issues/38884)) ([#38913](https://github.com/frappe/erpnext/issues/38913)) ([308c6ff](308c6ffb4f))
* use estimated rows instead of actual rows (backport [#38830](https://github.com/frappe/erpnext/issues/38830)) ([#38876](https://github.com/frappe/erpnext/issues/38876)) ([648f275](648f275797))
v15.8.0 		2023-12-27 08:41:36 +00:00