nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-20 01:55:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,001 Commits 404 Branches 1,702 Tags
378dc50aa49883dbcdbfcb67fcfd4741efad4e52
Commit Graph

47001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 894ae1fe0f)
 2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01 fix: allow on submit for child table fields 
(cherry picked from commit 5fae2f6d57)

# 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 ad5edbb1de)
 2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64 refactor: validate reposting settings for editables inv 
(cherry picked from commit 780b827adc)
 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 9c889b37fb)

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

(cherry picked from commit 73586fd9b2)

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

(cherry picked from commit 2a41da94d4)

---------

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 5426b93387)

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 d8245cef72)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-26 16:28:51 +05:30
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 477d9fa87e)
 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 728cc9f725)
 2023-11-24 09:51:31 +00:00
Gursheen Anand
ca2ad175d3 fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000)
 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 dd016e6ced)
 2023-11-24 06:20:11 +00:00
ruthra kumar
c06388fe48 refactor: make update_project_cost optional through Buying Settings 
(cherry picked from commit 0fe6dcd742)
 2023-11-24 06:20:11 +00:00
ruthra kumar
28e695baf8 refactor: provide UI button to recalculate when needed 
(cherry picked from commit bcbe6c4a53)
 2023-11-24 06:20:10 +00:00
ruthra kumar
deed9f5840 perf: optimize total_purchase_cost update 
(cherry picked from commit aa17110bde)
 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 1657337887)
 2023-11-24 04:30:39 +00:00
Gursheen Anand
3d46b323b3 fix: skip disabled bundles for non-report utils 
(cherry picked from commit 362f377f61)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
e4d9ef1293 fix: condition in other bundle utils 
(cherry picked from commit 8bdb61cb87)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
c0de9c0cef fix: validation for existing bundles 
(cherry picked from commit 67f43d37df)
 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 3543f86c63)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
fb517e823f fix: filter bundle items based on disabled check 
(cherry picked from commit 874774fe6c)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
fcd53be188 feat: add disabled field in product bundle 
(cherry picked from commit ee76af7681)
 2023-11-24 04:30:38 +00:00
Gursheen Anand
314a91ac4d fix: skip fixed assets in parent 
(cherry picked from commit f9713eeb56)
 2023-11-24 04:30:37 +00:00
ruthra kumar
7282dd1a85 chore: speed up Purchase Invoice cancellation 
(cherry picked from commit 1efff268b0)
 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 24fcd67f8b)
 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 3f6d805033)

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 64b44a360a)

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 0ca7527f7a)

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 816b1b6bd5)

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 627165dc7c)

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 74f9e34182)
 2023-11-23 05:09:24 +00:00
ruthra kumar
df70e048cf chore: rename 'unreconcile payments' to 'unreconcile payment' 
(cherry picked from commit 9006c9b747)
 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 8b04c1d4f6)
 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 e2bb4e2baa)

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 5c308a4f9a)

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 0ec8034507.

* fix: warn user if billing hours > actual hours

(cherry picked from commit ac91030b31)

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 4dff2c7a0d)
 2023-11-21 07:03:07 +00:00
ruthra kumar
034375b4f5 refactor(test): make use of utility methods 
(cherry picked from commit 547993f801)
 2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved 
(cherry picked from commit 946228d783)
 2023-11-21 07:03:06 +00:00