mergify[bot]
a551660d2a
fix: timezone aware SLA banner (backport #38745 ) ( #38747 )
...
fix: timezone aware SLA banner (#38745 )
(cherry picked from commit eaf86a6461438720fe941100d6feccefbfa3bfed)
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 1b3ba25220ca4ef96df5416331ee2f78376da64a)
2023-12-14 04:06:48 +00:00
mergify[bot]
753c1aa406
Revert "fix(ux): don't update qty blindly" (backport #38728 ) (backport #38730 ) ( #38734 )
...
Revert "fix(ux): don't update qty blindly" (backport #38728 ) (#38730 )
Revert "fix(ux): don't update qty blindly" (#38728 )
(cherry picked from commit 6851c5042fc5e2d3f45d070af18a33c24fc10794)
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 3fabca1051567aacc0d404b230fff1b881f249c9)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-14 00:30:18 +05:30
Frappe PR Bot
ff85f2a940
chore(release): Bumped to Version 15.6.1
...
## [15.6.1](https://github.com/frappe/erpnext/compare/v15.6.0...v15.6.1 ) (2023-12-13)
### Bug Fixes
* supplier removed on selection of item (backport [#38712 ](https://github.com/frappe/erpnext/issues/38712 )) (backport [#38713 ](https://github.com/frappe/erpnext/issues/38713 )) ([#38731 ](https://github.com/frappe/erpnext/issues/38731 )) ([04c605d](04c605d76b
2023-12-13 18:49:38 +00:00
mergify[bot]
04c605d76b
fix: supplier removed on selection of item (backport #38712 ) (backport #38713 ) ( #38731 )
...
fix: supplier removed on selection of item (backport #38712 ) (#38713 )
fix: supplier removed on selection of item (#38712 )
(cherry picked from commit db24e2488247eef326ef52a88dbae8e828893e7e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit feb452b740f1614cabc36f9f661d10843a992789)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-14 00:17:57 +05:30
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 6851c5042fc5e2d3f45d070af18a33c24fc10794)
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 27f05145ae700e1177bb2c2541e6d49f73cdbf7e)
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 13cba5068bd1d09bff4204a64a74999876566b6b)
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 db24e2488247eef326ef52a88dbae8e828893e7e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-13 14:39:00 +05:30
Frappe PR Bot
86b276a3ec
chore(release): Bumped to Version 15.6.0
...
# [15.6.0](https://github.com/frappe/erpnext/compare/v15.5.0...v15.6.0 ) (2023-12-12)
### Bug Fixes
* `split_invoices_based_on_payment_terms` (backport [#37859 ](https://github.com/frappe/erpnext/issues/37859 )) ([#38488 ](https://github.com/frappe/erpnext/issues/38488 )) ([4b76cc4](4b76cc46a1#38696 ](https://github.com/frappe/erpnext/issues/38696 )) ([#38703 ](https://github.com/frappe/erpnext/issues/38703 )) ([2bd9671](2bd96713db#38637 ](https://github.com/frappe/erpnext/issues/38637 )) ([#38654 ](https://github.com/frappe/erpnext/issues/38654 )) ([b0675f6](b0675f6490#38667 ](https://github.com/frappe/erpnext/issues/38667 )) ([#38681 ](https://github.com/frappe/erpnext/issues/38681 )) ([4055543](4055543f5dd79e6e353e9d5c79d6b27cb38a8f223845d4294c2fcfebe1d3e205772482#38621 ](https://github.com/frappe/erpnext/issues/38621 )) ([#38624 ](https://github.com/frappe/erpnext/issues/38624 )) ([c70e6f2](c70e6f23dfdbdb971e10#38688 ](https://github.com/frappe/erpnext/issues/38688 )) ([#38694 ](https://github.com/frappe/erpnext/issues/38694 )) ([a75081b](a75081b8c0#38659 ](https://github.com/frappe/erpnext/issues/38659 )) ([#38662 ](https://github.com/frappe/erpnext/issues/38662 )) ([dd07eca](dd07ecad45#38416 ](https://github.com/frappe/erpnext/issues/38416 )) ([aa66ee6](aa66ee64ec#38618 ](https://github.com/frappe/erpnext/issues/38618 )) ([#38619 ](https://github.com/frappe/erpnext/issues/38619 )) ([ce2bd15](ce2bd15872#38669 ](https://github.com/frappe/erpnext/issues/38669 )) ([#38682 ](https://github.com/frappe/erpnext/issues/38682 )) ([d188c8e](d188c8ec0e#38634 ](https://github.com/frappe/erpnext/issues/38634 )) ([#38646 ](https://github.com/frappe/erpnext/issues/38646 )) ([4150ed9](4150ed9b3b#38698 ](https://github.com/frappe/erpnext/issues/38698 )) ([#38699 ](https://github.com/frappe/erpnext/issues/38699 )) ([6e2cde4](6e2cde4a21#38692 ](https://github.com/frappe/erpnext/issues/38692 )) ([9239e73](9239e735ad#38673 ](https://github.com/frappe/erpnext/issues/38673 )) ([14ee13c](14ee13c77e#38608 ](https://github.com/frappe/erpnext/issues/38608 )) ([#38639 ](https://github.com/frappe/erpnext/issues/38639 )) ([0b2e2a2](0b2e2a2ab5#38477 ](https://github.com/frappe/erpnext/issues/38477 )) ([#38603 ](https://github.com/frappe/erpnext/issues/38603 )) ([c7dbcbc](c7dbcbcd17
2023-12-12 16:11:51 +00:00
Deepesh Garg
0d8a52f63b
Merge pull request #38690 from frappe/version-15-hotfix
...
chore: release v15
2023-12-12 21:40:42 +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 e7984b3ef90da98506e8c79303ac804e8d037085)
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 b562b4cf99e68108a0d7ba3a90e60ef3d7d01b0f)
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 69d7a640ee7da732d7983ecdd2574acfbc711fa1)
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 fa2d33cb50753449cc8f4218c94d07ed99f2af03)
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 15c90551b68f5cee549a1b53e564012b394e37cb)
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 780c4278e6c3a5d89814479c57fed02d0ccd3b89)
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 b023e5d6b3af376a22397c51f4ec8939da463686)
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 acb6e8e1209b7ac97e0503ad89d9f52b8a8e28d5)
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 ccff58856390aa56e1ae104a9c53712fb774b704)
2023-12-12 07:16:50 +00:00
ruthra kumar
122e6902ed
refactor: remove explicit commit on repost
...
(cherry picked from commit a97b3db749b2850659c733d0cddebfc92fb38cb8)
2023-12-12 07:16:50 +00:00
ruthra kumar
64d93cec66
refactor(test): repost utility deletion flag test
...
(cherry picked from commit cc15f695b428945fa1e3d3f29a3e9cbdb46853d4)
2023-12-12 07:16:50 +00:00
Raffael Meyer
14ee13c77e
fix: typo in unittest ( #38673 )
...
(cherry picked from commit 6ad298adfcac1932a7e0b37b8cab3bfdfcffd32a)
2023-12-12 04:26:54 +00:00
barredterra
b17178bba9
chore: deprecate unused method
...
(cherry picked from commit 956c3c50a09036dbeb9bfdf7ecd42958bdb0ec3e)
2023-12-12 04:24:39 +00:00
barredterra
3845d4294c
fix: get sales partner for leaderboard
...
(cherry picked from commit 40c1acc961d29394fb47ef6108864c7690331457)
2023-12-12 04:24:39 +00:00
barredterra
2fcfebe1d3
fix: get sales person for leaderboard
...
(cherry picked from commit 7babfd4ac4e3852d983487f1290799165933c4c0)
2023-12-12 04:24:39 +00:00
barredterra
e205772482
fix: get suppliers for leaderboard
...
(cherry picked from commit 65df4b6aa84523b917e0b6e83555a7b86157e42e)
2023-12-12 04:24:39 +00:00
barredterra
7cb38a8f22
fix: get items for leaderboard
...
(cherry picked from commit 2721ee3a8dda2e61ddf7f59698849c2e15e0e414)
2023-12-12 04:24:38 +00:00
barredterra
9d5c79d6b2
fix: get customers for leaderboard
...
(cherry picked from commit 137b5a610880684b1c08d868072335debceb3007)
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 89a0e9c2453ba4eef4158477db537771cdc9ed70)
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 89326bd657217b82e14675ebb464b87214332eec)
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 ca0c3eb184b02f56f36879f9472ce82b55dcee1d)
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 0156339f3433f1a3ddb08885d2b85902c1114345)
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 9611e9bd7fea9301fb850dfc28cd52f46464daab)
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 08ed3cd31394eb1108dc29a7a5b3f6ded85e3656)
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 231ab83562cd972ebc7663e1a86f82080e3b27cd)
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 f45dd740c58f34fad6e981d689c587815fba6625)
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 d34787cf6d37c479f00ac1c9bc529b544d95dab1)
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 6a47a2ceaf20572e143ab12ff76cfd9c54f509d6)
2023-12-06 20:54:43 +05:30
mergify[bot]
c7dbcbcd17
feat: add employee number to client user bootinfo (backport #38477 ) ( #38603 )
...
feat: add employee number to client user bootinfo (#38477 )
(cherry picked from commit 525f656cc111f6225b44e1211dc5726d311a120b)
Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
2023-12-06 20:52:50 +05:30
mergify[bot]
4b76cc46a1
fix: split_invoices_based_on_payment_terms (backport #37859 ) ( #38488 )
...
* refactor: `split_invoices_based_on_payment_terms`
- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first
(cherry picked from commit 6bd56d2d5f62814eb2f777934ed894bc5709e947)
* test: `get_outstanding_reference_documents` (triggered via UI)
(cherry picked from commit 162c0497d1db69e3af5f142459e3a875f03962af)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/test_payment_entry.py
* fix: Alert message and make sure invoice due dates are different for effective test
- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.
(cherry picked from commit 56ac3424d22b68bbc551913133803686431d1694)
* style: Remove spaces introduced via merge conflict
(cherry picked from commit 4b4b176fcf99241bf17067989ebc850b2de24bcb)
# Conflicts:
# erpnext/accounts/doctype/payment_entry/test_payment_entry.py
* fix: Re-add no.of rows split in alert message
(cherry picked from commit 1fc5844025d97de150195b94070b0c4061378992)
* fix: Merge conflicts in tests
---------
Co-authored-by: marination <maricadsouza221197@gmail.com>
2023-12-06 18:01:42 +05:30
Gursheen Kaur Anand
bfe2b923e1
Merge pull request #38572 from frappe/mergify/bp/version-15-hotfix/pr-38556
...
fix(minor): financial statements period end date (backport #38556 )
2023-12-05 22:02:27 +05:30
