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

9468 Commits

Author SHA1 Message Date
mergify[bot]
30c349b010
add flt() for None type error (backport #38299) (#38306) 
add flt() for None type error (#38299)

(cherry picked from commit 64b44a360af8c2d3a6a9cb99e03358b97cdf9fa5)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
 2023-11-23 22:42:37 +05:30
mergify[bot]
72647b8624
feat: add Bank Transaction to connections in Journal and Payment Entry (backport #38297) (#38301) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-11-23 15:09:23 +01:00
ruthra kumar
100ce27a60 chore: update new unreconcile doctype name in JS and PY files 
(cherry picked from commit 74f9e34182563b5dd3ef71d93b66596a12be5e91)
 2023-11-23 05:09:24 +00:00
ruthra kumar
df70e048cf chore: rename 'unreconcile payments' to 'unreconcile payment' 
(cherry picked from commit 9006c9b7478ceee5f7662d62e8eb02a08a309906)
 2023-11-23 05:09:23 +00:00
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query 
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
 2023-11-23 10:14:25 +05:30
ruthra kumar
c84c97577f
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234 2023-11-21 13:43:58 +05:30
ruthra kumar
034375b4f5 refactor(test): make use of utility methods 
(cherry picked from commit 547993f80103fa192563a82447c39fe122918767)
 2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved 
(cherry picked from commit 946228d783cb58cd2809f4b0bc0a854c49cc4060)
 2023-11-21 07:03:06 +00:00
ruthra kumar
337707b9cc fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8abfca6764d84665cb9877703c1a470)
 2023-11-21 07:03:05 +00:00
ruthra kumar
15f40a7af6 test: prevent rounding loss based validation error 
(cherry picked from commit 56e991b7f49e4677605f74b1de7d00ab40bf09cc)
 2023-11-21 12:16:36 +05:30
ruthra kumar
1ed65524e5 refactor: add flag to POS Invoice 
(cherry picked from commit 83a13e22b7f4aa8ba2c406389af4e7fa8aad55d0)
 2023-11-20 08:36:51 +00:00
ruthra kumar
5da9a22e4c refactor: set default for 'update_billed_amount_in_delivery_note' 
(cherry picked from commit ee0c64215d160f0bd493bcefc9e94a5a90d318d2)
 2023-11-20 08:36:50 +00:00
ruthra kumar
2186e1cce4
Merge pull request #38197 from frappe/mergify/bp/version-15-hotfix/pr-38159 
refactor: provision to truncate `remarks` in General Ledger and Accounts Receivable/Payable reports (backport #38159)
 2023-11-20 12:31:44 +05:30
Vishakh Desai
aef955c920 fix: Supplier Quotation fields (#37963) 
(cherry picked from commit c2bda2c70535ad9e8a61e752bbb551f387460125)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-20 04:42:48 +00:00
ruthra kumar
c2cb86b40a refactor: add substring logic in ar/ap report 
(cherry picked from commit a9bf906545dc7c89613c7f6211c35e62b8d7b989)
 2023-11-20 04:38:26 +00:00
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings 
(cherry picked from commit 97090ff3679104d77a031f29d4acafb8b7ac1580)
 2023-11-20 04:38:26 +00:00
Dany Robert
eab18e6f71 fix: test case for rounded total with cash disc 
(cherry picked from commit cc60c328fe349f7d53c77799e8e91973c2790746)
 2023-11-19 13:49:19 +00:00
Devin Slauenwhite
384d6b516c fix: payment entry rounding error 
(cherry picked from commit 3d1e3a9cded735c420cb6c0ceb17c62034983076)
 2023-11-19 13:17:51 +00:00
Vishakh Desai
a420e13765 fix: pass check permission in render_address 
(cherry picked from commit 45299fe4b3e23774920d7c35f7fb66e786cf5aa5)
 2023-11-18 12:08:58 +00:00
mergify[bot]
20e15ebd22
fix: allow regional gl in payment entry for gl preview (#38136) 
fix: allow regional gl in payment entry for gl preview (#38136)

(cherry picked from commit 7e43d7b1312fd665bdcde7db7c67d192f746e60a)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-11-17 12:40:18 +05:30
ruthra kumar
c9674683d1 fix: add revaluation journal filter in Payable report 
(cherry picked from commit 134201794ace2863c02458b3e1797da816802d06)
 2023-11-17 10:01:35 +05:30
Deepesh Garg
d51237195a
fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
Gursheen Anand
cb4bb5b4ee fix: test total unallocated amount in payment 
(cherry picked from commit 2499675ad121ab370f672e6f9ffdcda3c8c76b8e)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
376e09680c test: payment against partial return invoices 
(cherry picked from commit 09f9764bbdec90d1b9f85ccc5a368bf85547bea1)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
22b39ac4b4 fix: reset dr_or_cr for every reference 
(cherry picked from commit a59c942cd487e0440625663034760eb89171e2ef)
 2023-11-16 05:06:59 +00:00
Gursheen Anand
ac61abb2e4 fix: handle partial return against invoices 
(cherry picked from commit 5b446d45750c45c6a86bb420c689a06945ab4974)
 2023-11-16 05:06:59 +00:00
ruthra kumar
e2dd414793 refactor: use 'boolean' parameter while fetching FY year 
(cherry picked from commit c31ee8ea33afcc8128270f098c40cc0b0e3f1a49)
 2023-11-16 04:18:34 +00:00
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
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
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
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]
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
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
Gursheen Anand
8602a3eab1 fix: remove validation for negative outstanding invoices 
(cherry picked from commit 3d9938221a7fef7e08c0072364d8ebb855933d11)
 2023-11-09 06:46:31 +00:00
ruthra kumar
ef9e8406eb refactor: ignore disabled account while selecting Income Accounts 
(cherry picked from commit 6e3e094c957d8c2b71ed522e9a8034364345e5a7)
 2023-11-09 04:45:59 +00:00
mergify[bot]
b3562bdb87
fix: asset depreciation ledger (backport #37991) (#37993) 
fix: asset depreciation ledger (#37991)

* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'

(cherry picked from commit 9a171db97f67f88fad1589016afb4e808571d04c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-08 22:52:16 +05:30
ruthra kumar
0e979b6c5b
Merge pull request #37902 from frappe/mergify/bp/version-15-hotfix/pr-37887 
chore: performance optimization on payment ledger entry doctype (backport #37887)
 2023-11-08 10:13:55 +05:30
ruthra kumar
463e71664c refactor: update permissions for repost settings 
(cherry picked from commit 10b9570429e16906f3f879228c065b668f63882b)
 2023-11-07 10:15:24 +00:00