nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-15 15:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,474 Commits 606 Branches 1,799 Tags
a4cff805f10ea20e9112cfa42e53c3389e7d71ce
Commit Graph

58474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
1be92f6d05 refactor: better timer and complete button 2026-05-21 19:45:10 +05:30
Khushi Rawat
70b9f549a4 Merge pull request #55147 from khushi8112/debit-note-rate-adjustment-description 
fix: correct description for Is Rate Adjustment Entry (Debit Note) checkbox
 2026-05-21 18:06:51 +05:30
Rohit Waghchaure
0a215b0717 refactor: job_card.js code for better readability 2026-05-21 17:46:29 +05:30
Rohit Waghchaure
db64f451c1 feat: pending qty in job card 2026-05-21 17:46:24 +05:30
khushi8112
92c969478e fix: correct description for Is Rate Adjustment Entry (Debit Note) checkbox 2026-05-21 17:33:59 +05:30
khushi8112
c6cde700b5 fix: correct remarks for foreign currency payment entries 2026-05-21 17:25:55 +05:30
Rohit Waghchaure
068f7b9a8d refactor: split large functions into smaller functions 2026-05-21 17:12:59 +05:30
Khushi Rawat
83f100bae1 Merge pull request #55142 from khushi8112/composite-asset-net-purchase-amount-reset 
fix: don't reset net_purchase_amount for Composite Asset if already set
 2026-05-21 17:07:41 +05:30
khushi8112
98dae6e43a fix: don't reset net_purchase_amount for Composite Asset if already set 2026-05-21 17:04:33 +05:30
diptanilsaha
18bdd0afd3 Merge pull request #55127 from diptanilsaha/fix/tax-rule-date-filter 
refactor: migrate get_tax_template to query builder with hierarchical group matching
 2026-05-21 17:04:02 +05:30
diptanilsaha
8c43118725 test: add tests for supplier group hierarchy and use_for_shopping_cart filter 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-21 16:43:00 +05:30
diptanilsaha
4d43c74f5f fix: default use_for_shopping_cart to 0 in set_taxes 
Ensures regular transactions only match tax rules where
use_for_shopping_cart = 0, preventing webshop-specific rules
from applying to standard documents.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-21 16:43:00 +05:30
diptanilsaha
f98975f51a refactor: rewrite get_tax_template using query builder 
Migrates from raw frappe.db.sql with string interpolation to frappe.qb.
Adds hierarchical supplier_group matching (mirrors customer_group behaviour).
Removes unused get_customer_group_condition helper.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-21 16:43:00 +05:30
diptanilsaha
cb610b79d2 feat: add get_parent_supplier_groups using query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-21 16:42:56 +05:30
diptanilsaha
91a2a7b0a0 refactor: migrate get_parent_customer_groups to query builder 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-21 16:41:53 +05:30
rohitwaghchaure
8aaa7c0993 Merge pull request #55134 from rohitwaghchaure/fixed-removed-redundant-code 
fix: removed redundant code
 2026-05-21 15:24:41 +05:30
khushi8112
1fd99337b3 fix: use get_query instead of get_all for data fetching 2026-05-21 15:05:44 +05:30
Pandiyan P
1a81265c2c fix(manufacturing): remove forecast_qty and adjust_qty fields from sa… (#55129) 2026-05-21 15:01:55 +05:30
Rohit Waghchaure
14b17cd8a6 fix: removed redundant code 2026-05-21 14:56:35 +05:30
Mihir Kandoi
2f35660142 fix: consumed operation cost calculation (#54858) 2026-05-21 14:55:46 +05:30
khushi8112
21bb8fe979 fix: asset scrap flow related changes 2026-05-21 12:14:08 +05:30
Jatin3128
06477119d1 fix: corrected the pricing rule taking the wrong value (#54894) 2026-05-21 12:04:45 +05:30
Rohit Waghchaure
961cbc3625 refactor: using agentic AI 2026-05-21 09:52:55 +05:30
Raffael Meyer
341891e326 fix: status for settled credit notes in sales invoice list (#54764) 2026-05-20 21:50:41 +02:00
Rohit Waghchaure
4d14727b26 fix: linter issue 2026-05-20 23:31:09 +05:30
Mihir Kandoi
33dc1f5f09 fix: set weight in update items (#55089) 2026-05-20 16:38:37 +00:00
Rohit Waghchaure
a3a7733440 test: fixed test cases 2026-05-20 21:59:17 +05:30
Daniel Radl
d85f6a4541 chore: migrate to new docker publish workflow (#54499) 2026-05-20 16:22:09 +00:00
Raffael Meyer
8845be9419 fix: allow direct drop-ship on Purchase Orders without Sales Order (#54930) 2026-05-20 18:03:21 +02:00
Abdeali Chharchhoda
814c11200a fix: update formatter to handle blank rows in financial statements 2026-05-20 17:31:21 +05:30
Mihir Kandoi
3084e3654c fix: item price with party condition (#55100) 2026-05-20 11:48:15 +00:00
Abdeali Chharchhoda
f7c744350c fix: update add_total_row_account to control blank row addition 2026-05-20 17:15:44 +05:30
Mihir Kandoi
00057b1798 fix: valuation rate missing for standalone credit notes for moving av… (#55102) 2026-05-20 11:28:01 +00:00
Abdeali Chharchhoda
cf597361f6 fix: handle separator rows in financial statement formatter 2026-05-20 16:28:38 +05:30
Mihir Kandoi
0bbddf4994 fix: set bin details when adding item using update items (#55096) 2026-05-20 09:46:05 +00:00
soham7117
88f6f182e3 feat: removed extra page break 
Signed-off-by: soham7117 <sohampawar626@gmail.com>
 2026-05-20 14:57:29 +05:30
soham7117
4c8f95a1a5 feat: added cost of goods sold 
Signed-off-by: soham7117 <sohampawar626@gmail.com>
 2026-05-20 14:57:29 +05:30
Shllokkk
bd84434d34 fix: incorrect error message string in sales order (#55090) 2026-05-20 14:41:06 +05:30
Pandiyan P
a3950590da fix(manufacturing): fetch from_bom name in production plan (#55085) 2026-05-20 14:22:17 +05:30
diptanilsaha
6c6fa722af chore: migrate Address/Contact custom fields from JSON fixtures to install (#55084) 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-20 08:39:24 +00:00
MochaMind
eb67afa01a fix: sync translations from crowdin (#55065) 2026-05-20 13:53:53 +05:30
diptanilsaha
12bb86d688 chore: remove frappe-semgrep-rules submodule (#55083) 2026-05-20 07:28:01 +00:00
Rohit Waghchaure
38eeb6994c test: fixed test cases 2026-05-20 12:02:44 +05:30
ruthra kumar
dd782d96bf Merge pull request #55072 from ruthra-kumar/faster_opening_balance_range_calculation 
perf: faster opening balance range calculation in process period closing voucher
 2026-05-20 11:48:10 +05:30
Sudharsanan Ashok
b9e08f3ce4 fix(stock): remove recalculate current qty function (#54774) 2026-05-20 11:37:26 +05:30
ruthra kumar
eba58b2837 refactor: ppcv select with for update and skip locked 2026-05-20 11:23:06 +05:30
ruthra kumar
ee33574a6d fix: faster range calculation on process period closing voucher 2026-05-20 11:23:00 +05:30
MochaMind
202ea0061c fix: sync translations from crowdin (#54951) 2026-05-20 00:50:45 +05:30
Nabin Hait
13e0a211ae fix: prevent negative amounts in common party JE on return invoices (#55034) 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-05-20 00:48:29 +05:30
Nabin Hait
87a4e872cf fix: use route_options for Credit Note and Debit Note sidebar links (#55026) 
fix: use route_options instead of filters for Credit Note and Debit Note sidebar links

Filters with ["=", value] format produce broken URLs like
`?is_return=%3D%2C1` instead of `?is_return=1`. Switching to
route_options with a plain JSON object generates correct URLs.
 2026-05-19 23:13:30 +05:30