nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-25 13:03:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,378 Commits 606 Branches 1,802 Tags
292f17b1b0d2c65e93f7410df5fd96072f1ef1c6
Commit Graph

214 Commits

Author SHA1 Message Date
Fawaz Alhafiz
d950de2d09 fix: SQL operator precedence in Project query customer filter 
Added explicit parentheses around customer OR conditions in get_project_name()
to ensure proper grouping with AND filters. Without these parentheses, SQL
operator precedence caused the status filter to be bypassed when a customer
filter was applied, resulting in completed and cancelled projects appearing
in link field dropdowns.

Before:
WHERE customer='X' OR customer IS NULL OR customer='' AND status NOT IN (...)
was interpreted as:
WHERE customer='X' OR customer IS NULL OR (customer='' AND status NOT IN (...))

After:
WHERE (customer='X' OR customer IS NULL OR customer='') AND status NOT IN (...)

Fixes: Completed/cancelled projects showing in Project link fields
Affected: Any doctype using Project link fields with customer filters
(cherry picked from commit 0ec30a1cea)
 2025-10-06 07:34:55 +00:00
diptanilsaha
4a0d7fd205 fix: use query builder instead of raw SQL in get_blanket_orders 
(cherry picked from commit 1db135262d)
 2025-08-19 05:25:18 +00:00
diptanilsaha
c9f79b3ba9 fix: formatted string for disabled filter in get_income_account 
(cherry picked from commit 6320f7290f)
 2025-08-19 05:25:17 +00:00
mithili
0d47eb1fa0 fix: add condition to fetch active accounts 
(cherry picked from commit 7c8dd86a35)
 2025-08-08 05:25:04 +00:00
mithili
b060cdb4f5 fix(purchase invoice): filter only enabled account 
(cherry picked from commit c3111db6e2)
 2025-08-08 05:25:04 +00:00
Diptanil Saha
6b96a26462 Merge pull request #48614 from diptanilsaha/backport_48411 
fix: employee search based on the fields mentioned in the employee doctype search fields (backport #48411)
 2025-07-15 18:51:51 +05:30
Rohit Waghchaure
994454bfc3 fix: batch page length 
(cherry picked from commit 338256b799)
 2025-06-11 14:33:13 +00:00
ljain112
e752f3f914 chore: added test case for employee query with user permissions 
(cherry picked from commit 4be975f87c)

# Conflicts:
#	erpnext/controllers/tests/test_queries.py
 2025-04-22 16:00:00 +05:30
ljain112
a450ce25b9 fix: respect field "ignore_user_permissions" property in employee query 
(cherry picked from commit 91d7bc55be)
 2025-04-22 10:12:30 +00:00
Rohit Waghchaure
3d4f3e1be7 fix: disbaled UOM showing in the list 
(cherry picked from commit 3745825052)
 2025-04-21 16:43:17 +00:00
Rohit Waghchaure
288aad6f5d feat: allow UOMs to select for which converstion rate defined in item master 
(cherry picked from commit b1dfbbe85e)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2025-03-31 10:53:11 +00:00
Ninad Parikh
877d5bd3aa fix: base_net_rate Required to Check Valid Range (backport #46332) (#46382) 
fix: `base_net_rate` required to check valid range
 2025-03-12 16:12:44 +05:30
ruthra kumar
0b591ba7eb chore: resolve conflicts 2025-02-05 16:37:09 +05:30
Bhavan23
8ea9a9e467 fix: filter the item tax template using the input text 
(cherry picked from commit 4dd37ba033)

# Conflicts:
#	erpnext/controllers/queries.py
 2025-02-05 11:01:21 +00:00
venkat102
74220430e5 fix: include company in filter condition 
(cherry picked from commit b92f8bc514)
 2024-12-30 09:59:09 +00:00
rohitwaghchaure
4ba07a40eb fix: not able to reconcile expired batches (#44012) 
(cherry picked from commit 8805e74784)
 2024-11-12 10:19:19 +00:00
mergify[bot]
56dad7d365 fix: disabled batches showing in the list (backport #43024) (#43069) 
fix: disabled batches showing in the list (#43024)

(cherry picked from commit c13a147df1)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-09-05 16:00:33 +05:30
Rohit Waghchaure
67d1709ef8 fix: batch qty in the dropdown field 
(cherry picked from commit eb426c69fe)
 2024-06-12 07:32:03 +00:00
mergify[bot]
24775db97e fix: batch selection issue (backport #41692) (#41693) 
fix: batch selection issue (#41692)

(cherry picked from commit 968120d0eb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-30 18:49:12 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Rohit Waghchaure
79d047802a fix: existing batch from different warehouse not showing in the dropdown 
(cherry picked from commit 662cf21afb)
 2024-03-26 10:35:51 +00:00
Deepesh Garg
313350534f fix: Remove custom queries for customer 
(cherry picked from commit 60ba25caf2)
 2024-03-16 14:34:36 +00:00
Deepesh Garg
2512d4c7f2 chore: Remove custom party queries 
(cherry picked from commit c9623b6fd6)
 2024-03-16 14:34:36 +00:00
mergify[bot]
40752c1f5c fix: conditionally apply is_group filter in accounting dimension query (backport #40414) (#40416) 
fix: conditionally apply `is_group` filter in accounting dimension query (#40414)

(cherry picked from commit daf4ae2a6b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-03-12 20:45:31 +05:30
Deepesh Garg
173b3b85f6 fix: Filter for projects in Sales Cycle 
(cherry picked from commit d0e0b66b2f)
 2024-03-10 13:57:13 +00:00
mergify[bot]
4b15c00b11 fix: use serial batch fields for subcontracting receipt (backport #40311) (#40315) 
fix: use serial batch fields for subcontracting receipt (#40311)

(cherry picked from commit cef6291311)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-06 19:59:21 +05:30
mergify[bot]
53992deb10 fix: show warehouse title field in sales docs (backport #39746) (#39755) 
fix: show warehouse title field in sales docs

(cherry picked from commit ee14faaa39)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-06 12:45:37 +05:30
ruthra kumar
5a65a10dba refactor: better ordering of query result 
(cherry picked from commit bfe42fdccb)
 2024-01-16 10:55:36 +00:00
ruthra kumar
1b8f572e80 fix(test): test case for project query 
(cherry picked from commit 3349dde5e2)
 2024-01-16 10:55:36 +00:00
ruthra kumar
07e2901e4b fix: project query controller logic 
(cherry picked from commit 4eefb445a7)
 2024-01-16 10:55:35 +00:00
Rohit Waghchaure
1394a1c5e9 fix: batches not coming correctly in the batch selector 
(cherry picked from commit 114f2b4326)
 2024-01-14 18:19:30 +00:00
mergify[bot]
8c2c90f77a feat: provision to add items in Stock Reservation dialog (backport #38558) (#38920) 
* feat: provision to update items in Stock Reservation dialog

(cherry picked from commit 9471d8fff9)

* fix(ux): show row index and field label while selecting the Sales Order Item

(cherry picked from commit 00261094c8)

* feat: provision to add items in Stock Reservation dialog

(cherry picked from commit 8d5045ef4c)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-22 15:50:07 +05:30
ruthra kumar
ef9e8406eb refactor: ignore disabled account while selecting Income Accounts 
(cherry picked from commit 6e3e094c95)
 2023-11-09 04:45:59 +00:00
ruthra kumar
662ccd467c fix: allocation logic on 'Get Outstanding Invoices' btn in PE 
1. fixed broken `payment_term` filter in Payment References section
2. Throw error if user fails to select 'Payment Term' for an invoice
with 'Payment Term based allocation' enabled.
 2023-07-23 11:37:27 +05:30
mergify[bot]
b4db5e9561 fix: validate docs in closed accounting period on save (#36157) 
fix: validate docs in closed accounting period on save (#36157)

(cherry picked from commit 5985e02574)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-07-18 17:40:49 +05:30
Rohit Waghchaure
acd12c5830 fix: get_query for batch number and incorrect batch qty 2023-06-04 16:09:01 +05:30
HarryPaulo
e12e3bb012 fix: allow search leads by doctype search fields 
* fix: allow search leads by doctype search fields

* fix: allow search leads by doctype search fields, linters fix
 2023-05-14 08:08:47 +05:30
Ankush Menat
6de71eb158 fix: pass reference_doctype in link queries (#35038) 2023-04-25 18:33:31 +05:30
Rohit Waghchaure
b0fc568c80 fix: not able to select customer / supplier 2022-11-03 11:24:58 +05:30
Rohit Waghchaure
5f84993bae test: added test case to validate seachfields for customer, supplier 2022-10-24 16:10:47 +05:30
Rohit Waghchaure
46d148defd fix: searchfield not working for cuctsomer, supplier as per customize form 2022-10-24 15:48:34 +05:30
Rohit Waghchaure
fd889fd29a fix: searchfields as per customize form not working for Item 2022-09-28 23:00:45 +05:30
Sagar Vora
9baa222976 fix: specify allowed doctype in queries (#31761) 2022-08-03 11:12:30 +05:30
Conor
ea28ed1bb3 refactor: if() to CASE WHEN (#31360) 
* refactor: if() to CASE WHEN

* fix: remove duplicate order by

* fix: remove extraneous table

* style: reformat to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 21:17:48 +05:30
Conor
74a782d81d refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Conor
b8f728a40a refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Conor
00ef499739 refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Saqib Ansari
a1e3ae8869 fix: user can select disabled accounts in taxes table 2022-05-11 13:01:06 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Deepesh Garg
57924599da fix: GST account not showing up in tax templates 2022-03-22 18:26:58 +05:30