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

8895 Commits

Author SHA1 Message Date
Deepesh Garg
98cfea6f63 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-20 13:26:14 +05:30
Deepesh Garg
32c35b87f9
Merge pull request #34675 from frappe/bank-trans-party-automatch 
feat: Auto set Party in Bank Transaction
 2023-06-20 13:24:44 +05:30
Deepesh Garg
016ed951da test: Update tests 2023-06-20 13:22:32 +05:30
ruthra kumar
6694175a51 refactor: higher precision for rounding loss and allow '0' 2023-06-20 12:44:08 +05:30
ruthra kumar
4567474418 refactor: allow '0' rounding allowance 2023-06-20 12:44:08 +05:30
ruthra kumar
9d04af9ecc refactor: allow higher precision for new exchange rate 2023-06-20 12:44:08 +05:30
ruthra kumar
1b33afd699 fix: for zero bal accounts, dr/cr only on currency that has balance 2023-06-20 12:44:04 +05:30
marination
8f2e5288ff test: Dunning and PE against partially due invoice 
- Check if the right payment portion is picked
- Check if the SI and Dunning are updated on submission and cancellation of PE
 2023-06-20 11:47:04 +05:30
Deepesh Garg
175a7baa60 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 21:39:01 +05:30
Smit Vora
4fbff20954
fix: make credit note and debit note exclusive (#35781) 2023-06-19 21:14:42 +05:30
Gursheen Anand
b3d565c91f feat: Provision to send Accounts Receivable Reports using Process Statement of Accounts 
Issue #35707
 2023-06-19 19:59:24 +05:30
Anand Baburajan
c1da3ddbbf
fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776) 
* fix: fix get outstanding invoices btn and add get outstanding orders btn

* chore: remove unnecessary arg
 2023-06-19 19:53:05 +05:30
Raffael Meyer
11126521c9
Merge branch 'develop' into bank-trans-party-automatch 2023-06-19 15:04:37 +02:00
Deepesh Garg
9d27a25e5f
fix: Allocated amount validation for other party types (#35741) 
* fix: Allocated amount validation for other party types

* chore: Validation for return allocations

* chore: minor typo

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-06-19 11:04:50 +05:30
Deepesh Garg
7ec9d76545 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-19 09:48:01 +05:30
Deepesh Garg
5e9014be8c
Merge branch 'develop' into make-accounting-dimension-filter-values-optional 2023-06-19 09:21:04 +05:30
Lakshit Jain
93c0c26843
fix: modify filters for account in journal entry (#35626) 2023-06-18 22:25:28 +05:30
David Arnold
0444b98802
feat: add verified chart of accounts for colombia in two variants (#34508) 
This information is scraped from the in Colombia widely trusted site
dedicated to the plan unico de cuentas (PUC): puc.com.co

feat(accounts): add account_type overlay to colombian CoA

Add account_type overlay with a most significant number matching
strategy and a hand-crafted dictionary based on the erpnext
documentation and the corresponding account description from puc.com.co

Script used for scraping:
https://gist.github.com/blaggacao/d45a454d27556f41fef88833937088f1
 2023-06-18 22:17:31 +05:30
Marica
05e64b342a
Merge branch 'develop' into payments-based-dunning 2023-06-16 19:20:18 +05:30
Ankush Menat
6086d1a99d
perf: duplicate queries while checking prevdoc (#35746) 
These values can't change durning DB transaction AFAIK
 2023-06-16 18:25:58 +05:30
marination
47852803f0 fix: Set Address via JS and Py files (for API usecases) 2023-06-16 14:10:07 +05:30
Gursheen Anand
442e3f2aa2 fix: update outstanding amount and unpaid status on cancellation of payment entry 2023-06-16 13:38:47 +05:30
Raffael Meyer
51848ee9d7
Merge branch 'develop' into bank-trans-party-automatch 2023-06-15 16:36:17 +02:00
marination
c32113918e fix: Updation of dunning on PE cancellation 2023-06-15 20:04:54 +05:30
marination
254bab33da fix: Consider installments/partial payments while back updating Dunning 
- Also use data from Overdue Payment table and not just Dunning parent document
 2023-06-15 19:00:24 +05:30
Rohit Waghchaure
f9f662679f test: added test case 2023-06-15 18:09:56 +05:30
marination
4673aa412e fix: Broken pop-up and references to non-existent field 
- `child_fieldname` misspelled causing broken pop up to fetch overdue payments
- `sales_invoice` referenced in dunning fields, which has been removed
- Fetch `customer_name` from `customer` link field
 2023-06-15 15:48:50 +05:30
Marica
b497436d4f
Merge branch 'develop' into payments-based-dunning 2023-06-15 13:12:34 +05:30
ruthra kumar
f8273f7db6 fix: typeerror on exchange rate revaluation 2023-06-15 11:37:59 +05:30
ruthra kumar
cd538e138a fix: reference error while using exchange rate revaluation 2023-06-14 20:28:28 +05:30
marination
772f6ffd21 fix: Linter and incorrect cost center in test records 2023-06-14 16:48:18 +05:30
Gursheen Anand
033e4e84f5 fix: modify voucher details for liability entries 2023-06-14 14:20:42 +05:30
barredterra
18495ed624 fix: semgrep issues 2023-06-14 13:53:05 +05:30
barredterra
15816c8afd test: test records for dunning type 2023-06-14 13:52:47 +05:30
barredterra
315df7b2cf test: fix dunning test 2023-06-14 13:52:47 +05:30
barredterra
04aaadcb39 style: sider issues 2023-06-14 13:52:46 +05:30
barredterra
4911c3b5b7 fix: precision for interst 2023-06-14 13:47:16 +05:30
barredterra
ccefe96665 fix: map only overdue payments 2023-06-14 13:47:16 +05:30
barredterra
88f67e4786 fix: set income account and cost center 2023-06-14 13:41:04 +05:30
barredterra
fd6d86eefc fix: show "Create Dunning" when any scheduled payment is overdue 2023-06-14 13:41:04 +05:30
barredterra
028d19f32d test: link Dunning Type to COmpany 2023-06-14 13:41:03 +05:30
Raffael Meyer
d790710ae7 refactor: apply suggestions from code review 
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2023-06-14 13:41:03 +05:30
barredterra
28dfbdda93 feat: fetch income account and cost center from dunning type 2023-06-14 13:41:03 +05:30
barredterra
60b6afb470 fix: fetch overdue payments 2023-06-14 13:40:51 +05:30
barredterra
8bfe865759 fix: ignore cancelled dunnings 2023-06-14 13:40:50 +05:30
barredterra
0a06241e7c test: refactor, fix missing income account 2023-06-14 13:40:50 +05:30
barredterra
d55c59f298 test: make failing tests work 2023-06-14 13:40:50 +05:30
barredterra
84459c7196 fix: create payment entry 2023-06-14 13:40:50 +05:30
barredterra
e37f98267b fix: resolve dunning 2023-06-14 13:38:53 +05:30
barredterra
8652331d1c Revert "feat: remove dunning as possible reference from payment entry" 
This reverts commit b774d8d0e3c1e5a53b3422591b3f2d52ca959645.
 2023-06-14 13:38:53 +05:30