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

37073 Commits

Author SHA1 Message Date
mergify[bot]
b65c22579d
fix: serial no status (backport #38391) (#38397) 
fix: serial no status (#38391)

(cherry picked from commit 592fc81260779ec42b35c88c6b8de19a598911d0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-28 18:31:23 +05:30
Gursheen Anand
573c4d2bfc chore: fix imports for renamed report 
(cherry picked from commit aee2e12f3944ae4db2dd77a31d0c544c1bacb65a)
 2023-11-28 12:53:53 +00:00
mergify[bot]
922aef665b
fix: Server Error while creating Product Bundle (backport #38377) (#38380) 
* fix: product bundle search input

(cherry picked from commit 729fc738af7d78a6f75cb0f794f4c4451d74cd05)

* fix: don't select all fields

(cherry picked from commit 8c3713b649c7777e35be74b7afe437cec682359e)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-28 14:54:05 +05:30
mergify[bot]
a6f3a103db
chore: fix flaky test case (backport #38369) (#38373) 
chore: fix flaky test case (#38369)

(cherry picked from commit ad3634be7c2607ab5c9c831ae01e5ddff7c9ba8b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-28 08:36:06 +05:30
Sagar Vora
721b429d93 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360) 
(cherry picked from commit 5a53a4b044be7e889080329056c7911970d92da8)
 2023-11-27 14:53:39 +00:00
ruthra kumar
8564d58afe refactor: handle rounding loss on AR/AP reports 
(cherry picked from commit 592ce45da7659dcf4ca148f5924dbe0d783956bf)
 2023-11-27 06:22:52 +00:00
mergify[bot]
4699887f1c
fix: Payment Reco Issue and chart of account importer 
fix: Payment Reco Issue and chart of account importer
 2023-11-27 10:31:12 +05:30
mergify[bot]
14174df862
fix: Negative Qty and Rates in SO/PO (backport #38252) (#38357) 
fix: Negative Qty and Rates in SO/PO (#38252)

* fix: Don't allow negative qty in SO/PO

* fix: Type casting for safe comparisons

* fix: Grammar in error message

* fix: Negative rates should be allowed via Update Items in SO/PO

* fix: Use `non_negative` property in docfield & emove code validation

(cherry picked from commit b9f5a1c85dc29acc22e704d866178a98f3035c1d)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2023-11-27 09:30:16 +05:30
ruthra kumar
378dc50aa4 chore: resolve conflict 2023-11-27 09:09:04 +05:30
Gursheen Anand
25bf475d5a fix: check reposting settings before allowing editable si 
(cherry picked from commit 894ae1fe0f8da1931f705d433c15b19410486186)
 2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01 fix: allow on submit for child table fields 
(cherry picked from commit 5fae2f6d57bac332263d8c73e3d090f485b5844d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 2023-11-27 03:35:39 +00:00
Gursheen Anand
6a3c3b4cac fix: do not set repost flag without validating voucher 
(cherry picked from commit ad5edbb1de95befa1b6f312dcb7df6d8c5a8ce6c)
 2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64 refactor: validate reposting settings for editables inv 
(cherry picked from commit 780b827adcba571b46ee73404f9a038c36dd0eb9)
 2023-11-27 03:35:38 +00:00
mergify[bot]
3cbe59902a
fix(ux): Sales Order Stock Reservation Dialog (backport #38261) (#38344) 
* fix(ux): no need to select rows to reserve the stock

(cherry picked from commit 9c889b37fb3e6572043c7a28706e43d051e2ff46)

* fix: use field `sales_order_item` instead `name`

(cherry picked from commit 73586fd9b2f9392d18f65a063b14ef2de2629615)

* fix(ux): no need to select rows to unreserve the stock

(cherry picked from commit 2a41da94d443dee51e615b395d18ad161d4e87fc)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-26 22:25:51 +05:30
mergify[bot]
cda5ff40f1
refactor: bank transaction (#38182) 
refactor: bank transaction (#38182)

(cherry picked from commit 5426b93387c8a4599b11d5e064d4d8b37078aca1)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-26 18:57:01 +05:30
mergify[bot]
d6fe7eb10c
fix: job card overlap validation (backport #38345) (#38348) 
fix: job card overlap validation (#38345)

(cherry picked from commit d8245cef723575eaf52c2e39d25a6f9c83ce9ba0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-26 16:28:51 +05:30
Raffael Meyer
ea2c3487a3 feat: new Report "Lost Quotations" (#38309) 
(cherry picked from commit 477d9fa87e3cd7476f19930d60d23e347e46e658)
 2023-11-24 21:28:38 +00:00
Deepesh Garg
64d9c5d61c
Merge pull request #38316 from frappe/mergify/bp/version-15-hotfix/pr-38269 
fix: skip fixed assets in product bundle (backport #38269)
 2023-11-24 16:30:29 +05:30
Gursheen Anand
b9a1fac7d8 fix: fiscal year using future date 
(cherry picked from commit 728cc9f725264e057d9331362b256ea8d0f80b83)
 2023-11-24 09:51:31 +00:00
Gursheen Anand
ca2ad175d3 fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000decb84aad1a99557e13a0bb2b68ec4)
 2023-11-24 09:51:30 +00:00
ruthra kumar
7fc4e211bc refactor: update project costing based on frequency 
(cherry picked from commit dd016e6ced432b6f8754042fbad808b1cba56cec)
 2023-11-24 06:20:11 +00:00
ruthra kumar
c06388fe48 refactor: make update_project_cost optional through Buying Settings 
(cherry picked from commit 0fe6dcd74288d5f2df1ffc37485e22ee96329b9e)
 2023-11-24 06:20:11 +00:00
ruthra kumar
28e695baf8 refactor: provide UI button to recalculate when needed 
(cherry picked from commit bcbe6c4a531986836a0a2497e05bdbe1a327407a)
 2023-11-24 06:20:10 +00:00
ruthra kumar
deed9f5840 perf: optimize total_purchase_cost update 
(cherry picked from commit aa17110bde44603574d4532afaa6cf1181423ac5)
 2023-11-24 06:20:10 +00:00
Gursheen Anand
d076aca998 chore: linting issues 
(cherry picked from commit 16573378870bb9c6e80f39e80fa43e5b2cc0a69f)
 2023-11-24 04:30:39 +00:00
Gursheen Anand
3d46b323b3 fix: skip disabled bundles for non-report utils 
(cherry picked from commit 362f377f6127e9262ab7829a427d0a2051a77b2f)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
e4d9ef1293 fix: condition in other bundle utils 
(cherry picked from commit 8bdb61cb87802723a0db1aaa29c30c15c740ec6b)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
c0de9c0cef fix: validation for existing bundles 
(cherry picked from commit 67f43d37df9e77c3e59562117fa44ea76273a536)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
5c12872f70 fix: has_product_bundle util to only check for enabled bundles 
(cherry picked from commit 3543f86c639cf7383c37a5ed9a61d5787c9ebad4)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
fb517e823f fix: filter bundle items based on disabled check 
(cherry picked from commit 874774fe6c81c854fb3ade03e93f003c0fc8dd8a)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
fcd53be188 feat: add disabled field in product bundle 
(cherry picked from commit ee76af76812fe04d86653fd1955ad133c8cb5df8)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
314a91ac4d fix: skip fixed assets in parent 
(cherry picked from commit f9713eeb5690f9e71e01c6c570012f561a633c73)
 2023-11-24 04:30:37 +00:00
ruthra kumar
7282dd1a85 chore: speed up Purchase Invoice cancellation 
(cherry picked from commit 1efff268b036dd27f7472bc7ec494aafac9edbc8)
 2023-11-24 04:16:22 +00:00
ruthra kumar
3720b7171b chore: index to speed up queries on JE child table reference 
(cherry picked from commit 24fcd67f8bcf8cc8b387856983b97d8778eac084)
 2023-11-24 04:16:22 +00:00
mergify[bot]
99c1fbf9fc
fix: display all item rate stop messages (backport #38289) (#38307) 
fix: display all item rate stop messages (#38289)

(cherry picked from commit 3f6d80503335a33bf2bff53a19870a6cdba00044)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2023-11-23 23:39:53 +05:30
mergify[bot]
30c349b010
add flt() for None type error (backport #38299) (#38306) 
add flt() for None type error (#38299)

(cherry picked from commit 64b44a360af8c2d3a6a9cb99e03358b97cdf9fa5)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
 2023-11-23 22:42:37 +05:30
mergify[bot]
4c9890a24e
fix: patch - Duplicate entry quality inspection parameter (backport #38262) (#38264) 
fix: patch - Duplicate entry quality inspection parameter (#38262)

(cherry picked from commit 0ca7527f7abddcab59edce434d0e68e1deebfc33)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-23 22:39:26 +05:30
mergify[bot]
72647b8624
feat: add Bank Transaction to connections in Journal and Payment Entry (backport #38297) (#38301) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-23 15:09:23 +01:00
mergify[bot]
18613c595f
fix: don't depreciate assets with no schedule on scrapping (backport #38276) (#38293) 
fix: don't depreciate assets with no schedule on scrapping (#38276)

fix: don't depreciate non-depreciable assets on scrapping
(cherry picked from commit 816b1b6bd52b4f6adcb35d4039ad75892b0976ff)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-23 14:05:08 +05:30
mergify[bot]
37d1f1ac67
fix: Supplier Primary Contact (backport #38268) (#38286) 
fix: Supplier `Primary Contact`

(cherry picked from commit 627165dc7c6c1cd83d746b97c82210abeb9a2e29)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-23 11:13:32 +05:30
ruthra kumar
100ce27a60 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182563b5dd3ef71d93b66596a12be5e91)
 2023-11-23 05:09:24 +00:00
ruthra kumar
df70e048cf chore: rename 'unreconcile payments' to 'unreconcile payment' 
(cherry picked from commit 9006c9b7478ceee5f7662d62e8eb02a08a309906)
 2023-11-23 05:09:23 +00:00
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query 
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
 2023-11-23 10:14:25 +05:30
Frappe PR Bot
33869a231c chore(release): Bumped to Version 15.3.0 
# [15.3.0](https://github.com/frappe/erpnext/compare/v15.2.0...v15.3.0) (2023-11-21)

### Bug Fixes

* attributes were mandatory for manufacturers ([00b9c23](00b9c2326c))
* issue occured when creating supplier with contact details ([aaccfeb](aaccfeb918))
* overallocation on Payment with PO/SO ([337707b](337707b9cc))
* pass check permission in render_address ([a420e13](a420e13765))
* payment entry rounding error ([384d6b5](384d6b516c))
* set asset's valuation_rate according to asset quantity (backport [#38254](https://github.com/frappe/erpnext/issues/38254)) ([#38256](https://github.com/frappe/erpnext/issues/38256)) ([c60aaa7](c60aaa799a))
* set default asset quantity as 1 [dev] (backport [#38223](https://github.com/frappe/erpnext/issues/38223)) ([#38226](https://github.com/frappe/erpnext/issues/38226)) ([99bf63e](99bf63ec0f))
* Suppier name was not taken when creating address from supplier ([2b94489](2b9448962f))
* Supplier Quotation fields ([#37963](https://github.com/frappe/erpnext/issues/37963)) ([aef955c](aef955c920))
* test case for rounded total with cash disc ([eab18e6](eab18e6f71))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](https://github.com/frappe/erpnext/issues/38134)) ([#38153](https://github.com/frappe/erpnext/issues/38153)) ([5b7b431](5b7b431dc9))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting  (backport [#38239](https://github.com/frappe/erpnext/issues/38239)) ([#38241](https://github.com/frappe/erpnext/issues/38241)) ([1f2f5d8](1f2f5d8cf6))
* TypeError in Subcontracting Receipt (backport [#38200](https://github.com/frappe/erpnext/issues/38200)) ([#38208](https://github.com/frappe/erpnext/issues/38208)) ([3f57a7e](3f57a7e9f0))
* update modified timestamp ([a492e57](a492e574de))
* **ux:** `Task` creation from `Timesheet` (backport [#38207](https://github.com/frappe/erpnext/issues/38207)) ([#38211](https://github.com/frappe/erpnext/issues/38211)) ([e272041](e272041872))
* valuation rate for FG item for subcontracting receipt (backport [#38244](https://github.com/frappe/erpnext/issues/38244)) ([#38245](https://github.com/frappe/erpnext/issues/38245)) ([ed7b845](ed7b845a55))
* valuation rate in report Item Prices ([#38161](https://github.com/frappe/erpnext/issues/38161)) ([f71234e](f71234e3af))
* wrong round off and rounded total ([70eccf7](70eccf7da0))

### Features

* add `Supplier Delivery Note` field in SCR (backport [#38127](https://github.com/frappe/erpnext/issues/38127)) ([#38156](https://github.com/frappe/erpnext/issues/38156)) ([b89a4a7](b89a4a7218))
* Add accounting dimensions to Supplier Quotation ([7d4ac7e](7d4ac7e7ff))
 2023-11-21 18:57:56 +00:00
Deepesh Garg
de783da2b6
Merge pull request #38248 from frappe/version-15-hotfix 
chore: release v15
 2023-11-22 00:26:18 +05:30
mergify[bot]
c60aaa799a
fix: set asset's valuation_rate according to asset quantity (backport #38254) (#38256) 
fix: set asset's valuation_rate according to asset quantity (#38254)

(cherry picked from commit e2bb4e2baa9059afb27f685beb88172a615097a4)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-21 22:57:34 +05:30
ruthra kumar
07c0ed127a
Merge pull request #38236 from frappe/mergify/bp/version-15-hotfix/pr-38234 
test: prevent rounding loss based validation error (backport #38234)
 2023-11-21 15:00:40 +05:30
mergify[bot]
ed7b845a55
fix: valuation rate for FG item for subcontracting receipt (backport #38244) (#38245) 
fix: valuation rate for FG item for subcontracting receipt (#38244)

(cherry picked from commit 5c308a4f9aa1a27cbd216addbe495b9bf69735b1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-21 14:53:03 +05:30
ruthra kumar
c84c97577f
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234 2023-11-21 13:43:58 +05:30
mergify[bot]
1f2f5d8cf6
fix(Timesheet): warn user if billing hours > actual hours instead of resetting (backport #38239) (#38241) 
fix(Timesheet): warn user if billing hours > actual hours instead of resetting  (#38239)

* revert: "fix(Timesheet): reset billing hours equal to hours if they exceed actual hours"

This reverts commit 0ec8034507996f06eaf8ca13a414d10b34038c6c.

* fix: warn user if billing hours > actual hours

(cherry picked from commit ac91030b31f1108b7e32844f12a3a6c916c0120f)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-21 13:41:50 +05:30