nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-26 13:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,590 Commits 613 Branches 1,804 Tags
c442dc6b8e18066ad70b5f1745992770a42a3621
Commit Graph

36902 Commits

Author SHA1 Message Date
ruthra kumar
fff8f8b83f chore: resolve conflict 2024-09-18 12:12:06 +05:30
krishna
c9467f4c1f fix: add currency in options for rate field in pricing rule 
(cherry picked from commit 636c0131fa)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
 2024-09-18 06:29:34 +00:00
venkat102
4646f11829 fix: cancel cost center allocation and journal entry after test 
(cherry picked from commit 3c65b98b49)
 2024-09-18 05:49:31 +00:00
venkat102
872c150ea7 test: add unit test for validating multiple cost center allocation with different child cost center 
(cherry picked from commit 4d5d6150e1)
 2024-09-18 05:49:30 +00:00
venkat102
a26f0e9973 fix: fetch cost center allocation percentage only from the applicable allocation 
(cherry picked from commit 36e5945c66)
 2024-09-18 05:49:30 +00:00
Dany Robert
9af2df3810 fix: invalid gp calculation 
(cherry picked from commit c79851239c)
 2024-09-17 06:33:14 +00:00
ljain112
5434432cfc fix: hide and reset discount control on new POS order 
(cherry picked from commit 5b0053f8dd)
 2024-09-16 14:25:19 +00:00
ruthra kumar
2193395072 Merge pull request #43201 from frappe/mergify/bp/version-14-hotfix/pr-43191 
fix: delete exchange gain loss journal entry while deleting payment entry (backport #43191)
 2024-09-13 11:22:56 +05:30
ruthra kumar
2e323cc126 refactor(test): use test fixture on pricing rule test suite 
(cherry picked from commit 0ea1d6d960)
 2024-09-13 05:20:23 +00:00
Navin-S-R
95a66b8d8f test: add unit test for deletion of gain loss jv while deleting payment entry 
(cherry picked from commit 7855d3034b)
 2024-09-13 05:19:04 +00:00
Navin-S-R
62f12861f1 fix: delete exchange gain loss journal entry while deleting payment entry 
(cherry picked from commit 9886cf0d46)
 2024-09-13 05:19:03 +00:00
ruthra kumar
097eae478d refactor: enable no-copy on Purchase Invoice status 
(cherry picked from commit 0d9741fdd7)
 2024-09-11 07:56:59 +00:00
mergify[bot]
91105344bb fix: bom cost update is not working (backport #43155) (#43156) 
fix: bom cost update is not working (#43155)

(cherry picked from commit 05f9015c0b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-10 23:07:52 +05:30
ruthra kumar
2a890f9061 refactor: allow all accounts 
(cherry picked from commit 43198c946b)
 2024-09-10 09:06:14 +00:00
ruthra kumar
b2d361b495 refactor: fetch as dictionary 
(cherry picked from commit 2126b10a92)
 2024-09-10 09:06:14 +00:00
ruthra kumar
d51cf281c3 refactor: barebones methods with basic logic 
(cherry picked from commit b05b378ef0)
 2024-09-10 09:06:14 +00:00
ruthra kumar
3574d11946 refactor: standard filters 
(cherry picked from commit dccbc1f432)
 2024-09-10 09:06:14 +00:00
ruthra kumar
37b8715096 feat: utility report to identify invalid ledger entries 
(cherry picked from commit 832c4aaf82)
 2024-09-10 09:06:13 +00:00
mergify[bot]
e8aae5018a fix: return type of get_party_details (backport #43131) (#43135) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: return type of `get_party_details` (#43131)
 2024-09-09 19:26:21 +02:00
mergify[bot]
a4b9dda4b2 fix: incorrect actual cost in Procurement Tracker report (backport #43109) (#43137) 
fix: incorrect actual cost in Procurement Tracker report (#43109)

(cherry picked from commit 80f101f92e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-09 20:35:14 +05:30
barredterra
14ae3edc1d refactor: extract common validation method 
(cherry picked from commit 08646b7ab7)
 2024-09-09 09:14:01 +00:00
barredterra
5e33961448 fix(Delivery Note): translatability of validation errors 
(cherry picked from commit 34df6e39dc)
 2024-09-09 09:14:00 +00:00
Prashant Kamble
53496ed79f fix: unreconcile allocation child table redirect url voucher no issue 
(cherry picked from commit 5d6f6a2fb9)
 2024-09-09 09:00:19 +00:00
Nihantra C. Patel
36f65fc592 fix: set today in 'On This Date' in Available Batch Report 
(cherry picked from commit 9fd55e4c83)
 2024-09-09 08:27:14 +00:00
ruthra kumar
cf78f9702c chore: resolve conflict 2024-09-09 11:01:54 +05:30
ruthra kumar
de0b8c07f6 refactor(test): use change_settings decorator 
(cherry picked from commit ee94fb37c8)
 2024-09-09 05:06:22 +00:00
venkat102
4dd06b69a1 fix: uncomment internal parties 
(cherry picked from commit 454e18ad5f)
 2024-09-09 05:06:21 +00:00
venkat102
b6f352a024 test: add unit test for common party with foreign currency 
(cherry picked from commit 740a04a704)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2024-09-09 05:06:21 +00:00
venkat102
a3a40febf3 fix: check multi-currency on jv for common party accounting with foreign currency 
(cherry picked from commit 00938bfd4d)
 2024-09-09 05:06:21 +00:00
Smit Vora
6bfc8a0152 Merge pull request #43091 from frappe/mergify/bp/version-14-hotfix/pr-43013 
fix: `default_advance_account` field in Process Payment Reconciliation (backport #43013)
 2024-09-09 08:00:21 +05:30
Smit Vora
5113b0063e chore: resolve conflicts with backport 2024-09-09 06:58:34 +05:30
Smit Vora
9e77a0245a chore: resolve conflicts with backport 2024-09-09 06:51:30 +05:30
mergify[bot]
77892f4e24 fix: incorrect qty after transaction in SLE (backport #43103) (#43104) 
fix: incorrect qty after transaction in SLE (#43103)

(cherry picked from commit 5ff87edc85)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-07 17:34:22 +05:30
venkat102
e7b17e05b0 test: add unit test for canceling the common party advance jv created from sales invoice 
(cherry picked from commit 8c6e3f3c12)
 2024-09-06 14:50:05 +00:00
venkat102
f5069524f3 fix: cancel common party advance jv while canceling the invoice 
(cherry picked from commit 6a928b92df)
 2024-09-06 14:50:04 +00:00
ruthra kumar
202ebbe140 refactor: fetch advance account on party seleection 
(cherry picked from commit c4ed04cb31)
 2024-09-06 09:48:47 +00:00
ljain112
3691a500eb fix: default_advance_account field in Process Payment Reconciliation 
(cherry picked from commit 143209f91a)

# Conflicts:
#	erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
#	erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
 2024-09-06 09:48:47 +00:00
ruthra kumar
2913785bac refactor: filter to toggle employee advance scenario in AP 
(cherry picked from commit 257e13c299)
 2024-09-05 11:44:02 +00:00
ruthra kumar
3a57ef4c5f refactor: Handle Emp Advance as separate row in AP report 
(cherry picked from commit eedf22b07a)
 2024-09-05 11:44:02 +00:00
Lakshit Jain
3912c688ac fix: adjust price insertion logic for internal suppliers/customers (#42988) 
* fix: adjust price insertion logic for internal suppliers/customers

* refactor: correct indentation, specify conditions within function

* fix: typo

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
(cherry picked from commit 38f925b376)
 2024-09-04 07:26:53 +00:00
ruthra kumar
22b283d4a8 fix: typerror on default_currency 
(cherry picked from commit 4a7cc4da87)
 2024-09-03 11:11:30 +00:00
vishnu
e8cfb4d602 fix: indentation 
(cherry picked from commit 598e9c1390)
 2024-09-03 10:14:32 +00:00
vishnu
c87f2d2f7c fix: retain date filter when redirecting in Profit and Loss report 
(cherry picked from commit bb29fc4c3d)
 2024-09-03 10:14:32 +00:00
Khushi Rawat
ec00b2cf48 Merge pull request #42965 from frappe/mergify/bp/version-14-hotfix/pr-41845 
fix: resolve gl entries duplication in asset purchase workflow (backport #41845)
 2024-09-02 16:35:19 +05:30
mergify[bot]
c55f8e3388 fix: Discount and taxes in return document should follow the reference document (backport #41911) (#42573) 
* fix: Discount and taxes in return document should follow the reference document (#41911)

* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue

(cherry picked from commit 281198456d)

# Conflicts:
#	erpnext/controllers/sales_and_purchase_return.py

* fix: resolved conflict

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-09-02 11:12:22 +05:30
Khushi Rawat
4951d01102 Merge pull request #42766 from frappe/mergify/bp/version-14-hotfix/pr-42765 
fix: set up filters for dimensions (backport #42765)
 2024-08-30 13:43:51 +05:30
ruthra kumar
ef7a83c354 refactor: link utility report with bank reconciliation statement 
(cherry picked from commit 00eac65712)
 2024-08-29 10:42:52 +00:00
ruthra kumar
cfb5a6592c chore: resolve conflict 2024-08-29 14:11:28 +05:30
ruthra kumar
9afbd43f05 refactor: better UX on Bank Clearance tool 
(cherry picked from commit 6a06e26d04)

# Conflicts:
#	erpnext/accounts/doctype/bank_clearance/bank_clearance.js
 2024-08-29 08:25:09 +00:00
Khushi Rawat
6fda0e8e1b chore: linters check 2024-08-28 15:22:07 +05:30