nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 23:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,114 Commits 459 Branches 1,746 Tags
2eac2ef69fae71d570eb7dceb6edb6e312fbef36
Commit Graph

48114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
e2bf03bdb2 Merge pull request #38952 from frappe/version-15-hotfix 
chore: release v15
 2023-12-27 14:10:09 +05:30
mergify[bot]
5874be0f79 fix: incorrect qty in serial batch bundle against pick list (backport #38964) (#38966) 
fix: incorrect qty in serial batch bundle against pick list (#38964)

(cherry picked from commit 47ee801d37)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-27 14:06:55 +05:30
mergify[bot]
ab9fce333d fix: min order qty optional in production plan (backport #38956) (#38958) 
fix: min order qty optional in production plan (#38956)

* fix: min order qty optional in production plan

* fix: test cases

(cherry picked from commit b09c9354fb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-26 21:55:23 +05:30
mergify[bot]
0e48ef7ace fix: not able to import serial batch bundle using csv (backport #38950) (#38955) 
* fix: not able to import serial batch bundle using csv (#38950)

(cherry picked from commit d00f6672a8)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py

* chore: fixed conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-26 16:29:34 +05:30
mergify[bot]
a41cf62437 fix: do not make serial batch bundle for zero qty (backport #38949) (#38954) 
fix: do not make serial batch bundle for zero qty (#38949)

(cherry picked from commit 06d6220a2a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-26 15:39:00 +05:30
mergify[bot]
f704ccbb59 fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate (backport #38942) (#38944) 
* fix(ux): make PI Item rate field editable

(cherry picked from commit eb5bb9f9a9)

* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit cb9114442b)

* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`

(cherry picked from commit b1ba210332)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-26 14:45:05 +05:30
ruthra kumar
1ea8574be9 Merge pull request #38946 from frappe/mergify/bp/version-15-hotfix/pr-38891 
fix: incorrect price list in customer-wise item price report (backport #38891)
 2023-12-26 12:16:55 +05:30
ruthra kumar
e0dbb573b1 fix: incorrect price list in customer-wise item price report 
(cherry picked from commit 9a00edb031)
 2023-12-26 06:17:54 +00:00
mergify[bot]
82960e3312 fix: reset the incoming rate on changing of the warehouse (backport #38925) (#38926) 
fix: reset the incoming rate on changing of the warehouse (#38925)

(cherry picked from commit 161ae1edd1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-22 17:55:58 +05:30
mergify[bot]
8f643f0df8 fix: Reserved Stock report (backport #38922) (#38924) 
* chore: improve `Allowed Qty` error msg

(cherry picked from commit 1a1629196d)

* fix: `Reserved Stock` report

(cherry picked from commit a5d5223c0e)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-22 16:45:40 +05:30
mergify[bot]
8c2c90f77a feat: provision to add items in Stock Reservation dialog (backport #38558) (#38920) 
* feat: provision to update items in Stock Reservation dialog

(cherry picked from commit 9471d8fff9)

* fix(ux): show row index and field label while selecting the Sales Order Item

(cherry picked from commit 00261094c8)

* feat: provision to add items in Stock Reservation dialog

(cherry picked from commit 8d5045ef4c)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-22 15:50:07 +05:30
mergify[bot]
a8f3f2343d chore: fixup broken JSON files (backport #38915) (#38917) 
chore: fixup broken JSON files (#38915)

(cherry picked from commit 2dc49c834a)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-22 07:41:00 +05:30
mergify[bot]
308c6ffb4f perf: Drop unused/duplicate/sub-optimal indexes (backport #38884) (#38913) 
perf: Drop unused/duplicate/sub-optimal indexes (#38884)

* ci: enable more checks

* perf: Drop unused/duplicate indexes

(cherry picked from commit 787333896c)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-21 21:39:20 +05:30
mergify[bot]
a99470e017 chore: additional_asset_cost field (backport #38904) (#38906) 
chore: additional_asset_cost field (#38904)

(cherry picked from commit 283763dfb2)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-21 16:55:41 +05:30
mergify[bot]
eabb956aca fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (backport #38897) (#38901) 
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895) (#38897)

* fix: reposting not fixing valuation rate for sales return using movin… (#38895)

fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe96)

# Conflicts:
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

---------

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-12-21 15:44:50 +05:30
mergify[bot]
f6eb2b521d fix: do not reset the basic rate for the material receipt stock entry (backport #38896) (#38899) 
fix: do not reset the basic rate for the material receipt stock entry (#38896)

(cherry picked from commit 98bfcc4c75)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-21 14:22:53 +05:30
ruthra kumar
135aced98e Merge pull request #38894 from frappe/mergify/bp/version-15-hotfix/pr-38893 
fix: typeerror on pos order summary to new order screen (backport #38893)
 2023-12-21 12:26:04 +05:30
ruthra kumar
bf98a8f855 fix: typeerror on pos order summary to new order screen 
(cherry picked from commit 6a0a08b59c)
 2023-12-21 06:53:22 +00:00
mergify[bot]
74606dc927 fix: allow to set rate manually for service item in BOM (backport #38880) (backport #38882) (#38885) 
fix: allow to set rate manually for service item in BOM (backport #38880) (#38882)

fix: allow to set rate manually for service item in BOM (#38880)

(cherry picked from commit c2f692a4e4)

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

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2023-12-21 10:44:20 +05:30
mergify[bot]
58f1df5004 feat: total_asset_cost field (backport #38879) (#38887) 
* feat: total_asset_cost field (#38879)

(cherry picked from commit d370c60a6c)

# Conflicts:
#	erpnext/patches.txt

* chore: resolve conflicts

* chore: remove unnecessary patch

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-20 22:47:48 +05:30
mergify[bot]
e3be9c1da4 fix: local reference error in BOM (backport #38850) (#38877) 
fix: local reference error in BOM (#38850)

fix: local reference error
(cherry picked from commit ae353398d9)

Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com>
 2023-12-20 16:34:27 +05:30
mergify[bot]
648f275797 perf: use estimated rows instead of actual rows (backport #38830) (#38876) 
perf: use estimated rows instead of actual rows (#38830)

(cherry picked from commit 9983283f95)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-20 13:58:38 +05:30
ruthra kumar
4626ab5e19 Merge pull request #38873 from frappe/mergify/bp/version-15-hotfix/pr-38838 
fix: use party account currency when party account is specified (backport #38838)
 2023-12-20 13:09:15 +05:30
Devin Slauenwhite
2d9a0a8e2e fix(test): expect account currency when party account is specified. 
(cherry picked from commit a09241e3c7)
 2023-12-20 07:05:32 +00:00
Devin Slauenwhite
32d3d4e571 fix: use party account currency when party account is specified 
(cherry picked from commit c7b961ffa2)
 2023-12-20 07:05:32 +00:00