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
46,748 Commits 459 Branches 1,746 Tags
5cd9bf3bda1c63fc04b6b4db8ddfdb2f9c7b456e
Commit Graph

46748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
e5b90c8ec5 Merge pull request #39321 from frappe/mergify/bp/version-14-hotfix/pr-39320 
fix: possible typeerror in consolidated report (backport #39320)
 2024-01-11 17:13:00 +05:30
ruthra kumar
faa312e680 Merge pull request #39318 from frappe/mergify/bp/version-14-hotfix/pr-39317 
fix: broken dimension filters in Sales/Purchase register (backport #39317)
 2024-01-11 17:12:48 +05:30
ruthra kumar
9395f7535b fix: possible typeerror in consolidated report 
(cherry picked from commit 268731aec4)
 2024-01-11 16:59:32 +05:30
ruthra kumar
298cdf5f0e fix: broken dimension filters in Sales/Purchase register 
(cherry picked from commit 7b3f9386d7)
 2024-01-11 11:20:42 +00:00
rohitwaghchaure
531f15b5d8 Merge pull request #39314 from frappe/mergify/bp/version-14-hotfix/pr-39215 
fix: incorrect percentage received in purchase invoice (backport #39215)
 2024-01-11 15:14:52 +05:30
rohitwaghchaure
daf0e435e2 chore: fix conflicts 2024-01-11 14:53:21 +05:30
Rohit Waghchaure
453700d0ab fix: incorrect percentage received in purchase invoice 
(cherry picked from commit 8d2c78867e)
 2024-01-11 09:21:23 +00:00
Rohit Waghchaure
dfcb746774 fix: circular dependency error while deleting QC 
(cherry picked from commit 7cc324e31e)

# Conflicts:
#	erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
 2024-01-11 09:20:08 +00:00
Frappe PR Bot
5ae050ecd4 chore(release): Bumped to Version 14.60.1 
## [14.60.1](https://github.com/frappe/erpnext/compare/v14.60.0...v14.60.1) (2024-01-10)

### Bug Fixes

* performance issue related to stock entry (backport [#39301](https://github.com/frappe/erpnext/issues/39301)) ([#39302](https://github.com/frappe/erpnext/issues/39302)) ([49d914b](49d914bdb6))
v14.60.1 		2024-01-10 16:55:11 +00:00
rohitwaghchaure
d3cc0c9aea Merge pull request #39304 from frappe/mergify/bp/version-14/pr-39302 
fix: performance issue related to stock entry (backport #39301) (backport #39302)
 2024-01-10 22:23:58 +05:30
mergify[bot]
49d914bdb6 fix: performance issue related to stock entry (backport #39301) (#39302) 
fix: performance issue related to stock entry (#39301)

(cherry picked from commit c67b0a3a64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit dc7c9e7aff)
 2024-01-10 16:53:05 +00:00
mergify[bot]
dc7c9e7aff fix: performance issue related to stock entry (backport #39301) (#39302) 
fix: performance issue related to stock entry (#39301)

(cherry picked from commit c67b0a3a64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-10 22:22:16 +05:30
Frappe PR Bot
5fd68f7204 chore(release): Bumped to Version 14.60.0 
# [14.60.0](https://github.com/frappe/erpnext/compare/v14.59.0...v14.60.0) (2024-01-10)

### Features

* provision to select the qty field for Product Page (backport [#39292](https://github.com/frappe/erpnext/issues/39292)) ([#39300](https://github.com/frappe/erpnext/issues/39300)) ([760af49](760af497ca))
v14.60.0 		2024-01-10 16:24:39 +00:00
mergify[bot]
760af497ca feat: provision to select the qty field for Product Page (backport #39292) (#39300) 
feat: provision to select the qty field for Product Page (#39292)

feat: provision to select the qty field to be shown as `In Stock` in product page
(cherry picked from commit d42db1174d)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-10 21:51:34 +05:30
s-aga-r
d42db1174d feat: provision to select the qty field for Product Page (#39292) 
feat: provision to select the qty field to be shown as `In Stock` in product page
 2024-01-10 21:31:03 +05:30
Frappe PR Bot
2e6f1378f1 chore(release): Bumped to Version 14.59.0 
# [14.59.0](https://github.com/frappe/erpnext/compare/v14.58.1...v14.59.0) (2024-01-10)

### Bug Fixes

* add read permission to Buying Settings (backport [#39158](https://github.com/frappe/erpnext/issues/39158)) ([#39257](https://github.com/frappe/erpnext/issues/39257)) ([a15ad80](a15ad804d0))
* asset WDV depreciation calc according to IT act ([1cbe1e8](1cbe1e894d))
* BOM replace tool does not update exploded items of root (backport [#39244](https://github.com/frappe/erpnext/issues/39244)) ([#39249](https://github.com/frappe/erpnext/issues/39249)) ([c2eeeec](c2eeeecac8))
* don't set rate for non-stock item in Internal Transfer (backport [#39140](https://github.com/frappe/erpnext/issues/39140)) ([#39168](https://github.com/frappe/erpnext/issues/39168)) ([06d193a](06d193ad87))
* Duplicate Closing Stock Balance (backport [#39262](https://github.com/frappe/erpnext/issues/39262)) ([#39263](https://github.com/frappe/erpnext/issues/39263)) ([a3146c3](a3146c39dd))
* **Employee:** treeview ([#39126](https://github.com/frappe/erpnext/issues/39126)) ([080a742](080a742725))
* FG Item incorrect qty in the work order (backport [#39200](https://github.com/frappe/erpnext/issues/39200)) ([#39210](https://github.com/frappe/erpnext/issues/39210)) ([5e517cf](5e517cfc77))
* Ignore asset qty and status validation while cancelling LCV ([952cee3](952cee3d6a))
* Ignore UP on "allowed to transact with" (backport [#39103](https://github.com/frappe/erpnext/issues/39103)) ([#39104](https://github.com/frappe/erpnext/issues/39104)) ([7d64df0](7d64df05bc))
* improved validation message ([580e9f6](580e9f6e10))
* incorrect indicator title for portal sales order (backport [#39247](https://github.com/frappe/erpnext/issues/39247)) ([#39254](https://github.com/frappe/erpnext/issues/39254)) ([8c496fb](8c496fbf2b))
* inventory dimension negative stock validation (backport [#39149](https://github.com/frappe/erpnext/issues/39149)) ([#39150](https://github.com/frappe/erpnext/issues/39150)) ([2866f7c](2866f7c441))
* possible typeerror on transaction.js ([8fe346a](8fe346aef8))
* Purchase date and amount is not mandatory for composite asset creation ([0f6477a](0f6477a253))
* remove global _("translation") calls (backport [#32828](https://github.com/frappe/erpnext/issues/32828)) ([#39231](https://github.com/frappe/erpnext/issues/39231)) ([ee7474b](ee7474ba20))
* resolved conflict ([b529883](b529883897))
* set `First Name` in Supplier Contact ([69c460c](69c460c756))
* Set asset purchase amount based on qty and valuation_rate ([41e3843](41e384326e))
* set parent doctype on chart (backport [#39286](https://github.com/frappe/erpnext/issues/39286)) ([#39287](https://github.com/frappe/erpnext/issues/39287)) ([a2a8558](a2a8558677))
* Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog ([7b4b630](7b4b630b2c))
* Show timesheet table after fetching data from timesheet (backport [#39275](https://github.com/frappe/erpnext/issues/39275)) ([#39280](https://github.com/frappe/erpnext/issues/39280)) ([1cc887a](1cc887a997))
* skip rate validation for return `DN Items` with `Moving Average` valuation (backport [#39242](https://github.com/frappe/erpnext/issues/39242)) ([#39265](https://github.com/frappe/erpnext/issues/39265)) ([f42e93b](f42e93bf6c))
* total allocated percentage for sales team issue ([71f9b7f](71f9b7f675))
* TypeError is pricing rules (backport [#39252](https://github.com/frappe/erpnext/issues/39252)) ([#39259](https://github.com/frappe/erpnext/issues/39259)) ([36ba33c](36ba33c500))
* typerror on multi select dialog ([71ecf08](71ecf081c3))
* update Maintenance Schedule status on Maintenance Visit submit (backport [#39167](https://github.com/frappe/erpnext/issues/39167)) ([#39185](https://github.com/frappe/erpnext/issues/39185)) ([2ea2146](2ea2146b34))
* **UX:** dont override framework's permission check messages (backport [#39118](https://github.com/frappe/erpnext/issues/39118)) ([#39119](https://github.com/frappe/erpnext/issues/39119)) ([26ae708](26ae708d6d))

### Features

* Copy project_name, from_time, to_time from timesheet details to sales invoice ([#33726](https://github.com/frappe/erpnext/issues/33726)) ([d0e1162](d0e1162c96))
v14.59.0 		2024-01-10 10:35:32 +00:00
Deepesh Garg
2d0e1830a9 Merge pull request #39246 from frappe/version-14-hotfix 
chore: release v14
 2024-01-10 16:04:20 +05:30
mergify[bot]
1cc887a997 fix: Show timesheet table after fetching data from timesheet (backport #39275) (#39280) 
fix: Show timesheet table after fetching data from timesheet

(cherry picked from commit e1ba5878a3)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-01-10 12:33:28 +05:30
mergify[bot]
ee7474ba20 fix: remove global _("translation") calls (backport #32828) (#39231) 
fix: remove global _("translation") calls (#32828)

This is not how it works. Translations are dynamic based on language
sets during request (using header, user's preferences etc)

Calling them on global variables makes no sense.

Ref: https://github.com/frappe/frappe/pull/18733
(cherry picked from commit 75983ce809)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-10 12:31:59 +05:30
mergify[bot]
a2a8558677 fix: set parent doctype on chart (backport #39286) (#39287) 
fix: set parent doctype on chart (#39286)

(cherry picked from commit 38c5ecf007)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-10 12:27:13 +05:30
Nabin Hait
cc07213faa Merge pull request #39189 from frappe/mergify/bp/version-14-hotfix/pr-39163 
fix: Purchase information is not required for creating a composite asset (backport #39163)
 2024-01-10 12:15:43 +05:30
Nabin Hait
f4e3f0d656 Merge pull request #39278 from frappe/mergify/bp/version-14-hotfix/pr-39191 
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191)
 2024-01-10 12:14:36 +05:30
Nabin Hait
0379ea5086 Merge pull request #39277 from frappe/mergify/bp/version-14-hotfix/pr-39238 
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)
 2024-01-10 12:14:24 +05:30
Nabin Hait
65005d8630 Merge pull request #39050 from anandbaburajan/asset_wdv_india 
fix: asset WDV depreciation calc according to IT act [v14]
 2024-01-10 12:13:53 +05:30
Nabin Hait
3f3fc8214d Merge pull request #39217 from frappe/mergify/bp/version-14-hotfix/pr-39214 
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214)
 2024-01-10 12:12:24 +05:30
Nabin Hait
b529883897 fix: resolved conflict 2024-01-10 12:01:32 +05:30
ruthra kumar
3d621d47a6 Merge pull request #39283 from frappe/mergify/bp/version-14-hotfix/pr-39282 
fix: possible typeerror on transaction.js (backport #39282)
 2024-01-10 12:00:50 +05:30
ruthra kumar
8fe346aef8 fix: possible typeerror on transaction.js 
(cherry picked from commit 9f27ac142b)
 2024-01-10 06:24:46 +00:00
Nabin Hait
952cee3d6a fix: Ignore asset qty and status validation while cancelling LCV 
(cherry picked from commit e9d36242ce)
 2024-01-10 06:04:10 +00:00
Nabin Hait
41e384326e fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aa)
 2024-01-10 06:03:03 +00:00
mergify[bot]
f42e93bf6c fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242) (#39265) 
* fix: skip rate validation for return `DN Items` with `Moving Average` valuation

(cherry picked from commit e0ad52b500)

# Conflicts:
#	erpnext/controllers/sales_and_purchase_return.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-10 10:53:09 +05:30
mergify[bot]
a3146c39dd fix: Duplicate Closing Stock Balance (backport #39262) (#39263) 
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:49 +05:30
mergify[bot]
a15ad804d0 fix: add read permission to Buying Settings (backport #39158) (#39257) 
* fix: add read permission to Buying Settings

(cherry picked from commit e05bf9d32a)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json

* chore: resolve merge conflicts

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-01-09 19:09:06 +05:30
mergify[bot]
8c496fbf2b fix: incorrect indicator title for portal sales order (backport #39247) (#39254) 
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:43:18 +05:30
mergify[bot]
36ba33c500 fix: TypeError is pricing rules (backport #39252) (#39259) 
fix: TypeError is pricing rules (#39252)

(cherry picked from commit 274c65c451)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:42:04 +05:30
mergify[bot]
c2eeeecac8 fix: BOM replace tool does not update exploded items of root (backport #39244) (#39249) 
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:24 +05:30
ruthra kumar
c9d4c41db3 Merge pull request #39240 from frappe/mergify/bp/version-14-hotfix/pr-39237 
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order (backport #39237)
 2024-01-09 14:40:15 +05:30
ruthra kumar
71f9b7f675 fix: total allocated percentage for sales team issue 
(cherry picked from commit b498094a97)
 2024-01-09 07:38:57 +00:00
ruthra kumar
0ebd133eda Merge pull request #39236 from frappe/mergify/bp/version-14-hotfix/pr-33726 
feat: Copy project_name, from_time, to_time from timesheet details to sales invoice. (backport #33726)
 2024-01-09 12:43:27 +05:30
Kevin Shenk
d0e1162c96 feat: Copy project_name, from_time, to_time from timesheet details to sales invoice (#33726) 
feat: Copy project_name, from_time, to_time from timesheet details to sales invoice
(cherry picked from commit e4bceaaf66)
 2024-01-09 06:33:24 +00:00
Nabin Hait
7b4b630b2c fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog 
(cherry picked from commit c14986f9e6)
 2024-01-08 16:07:25 +00:00
mergify[bot]
5e517cfc77 fix: FG Item incorrect qty in the work order (backport #39200) (#39210) 
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 17:43:36 +05:30
mergify[bot]
2ea2146b34 fix: update Maintenance Schedule status on Maintenance Visit submit (backport #39167) (#39185) 
* 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)

# Conflicts:
#	erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
#	erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-08 16:27:19 +05:30
s-aga-r
856926d664 Merge pull request #39184 from s-aga-r/FIX-7838 
fix: set `First Name` in Supplier Contact
 2024-01-08 15:36:07 +05:30
Nabin Hait
0f6477a253 fix: Purchase date and amount is not mandatory for composite asset creation 
(cherry picked from commit c34f09c503)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
 2024-01-08 06:52:33 +00:00
Nabin Hait
580e9f6e10 fix: improved validation message 
(cherry picked from commit fe43dab4d7)
 2024-01-08 06:52:32 +00:00
s-aga-r
69c460c756 fix: set First Name in Supplier Contact 2024-01-08 11:47:00 +05:30
mergify[bot]
06d193ad87 fix: don't set rate for non-stock item in Internal Transfer (backport #39140) (#39168) 
* 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)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-08 11:44:52 +05:30
ruthra kumar
f6b10f3d84 Merge pull request #39180 from frappe/mergify/bp/version-14-hotfix/pr-39159 
refactor: prevent permission error by always processing bulk transaction in background (backport #39159)
 2024-01-08 10:30:25 +05:30
ruthra kumar
f236a2c081 refactor: prevent permissions by always processing in background 
(cherry picked from commit 15dc5c7e99)
 2024-01-08 04:42:49 +00:00