nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 16:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,549 Commits 424 Branches 1,724 Tags
71da5d0928ba22c11bc29338094de267badf9019
Commit Graph

48549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
7ca9ffbaa7 Merge pull request #39329 from frappe/mergify/bp/version-15-hotfix/pr-38974 
fix: unreconciled Bank Transaction on cancel of payment voucher (#38974)
 2024-01-14 17:55:32 +05:30
rohitwaghchaure
137ce76a35 Merge pull request #39369 from frappe/mergify/bp/version-15-hotfix/pr-39224 
Update purchase_taxes_and_charges.json label Rate to Tax Rate (backport #39224)
 2024-01-14 11:59:41 +05:30
rohitwaghchaure
cd870ee30c fix: modified date 
(cherry picked from commit 6827edb2c5)
 2024-01-14 05:57:45 +00:00
rohitwaghchaure
2dc8686a81 fix: modified date was not set 
(cherry picked from commit 566876ae7a)
 2024-01-14 05:57:44 +00:00
mahsem
6bdf944ecf Update purchase_taxes_and_charges.json label Rate to Tax Rate 
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages

(cherry picked from commit bd464197c4)
 2024-01-14 05:57:44 +00:00
rohitwaghchaure
9842fb5b64 Merge pull request #39361 from frappe/mergify/bp/version-15-hotfix/pr-39225 
Update sales_taxes_and_charges.json (backport #39225)
 2024-01-14 11:24:20 +05:30
rohitwaghchaure
c548c57207 Merge pull request #39365 from frappe/mergify/bp/version-15-hotfix/pr-39359 
fix: added item group in stock reco (backport #39359)
 2024-01-14 11:24:00 +05:30
rohitwaghchaure
cb326ac0db Merge pull request #39362 from rohitwaghchaure/fixed-closing-stock-balance-field-issue 
chore: removed extra field
 2024-01-14 10:44:47 +05:30
rohitwaghchaure
f0480173fb fix: modified date 2024-01-14 10:43:34 +05:30
Rohit Waghchaure
eec6c25f9e fix: added item group in stock reco 
(cherry picked from commit 116ff8241c)
 2024-01-14 04:58:42 +00:00
Rohit Waghchaure
bf4e514cde chore: removed extra field 2024-01-14 10:21:38 +05:30
rohitwaghchaure
61595c7ede fix: modified date was not updated 
(cherry picked from commit f567af49a6)
 2024-01-14 04:46:29 +00:00
mahsem
d510b46f13 Update sales_taxes_and_charges.json 
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages

(cherry picked from commit 2b93be1139)
 2024-01-14 04:46:29 +00:00
rohitwaghchaure
15e116375b Merge pull request #39325 from frappe/mergify/bp/version-15-hotfix/pr-39305 
fix: naming series variable parsing for FY (backport #39305)
 2024-01-14 09:39:06 +05:30
mergify[bot]
b8f4c3193a fix: SBB Total Qty validation for SE (backport #39335) (backport #39348) (#39353) 
fix: SBB Total Qty validation for SE

(cherry picked from commit c20241fcb5)
(cherry picked from commit ca18853785)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-13 10:25:53 +05:30
rohitwaghchaure
832aa5f5ab Merge pull request #39348 from frappe/mergify/bp/version-15-hotfix/pr-39335 
fix: SBB Total Qty validation for SE (backport #39335)
 2024-01-12 21:19:26 +05:30
s-aga-r
ca18853785 fix: SBB Total Qty validation for SE 
(cherry picked from commit c20241fcb5)
 2024-01-12 15:30:36 +00:00
rohitwaghchaure
049864e7a2 Merge pull request #39342 from frappe/mergify/bp/version-15-hotfix/pr-38970 
fix: use local attribute range in multiple item variant dialog (backport #38970)
 2024-01-12 20:57:14 +05:30
rohitwaghchaure
62db0d77ca Merge pull request #39345 from frappe/mergify/bp/version-15-hotfix/pr-39333 
fix: added indexing to improve performance (backport #39333)
 2024-01-12 20:55:57 +05:30
Rohit Waghchaure
50fe4191d3 fix: added indexing to improve performance 
(cherry picked from commit ac81323fec)
 2024-01-12 13:10:47 +00:00
Gursheen Anand
04c96ddc6c fix: use child table values instead of global min max 
(cherry picked from commit 43fed29514)
 2024-01-12 13:08:31 +00:00
mergify[bot]
d7840559a0 chore: remove share, print and email permissions from Buying Settings (backport #39337) (#39339) 
chore: remove share, print and email permissions from Buying Settings

(cherry picked from commit 3c46abca6c)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-12 16:49:00 +05:30
Raffael Meyer
6f06313023 Merge pull request #39327 from frappe/mergify/bp/version-15-hotfix/pr-39117 
fix: consider all years in holiday list (backport #39117)
 2024-01-11 15:04:29 +01:00
barredterra
6b2e3503d9 chore: resolve merge confilcts 2024-01-11 14:56:20 +01:00
barredterra
b2fc5e4988 test: cancel voucher linked to Bank Transaction 
(cherry picked from commit 517bedeb7e)
 2024-01-11 13:37:48 +00:00
barredterra
16860c228d fix: unreconcile Bank Transaction on cancel of payment voucher 
(cherry picked from commit 0a95b38166)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2024-01-11 13:37:48 +00:00
barredterra
8a84f8a465 test: improve test for local holidays 
(cherry picked from commit 60329ade9e)
 2024-01-11 13:29:01 +00:00
barredterra
21eed78fa1 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fe)
 2024-01-11 13:29:00 +00:00
Gursheen Anand
e6f3a14289 fix: reset default after test 
(cherry picked from commit 813b7a96fb)
 2024-01-11 13:27:13 +00:00
Gursheen Anand
2beb3f8718 test: naming series variable parsing 
(cherry picked from commit bbdf98a8f0)
 2024-01-11 13:27:06 +00:00
Gursheen Anand
9aae439b1f fix: date in master document for dictionary condition 
(cherry picked from commit d96a777edd)
 2024-01-11 13:27:02 +00:00
Nabin Hait
b748095589 Merge pull request #39220 from frappe/mergify/bp/version-15-hotfix/pr-39202 
fix: parse naming series with FY name (backport #39202)
 2024-01-11 18:24:34 +05:30
ruthra kumar
7bd2acdef1 Merge pull request #39323 from frappe/mergify/bp/version-15-hotfix/pr-39212 
fix: project filters on Delivery Note and Sales Order (backport #39212)
 2024-01-11 18:07:12 +05:30
ruthra kumar
a51f956f3e fix: project filters on Delivery Note and Sales Order 
(cherry picked from commit 9ba6ff67d5)
 2024-01-11 12:34:43 +00:00
ruthra kumar
494c26e48a Merge pull request #39319 from frappe/mergify/bp/version-15-hotfix/pr-39317 
fix: broken dimension filters in Sales/Purchase register (backport #39317)
 2024-01-11 17:12:35 +05:30
Deepesh Garg
da7b2febe0 Merge pull request #39295 from frappe/mergify/bp/version-15-hotfix/pr-39256 
fix: Ignore default payment terms template for opening invoices (#39256)
 2024-01-11 17:06:53 +05:30
ruthra kumar
04037b7e38 fix: broken dimension filters in Sales/Purchase register 
(cherry picked from commit 7b3f9386d7)
 2024-01-11 11:20:43 +00:00
rohitwaghchaure
484db65797 Merge pull request #39315 from frappe/mergify/bp/version-15-hotfix/pr-39215 
fix: incorrect percentage received in purchase invoice (backport #39215)
 2024-01-11 15:14:44 +05:30
rohitwaghchaure
3f4cf15def Merge pull request #39312 from frappe/mergify/bp/version-15-hotfix/pr-39299 
fix: circular dependency error on deletion of QC and Stock Entry (backport #39299)
 2024-01-11 15:14:34 +05:30
Rohit Waghchaure
758b9b8a81 fix: incorrect percentage received in purchase invoice 
(cherry picked from commit 8d2c78867e)
 2024-01-11 09:21:41 +00:00
Rohit Waghchaure
7ca8e49b38 fix: circular dependency error while deleting QC 
(cherry picked from commit 7cc324e31e)
 2024-01-11 09:20:42 +00:00
mergify[bot]
d882305c72 fix: performance issue related to stock entry (backport #39301) (#39303) 
fix: performance issue related to stock entry (#39301)

(cherry picked from commit c67b0a3a64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-10 22:18:16 +05:30
Deepesh Garg
5dc2e80987 fix: Ignore default payment terms template for opening invoices 
(cherry picked from commit 53bf44d2b8)
 2024-01-10 10:37:45 +00:00
Frappe PR Bot
1dc85fcaf8 chore(release): Bumped to Version 15.10.0 
# [15.10.0](https://github.com/frappe/erpnext/compare/v15.9.1...v15.10.0) (2024-01-10)

### Bug Fixes

* add expected_start_date in sort by ([b064944](b064944753))
* Add name to Hungary - Chart of Accounts for Microenterprises json ([0784488](0784488eec))
* add read permission to Buying Settings ([e62dd0d](e62dd0d7cb))
* bank transction status upon reconciliation ([277aa7b](277aa7bc2b))
* BOM replace tool does not update exploded items of root (backport [#39244](https://github.com/frappe/erpnext/issues/39244)) ([#39250](https://github.com/frappe/erpnext/issues/39250)) ([0898ea5](0898ea5d92))
* Creating Asset Activity while Importing Asset ([#39113](https://github.com/frappe/erpnext/issues/39113)) ([5e46937](5e4693763a))
* don't set rate for non-stock item in Internal Transfer (backport [#39140](https://github.com/frappe/erpnext/issues/39140)) ([#39169](https://github.com/frappe/erpnext/issues/39169)) ([f3882a8](f3882a854f))
* Duplicate Closing Stock Balance (backport [#39262](https://github.com/frappe/erpnext/issues/39262)) ([#39264](https://github.com/frappe/erpnext/issues/39264)) ([78c65f2](78c65f27b0))
* duplicate entry for serial / batch creation (backport [#39188](https://github.com/frappe/erpnext/issues/39188)) ([#39192](https://github.com/frappe/erpnext/issues/39192)) ([672e6d6](672e6d6d06))
* **Employee:** treeview ([#39126](https://github.com/frappe/erpnext/issues/39126)) ([6020c8e](6020c8e8f7))
* FG Item incorrect qty in the work order (backport [#39200](https://github.com/frappe/erpnext/issues/39200)) ([#39211](https://github.com/frappe/erpnext/issues/39211)) ([abc99f8](abc99f84e9))
* flaky demo test case (backport [#39135](https://github.com/frappe/erpnext/issues/39135)) ([#39198](https://github.com/frappe/erpnext/issues/39198)) ([3caf462](3caf462c6b))
* Ignore asset qty and status validation while cancelling LCV ([87d1b0f](87d1b0f476))
* ignore cancelled payments in Sales/Purchase Register ([9e1b443](9e1b443857))
* Ignore UP on "allowed to transact with" ([#39103](https://github.com/frappe/erpnext/issues/39103)) ([aad39cf](aad39cf686))
* improved validation message ([e89dce7](e89dce726b))
* incorrect indicator title for portal sales order (backport [#39247](https://github.com/frappe/erpnext/issues/39247)) ([#39255](https://github.com/frappe/erpnext/issues/39255)) ([9f793b9](9f793b9b28))
* incorrect outstanding amt validation on advance as liability ([51d8a7a](51d8a7a0c1))
* Introduced company field to show amounts in company currency ([1d2e831](1d2e831846))
* inventory dimension negative stock validation (backport [#39149](https://github.com/frappe/erpnext/issues/39149)) ([#39151](https://github.com/frappe/erpnext/issues/39151)) ([82b96d3](82b96d3688))
* possible key error on Financial ratios report ([16269b0](16269b0730))
* possible typeerror on transaction.js ([fec892c](fec892c211))
* projects website list visible for guests and all logged in customers (backport [#39164](https://github.com/frappe/erpnext/issues/39164)) ([#39273](https://github.com/frappe/erpnext/issues/39273)) ([5d6bc96](5d6bc96375)), closes [#39009](https://github.com/frappe/erpnext/issues/39009)
* Purchase date and amount is not mandatory for composite asset creation ([d6d54ed](d6d54ed220))
* Resolved conflict ([afefae0](afefae08af))
* serial / batch barcode scanner (backport [#39114](https://github.com/frappe/erpnext/issues/39114)) ([#39143](https://github.com/frappe/erpnext/issues/39143)) ([2db1e1a](2db1e1a737))
* Set asset purchase amount based on qty and valuation_rate ([f0070b4](f0070b4046))
* set parent doctype on chart (backport [#39286](https://github.com/frappe/erpnext/issues/39286)) ([#39288](https://github.com/frappe/erpnext/issues/39288)) ([fe973a4](fe973a4b53))
* Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog ([50300b9](50300b9be6))
* Show timesheet table after fetching data from timesheet (backport [#39275](https://github.com/frappe/erpnext/issues/39275)) ([#39281](https://github.com/frappe/erpnext/issues/39281)) ([2598f8e](2598f8e7ec))
* skip rate validation for return `DN Items` with `Moving Average` valuation (backport [#39242](https://github.com/frappe/erpnext/issues/39242)) ([#39266](https://github.com/frappe/erpnext/issues/39266)) ([f00a6f6](f00a6f6c59))
* Subscription update patch ([7640fea](7640feaaa7))
* total allocated percentage for sales team issue ([756c062](756c062733))
* TypeError is pricing rules (backport [#39252](https://github.com/frappe/erpnext/issues/39252)) ([#39260](https://github.com/frappe/erpnext/issues/39260)) ([bb6025c](bb6025ca26))
* typerror on multi select dialog ([54a0df5](54a0df5164))
* update Maintenance Schedule status on Maintenance Visit submit (backport [#39167](https://github.com/frappe/erpnext/issues/39167)) ([#39186](https://github.com/frappe/erpnext/issues/39186)) ([926850d](926850d1f6))
* update status on manual allocation ([a147e29](a147e2954f))
* **UX:** dont override framework's permission check messages (backport [#39118](https://github.com/frappe/erpnext/issues/39118)) ([#39120](https://github.com/frappe/erpnext/issues/39120)) ([40ec5ff](40ec5ff90f))

### Features

* provision to close SCO (backport [#39127](https://github.com/frappe/erpnext/issues/39127)) ([#39144](https://github.com/frappe/erpnext/issues/39144)) ([b192ddd](b192ddd13b))
v15.10.0 		2024-01-10 10:36:08 +00:00
Deepesh Garg
e4e3313a0e Merge pull request #39245 from frappe/version-15-hotfix 
chore: release v15
 2024-01-10 16:04:56 +05:30
mergify[bot]
2598f8e7ec fix: Show timesheet table after fetching data from timesheet (backport #39275) (#39281) 
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:24 +05:30
mergify[bot]
fe973a4b53 fix: set parent doctype on chart (backport #39286) (#39288) 
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:16 +05:30
anandbaburajan
2448ba6bc4 fix: asset WDV depreciation calc according to IT act 
(cherry picked from commit 026824880d)
 2024-01-10 06:48:06 +00:00
Nabin Hait
f82125144a Merge pull request #39190 from frappe/mergify/bp/version-15-hotfix/pr-39163 
fix: Purchase information is not required for creating a composite asset (backport #39163)
 2024-01-10 12:15:02 +05:30
Nabin Hait
38c1350018 Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr-39191 
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191)
 2024-01-10 12:14:45 +05:30