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

46893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
0ec2978ea0 refactor: rollback for retries and UI alerts 
(cherry picked from commit c3202886901eaecc0ab8b9bf73d8816994e6dc1f)
 2023-11-16 04:22:47 +00:00
ruthra kumar
db60e147e0 refactor: barebones retry functionality 
(cherry picked from commit 0aa1636d04bed9fef260aedde4ed6a42b6a1968b)
 2023-11-16 04:22:47 +00:00
ruthra kumar
33f1e709f1 chore: show retried in list view 
(cherry picked from commit 194d70f8a0c93c8e2952cd58cdc5d994414198fb)
 2023-11-16 04:22:46 +00:00
ruthra kumar
696f8b0ae0 refactor: add basic functionalities 
(cherry picked from commit af35590549987ab84eadbf08c10f3837242203dc)
 2023-11-16 04:22:46 +00:00
ruthra kumar
e68d2e138a feat: virtual parent doctype 
(cherry picked from commit a248b13cc353fcd94b0009c74c24512ea629a376)
 2023-11-16 04:22:46 +00:00
ruthra kumar
461f7a1a1c chore: make from_doctype readonly 
(cherry picked from commit b0dfc936a10aef4dfd743959a6cf5e47ea69632e)
 2023-11-16 04:22:46 +00:00
ruthra kumar
6eaf67e700 chore: add indexes 
(cherry picked from commit 73090fa1306fd65ff8e290d57486697af5722081)
 2023-11-16 04:22:46 +00:00
ruthra kumar
f0a8c83fa8 chore: add list view filters 
(cherry picked from commit ade09bc709ab8bca047abdad5235461a4618bc17)
 2023-11-16 04:22:46 +00:00
ruthra kumar
feb49f23ed refactor: simplify logging logic bulk_transaction 
(cherry picked from commit ebd74a4e5b68534a4ceab2482618e16643f220d1)
 2023-11-16 04:22:45 +00:00
ruthra kumar
3be8bfe9d8 chore: rearrange fields 
(cherry picked from commit c4f8f3613f1173a54b17e3c6ca8ea52469f32e3b)
 2023-11-16 04:22:45 +00:00
ruthra kumar
bf0d8c16ac chore: convert child to normal table 
(cherry picked from commit e5a8ad54e26d74b5713e7db057860c1262c1b93b)
 2023-11-16 04:22:45 +00:00
ruthra kumar
9a9d5775e8 chore: remove 'Bulk Transaction Log' doctype 
(cherry picked from commit 815c616f18ae1cd6ec1dbd315fa5f0376edef523)
 2023-11-16 04:22:45 +00:00
mergify[bot]
8bc871a842
chore: change read only condition of asset quantity field (backport #38111) (#38113) 
chore: change read only condition of asset quantity field (#38111)

chore: change read only condition of asset quantity
(cherry picked from commit 6e0362dee85811267edff53f23a24b48ebd91c11)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-15 18:01:33 +05:30
mergify[bot]
28e6e5d910
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094) (#38097) 
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094)

fix: valuation rate for the subcontracting receipt supplied items with batch
(cherry picked from commit 3e77c0b5644c28ed9b4eef22b228fdc4a1283020)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-14 21:15:44 +05:30
mergify[bot]
77b1eedcf4
chore: refetch item images on transaction save (backport #38095) (#38099) 
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5d45a3bf0136ca3fc24a828b008aeee)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-14 20:11:19 +05:30
mergify[bot]
a8749977e1
fix: Not able to save subcontracting receipt (#38085) 
fix: Not able to save subcontracting receipt (#38085)

(cherry picked from commit e769e750ec712872a8fd28c533d1f02444e351a9)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-14 15:57:36 +05:30
mergify[bot]
4fdd1ec498
chore: delete comments and unlink attachments on company transactions deletion (backport #38077) (#38079) 
* chore: delete comments and unlink attachments on company transactions deletion

(cherry picked from commit 2f9e96e3245e210ab1a26ffe99499367b0e0afa5)

* fix: unrelated transation date typo

(cherry picked from commit b097bb20d99f1d25fbd8bdcf0277859741a0ee53)

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-13 19:17:00 +05:30
mergify[bot]
6d325a40a1
fix: indentation issue in the Production Plan Summary report (backport #38019) (#38069) 
fix: indentation issue in the Production Plan Summary report (#38019)

fix: Production Plan Summary report
(cherry picked from commit 4a111f73620136cda022e030c58d7d58b0c22a8e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-13 14:03:29 +05:30
bVisible
011cf3d73e
fix: Identical items are added line by line instead of grouped together in POS (#37986) 
fix: Identical items are added line by line instead of grouped together in POS (#37986)
 2023-11-13 14:01:42 +05:30
ruthra kumar
f6b56f225b
Merge pull request #38067 from frappe/mergify/bp/version-15-hotfix/pr-38064 
refactor: add revaluation journal checkbox in AR/AP summary reports (backport #38064)
 2023-11-13 13:39:24 +05:30
ruthra kumar
d71d5a2981 refactor: add revaluation journal checkbox in AR/AP summary reports 
(cherry picked from commit 95edd82638c5cb5aabefd871966d558f51095f94)
 2023-11-13 07:52:12 +00:00
Raffael Meyer
6ab2f83a61
Merge pull request #38061 from frappe/mergify/bp/version-15-hotfix/pr-38055 
fix(customer): contact creation for companies (backport #38055, #38060)
 2023-11-12 20:27:20 +01:00
barredterra
6f2b34e7d5 fix: deprecate unused create_contact 2023-11-12 20:01:10 +01:00
barredterra
d3d10231b9 test: parse full name 2023-11-12 19:44:01 +01:00
barredterra
f61b476be1 refactor: parse full name 2023-11-12 19:43:51 +01:00
barredterra
0142a9308b chore: resolve conflicts 2023-11-12 19:43:01 +01:00
David Arnold
fc09d757f0 fix(customer): contact creation for companies (#38055) 
(cherry picked from commit 9fde7824035580a3d8bd0b48a2e1a3d2ffc46082)

# Conflicts:
#	erpnext/selling/doctype/customer/customer.py
 2023-11-12 18:06:57 +00:00
mergify[bot]
cff56d4e50
fix: close Credit Limit Crossed dialog (backport #38052) (#38059) 
fix: close `Credit Limit Crossed` dialog (#38052)

(cherry picked from commit 94faa44697144157940a874090fd1bd02c1eb981)

Co-authored-by: Arjun <arjun99c@gmail.com>
 2023-11-12 18:07:16 +05:30
mergify[bot]
d5bf7a039d
fix: COA Importer app related issues (#37238) 
fix: COA Importer app related issues (#37238)

* fix: COA Importer app related issues

* fix: Clear all account links fields befor import

* fix: Attribute error

(cherry picked from commit 8634abc0210fdb259c8b0e7ffc93976ea0099057)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-12 17:41:18 +05:30
mergify[bot]
02e225845e
fix(customer): quick form and integration fixes (#37386) 
fix(customer): quick form and integration fixes (#37386)

(cherry picked from commit ae508144cdce348af11c406f6fd30e73f4dc3879)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-11-11 20:19:22 +05:30
mergify[bot]
99b7cdb5be
fix: make item field read-only in batch (backport #38010) (#38034) 
fix: make item field read-only in batch

(cherry picked from commit 779260fb497d6ac8000a89b7b762145c58e84471)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-11 10:48:09 +05:30
ruthra kumar
ddb1a7643a
Merge pull request #38036 from frappe/mergify/bp/version-15-hotfix/pr-38004 
fix: handling of exchange rate journals in AR/AP (backport #38004)
 2023-11-10 11:59:06 +05:30
ruthra kumar
fb71a6e787 fix: new logic for handling revaluation journals 
(cherry picked from commit 1d8fcd66e6ca6d17a274a8b18699b40a7ac93e1a)
 2023-11-10 11:18:59 +05:30
mergify[bot]
40cc3a7610
fix: sales order not assigned to territory orders (backport #37905) (#38025) 
fix: sales order not assigned to territory orders (#37905)

filtered sales order are not assigned to 'territory_orders' which results in 0 order amount and 0 billing amount in the output

(cherry picked from commit 45b4bfc94783bb0180c0a57a2f3a5bb7086008a3)

Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com>
 2023-11-09 21:52:27 +05:30
mergify[bot]
3c0f8b15a0
fix: Mark Status field in Payment Entry 'no_copy'. (#38000) 
fix: Mark Status field in Payment Entry 'no_copy'.

(cherry picked from commit a89afb65d72b7beb985449151b25fc678b4c6891)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-11-09 14:06:46 +05:30
Deepesh Garg
1b103faf05
Merge pull request #38007 from frappe/mergify/bp/version-15-hotfix/pr-37828 
fix: payments irrespective of party types (backport #37828)
 2023-11-09 14:06:14 +05:30
ruthra kumar
54bed25056
Merge pull request #38013 from frappe/mergify/bp/version-15-hotfix/pr-37716 
feat: multi-select customer group in AR Report (backport #37716)
 2023-11-09 13:23:38 +05:30
mergify[bot]
b23fa1f5dd
fix: make adjustment entry using stock reconciliation (backport #37995) (#38009) 
fix: make adjustment entry using stock reconciliation (#37995)

fix: do adjustment entry using stock reconciliation
(cherry picked from commit a8216b9727401bfb6900f15447ab935756d7f353)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-09 13:14:32 +05:30
vishal
b1714ec21d fix: minor change added to test_case 
(cherry picked from commit 30402033bc06296a32ffaf98fd28f18974be2248)
 2023-11-09 07:35:38 +00:00
vishal
848efe8047 feat(accounts_receivable): test_case added for multi-select customer group 
(cherry picked from commit de445b32f5a13d115ce3f49c190f23b1efdf6632)
 2023-11-09 07:35:38 +00:00
vishal
24be04427c fix: minor issue 
(cherry picked from commit b60c57a97dee1ab1a2b1654d4cc2d146e0141ff2)
 2023-11-09 07:35:38 +00:00
vishal
fff294fb37 feat: multi-select customer group in AR Report 
(cherry picked from commit 8903c1bc6f24c4e0187f05739887ac6f4af6a7b6)
 2023-11-09 07:35:38 +00:00
Gursheen Anand
2a5b3bdfd9 fix: use get_all instead of get_list 
(cherry picked from commit 2984a86f37e72bbdefd0348d7c456bd6ada540bb)
 2023-11-09 06:46:33 +00:00
Gursheen Anand
74983910bc chore: linting issues 
(cherry picked from commit 84f0d1ff1ff231f0388033d2304d977b07411253)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
6e463b1953 fix: handle gle for standalone credit and debit notes 
(cherry picked from commit 98a8288da2e2516153e30a2e028104f220df3644)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
22e58e0ee0 fix: skip check for removed validation 
(cherry picked from commit 0e100cd451892f3024d031ca7b45964c533cdc26)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
ced6d004fb refactor: move common util for fetching party types using account type 
(cherry picked from commit 4867ca353c1ba199844830eb539d9dca5455949b)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
9781f9b7b1 fix: credit note receive payment entry 
(cherry picked from commit 40157235916578ae88d2ec9a85f481c92fec9278)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
46c86de093 test: receive payments from payable party 
(cherry picked from commit cd1e016163141a4851b9128a2ff008809942482e)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
a89af589e8 fix: test for invoice returns 
(cherry picked from commit 1f4b38174899d99be2a3ac894a328c6b7ae7475f)
 2023-11-09 06:46:31 +00:00