Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,171 Commits 3 Branches 0 Tags
Commit Graph

47171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raffael Meyer
4fe7988249
Merge pull request #38814 from frappe/mergify/bp/version-15-hotfix/pr-38803 
fix: groups for current accounts in German CoAs (backport #38803)
 2023-12-17 19:52:24 +01:00
barredterra
58de9913b9 fix: groups for current accounts in German CoAs 
(cherry picked from commit 259f313af75c3cbdcc1af75a8e7d2ad1a3a90c0c)
 2023-12-17 18:24:07 +00:00
Deepesh Garg
b52ceceeb7
Merge pull request #38808 from vorasmit/fetch-item-taxes-v15 
fix: fetch item_tax_template values if fields with fetch_from exisit (#38284)
 2023-12-17 18:51:05 +05:30
mergify[bot]
8990c48e7b
fix: serial and batch bundle return not working (backport #38754) (#38806) 
fix: serial and batch bundle return not working (#38754)

* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289925d0866a16373c05cfb81825b58e35ba)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-17 18:02:31 +05:30
mergify[bot]
18bd330a59
fix: incorrect available qty for backdated stock reco with batch (backport #37858) (#38811) 
fix: incorrect available qty for backdated stock reco with batch (#37858)

* fix: incorrect available qty for backdated stock reco with batch

* test: added test case

(cherry picked from commit d4c0dbfacc7e99da6cba2c5d389f0a662490b0eb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-17 17:41:51 +05:30
Deepesh Garg
b02604396d
Merge pull request #38810 from frappe/mergify/bp/version-15-hotfix/pr-38807 
fix(demo): Demo setup for Canadian COA (#38807)
 2023-12-17 17:13:54 +05:30
Deepesh Garg
7d844411fb fix(demo): Demo setup for canadian COA 
(cherry picked from commit c9fd1822681420868923fd53aa1df3e3c776a4a6)
 2023-12-17 08:35:53 +00:00
Smit Vora
fba28d6941 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 13:59:22 +05:30
Deepesh Garg
57f7933a4b
Merge pull request #38771 from frappe/mergify/bp/version-15-hotfix/pr-38767 
fix: skip JVs against bank accounts in tax report (#38767)
 2023-12-16 22:28:55 +05:30
mergify[bot]
2045306283
fix: Reset SLA on issue doesn't work (backport #38789) (#38791) 
fix: Reset SLA on issue doesn't work (#38789)

This was broken since last refactor where it was spun off to work with
all types of doctypes but client side code was never adapted.

(cherry picked from commit fa1c7b663c2e3f433190d29017eaebbe15d4c604)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-15 22:02:33 +05:30
Raffael Meyer
4fb479e2f5
Merge pull request #38788 from barredterra/bp-38440 
fix(pe): show split alert only on splitting (backport #38440)
 2023-12-15 16:26:33 +01:00
Dany Robert
77dba4834c fix(pe): show split alert only on splitting 2023-12-15 16:08:48 +01:00
Raffael Meyer
a70be4299e
Merge pull request #38787 from frappe/mergify/bp/version-15-hotfix/pr-38742 
fix(Purchase Register): show bill_date and bill_no (backport #38742)
 2023-12-15 15:39:45 +01:00
ljain112
4ed86dbff2 fix: show bill_date and bill_no in Purchase Register 
(cherry picked from commit f53ba178a8b0909373c378db31d01928c576ee89)
 2023-12-15 14:25:03 +00:00
Deepesh Garg
63f6970b45
Merge pull request #38783 from frappe/mergify/bp/version-15-hotfix/pr-38691 
fix: Init internal child table values (#38691)
 2023-12-15 18:48:24 +05:30
Deepesh Garg
7802f6c528 fix: Init internal child table values 
(cherry picked from commit 2588970d5576bbfa085a1f30cf098d7e18e71a84)
 2023-12-15 12:45:56 +00:00
mergify[bot]
7fc8150617
fix: wrong currency in Stock Balance report (backport #38778) (#38780) 
fix: wrong currency in Stock Balance report

(cherry picked from commit 5a83a16e60b2c47f8ef0307edcd0311824007c86)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-15 15:32:59 +05:30
mergify[bot]
6e92c78cbd
fix: asset patch failure due to missing shift_based column (backport #38776) (#38777) 
fix: asset patch failure due to missing shift_based column (#38776)

* fix: add missing daily_prorata_based in get_asset_finance_books_map

* fix: reload Asset Finance Book doctype

(cherry picked from commit 1704180f38802ba81e9c912455e74d9a0595233e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-15 14:47:24 +05:30
ruthra kumar
5beea361fe
Merge pull request #38775 from frappe/mergify/bp/version-15-hotfix/pr-38766 
fix: validation error on reconciling PE to Journals as Invoice (backport #38766)
 2023-12-15 14:41:55 +05:30
ruthra kumar
aa5e16e681 fix: validation error on reconciling PE to Journals as Invoice 
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error

(cherry picked from commit 5eeb650dfd3ab4b20f49bacefc43d98cb856c3f3)
 2023-12-15 07:44:08 +00:00
Gursheen Anand
bf8a2d0e3a fix: skip jvs against bank accounts 
(cherry picked from commit f7b2380ec1cbe5e58755f88ca08cb052b92e05c7)
 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 726ac6bda1ee3b25c1d62b312d96aa32466ba11e)

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 74a0d6408a2082a2a039cd55547e56206e7c70bd)
 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 89f484282a90516c117c31624fb2cc5eab6fb840)
 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 d6201ce5c7b6f981ca6e0adbfa52c1c24ba5de83)

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 ceeb724acc54d06ec27f3a3b5e948e5b6236af7c)
 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 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]
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
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