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

47043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
e0f9c64290
Merge pull request #38332 from frappe/mergify/bp/version-15-hotfix/pr-38309 
feat: new Report "Lost Quotations" (#38309)
 2023-11-25 17:36:50 +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
Deepesh Garg
18f9650188
Merge pull request #38325 from frappe/mergify/bp/version-15-hotfix/pr-38273 
fix: annual income and expenses in email digest (#38273)
 2023-11-24 16:29:43 +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
2d6b2f7ae3
Merge pull request #38319 from frappe/mergify/bp/version-15-hotfix/pr-38298 
perf: optimize update_purchase_cost method  (backport #38298)
 2023-11-24 12:21:26 +05:30
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
ruthra kumar
220a0f4b11
Merge pull request #38312 from frappe/mergify/bp/version-15-hotfix/pr-38296 
chore: index to speed up basic submit/cancel functions on purchase invoice (backport #38296)
 2023-11-24 10:04:43 +05:30
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
fb4235c528
Merge pull request #38282 from frappe/mergify/bp/version-15-hotfix/pr-38258 
refactor: rename 'Unreconcile Payments' doctype to singular 'Unreconcile Payment' (backport #38258)
 2023-11-23 11:09:33 +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
0c3c36f658
Merge pull request #38280 from frappe/mergify/bp/version-15-hotfix/pr-38257 
refactor: optmize outstanding amount query (backport #38257)
 2023-11-23 10:36:53 +05:30
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query 
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
 2023-11-23 10:14:25 +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
ruthra kumar
bb77546849
Merge pull request #38237 from frappe/mergify/bp/version-15-hotfix/pr-37586 
fix: overallocation on purchase order to multiple invoices (backport #37586)
 2023-11-21 13:26:39 +05:30
ruthra kumar
2bec89a5bf chore: fix flakiness test_sales_order_partial_advance_payment 
(cherry picked from commit 4dff2c7a0dad1de840a2b1f53d51e9fe1682fa7f)
 2023-11-21 07:03:07 +00:00
ruthra kumar
034375b4f5 refactor(test): make use of utility methods 
(cherry picked from commit 547993f80103fa192563a82447c39fe122918767)
 2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved 
(cherry picked from commit 946228d783cb58cd2809f4b0bc0a854c49cc4060)
 2023-11-21 07:03:06 +00:00
ruthra kumar
337707b9cc fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8abfca6764d84665cb9877703c1a470)
 2023-11-21 07:03:05 +00:00
ruthra kumar
15f40a7af6 test: prevent rounding loss based validation error 
(cherry picked from commit 56e991b7f49e4677605f74b1de7d00ab40bf09cc)
 2023-11-21 12:16:36 +05:30
mergify[bot]
99bf63ec0f
fix: set default asset quantity as 1 [dev] (backport #38223) (#38226) 
fix: set default asset quantity as 1 [dev] (#38223)

* fix: make default asset quantity as 1

* fix: get rate_of_depreciation from asset category for asset auto-creation

* chore: create asset depr schedules on PR submit, not asset submit

* fix: set default asset quantity as 1

* chore: move patch from v15 to v14

(cherry picked from commit 9903049c7ac7310ca9e3f69c30dc355c2e13bfd5)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-20 22:49:38 +05:30
ruthra kumar
491e9b4fd5
Merge pull request #38214 from frappe/mergify/bp/version-15-hotfix/pr-38210 
refactor: extend billed amount update flag to POS Invoice as well (backport #38210)
 2023-11-20 15:02:24 +05:30
ruthra kumar
f88ec533e6
Merge pull request #38216 from frappe/mergify/bp/version-15-hotfix/pr-38212 
refactor: update scheduled job for bulk transaction (backport #38212)
 2023-11-20 14:49:33 +05:30
ruthra kumar
afaf6afd27 refactor: update scheduled job for bulk transaction 
(cherry picked from commit fb06ad7330fd31bf1def7b87a6c3b787650f1555)
 2023-11-20 08:51:31 +00:00
ruthra kumar
1ed65524e5 refactor: add flag to POS Invoice 
(cherry picked from commit 83a13e22b7f4aa8ba2c406389af4e7fa8aad55d0)
 2023-11-20 08:36:51 +00:00
ruthra kumar
5da9a22e4c refactor: set default for 'update_billed_amount_in_delivery_note' 
(cherry picked from commit ee0c64215d160f0bd493bcefc9e94a5a90d318d2)
 2023-11-20 08:36:50 +00:00