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

8864 Commits

Author SHA1 Message Date
Deepesh Garg
2f169575e9
fix: Netherlands - Grootboekschema COA structure (#35991) 
fix: Netherlands - Grootboekschema coa structure
 2023-07-04 15:30:27 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
barredterra
e686bb0739 Merge remote-tracking branch 'upstream/develop' into payments-based-dunning 2023-07-03 19:56:42 +02:00
rohitwaghchaure
8179d6a30d
Merge pull request #35977 from rohitwaghchaure/reserve-pos-invoice-batches 
fix: reserve the pos invoice batches
 2023-07-03 22:33:45 +05:30
Rohit Waghchaure
1e8f6c0840 fix: reserve the pos invoice batches 2023-07-03 17:38:48 +05:30
Deepesh Garg
5448859254
fix: Update no copy for received_qty field (#35965) 2023-07-03 13:03:52 +05:30
Deepesh Garg
3df0c5e32f
Merge pull request #35609 from GursheenK/#34282-Record-advance-payment-as-a-liability 
feat: Record Advance Payment as a liability
 2023-07-01 17:49:49 +05:30
Deepesh Garg
d54f52474a
fix: Expense Account filter in Sales Invoice (#35944) 2023-06-30 20:02:46 +05:30
Deepesh Garg
be5cb1aa17
Merge pull request #35943 from GursheenK/company-specific-proj-filtering 
fix: project filtering based on company in P&L Report
 2023-06-30 20:01:24 +05:30
Deepesh Garg
fda2d2bd59 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-30 19:35:34 +05:30
Deepesh Garg
80e6c90740 chore: precision in test 2023-06-30 19:35:22 +05:30
Deepesh Garg
7e7737d692 test: Update test account 2023-06-30 18:37:52 +05:30
Deepesh Garg
0a49213338 test: Update test records 2023-06-30 17:32:42 +05:30
Marica
0a67a3a9c4
Merge branch 'develop' into payments-based-dunning 2023-06-30 13:32:50 +05:30
Deepesh Garg
bbb6ebb84e fix: Outstanding amount validation 2023-06-30 13:25:22 +05:30
Gursheen Anand
84d4888f5f fix: make company field mandatory in project doctype 2023-06-30 12:54:45 +05:30
Gursheen Anand
ce252a0d45 fix: show projects with no company value set 2023-06-30 12:42:19 +05:30
Gursheen Anand
904ca746a6 fix: project filtering in P&L Report 2023-06-30 12:11:23 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module (#35522) 
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
 2023-06-30 11:02:49 +05:30
Deepesh Garg
0408b6d655 Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability 2023-06-29 12:19:42 +05:30
Deepesh Garg
1e078d03bb fix: Partial PLE cancellation 2023-06-29 12:18:25 +05:30
Deepesh Garg
06821f9781
Merge pull request #35904 from GursheenK/voucher-wise-balance-report 
feat: add voucher-wise balance report for unequal dr/cr GL entries
 2023-06-29 09:07:45 +05:30
marination
5a952987a3 fix: Use this.frm (Linter) 2023-06-28 17:13:34 +05:30
Marica
0498a31c42
Merge branch 'develop' into payments-based-dunning 2023-06-28 16:48:22 +05:30
mergify[bot]
e832455790
perf: improve item wise register reports (backport #35908) (#35911) 
perf: improve item wise register reports (#35908)

(cherry picked from commit 33ee01174bb909ee46bb3d714d6f94fa0aefe48f)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-28 10:25:03 +05:30
Gursheen Anand
6b9f9f9b0e fix: remove debug flag from sql 2023-06-27 21:59:35 +05:30
Deepesh Garg
7312827d4d fix: On cancel flow 2023-06-27 18:25:10 +05:30
Deepesh Garg
f2edc91dc6 fix: Multi invoice reconciliation 2023-06-27 18:11:47 +05:30
Gursheen Anand
5d726ef037 feat: add voucher-wise balance report logic 2023-06-27 16:49:28 +05:30
Deepesh Garg
2d2f0f02d6
Merge pull request #35886 from deepeshgarg007/ldc_breach_fix 
fix: TDS amount calculation post LDC breach
 2023-06-27 09:39:06 +05:30
Deepesh Garg
62c3ca8286 fix: Paid invoice in AR report 2023-06-26 23:53:55 +05:30
Deepesh Garg
1f9ef6c48f fix: TDS amount calculation post LDC breach 2023-06-26 22:01:12 +05:30
ruthra kumar
84ea0a828c
Merge pull request #35882 from ruthra-kumar/refactor_cr_note_reconciliation_with_exchange_gain_loss 
refactor: simplify exchange logic on cr/dr note reconciliation
 2023-06-26 17:32:12 +05:30
ruthra kumar
af75f6cea7 refactor: simplify exchange logic on cr/dr note reconciliation 2023-06-26 16:09:54 +05:30
ruthra kumar
a90fe25cc4
Merge pull request #35868 from ruthra-kumar/get_base_grand_total_while_pulling_reference_details 
fix: incorrect outstanding and total amount in reference table of payment entry
 2023-06-25 18:29:54 +05:30
Deepesh Garg
ebeb5e0cb7
Merge pull request #35594 from nikkothari22/make-accounting-dimension-filter-values-optional 
feat: added support for mandatory dimensions per account without applying restrictions on dimension values
 2023-06-25 17:55:26 +05:30
Deepesh Garg
63b126967e chore: Linting Issues 2023-06-25 16:24:22 +05:30
Deepesh Garg
bcff4b0e5a
chore: linting issues 2023-06-25 16:03:58 +05:30
Deepesh Garg
c7186ff95c
Merge pull request #35789 from GursheenK/Provision-to-send-Accounts-Receivable-Reports 
feat: Provision to send Accounts Receivable Reports using Process SOA
 2023-06-24 17:10:50 +05:30
HarryPaulo
1e20016059
fix: POS Closing Entry load all invoices with one request on save (#35819) 
fix: load all invoices with one request
 2023-06-24 16:34:24 +05:30
Deepesh Garg
1894dc8197 fix: Test case and code cleanup 2023-06-23 21:53:34 +05:30
Deepesh Garg
da6bc1a13e refactor: Redo workflows 2023-06-23 20:57:51 +05:30
ruthra kumar
2f638ae32a
Merge pull request #35604 from pps190/fix-reconcile-invoice-return 
fix: reconcile invoice against credit note.
 2023-06-23 17:44:25 +05:30
ruthra kumar
9655d78642 test: test reference details response 2023-06-23 17:24:19 +05:30
Marica
2868baebab
fix: Payment Term must be mandatory if Allocate Payment based on .. is checked (#35798) 
- Front and Back end validation of condition
- Fix test to accomodate fix
 2023-06-23 16:00:20 +05:30
Deepesh Garg
df035f6b19
Merge branch 'develop' into Provision-to-send-Accounts-Receivable-Reports 2023-06-23 15:58:38 +05:30
ruthra kumar
9e73af891d fix: get base grand total while pulling reference details in PE 2023-06-23 14:50:14 +05:30
Gursheen Anand
555c126eb9 fix: add patch for setting default value of report field 2023-06-23 10:52:25 +05:30
Anand Baburajan
f37484c6fe
chore: better err msg on cancelling JE for asset scrap [dev] (#35850) 
chore: better err msg on cancelling JE for asset scrap
 2023-06-22 22:32:06 +05:30
Deepesh Garg
904f835d4a
Merge pull request #35602 from deepeshgarg007/pl_account_balance 
fix: Remove special treatment for P&L Accounts
 2023-06-22 21:11:23 +05:30
Deepesh Garg
05c2198569 test: Update order 2023-06-22 21:08:58 +05:30
Deepesh Garg
13c0c129df
Merge pull request #35828 from phot0n/pr-fieldname-item-wise-purchase-register 
fix: use correct fieldname for purchase receipt column in item_wise_purchase_register report
 2023-06-22 20:40:14 +05:30
Deepesh Garg
11a9bd523d test: Add posting date parameter 2023-06-22 20:26:12 +05:30
Deepesh Garg
b101dceb2a test: GL Entry order 2023-06-22 19:38:33 +05:30
Deepesh Garg
d81d6069fb fix: JV query 2023-06-22 18:28:16 +05:30
Deepesh Garg
b523c779f5 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-22 15:43:43 +05:30
Deepesh Garg
0e68da5a2a feat: Show stock ledger preview 2023-06-22 15:43:32 +05:30
ruthra kumar
b4db25dd18 refactor: increase precision for current exc rate in ERR 2023-06-22 12:40:02 +05:30
Deepesh Garg
3aead05f42 fix: Test related errors 2023-06-22 11:41:43 +05:30
ruthra kumar
4e7deba2ad
Merge pull request #35825 from ruthra-kumar/convert_db_call_to_whitelisted_method 
fix: multiple fixes in reconciliation tools
 2023-06-22 11:27:04 +05:30
ruthra kumar
41b9e92868 fix: incorrect cost center error in bank reconciliation 2023-06-22 10:43:13 +05:30
Deepesh Garg
b64ebc6fcc test: fix payment reco tests 2023-06-21 17:49:45 +05:30
Deepesh Garg
e7d2bcf108 Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview 2023-06-21 17:16:46 +05:30
Deepesh Garg
ed76ee3e16 fix: Move ledger display to dialog 2023-06-21 17:15:46 +05:30
phot0n
dcfc86e3af fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report 2023-06-21 16:49:54 +05:30
ruthra kumar
ad758b8d85 fix: no permission for accounts settings on payment reconciliation 2023-06-21 14:19:02 +05:30
Deepesh Garg
92f845c0e1 chore: Advance fetching order 2023-06-21 12:21:19 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting 
chore: remove whitelisting for methods not accessed from UI
 2023-06-20 20:29:49 +05:30
ruthra kumar
8aa47a13e3
Merge pull request #35794 from ruthra-kumar/exchange_revaluation_only_post_on_account_currency_based_on_scenario 
fix: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account
 2023-06-20 13:58:54 +05:30
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
barredterra
9eeaac0c3e feat: remove dunning as possible reference from payment entry 2023-06-14 13:29:21 +05:30
barredterra
24f400b123 feat: remove Dunning dashboard as there are no incoming links 2023-06-14 13:08:55 +05:30
barredterra
1250e56dd6 feat: add Dunning to Dunning Type's dashboard 2023-06-14 13:07:48 +05:30
barredterra
fd7be5da99 feat: remove obsolete "debit_to" field 2023-06-14 13:01:28 +05:30
barredterra
c142d89952 tests: remove obsolete test 2023-06-14 13:01:14 +05:30
barredterra
ac8b6bba5c feat: resolve dunning on payment entry 2023-06-14 13:00:47 +05:30
barredterra
270040303c refactor: make sider happy 2023-06-14 12:59:27 +05:30
barredterra
6b6f4dd017 refactor: run pre-commit 2023-06-14 12:59:26 +05:30
barredterra
ff7ec977e6 feat: more info for payment deductions 2023-06-14 12:59:26 +05:30
barredterra
16a23d9f0f refactor: dunning 2023-06-14 12:59:26 +05:30
barredterra
603117eb6b feat: change print format to reflect doctype changes 2023-06-14 12:56:28 +05:30
barredterra
3895c03ba9 feat: change make_gl_entries to work with new data structure 2023-06-14 12:56:28 +05:30
barredterra
bc40f3f425 refactor: rename interest_amount to interest, dunning_level 2023-06-14 12:54:17 +05:30
barredterra
be5fb94837 feat: currency section , debit_to, base_dunning_amount 2023-06-14 12:54:14 +05:30
barredterra
df840cca75 refactor: validate totals 2023-06-14 12:54:01 +05:30
barredterra
24e7a21839 refactor: remove redndant argument 2023-06-14 12:54:00 +05:30
barredterra
f143fe7dcc refactor: tests 2023-06-14 12:53:56 +05:30
barredterra
676ed6b881 feat: hide fields in print 2023-06-14 12:50:57 +05:30
barredterra
043066a2c8 style: use double quotes 2023-06-14 12:50:41 +05:30
barredterra
938f7d2266 reafctor: validate instead of postprocess 2023-06-14 12:42:21 +05:30
barredterra
9016baddca feat: company address query + style 2023-06-14 12:42:21 +05:30
barredterra
b07620aacf feat: child table triggers calculation of totals 2023-06-14 12:42:20 +05:30
barredterra
b186f8e9d7 feat: address display 2023-06-14 12:42:17 +05:30
barredterra
db47e1b69c feat: address and contact queries 2023-06-14 12:42:02 +05:30
barredterra
4f51dfe4c5 refactor: remove unnecessary code 2023-06-14 12:42:02 +05:30
barredterra
2d0dadd9ac feat: rework dunning backend 2023-06-14 12:41:59 +05:30
Gursheen Anand
ba4ab06ae3 fix: changed account types in controller method 2023-06-14 12:39:16 +05:30
barredterra
2ee919220a feat: rework dunning frontend 2023-06-14 12:37:58 +05:30
barredterra
8976e94a1d feat: rework doctypes 2023-06-14 12:37:55 +05:30
barredterra
86a8b0b30f refactor: doctype naming 
Overdue Payments -> Overdue Payment
 2023-06-14 12:37:31 +05:30
barredterra
487c6018bf feat: restructure dunning doctype 2023-06-14 12:37:02 +05:30