nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,945 Commits 474 Branches 1,756 Tags
6912f3c88f06dfac77e2d619a00be56cba514a27
Commit Graph

2894 Commits

Author SHA1 Message Date
mergify[bot]
e271a5cba0 feat: disable auto setting grand total to default mode of payment (backport #45591) (#45917) 
feat: disable auto setting grand total to default mode of payment (#45591)

(cherry picked from commit f0a6399056)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-14 17:34:37 +05:30
Sanket322
d4bc3d182f fix: update ctx to args 2025-02-06 17:55:37 +05:30
Mihir Kandoi
34f8a370d1 fix: show only items with inspection enabled on create QI dialog 
(cherry picked from commit c92ec312b9)

# Conflicts:
#	erpnext/controllers/stock_controller.py
 2025-02-04 19:04:57 +00:00
mergify[bot]
b915e7f637 fix: point of sale padding (backport #45697) (#45699) 
fix: point of sale padding (#45697)

(cherry picked from commit 51a65899ec)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-02-04 14:02:38 +05:30
Sanket Shah
f60a3bcedf fix: update fields on change of item code In Update Items of Sales Order (#45125) 
* fix: update fields on change of item code

* fix: minor update

* fix: set the new values always

* Revert "fix: set the new values always"

This reverts commit 44daa0a641.

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 9933d3c8ff)
 2025-01-28 05:58:28 +00:00
Sanket322
4e347d835e fix: remove applied pricing rule 
(cherry picked from commit 50223c6bec)
 2025-01-27 10:32:53 +00:00
Sanket322
e73aab0df5 fix: use user defined discount amount or default 
(cherry picked from commit e2a32b7257)
 2025-01-27 10:32:53 +00:00
mergify[bot]
692a44816f feat(UX): scroll to required field (backport #44367) (#45433) 
feat(UX): scroll to required field (#44367)

(cherry picked from commit 4008ca5ddd)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2025-01-26 12:14:44 +05:30
mergify[bot]
224a92587d fix: resolved pos return setting to default mode of payment instead of user selection (backport #45377) (#45419) 
fix: resolved pos return setting to default mode of payment instead of user selection (#45377)

* fix: resolved pos return setting to default mode of payment instead of user selection

* refactor: removed console log statement

* refactor: moved get_payment_data to sales_and_purchase_return.py

(cherry picked from commit 54d234e05d)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-01-24 13:13:15 +05:30
Rohit Waghchaure
2f2554e9e5 fix: auto fetch batch and serial no for draft stock transactions 
(cherry picked from commit 88ab9be79c)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-01-14 07:06:32 +00:00
ruthra kumar
74a256ad57 Merge pull request #45255 from frappe/mergify/bp/version-15-hotfix/pr-45074 
fix: set billing and shipping address on change of company (backport #45074)
 2025-01-14 10:22:42 +05:30
Sanket322
80e6112549 fix: pass right existing address 
(cherry picked from commit ce99764772)
 2025-01-14 04:35:20 +00:00
Sanket322
42eb88f5f6 fix: set billing and shipping address on change of company 
(cherry picked from commit f46f1bead4)
 2025-01-14 04:35:20 +00:00
DHINESH00
1d5a73a325 fix: Semgrep rules 
(cherry picked from commit 547c8004eb)
 2025-01-14 04:29:07 +00:00
DHINESH00
38cb5a98bf fix: update discounting on mixed conditions 
(cherry picked from commit d541259da9)
 2025-01-14 04:29:06 +00:00
Rohit Waghchaure
a79cae1fef fix: not able to see create Quality Inspection button 
(cherry picked from commit b291835ccd)
 2025-01-09 09:07:50 +00:00
ruthra kumar
c45f22c776 Merge pull request #45139 from frappe/mergify/bp/version-15-hotfix/pr-45130 
refactor: change sales invoice button position (backport #45130)
 2025-01-08 09:01:59 +05:30
marination
931b5166a8 fix: Missing company filter breaks get_account_balance in Bank Reco 
(cherry picked from commit 8de0fe78ea)
 2025-01-08 02:47:21 +00:00
Ejaaz Khan
f654c2d156 refactor: change sales invoice button position (#45130) 
(cherry picked from commit a0f17f8e73)
 2025-01-07 11:49:24 +00:00
ruthra kumar
af53381163 fix: discount resetting on date change 
revert #44989

(cherry picked from commit 886281f81a)
 2025-01-07 05:51:48 +00:00
ruthra kumar
4dfc5a664a chore: partial revert #44989 
(cherry picked from commit 63d547fb4a)
 2025-01-02 15:27:40 +00:00
DHINESH00
f09acc784f fix: apply apply_pricing_rule date change 
(cherry picked from commit 2cbab9b875)
 2025-01-01 04:42:48 +00:00
mergify[bot]
0a2cc6bcd7 fix: incorrect quality inspection linked in purchase receipt (backport #44985) (#45020) 
* fix: incorrect quality inspection linked in purchase receipt (#44985)

(cherry picked from commit b84c8ff960)

# Conflicts:
#	erpnext/stock/doctype/quality_inspection/quality_inspection.json

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2025-01-01 09:24:48 +05:30
venkat102
d550b433c1 fix: add company filter to project 
(cherry picked from commit 1a7b09e576)
 2024-12-30 09:59:09 +00:00
Sanket322
e582ff862e fix: use meta to check field instead of doctype 
(cherry picked from commit 187c74ae09)
 2024-12-30 06:52:56 +00:00
Sanket322
98631eb266 fix: move code from purchase invoice to buying controller 
(cherry picked from commit cb197fd01f)
 2024-12-30 06:52:55 +00:00
Sanket322
cfa432dbca fix: set/update billing address on change of company 
(cherry picked from commit 0adfebee85)
 2024-12-30 06:52:55 +00:00
mergify[bot]
488d8080c8 fix: strings for translation (backport #44816) (#44927) 
* fix: strings for translation

(cherry picked from commit 3be633f6f1)

# Conflicts:
#	erpnext/accounts/utils.py

* fix: resolved conflict

---------

Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-12-27 11:33:09 +05:30
ruthra kumar
db3a87c837 fix: allow all dispatch address for drop ship invoice 2024-12-17 17:43:31 +05:30
ruthra kumar
ae81bb3c1b chore: revert 'stub' 2024-11-29 10:52:38 +05:30
ruthra kumar
48d6fcaab8 chore: resolve conflict 2024-11-29 10:43:36 +05:30
David
633be8d06b fix: link cash flow rows and fix summary linking 
(cherry picked from commit b94af28587)

# Conflicts:
#	erpnext/public/js/financial_statements.js
 2024-11-29 05:00:48 +00:00
Ninad Parikh
8ab9fc7f55 fix: Data Should be Computed in Backend to Maintain Consistent Behaviour (#44195) 
(cherry picked from commit 69bd90b038)
 2024-11-28 10:31:27 +00:00
ruthra kumar
173d60fb7d fix: typeerror on transaction.js 
(cherry picked from commit 46ce8780f2)
 2024-11-28 09:20:38 +00:00
mergify[bot]
0fbc60a20e fix: show "Send SMS" only when enabled (backport #43941) (#43970) 
fix: show "Send SMS" only when enabled (#43941)

(cherry picked from commit 65088cbb1b)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-11-27 23:52:16 +01:00
mergify[bot]
70b5b08d58 feat: add Company Contact Person in selling transactions (backport #44362) (#44398) 
* feat: add Company Contact Person in selling transactions (#44362)

(cherry picked from commit f6776c7d6b)

* chore: resolve merge conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-11-27 18:55:43 +01:00
mergify[bot]
7e61aca512 fix: unify company address query in sales transactions (backport #44361) (#44365) 
fix: unify company address query in sales transactions (#44361)

* fix: unify company address query in sales transactions

* refactor: get the correct field label

(cherry picked from commit 3f92a57d63)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-11-26 20:16:24 +01:00
Sugesh393
8cd455b050 fix: set price_list_currency only if it exists 
(cherry picked from commit f0b9cb4019)
 2024-11-25 07:10:04 +00:00
ruthra kumar
f04a934ed1 Merge pull request #44180 from frappe/mergify/bp/version-15-hotfix/pr-44147 
fix: set conversion factor before applying price list (backport #44147)
 2024-11-18 10:14:45 +05:30
vishakhdesai
5848de76ea fix: set conversion factor before applying price list 
(cherry picked from commit 9749fe23cc)
 2024-11-18 04:38:37 +00:00
UmakanthKaspa
2a54cd5004 refactor: set 'cannot_add_rows' directly in the allocations table field (optimized approach) 
(cherry picked from commit 5dd8eafdfc)
 2024-11-18 04:36:19 +00:00
UmakanthKaspa
c59a778503 fix: correctly set 'cannot_add_rows' property on allocations table field 
(cherry picked from commit 13ca2700f8)
 2024-11-15 04:47:53 +00:00
Nihantra Patel
8af005cef0 fix: Drop Shipping address based on customer shopping address 
(cherry picked from commit c7499f3528)
 2024-11-13 10:02:20 +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
Kavin
61559be8a4 fix: update payment amount for partial pos return 
(cherry picked from commit 53ef6336b6)
 2024-11-12 04:20:31 +00:00
ruthra kumar
07dcf3fac2 Merge pull request #44040 from ruthra-kumar/manual_backport_pr_39481 
fix: specify precision for net_amount (backport #39481)
 2024-11-11 17:11:11 +05:30
rohitwaghchaure
9ac54f694c fix: item mapping from modal to batch form (#44090) 
(cherry picked from commit 9223ef2f37)
 2024-11-11 10:38:42 +00:00
mergify[bot]
363f15124e fix: populate payment schedule from payment terms (backport #44082) (#44083) 
fix: populate payment schedule from payment terms (#44082)

(cherry picked from commit c81eb6c824)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-11-11 13:12:30 +05:30
ruthra kumar
50fa77276e refactor: depracate old method and handle inclusive tax 2024-11-08 16:14:13 +05:30
mergify[bot]
6dcd015a39 fix: item not set in the batch quick entry form (backport #44028) (#44031) 
fix: item not set in the batch quick entry form (#44028)

(cherry picked from commit 0399ccc51e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-08 12:23:50 +05:30