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

47121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
mergify[bot]
9d45bbd051
fix: consider the Valuation Method while picking incorrect SLE (backport #38592) (#38595) 
* fix: incorrect SLE for `Moving Average` valuation method

(cherry picked from commit 8beec586709dcd716de4fb46476218baed2ec972)

* feat: add `Valuation Method` column in `Stock Ledger Variance` report

(cherry picked from commit 16c297c2ecbc9a174e90597756cf46170bbd7c4a)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 18:13:43 +05:30
ruthra kumar
acf94dd4ad
Merge pull request #38586 from frappe/mergify/bp/version-15-hotfix/pr-38580 
fix: sql error while filtering on finance book in GL (backport #38580)
 2023-12-05 15:06:42 +05:30
ruthra kumar
3779943221 fix: sql error while filtering on finance book in GL 
(cherry picked from commit b1d9f3132d69df010e4f8f6e5d24b187823c2d8b)
 2023-12-05 09:11:40 +00:00
mergify[bot]
145ed3a3b1
fix: incorrect material request quantity in Production Plan (backport #38566) (#38579) 
fix: incorrect material request quantity in Production Plan (#38566)

(cherry picked from commit aaa9036eca4c5d50fb82a346e08d841e1735fc72)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-05 14:24:26 +05:30
ruthra kumar
7076f3d778
Merge pull request #38577 from frappe/mergify/bp/version-15-hotfix/pr-38570 
refactor: ignore unreconcile doc on PI cancel/delete (backport #38570)
 2023-12-05 13:13:29 +05:30
mergify[bot]
02d7dd8b15
feat: Company filter in Stock Ledger Variance report (backport #38553) (#38574) 
feat: `Company` filter in `Stock Ledger Variance` report

(cherry picked from commit fb3421fccee518799a36a27d79bf4f6632736f81)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 12:33:06 +05:30
ruthra kumar
ee87c2a211 refactor: ingore on JE cancel as well 
(cherry picked from commit 1a5d56977e158d27210a2bfeeaa9075cb7094875)
 2023-12-05 06:34:14 +00:00
ruthra kumar
c83c97f466 refactor: ignore unreconcile doc on PI cancel/delete 
(cherry picked from commit 4ca84eadb607263f8432698ff61c4acfd2f0363b)
 2023-12-05 06:34:14 +00:00
Gursheen Anand
dbdb971e10 fix: limit end date to current date 
(cherry picked from commit ab6e92aae129653f13e54728d8d3a8c88dcda6cb)
 2023-12-05 05:54:49 +00:00
Shariq Ansari
39e04b119a
Merge pull request #38564 from frappe/mergify/bp/version-15-hotfix/pr-38562 
fix: get dynamic link with parenttype contact (backport #38562)
 2023-12-04 19:22:37 +05:30
Shariq Ansari
cb9589b8ef fix: get dynamic link with parenttype contact 
(cherry picked from commit 3d7ad71b22578e46366639ef19de8d665a922c04)
 2023-12-04 13:51:36 +00:00
mergify[bot]
88d2a8d668
fix: scan for serial or batch in bundle (backport #38534) (#38552) 
fix: scan for serial or batch in bundle (#38534)

(cherry picked from commit c8693cdf37ba9e91bf47d89de69aafc2fde5e6ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-04 15:24:28 +05:30
ruthra kumar
92c8eb17ca
Merge pull request #38550 from frappe/mergify/bp/version-15-hotfix/pr-38475 
fix: incorrect customer outstanding amount (backport #38475)
 2023-12-04 13:57:00 +05:30
NIYAZ RAZAK
98fe89a24d fix: incorrect customer outstanding amount (#38475) 
* fix: incorrect customer outstanding amount

* chore: resolve linting error

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 3df1d75bdd7a34c9fef4c4fe9af9341bc2e6e094)
 2023-12-04 08:11:06 +00:00
ruthra kumar
66e3dc7358
Merge pull request #38547 from frappe/mergify/bp/version-15-hotfix/pr-38283 
chore: move reconciliation cleanup patch to pre-model sync (backport #38283)
 2023-12-04 13:40:48 +05:30
ruthra kumar
e405695838 chore: move reconciliation cleanup patch to pre-model 
(cherry picked from commit f258ab5e98f323303276aeca98dcc644f6611a70)
 2023-12-04 07:34:09 +00:00
ruthra kumar
d8f9e3a8b1
Merge pull request #38542 from frappe/mergify/bp/version-15-hotfix/pr-38148 
refactor: convert Payment Reconciliation to virtual doctype (backport #38148)
 2023-12-04 12:37:06 +05:30
mergify[bot]
282a5b27ad
fix: don't show non-stock items in Stock Analytics report (backport #38543) (#38545) 
* fix(ux): stock-item filter for Item Code field

(cherry picked from commit ccdcb7dfcc29eb68d1cad38f3426e6fb575528eb)

* fix: don't show non-stock items in Stock Analytics report

(cherry picked from commit 01aadbef85e2570399f054027e57d6bb01af9433)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-04 12:18:58 +05:30
ruthra kumar
b8b8c02bf9 chore: resolve conflict 2023-12-04 12:16:41 +05:30
ruthra kumar
192343dec2 chore: clear singles table and reconciliation related tables 
(cherry picked from commit f31002636bf21a3599ee5a7372db4d0cb3dbfad9)
 2023-12-04 06:31:08 +00:00
ruthra kumar
4123f4b0bd chore: remove reconciliation defaults from patch 
(cherry picked from commit b5dd0c8630c59cc38011039e7c7a21976b53ebd8)
 2023-12-04 06:31:08 +00:00
ruthra kumar
bcbf5da905 refactor: virtual doctype methods 
(cherry picked from commit 9c7b19e0b7732189c9db12e2c67b12a67fe562b3)
 2023-12-04 06:31:08 +00:00
ruthra kumar
f6d481de89 refactor: convert payment reconciliation tool to virtual doctype 
(cherry picked from commit 3a51a3f37ecd70c13cee558a0b882d06e812a21c)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
 2023-12-04 06:31:07 +00:00
ruthra kumar
0b64daf497
Merge pull request #38540 from frappe/mergify/bp/version-15-hotfix/pr-38220 
fix: exclude `invoice_doctypes` from party advance (backport #38220)
 2023-12-04 11:19:03 +05:30
ruthra kumar
0a05154698
Merge pull request #38538 from frappe/mergify/bp/version-15-hotfix/pr-38437 
fix: incorrectly treating normal payment as advance (backport #38437)
 2023-12-04 11:08:46 +05:30
Dany Robert
927538f776 fix: exclude invoice_doctypes from party advance 
(cherry picked from commit f34ffc20620de442b1a0c9f3d0eb4eb0ff689831)
 2023-12-04 05:31:50 +00:00
ruthra kumar
246dd74ba4 fix: incorrectly treating normal payment as advance (#38437) 
fix: treating normal payment as advance
(cherry picked from commit dd39da0b77f73dc9006c036b960b63404cc2c2f5)
 2023-12-04 04:39:16 +00:00