nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 18:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,623 Commits 462 Branches 1,752 Tags
7ff97794f41601d8a669407a17e085412cdc6643
Commit Graph

36927 Commits

Author SHA1 Message Date
Ankush Menat
7ff97794f4 fix: encode thumbnail URL 
If it contains space the URL won't load

(cherry picked from commit 30039e8e62)
 2024-10-01 11:50:42 +00:00
Ankush Menat
9ac973fff6 refactor!: drop redisearch 
incr: replace text and tag fields

incr: use rediswrapper's make key

incr: indexDefinition from redis

incr: replace index creation

incr: replace AutoCompleter

incr: replace product search ac

incr: replace client querying

fix: broken redisearch load test

fix: pass actual query to get suggestion
(cherry picked from commit 4a38ce659d)

# Conflicts:
#	erpnext/e_commerce/redisearch_utils.py
#	erpnext/templates/pages/product_search.py
#	pyproject.toml
 2024-10-01 11:50:42 +00:00
Nihantra Patel
3cb85028d0 fix: add company filter in Warehouse wise Item Balance Age and Value 
(cherry picked from commit 75950f86cf)
 2024-10-01 05:47:33 +00:00
Rohit Waghchaure
57925a1315 fix: adjustmen entry for stock reco 
(cherry picked from commit 4e463b7d6d)
 2024-09-30 08:57:50 +00:00
Rohit Waghchaure
44263842f5 fix: Stock Ledger Invariant Check report 
(cherry picked from commit d7daedc5b2)
 2024-09-29 17:07:35 +00:00
mergify[bot]
4146bdf324 fix(Bank Account): dashboard connections (backport #43365) (#43366) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix(Bank Account): dashboard connections (#43365)
 2024-09-24 16:20:05 +02:00
ruthra kumar
79f95ba507 fix: AR / AP report to ignore 0.0 outstanding 
(cherry picked from commit 6e2cf79e2c)
 2024-09-24 10:14:49 +00:00
Nihantra C. Patel
5ba9fb73bb Merge pull request #43342 from frappe/mergify/bp/version-14-hotfix/pr-43253 
fix: partial return on POS invoice (backport #43253)
 2024-09-23 23:36:25 +05:30
ruthra kumar
43ba79f0e5 Merge pull request #43299 from barredterra/de-payment-reco 
fix(Payment Reconciliation): German translations
 2024-09-23 20:03:02 +05:30
ruthra kumar
5ce4dae204 chore: resolve conflict 2024-09-23 20:02:10 +05:30
Nihantra C. Patel
50e0f56d18 fix: partial return on POS invoice 
(cherry picked from commit 18bdd06652)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2024-09-23 14:26:05 +00:00
Nihantra C. Patel
ef7d4fe84a fix: partial return on POS invoice 
(cherry picked from commit 76289fa8dc)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.py
 2024-09-23 14:26:05 +00:00
ruthra kumar
8f81fdba4f Merge pull request #43335 from frappe/mergify/bp/version-14-hotfix/pr-43316 
fix: incorrect outstanding on non-pos invoice with write_off_account (backport #43316)
 2024-09-23 18:22:39 +05:30
ruthra kumar
5434d4bb1c Merge pull request #43337 from frappe/mergify/bp/version-14-hotfix/pr-43308 
fix: show chart tool tip in report currency (backport #43308)
 2024-09-23 18:22:17 +05:30
venkat102
c0dfda6ccc fix: change dynamic link doctype fieldtype to data 
(cherry picked from commit 1e46f7344a)
 2024-09-23 12:23:01 +00:00
venkat102
6becaba672 fix: add currency in financial statement 
(cherry picked from commit 91a27bda84)
 2024-09-23 12:11:47 +00:00
venkat102
92438f8dba fix: show chart tool tip in report currency 
(cherry picked from commit 827b3f4542)
 2024-09-23 12:11:46 +00:00
ruthra kumar
79235cd688 fix: incorrect outstanding on non-pos invoice with write_off_account 
(cherry picked from commit d5e2906e59)
 2024-09-23 12:09:50 +00:00
barredterra
32d4f96e02 fix(Payment Reconciliation): German translations 2024-09-19 13:57:55 +02:00
mergify[bot]
1bdbcc6703 fix: incorrect stock balance for inventory dimension (backport #43284) (#43289) 
* fix: incorrect stock balance for inventory dimension (#43284)

(cherry picked from commit 3e7a7a54bf)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.js

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-19 10:20:58 +05:30
rohitwaghchaure
8abc1f4da9 fix: Serial No reserved against historical sales order - unable to sell again (#43294) 2024-09-19 09:37:08 +05:30
Doğancan
e43c357c08 fix: translate in js 
(cherry picked from commit 25faec5662)
 2024-09-19 03:27:14 +00:00
sameer Chauhan
7ac39dc233 fix: Payment Ledger Report currency fieldtype fix 
(cherry picked from commit ad2d6a1625)
 2024-09-19 01:36:31 +00:00
Nihantra C. Patel
b6ce9222aa fix: Translation for button SO to PO --conflicts 2024-09-18 21:47:30 +05:30
Nihantra C. Patel
a8b5bcfe02 fix: Translation for button SO to PO 
(cherry picked from commit a5275e9f28)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.js
 2024-09-18 16:14:06 +00:00
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