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

47775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barredterra
b2fc5e4988 test: cancel voucher linked to Bank Transaction 
(cherry picked from commit 517bedeb7ee68d7794d09a5f49b97ab64f652abf)
 2024-01-11 13:37:48 +00:00
barredterra
16860c228d fix: unreconcile Bank Transaction on cancel of payment voucher 
(cherry picked from commit 0a95b38166e36946f89286d39081b0f529e88cb6)

# 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 60329ade9e4377741ef1578b4a9cc9529e3766c1)
 2024-01-11 13:29:01 +00:00
barredterra
21eed78fa1 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fecf5b65fadf9ec18d122b6d8e327fca)
 2024-01-11 13:29:00 +00:00
Gursheen Anand
e6f3a14289 fix: reset default after test 
(cherry picked from commit 813b7a96fbb0ff048c112dec5551edf5980d0955)
 2024-01-11 13:27:13 +00:00
Gursheen Anand
2beb3f8718 test: naming series variable parsing 
(cherry picked from commit bbdf98a8f0a53b0b4c5a73eb1842401d67314760)
 2024-01-11 13:27:06 +00:00
Gursheen Anand
9aae439b1f fix: date in master document for dictionary condition 
(cherry picked from commit d96a777edd9cad698b9d9bb90863c1080eacb36f)
 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 9ba6ff67d5727ee97f12a9cbee120e78c20d6cec)
 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 7b3f9386d7af54181a59c42e9e07ee3d6f54903e)
 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 8d2c78867e1d563aafa740b3dc5f8a4fae68e52f)
 2024-01-11 09:21:41 +00:00
Rohit Waghchaure
7ca8e49b38 fix: circular dependency error while deleting QC 
(cherry picked from commit 7cc324e31ebf533b0ffde8a2a3c4013756959d7a)
 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 c67b0a3a6408075785211da20603fbcd829825bb)

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 53bf44d2b870aad620c07fc72007c1a51e4eca9f)
 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))
 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 e1ba5878a3c61d44006dbc5f1f269e6a2542583c)

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 38c5ecf007751b0e3b152ee5089e7a8e00f17f41)

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 026824880daa16bcdbd1c28fd61d59adad8d10c0)
 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
Nabin Hait
24cfcf36e4
Merge pull request #39276 from frappe/mergify/bp/version-15-hotfix/pr-39238 
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)
 2024-01-10 12:14:10 +05:30
Nabin Hait
0c0be03e90
Merge pull request #39218 from frappe/mergify/bp/version-15-hotfix/pr-39214 
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214)
 2024-01-10 12:12:32 +05:30
ruthra kumar
cd57bbc3d0
Merge pull request #39284 from frappe/mergify/bp/version-15-hotfix/pr-39282 
fix: possible typeerror on transaction.js (backport #39282)
 2024-01-10 12:00:43 +05:30
Nabin Hait
afefae08af
fix: Resolved conflict 2024-01-10 11:59:54 +05:30
ruthra kumar
fec892c211 fix: possible typeerror on transaction.js 
(cherry picked from commit 9f27ac142b6239bb01fb8304056776f1fae24694)
 2024-01-10 06:24:46 +00:00
Nabin Hait
87d1b0f476 fix: Ignore asset qty and status validation while cancelling LCV 
(cherry picked from commit e9d36242ce3e09ee423f917eede2275bded10d6d)
 2024-01-10 06:04:19 +00:00
Nabin Hait
f0070b4046 fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aab3b1f4ae2361b327c579468d71d6d6)
 2024-01-10 06:03:01 +00:00
mergify[bot]
5d6bc96375
fix: projects website list visible for guests and all logged in customers (backport #39164) (#39273) 
fix: projects website list visible for guests and all logged in customers (#39164)

* fix: projects website list visible for guests

fix: projects website list visible for guests and all logged in customers

see the issue for details

fixes issue #39009

* fix: remove user = frappe.session.user

(cherry picked from commit eabf706f3728f0e571ea54fb825462a76984f245)

Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com>
 2024-01-10 10:45:45 +05:30
Raffael Meyer
4fa978ef1f
test: fix wrong fieldname (#39270) 2024-01-10 10:32:01 +05:30
mergify[bot]
f00a6f6c59
fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242) (#39266) 
fix: skip rate validation for return `DN Items` with `Moving Average` valuation

(cherry picked from commit e0ad52b50036e689247f23090a5de89a7fb4abfa)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 22:02:20 +05:30
mergify[bot]
78c65f27b0
fix: Duplicate Closing Stock Balance (backport #39262) (#39264) 
fix: Duplicate Closing Stock Balance

(cherry picked from commit b15795392bdf8165e7ddfb60451353ebefa177d2)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 20:37:38 +05:30
Raffael Meyer
a326876cc5
Merge pull request #39258 from frappe/mergify/bp/version-15-hotfix/pr-39158 
fix: add read permission to Buying Settings (backport #39158)
 2024-01-09 13:34:56 +01:00
mergify[bot]
9f793b9b28
fix: incorrect indicator title for portal sales order (backport #39247) (#39255) 
fix: incorrect indicator title for portal sales order (#39247)

(cherry picked from commit 2d2ff7cf52a548b8e880cd212cbbe6ef4569ea28)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:42:27 +05:30
mergify[bot]
bb6025ca26
fix: TypeError is pricing rules (backport #39252) (#39260) 
fix: TypeError is pricing rules (#39252)

(cherry picked from commit 274c65c451ccc71f11f29a2abc6d13b2b49b776c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 17:41:53 +05:30
ruthra kumar
4ad61fc3a5
Merge pull request #39253 from frappe/mergify/bp/version-15-hotfix/pr-39251 
fix: update status on manual allocation (backport #39251)
 2024-01-09 16:36:35 +05:30
s-aga-r
e62dd0d7cb fix: add read permission to Buying Settings 
(cherry picked from commit e05bf9d32a00aac55021faaacbfa914ee9f7275a)
 2024-01-09 10:44:21 +00:00
ruthra kumar
a147e2954f fix: update status on manual allocation 
(cherry picked from commit d32a407e08609737fa0bc880d5ef737ebf2b3e4c)
 2024-01-09 10:29:36 +00:00
mergify[bot]
0898ea5d92
fix: BOM replace tool does not update exploded items of root (backport #39244) (#39250) 
fix: BOM replace tool does not update exploded items of root (#39244)

(cherry picked from commit 5e0d017497ef7afaaa70abffbd3d3924f9e56063)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-09 15:59:12 +05:30
ruthra kumar
d0688e7a55
Merge pull request #39241 from frappe/mergify/bp/version-15-hotfix/pr-39237 
fix: sales team commission overallocation on fetching items from multiple quotations to Sales Order (backport #39237)
 2024-01-09 14:40:24 +05:30
ruthra kumar
756c062733 fix: total allocated percentage for sales team issue 
(cherry picked from commit b498094a9759bb95a3c77c6ec6877aafc6daa0ea)
 2024-01-09 07:39:28 +00:00
ruthra kumar
ec7a60bd02
Merge pull request #39234 from frappe/mergify/bp/version-15-hotfix/pr-39196 
fix: bank transaction status upon reconciliation (backport #39196)
 2024-01-09 11:57:50 +05:30
ruthra kumar
53eb6129ea refactor: remove 'Bank Trasaction' logic from status_update 
(cherry picked from commit cf988434e9e4fd7f7c6df2b024902f8df9942ca3)
 2024-01-09 05:51:38 +00:00
ruthra kumar
277aa7bc2b fix: bank transction status upon reconciliation 
(cherry picked from commit 6de8c18f9803c055c17e220f8f8d7eed5dfb45c6)
 2024-01-09 05:51:37 +00:00
Nabin Hait
97a51487c1
Merge pull request #39219 from frappe/mergify/bp/version-15-hotfix/pr-39209 
fix: Introduced company field to show amounts in company currency (backport #39209)
 2024-01-08 21:53:16 +05:30