nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-14 07:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,462 Commits 602 Branches 1,799 Tags
ffd0dbdfd981375c23c3f4e8f449ee2a63c13c8a
Commit Graph

58462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pandiyan P
d0d9411700 fix(accounts): include asset items in purchase receipt validation (#55150) 2026-06-03 13:11:50 +05:30
Pandiyan P
c4d28a2612 fix(stock): set stock received but not billed account for purchase (#55149) 2026-06-03 13:10:26 +05:30
Abdeali Chharchhodawala
6c46692cc4 fix: add custom dimensions filters in Gross and Net profit report (#55110) 2026-06-03 13:08:45 +05:30
Antoine Maas
68b8ba7235 regional(setup): add 0% and 6% VAT rates for Belgium (#54719) 2026-06-03 13:05:13 +05:30
Nabin Hait
e0c285e27e refactor(gl): move make_discount_gl_entries onto SalesInvoiceGLComposer 
It is Sales-Invoice-specific GL assembly and was the only TaxService
method called by the composer. Move it to SalesInvoiceGLComposer (verbatim),
call it as self.make_discount_gl_entries, drop the now-unused composer-level
TaxService local and the orphaned get_account_currency import in taxes.py.
 2026-06-03 13:00:50 +05:30
Ankush Menat
b72cde73ba fix: Add likely missing escaps (#55574) 2026-06-03 07:28:05 +00:00
Lakshit Jain
260cec3b86 fix: prevent leakage of party-derived fields in cross doctype transactions (#55336) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2026-06-03 07:26:37 +00:00
Nabin Hait
cfed16ab6c refactor(gl): give SI and PI their own precision-loss GL entry method 
Remove the doctype-branching make_precision_loss_gl_entry from
exchange_gain_loss.py (and its accounts_controller wrapper); add a
dedicated method to each of SalesInvoiceGLComposer and
PurchaseInvoiceGLComposer. The SI variant now passes 'Sales Invoice'
as the round-off voucher type (output-equivalent) and the throwaway
return value no longer shadows the gettext _ helper.
 2026-06-03 12:45:58 +05:30
Nabin Hait
d8760b76a8 refactor(sales_invoice): drop loyalty delegation shims, call LoyaltyService directly 
The make_/delete_/apply_loyalty_points methods on SalesInvoice only existed
as an inheritance surface for POSInvoice (self.X()). Route all callers
through LoyaltyService(doc).X() directly, consistent with how related-doc
cases already worked, and remove the three forwarding methods.
 2026-06-03 12:40:46 +05:30
nishkagosalia
0b4e20ae98 fix(UX): stock settings form cleanup 2026-06-03 12:38:32 +05:30
Loic Oberle
a2a2e1020b refactor(sales_invoice): replace sql with qb in get_mode_of_payments_… (#55376) 2026-06-03 06:57:08 +00:00
Arshad Qureshi
86726bbd85 fix(buying): honour over delivery/receipt allowance in PR mapper (#55247) 2026-06-03 06:52:48 +00:00
mergify[bot]
8164782263 feat: add New Zealand chart of accounts (backport #55478) (#55571) 
Co-authored-by: Imesha Sudasingha <imesha.sudasingha@gmail.com>
 2026-06-03 12:11:28 +05:30
Shllokkk
0c61ad4e6d Avoid status updation for purchase invoice from paid to unpaid by issuing a paid debit note against it (#54382) 2026-06-03 12:04:19 +05:30
Shubh Doshi
5074597d00 perf: batch status check for on-hold/closed documents, remove N+1 queries (#54798) 2026-06-03 11:50:49 +05:30
Loic Oberle
42383c3f36 refactor(sales_invoice): replace sql with qb in delete_loyalty_point_… (#55379) 2026-06-03 11:29:04 +05:30
Mihir Kandoi
3b2f2168d0 Merge pull request #55375 from loicdokos/refactor/sales_invoice-get_mode_of_payment_info 
refactor(sales_invoice): replace sql with qb in get_mode_of_payment_info
 2026-06-03 11:27:31 +05:30
Luis Mendoza
36dc196a1d fix: prevent double rounding in inclusive tax calculations (#52512) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-06-03 11:09:42 +05:30
Nabin Hait
04443ae29e Merge upstream/develop into erpnext-refactoring 
Resolve 4 conflicts from Phase 7 service/mapper extraction vs upstream:
- asset.py: take extraction; repoint dangling make_asset_movement JS to mapper
- job_card: port upstream field_no_map(naming_series) into mapper.make_subcontracting_po
- sales_order: port upstream rows-index fix into mapper.make_delivery_note
- sales_invoice (Phase 7): take service delegations; port upstream SQL->QB/ORM
  changes for get_warehouse, get_all_mode_of_payments, get_discounting_status,
  clear_unallocated_mode_of_payments, and set_pos_fields(POS DN skip) into services
 2026-06-03 11:05:01 +05:30
Vishnu Priya Baskaran
da82ac86b5 fix payment schedule discount date when no discount is applied (#55462) 2026-06-03 10:56:19 +05:30
Shllokkk
efb8336bf8 fix: remove ignore_permissions from get_party_details signature (#55491) 2026-06-03 10:51:44 +05:30
Khushi Rawat
b1882dc83a Merge pull request #55562 from khushi8112/budget-variance-cost-center-hierarchy 
fix: aggregate child cost center data in Budget Variance Report
 2026-06-03 03:17:57 +05:30
khushi8112
41884cfd2a refactor: replace db.sql with frappe.qb 2026-06-03 02:48:56 +05:30
Khushi Rawat
48700a8aa3 Merge pull request #54840 from Hemil-Sangani/fix/budget-variance-report-filter 
fix: add company filter to Budget Against dimension options
 2026-06-03 02:30:52 +05:30
khushi8112
c34eeee096 fix: move Company filter at the start 2026-06-03 02:14:14 +05:30
Raffael Meyer
016b64df6d fix(item): format integer numeric variant attributes without decimals (#55561) 2026-06-02 22:42:32 +02:00
khushi8112
cd7fa56ec4 fix: aggregate child cost center data in Budget Variance Report 2026-06-03 02:02:03 +05:30
Raffael Meyer
e94bd51764 perf(transaction): exit early before backend query (#55556) 2026-06-02 20:24:10 +02:00
rohitwaghchaure
e1ea14b135 Merge pull request #54785 from aerele/fix/support-#67579 
fix(stock): add validation for work order serial nos and batch nos
assets-version-16 		2026-06-02 18:06:42 +05:30
ruthra kumar
7afe5d4ee3 Merge pull request #54974 from Soham-ambibuzz/philipinnes_localization_coa_v2 
feat: added cost of goods sold
 2026-06-02 17:23:48 +05:30
Khushi Rawat
d154796c82 Merge pull request #55484 from khushi8112/accounting-dashboard-number-cards-fiscal-year 
fix: use fiscal year instead of calendar year in accounting dashboard number cards
 2026-06-02 16:54:32 +05:30
ruthra kumar
d6f9e4ac3f Merge pull request #54979 from rtdany10/ppr-adv-error 
fix(ppr): make default_advance_account optional
 2026-06-02 15:36:04 +05:30
Khushi Rawat
10c18ca801 Merge pull request #55539 from khushi8112/warn-before-cancel-reconciled-payment-entry 
feat(payment-entry): warn user before cancelling reconciled payment entry
 2026-06-02 15:29:15 +05:30
Mihir Kandoi
0a49403838 fix: unable to submit subcontracted job card (#55537) 2026-06-02 09:18:42 +00:00
khushi8112
f0ba54d957 feat(payment-entry): warn user before cancelling reconciled payment entry 2026-06-02 14:47:39 +05:30
Loïc Oberle
7ee7c4253b fix(sales_invoice): switch parent and child doctype 
Switch the parent and child doctype in sales_invoice.py
 2026-06-02 10:42:19 +02:00
shahzeelahmed
519dc0b958 fix: include CRM Deal in quotation to filters 2026-06-02 12:39:29 +05:30
Mihir Kandoi
85be72a403 fix: minor improvements to web templates, banking page and CI workflow (#55525) 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-02 08:26:23 +05:30
Mihir Kandoi
78f9434d14 refactor: resolve regression-safe CodeQL code-quality findings (#55531) 
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-02 08:25:32 +05:30
Rushabh Mehta
4611dd1c36 Merge pull request #55532 from rmehta/feat/build-and-upload-assets 
feat: build and upload assets to GitHub Releases
assets-version-16-hotfix assets-develop 		2026-06-02 07:37:30 +05:30
Rushabh Mehta
6ac050e624 feat: build and upload assets to GitHub Releases 2026-06-02 06:45:10 +05:30
Diptanil Saha
71fcda5ab7 fix(pos): escape html output in pos page templates (#55527) 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-06-02 00:43:08 +05:30
Diptanil Saha
86f6a8154d Revert "ci(crowdin): mapped zh-TW with zh_TW" (#55524) 2026-06-01 16:50:12 +00:00
Diptanil Saha
97ec7f8837 ci(crowdin): mapped zh-TW with zh_TW (#55520) 2026-06-01 16:21:20 +00:00
rohitwaghchaure
ba477412ea Merge pull request #55415 from aerele/fix/support-#68706 
fix(stock): allow to create quality inspection after purchase/delivery
 2026-06-01 21:43:24 +05:30
MochaMind
7b7732531f fix: sync translations from crowdin (#55464) 2026-06-01 21:38:59 +05:30
Diptanil Saha
56f89cc392 chore(serial_and_batch_bundle): remove update_serial_or_batch method (#55481) 2026-06-01 21:23:32 +05:30
Gajendra Nishad
57dbac712f fix(je): preserve account on duplicate row when party row exists (#55180) 2026-06-01 18:41:19 +05:30
Nabin Hait
530e587bf2 refactor: use mapper paths directly, drop re-export shims 
Repoint all JS method strings and Python imports for mapper functions
across 18 doctypes from the doctype module to its mapper module, and
remove the now-unused re-export shims from each doctype file (keeping
only names used internally).
 2026-06-01 18:17:56 +05:30
Diptanil Saha
24b28b4d29 fix(pos): escape item data on pos item selector (#55503) 2026-06-01 16:57:35 +05:30