nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 17:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,151 Commits 402 Branches 1,700 Tags
bf8a2d0e3aab2790beb071785068df78d64f32ae
Commit Graph

47151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
bf8a2d0e3a fix: skip jvs against bank accounts 
(cherry picked from commit f7b2380ec1)
 2023-12-15 07:29:30 +00:00
mergify[bot]
703be50bc7 fix(ux): don't override Item Name and Description in MR (backport #38720) (#38763) 
fix(ux): don't override Item Name and Description in MR

(cherry picked from commit 726ac6bda1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-15 11:58:20 +05:30
ruthra kumar
013d0ff99c Merge pull request #38764 from frappe/mergify/bp/version-15-hotfix/pr-37625 
refactor: set exchange rate on foreign currency JE from Bank Reconciliation (backport #37625)
 2023-12-15 11:41:04 +05:30
ruthra kumar
b1b157aa19 refactor: handle bank transaction in foreign currency 
(cherry picked from commit 74a0d6408a)
 2023-12-15 05:51:44 +00:00
ruthra kumar
e7e5727015 refactor: exc rate on foreign currency JE from Bank Reconciliation 
(cherry picked from commit 89f484282a)
 2023-12-15 05:51:43 +00:00
mergify[bot]
ad3a5b58e4 fix: homepage not working (backport #38755) (#38756) 
fix: homepage not working (#38755)

(cherry picked from commit d6201ce5c7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-14 23:02:25 +05:30
Raffael Meyer
f501c8b336 Merge pull request #38752 from frappe/mergify/bp/version-15-hotfix/pr-38505 2023-12-14 16:38:29 +01:00
barredterra
f7706211ea feat: set lead name from email 
(cherry picked from commit ceeb724acc)
 2023-12-14 12:49:41 +00:00
mergify[bot]
a551660d2a fix: timezone aware SLA banner (backport #38745) (#38747) 
fix: timezone aware SLA banner (#38745)

(cherry picked from commit eaf86a6461)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-14 15:59:21 +05:30
ruthra kumar
5cbe170117 Merge pull request #38737 from frappe/mergify/bp/version-15-hotfix/pr-38717 
fix: fetch exc rate of multi currency journals on reconciliation (backport #38717)
 2023-12-14 09:59:47 +05:30
ruthra kumar
f55b561ff9 fix: fetch exc rate of multi currency journals 
(cherry picked from commit 1b3ba25220)
 2023-12-14 04:06:48 +00:00
mergify[bot]
3fabca1051 Revert "fix(ux): don't update qty blindly" (backport #38728) (#38730) 
Revert "fix(ux): don't update qty blindly" (#38728)

(cherry picked from commit 6851c5042f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-13 23:16:15 +05:30
Raffael Meyer
32ec73dd96 Merge pull request #38727 from frappe/mergify/bp/version-15-hotfix/pr-38725 2023-12-13 17:48:11 +01:00
barredterra
f30bede2e0 feat: RFQ print preview 
(cherry picked from commit 27f05145ae)
 2023-12-13 16:32:30 +00:00
mergify[bot]
1dcb065c64 fix: barcode scanning for the stock entry (backport #38716) (#38718) 
fix: barcode scanning for the stock entry (#38716)

(cherry picked from commit 13cba5068b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-13 18:32:48 +05:30
mergify[bot]
feb452b740 fix: supplier removed on selection of item (backport #38712) (#38713) 
fix: supplier removed on selection of item (#38712)

(cherry picked from commit db24e24882)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-13 14:39:00 +05:30
mergify[bot]
2bd96713db fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (backport #38696) (#38703) 
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38696)

fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
(cherry picked from commit e7984b3ef9)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-12 21:09:38 +05:30
Raffael Meyer
1d2edec550 Merge pull request #38675 from frappe/mergify/bp/version-15-hotfix/pr-38672 
fix: get data for leaderboard (backport #38672)
 2023-12-12 13:44:04 +01:00
ruthra kumar
965126df83 Merge pull request #38678 from frappe/mergify/bp/version-15-hotfix/pr-38673 
fix: typo in unittest (backport #38673)
 2023-12-12 17:35:22 +05:30
mergify[bot]
6e2cde4a21 fix: show stock qty in popup (backport #38698) (#38699) 
fix: show stock qty in popup (#38698)

(cherry picked from commit b562b4cf99)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 17:04:57 +05:30
mergify[bot]
a75081b8c0 fix: negative batch issue (backport #38688) (#38694) 
fix: negative batch issue (#38688)

(cherry picked from commit 69d7a640ee)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 16:41:26 +05:30
ruthra kumar
b68e1f6ea6 Merge pull request #38693 from frappe/mergify/bp/version-15-hotfix/pr-38692 
fix: typeerror on new sites (backport #38692)
 2023-12-12 16:03:08 +05:30
ruthra kumar
9239e735ad fix: typeerror on new sites (#38692) 
(cherry picked from commit fa2d33cb50)
 2023-12-12 10:14:39 +00:00
ruthra kumar
576ff49943 Merge pull request #38687 from frappe/mergify/bp/version-15-hotfix/pr-38685 
refactor: add `get_list` for virtual child doctypes (backport #38685)
 2023-12-12 15:24:37 +05:30
ruthra kumar
92b5c80a4a refactor: add get_list for virtual child doctypes 
(cherry picked from commit 15c90551b6)
 2023-12-12 09:12:39 +00:00
mergify[bot]
d188c8ec0e fix: serial no filter in the Serial No Ledger report (backport #38669) (#38682) 
fix: serial no filter in the Serial No Ledger report (#38669)

(cherry picked from commit 780c4278e6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 14:33:11 +05:30
mergify[bot]
4055543f5d fix: close PO on SCO close (backport #38667) (#38681) 
fix: close PO on SCO close

(cherry picked from commit b023e5d6b3)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-12 13:40:30 +05:30
ruthra kumar
fc79c6bf54 Merge pull request #38684 from frappe/mergify/bp/version-15-hotfix/pr-38679 
refactor(test): repost utility deletion flag test (backport #38679)
 2023-12-12 13:33:24 +05:30
ruthra kumar
522113ba98 refactor(test): update repost settings before test case 
(cherry picked from commit acb6e8e120)
 2023-12-12 07:16:51 +00:00
ruthra kumar
6469526c26 refactor: increase limit and remove explicit call to start_repost 
(cherry picked from commit ccff588563)
 2023-12-12 07:16:50 +00:00
ruthra kumar
122e6902ed refactor: remove explicit commit on repost 
(cherry picked from commit a97b3db749)
 2023-12-12 07:16:50 +00:00
ruthra kumar
64d93cec66 refactor(test): repost utility deletion flag test 
(cherry picked from commit cc15f695b4)
 2023-12-12 07:16:50 +00:00
Raffael Meyer
14ee13c77e fix: typo in unittest (#38673) 
(cherry picked from commit 6ad298adfc)
 2023-12-12 04:26:54 +00:00
barredterra
b17178bba9 chore: deprecate unused method 
(cherry picked from commit 956c3c50a0)
 2023-12-12 04:24:39 +00:00
barredterra
3845d4294c fix: get sales partner for leaderboard 
(cherry picked from commit 40c1acc961)
 2023-12-12 04:24:39 +00:00
barredterra
2fcfebe1d3 fix: get sales person for leaderboard 
(cherry picked from commit 7babfd4ac4)
 2023-12-12 04:24:39 +00:00
barredterra
e205772482 fix: get suppliers for leaderboard 
(cherry picked from commit 65df4b6aa8)
 2023-12-12 04:24:39 +00:00
barredterra
7cb38a8f22 fix: get items for leaderboard 
(cherry picked from commit 2721ee3a8d)
 2023-12-12 04:24:38 +00:00
barredterra
9d5c79d6b2 fix: get customers for leaderboard 
(cherry picked from commit 137b5a6108)
 2023-12-12 04:24:38 +00:00
mergify[bot]
dd07ecad45 fix: not able to make serial and batch using csv import (backport #38659) (#38662) 
fix: not able to make serial and batch using csv import (#38659)

(cherry picked from commit 89a0e9c245)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-11 11:29:25 +05:30
mergify[bot]
b0675f6490 fix: auto delete draft serial and batch bundle (backport #38637) (#38654) 
fix: auto delete draft serial and batch bundle (#38637)

(cherry picked from commit 89326bd657)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-10 16:45:03 +05:30
mergify[bot]
4150ed9b3b fix: Shipping Address Link Showing in Buying (backport #38634) (#38646) 
fix(ux): `Shipping Address Link`

(cherry picked from commit ca0c3eb184)

Co-authored-by: creative-paramu <pparameshwari@thirvusoft.in>
 2023-12-08 19:04:24 +05:30
mergify[bot]
0b2e2a2ab5 fix(ux): don't update qty blindly (backport #38608) (#38639) 
fix(ux): don't update qty blindly

(cherry picked from commit 0156339f34)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-08 17:59:32 +05:30
mergify[bot]
c70e6f23df fix: ignore non-existing regional customizations (backport #38621) (#38624) 
fix: ignore non-existing regional customizations (#38621)

(cherry picked from commit 9611e9bd7f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-07 21:43:46 +05:30
Shariq Ansari
5cf0c896bb Merge pull request #38627 from frappe/mergify/bp/version-15-hotfix/pr-38623 
fix: format only if searched text contain link value text (backport #38623)
 2023-12-07 20:51:03 +05:30
Shariq Ansari
d79e6e353e fix: format only if searched text contain link value text 
(cherry picked from commit 08ed3cd313)
 2023-12-07 15:18:52 +00:00
mergify[bot]
ce2bd15872 fix: serial and batch bundle permission (backport #38618) (#38619) 
fix: serial and batch bundle permission (#38618)

(cherry picked from commit 231ab83562)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-07 18:36:31 +05:30
mergify[bot]
deef6ea66a chore: minor code cleanup (backport #38615) (#38616) 
chore: minor code cleanup (#38615)

(cherry picked from commit f45dd740c5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-07 15:36:21 +05:30
mergify[bot]
aa66ee64ec fix: only highest eligible coupon applied (#38416) 
fix: only highest eligible coupon applied (#38416)

* fix: application of pricing rule when coupon is used

(cherry picked from commit d34787cf6d)

Co-authored-by: sandratridz <102575830+sandratridz@users.noreply.github.com>
 2023-12-07 10:34:11 +05:30
Ankush Menat
eeb0567a73 chore: remove unused cache=True 
(cherry picked from commit 6a47a2ceaf)
 2023-12-06 20:54:43 +05:30