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
barredterra
e7705327f0
feat: filter invoices
2023-06-14 12:35:30 +05:30
barredterra
e5b57ec965
feat: Overdue Payments table
2023-06-14 12:35:29 +05:30
Deepesh Garg
937c0feefe
fix: Lower deduction certificate not getting applied ( #35667 )
2023-06-13 20:06:36 +05:30
Anand Baburajan
491a50a027
fix: make showing taxes as table in print configurable ( #35672 )
2023-06-13 19:42:56 +05:30
Devin Slauenwhite
20de27d480
fix(accounts): validate payment entry references with latest data. ( #31166 )
...
* test: payment entry over allocation.
* fix: validate allocated_amount against latest outstanding amount.
* fix: payment entry get outstanding documents for advance payments
* fix: only fetch latest outstanding_amount.
* fix: throw if reference is allocated
* test: throw error if a reference has been partially allocated after inital creation.
* chore: test name
* fix: remove unused part of test
* chore: linter
* chore: more user friendly error messages
* fix: only validate outstanding amount if partly paid and don't filter by cost center
* chore: minor refactor for doc.cost_center
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-06-13 19:06:53 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value ( #35668 )
...
I just applied semgrep autofix. Untested completed, review before merging.
```yaml
- id: frappe-set-value-semantics
patterns:
- pattern-either:
- pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
- pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
message: |
If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
languages: [python]
severity: ERROR
```
2023-06-13 17:30:38 +05:30
Gursheen Anand
17341adf1c
fix: calculate outstanding amount on reconcile correctly
2023-06-13 15:00:46 +05:30
ruthra kumar
b43e068852
Merge pull request #35659 from ruthra-kumar/fix_attribute_error_in_payment_reconciliation
...
fix: attribute error on payment reconciliation tool
2023-06-13 10:16:26 +05:30
ruthra kumar
b672616617
Merge pull request #35620 from ruthra-kumar/err_higher_allowance_for_debit_credit_diff
...
fix: allow custom rounding loss allowance in Exchange Rate Revaluation
2023-06-13 09:46:08 +05:30
ruthra kumar
bada5796fa
fix: attribute error on payment reconciliation tool
2023-06-13 09:32:24 +05:30
ruthra kumar
96a0132501
fix: allow user to set rounding loss allowance for accounts balance
2023-06-12 22:05:08 +05:30
Gursheen Anand
5e9821dce2
test: modify test to check posting date
2023-06-12 18:00:15 +05:30
ruthra kumar
42f4f80e0c
fix: Payment against credit notes will be considered as payment against parent invoice in Accounts Receivable/Payable report ( #35642 )
...
* fix: payment against credit note should be linked to parent invoice
* test: AR/AP report for payment against cr note scenario
* fix: cr_note shows up as outstanding invoice
Payment made against cr_note causes it be reported as outstanding invoice
2023-06-12 17:35:13 +05:30
Gursheen Anand
a06017c2c3
fix: Use advance account from Reconciliation document for fetching Payment Entries
2023-06-12 15:24:53 +05:30
Deepesh Garg
2f24546b21
fix: Make difference entry button not working ( #35622 )
2023-06-12 15:20:28 +05:30
Deepesh Garg
e30c3eafef
fix: Stock ledger preview
2023-06-12 11:46:51 +05:30
Gursheen Anand
7591f1010b
fix: Make get party account method return a list instead of a single default account.
2023-06-12 11:06:03 +05:30
David Arnold
c1b42b858d
fix: set Phone and Email option in doctypes ( #35549 )
2023-06-11 19:34:41 +05:30
ruthra kumar
dcbd7d5f1f
fix: incorrect TCS amount while customer has advance payment ( #35397 )
...
* fix: incorrect TCS amount while customer has advance payment
* test: only unallocated advance should for threshold breach validation
2023-06-10 20:55:30 +05:30
Raffael Meyer
b91bb17779
refactor: get default contact or address ( #35248 )
...
* refactor: get_party_shipping_address
* refactor: get_default_contact
* chore: adding docstrings
* fix: keep original order
* fix: use get_all instead of get_list
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2023-06-08 19:49:09 +05:30
Gursheen Anand
b65e58c1ae
test: add tests for advance liability entries
...
Add Sales and Purchase Invoice Tests to check if GL entries and Outstanding Amount are generated correctly when advance entries are recorded as liability.
Few changes to return value of added column in Payment Entry References.
2023-06-08 18:15:37 +05:30
ruthra kumar
992d61bd90
chore: fix travis
2023-06-08 15:11:46 +05:30
Gursheen Anand
4ee163742a
fix: Using one field for both advance liability accounts
2023-06-08 13:15:23 +05:30
Devin Slauenwhite
54935438e1
fix: reconcile invoice against credit note
2023-06-07 15:55:37 -04:00
Devin Slauenwhite
7973951c37
fix: missing attribute error
2023-06-07 15:55:16 -04:00
Devin Slauenwhite
f68ab3dfff
test: reconcile credit against invoice
2023-06-07 15:14:24 -04:00
Deepesh Garg
0bd4de4504
fix: Remove special treatment for P&L Accounts
2023-06-07 22:33:35 +05:30
Deepesh Garg
f732cac678
fix: Project in item-wise sales register ( #35596 )
2023-06-07 22:06:05 +05:30
Dirk van der Laarse
3b409af9a0
fix: exclude disabled customers when fetching customers on process statement of accounts ( #35539 )
...
fix: exclude disabled when fetching customers
2023-06-07 22:01:44 +05:30
Raffael Meyer
e1f3b7cbc8
fix: pass translated label to change button type ( #35564 )
...
fix: change button type for translated labels
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2023-06-07 21:49:02 +05:30
Nikhil Kothari
83a7584475
fix: tests now create filters with checkbox enabled
2023-06-07 15:00:05 +05:30
Nikhil Kothari
e1116bbbbb
fix: added server side check for allow/restrict
2023-06-07 14:20:42 +05:30
Nikhil Kothari
83c46085fb
feat: added support for mandatory dimensions per account
2023-06-07 14:14:57 +05:30
DaizyModi
5155d5bfb2
chore: remove whitelisting for methods not accessed from UI
2023-06-07 12:05:17 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit wherever it makes sense ( #35588 )
2023-06-07 11:58:36 +05:30
marination
eb1db5eaa3
chore: Remove instances of bank_party_mapper and use new_doc
2023-06-07 11:54:51 +05:30
Marica
75387bbaef
Merge branch 'develop' into bank-trans-party-automatch
2023-06-06 19:03:26 +05:30
marination
752a92bd8b
chore: Remove Bank Party Mapper implementation
...
- Matching by Acc No/IBAN can easily happen with Bank Accounts. It's not a tedious query
- Historical lookups for Party Name/Desc match are very tricky. The user could have manually set a match and we would not know. Also this leaves the Bank Party Mapper only useful for Party Name/Desc lookups, which feels excessive.
- We want to reduce the number of places the same data is stored and reduce confusion
- The Party Name/Desc will optionally happen fuzzily, or not at all
- There will be no Mapper lookups
2023-06-06 18:59:07 +05:30
Nabin Hait
47ce6de57d
feat: ability to create quotation against a prospect
2023-06-06 15:19:04 +05:30
Deepesh Garg
2e52a63b0d
feat: Accounting Ledger Preview
2023-06-04 19:20:28 +05:30
rohitwaghchaure
14292ffc6f
Merge pull request #34564 from rohitwaghchaure/serial-no-normalization
...
Feat: Serial No Normalization and Serial Batch Bundle
2023-06-02 18:13:02 +05:30
Deepesh Garg
abc6fe0b06
refactor!: Remove custom cashflow report mapper ( #35523 )
...
* refactor: Remove custom cashflow mapper
* chore: patch to delete docs
* fix: Cleanup defaults during install
* fix: Remove custom cashflow mapper from consolidated financial statement
2023-06-02 17:48:59 +05:30
Rohit Waghchaure
74ab20f97a
fix: travis for POS merge invoice and putaway rule
2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f8bf4aa7c8
fix: travis for work order, pos invoice and landed cost voucher
2023-06-02 17:14:17 +05:30
Rohit Waghchaure
48fbf99e6d
fix: travis for sales and purchase invoice
2023-06-02 17:14:17 +05:30
Rohit Waghchaure
d3ceb07936
fix: travis
2023-06-02 17:14:17 +05:30
Rohit Waghchaure
c2d7461d3c
fix: travis issue
2023-06-02 17:14:17 +05:30
Rohit Waghchaure
9b72845f0f
feat: serial and batch bundle for pick list
2023-06-02 17:14:16 +05:30
Rohit Waghchaure
648efca940
feat: auto create serial and batch bundle
2023-06-02 17:14:16 +05:30
Rohit Waghchaure
0eaf6de5de
feat: serial and batch bundle for POS
2023-06-02 17:14:16 +05:30
Rohit Waghchaure
467046436b
refactor: serial no ledger and batchwise balance history report
2023-06-02 17:14:16 +05:30
Rohit Waghchaure
5bb3173676
refactor: rename doctype serial and batch ledger to serial and batch entry
2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a
refactor: added new file serial batch bundle
2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1
fix: removed sales and purchase fields from serial nos
2023-06-02 17:14:14 +05:30
Gursheen Anand
74619269f0
feat: Record Advance Payments as Liability
...
Ability to let user record advance payments as liability instead of a negative asset.
Issue #34282
2023-06-02 17:13:51 +05:30
Nabin Hait
f11d9b019d
fix: Ignore permissions while submitting account closing balance record ( #35536 )
2023-06-02 16:57:00 +05:30
Raffael Meyer
09872301bd
Merge branch 'develop' into bank-trans-party-automatch
2023-06-01 18:03:10 +02:00
brunoherrick
4eb2717c3b
feat(accounts): add Portuguese SNC CoA ( #35486 )
...
The ultimate goal of this commit is to add an updated Portuguese Chart of Accounts (CoA), based on Portugal's SNC norm. Account numbers are included. "Account types" shall ideally be confirmed and improved by an accountant. Howbeit, the account types are mostly inspired on former OpenERP, now designated Odoo.
2023-06-01 15:38:18 +05:30
ruthra kumar
c02fc955c5
Merge pull request #35518 from ruthra-kumar/add_precision_in_exchange_rate_revaluation
...
fix:higher precision causes ERR to misjudge zero bal acc as non-zero
2023-06-01 14:59:04 +05:30
ruthra kumar
0319650187
Merge pull request #35112 from ruthra-kumar/gp_report_simplify_groupby_invoice
...
refactor(Gross Profit): simplify group by invoice logic
2023-06-01 14:34:01 +05:30
ruthra kumar
0cd47f07a6
fix: higher precision makes ERR to misjudge zero bal acc as non-zero
2023-06-01 14:24:03 +05:30
Akshay
e08d6fb2cb
chore: typo in pricing rule schema ( #35457 )
2023-06-01 14:16:52 +05:30
Ankush Menat
4bdd276f74
Merge pull request #35409 from nabinhait/workspace-cleanup
...
refactor: Workspace cleanup
2023-05-31 16:40:26 +05:30
Deepesh Garg
27d5e6a99b
fix: Error while validating budget ( #35487 )
...
* fix: Error while validating budget
* chore: remove print statement
2023-05-31 10:51:33 +05:30
Nabin Hait
e78a7de1e5
fix: Rearranged accounting module links
2023-05-30 13:25:00 +05:30
Nabin Hait
243c49c550
refactor: Workspace cleanup
2023-05-30 13:17:59 +05:30
Akshay
1ab04344db
fix (ui): debit note issued status indicator color ( #35401 )
...
* fix: debit note issued status indicator color
* fix: change DebitNoteIssued color from grey to gray
2023-05-29 09:42:01 +05:30
Nabin Hait
3504bf7f62
fix: Show future payments in accounts receivable summary ( #35416 )
2023-05-29 09:23:40 +05:30
Sagar Sharma
027de41600
fix: incorrect POS Reserved Qty in Stock Projected Qty Report
2023-05-27 12:05:37 +05:30
mergify[bot]
55806c51f2
fix: Gross and Net Profit Report - incorrect calculation of totals
...
* fix: account group totals calculation to consider include_in_gross
(cherry picked from commit 8dcb9302b417618505ea24e5566c017eff451c1e)
* refactor: remove unused parameters
(cherry picked from commit 50822f207ec5272d4d71a2b6579693da2088105d)
* refactor: merge separate loops for calculating group / leaf node totals
rename function
remove return statement as the list is mutated
(cherry picked from commit 1a3b9c5bdfb9fac04a3a7d8724e6b3c3b593ec19)
* fix: add total col for gross and net profit
(cherry picked from commit cb9b4fbb91f4b73916416167932064ef5965eed1)
---------
Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
2023-05-25 18:12:50 +05:30
ruthra kumar
ec5d34117b
Merge pull request #35417 from ruthra-kumar/fix_ambiguous_company_in_gross_profit_report
...
fix(Gross Profit): 'company' column is ambiguous in filter
2023-05-25 15:06:35 +05:30
ruthra kumar
448712f719
fix(Gross Profit): 'company' column is ambiguous in filter
2023-05-25 14:18:41 +05:30
Anand Baburajan
edb7b0db8f
fix: incorrect depr schedule and posting dates on selling of existing assets [dev] ( #35398 )
...
* fix: calc depr amount properly on selling of existing assets and fix incorrect posting dates
* chore: get number_of_depreciations_booked properly
* chore: fix test_gle_made_by_asset_sale_for_existing_asset
2023-05-24 12:29:46 +05:30
Ankush Menat
b0eb72ffac
fix: replace quotation with invoice in first onboarding ( #35389 )
...
[skip ci]
2023-05-23 15:35:55 +05:30
Marica
6fe5264ae2
Merge branch 'develop' into bank-trans-party-automatch
2023-05-18 12:57:58 +05:30
ruthra kumar
1587ce3bfb
Merge pull request #35335 from ruthra-kumar/incorrect_tds_calcuation_if_supplier_has_different_category
...
fix: tds incorrectly calculated for invoice that are below threshold
2023-05-18 12:38:31 +05:30
ruthra kumar
132846bbd1
fix(test): cumulative threshold checks
2023-05-18 12:00:59 +05:30
marination
4364fb9628
feat: Optional Fuzzy Matching & Skip Matches for multiple similar matches
...
- Fuzzy matching can be enabled optionally in the settings
- If a query gets multiple matches with the same score, do not set a party as it is an extremely close call
- misc: Add 'cancelled' status to Bank transaction
- Test for skipping matching with extremely close matches
2023-05-17 19:45:03 +05:30
marination
4a14e9ea4e
fix: Tests
2023-05-17 14:23:44 +05:30
ruthra kumar
84b7c1bba0
fix: tds incorrectly calculated for invoice that are below threshold
...
Two purchase invoices for the same supplier, using different tax
withholding categories have this issue.
| Category | single | cumulative |
|----------+--------+------------|
| cat1 | 100 | 500 |
| cat2 | 1000 | 5000 |
1. PINV1 of net total: 105/- uses cat1. TDS is calculated as it
breached single threshold
2. PINV2 of net total: 200/- uses cat2. TDS incorrectly calculated as
PINV1 already has TDS calculated and 'consider_party_ledger_amount' is enabled.
2023-05-17 13:55:41 +05:30
ruthra kumar
e927f6cab1
Merge pull request #35239 from ashish-greycube/patch-8
...
fix: in payment_entry difference amount cal is broken
2023-05-17 10:25:55 +05:30
Ashish Shah
ae4e56747c
refactor: use 'flt' for base_total_taxes_and_charges
...
difference_amount calculation is broken, as calculation gives NaN. Fix is make frm.doc.base_total_taxes_and_charges as flt(frm.doc.base_total_taxes_and_charges)
2023-05-16 16:55:11 +05:30
ruthra kumar
776a83066d
fix: cancelled vouchers in tax withheld vouchers list ( #35309 )
2023-05-16 15:54:46 +05:30
Smit Vora
2a609616d9
fix: port option for additional_conditions in item wise sales register ( #35187 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-05-15 13:24:39 +05:30
Phanupong Janthapoon
2b59a95162
fix: share_transfer display wrong currency symbo
...
In multi-companies setting, on amount and rate field of Share Transfer
doctype are displaying wrong currency symbol, when create a
Share Transfer of others company that has different currency than
the main company. This due to the lack of `options` on those fields.
To fix this, add `options` to `amount` and `rate` fields.
2023-05-14 08:06:58 +05:30
Ankush Menat
2ea38333f0
refactor: use job_id instead of job_name ( #35242 )
...
depends on https://github.com/frappe/frappe/pull/20951
2023-05-10 13:26:10 +05:30
marination
dbf7a479b6
fix: Use existing bank fields to match by bank account no/IBAN
...
- Remove newly added fields in Party doctypes to store bank details
- Use Bank Account's fields to match against account no/iban
- For employee, if Bank Account does not exist, find in Employee doctype against account no/iban
2023-05-09 20:47:14 +05:30
ruthra kumar
afe9d7614b
Merge pull request #35212 from ruthra-kumar/chore_change_throw_to_msgprint
...
chore: convert throw to msgprint in payment reconciliation job hook
2023-05-08 17:57:13 +05:30
Anand Baburajan
5a3acab110
fix: handle empty FBs properly in TB and GL [develop] ( #35190 )
...
fix: handle empty FBs properly in TB and GL
2023-05-08 16:54:00 +05:30
ruthra kumar
73134d57bf
chore: convert throw to msgprint
2023-05-08 16:42:12 +05:30
ruthra kumar
34a5f24026
Merge pull request #35186 from ruthra-kumar/child_account_should_inherit_parent_account_currency
...
fix: child acc will inherit acc currency if explicitly specified
2023-05-08 14:09:46 +05:30
ruthra kumar
f6ea8fd8d7
test: currency inheritance on child accounts
2023-05-08 13:30:39 +05:30
Rohit Waghchaure
15f5f98858
fix: error regarding accepted and supplier warehouse
2023-05-07 20:27:17 +05:30
ruthra kumar
abe691c03d
fix: child acc will inherit acc currency if explicitly specified
2023-05-06 10:40:41 +05:30
Anand Baburajan
6864b11f83
fix: handle finance book properly in trial balance and general ledger ( #35085 )
...
* fix: get default fb properly and handle different fb and default fb case
* chore: minor UX improvement
* fix: handle FBs properly in general ledger
2023-05-02 20:58:22 +05:30
ruthra kumar
7e24215b3a
Merge pull request #35107 from ruthra-kumar/fix_incorrect_paid_amount_if_bank_cash_account_missing
...
fix: incorrect paid_amount and exchange rate in Payment Entry
2023-05-02 15:07:36 +05:30
ruthra kumar
1d70183d8c
Merge pull request #35091 from ruthra-kumar/cost_center_allocation_splits_roundoff
...
refactor: button to toggle parent doc cost center preference for rounding adjustment amount
2023-05-02 14:07:22 +05:30
ruthra kumar
8f2302a7bf
Merge pull request #35061 from ruthra-kumar/refactor_pe_dont_book_gain_loss_for_sales_purchase_orders
...
refactor: don't book exchange gain/loss for sales/purchase orders
2023-05-02 14:03:17 +05:30
rohitwaghchaure
a10aab35ff
Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation
...
fix: don't allow to make reposting for the closed period
2023-05-01 20:41:14 +05:30
Rohit Waghchaure
f751727149
fix: don't allow to make reposting for the closed period
2023-05-01 18:48:29 +05:30
ruthra kumar
ce4e18c8d2
test: Sales/Purchase Orders will not book Exchange gain/loss
2023-05-01 14:09:19 +05:30
ruthra kumar
effb34bbfa
refactor: don't book exch gain/loss for sales/purchase orders
2023-05-01 14:08:30 +05:30
Deepesh Garg
ea0b03ae9e
fix: Updates in process statement of Accounts ( #35064 )
2023-05-01 13:09:47 +05:30
ruthra kumar
092c4b4c58
refactor: simplify group by invoice logic
2023-05-01 11:53:43 +05:30
Deepesh Garg
f3b3dabb9a
fix: Naming series error in Journal Entry template ( #35084 )
2023-05-01 10:50:51 +05:30
ruthra kumar
123355392b
fix: incorrect paid_amount and exchange rate in PE
...
If Company master has no default cash or bank account set but Party has
default company bank account set. In this case, paid_amount and
conversion rate are not calculated correctly
2023-04-30 08:36:56 +05:30
ruthra kumar
4ccce93394
refactor: checkbox to toggle parent doc cost center preference
2023-04-28 14:20:50 +05:30
ruthra kumar
0f3b06cc8a
refactor: checkbox in Sales Invoice
2023-04-28 14:20:50 +05:30
ruthra kumar
ebe6787510
refactor: checkbox to toggle parent doc cost center preference
2023-04-28 14:20:48 +05:30
ruthra kumar
b44331c981
refactor: checkbox in purchase invoice
2023-04-28 14:06:04 +05:30
Nihantra Patel
6dfca79af3
fix: Report link, option, and added a link for Sales Person in GP
2023-04-27 15:04:50 +05:30
Kitti U. @ Ecosoft
c36dc3dc57
fix: v14, Bank Reconcile Tools not cover case JV debit bank ( #35000 )
2023-04-25 21:34:28 +05:30
rohitwaghchaure
b24704740b
Merge pull request #34918 from s-aga-r/FIX-ISS-22-23-06298
...
perf: Journal Entries
2023-04-25 21:27:52 +05:30
Raffael Meyer
d6bc8bba8b
fix: per_billed condition for Payment Entry ( #34969 )
2023-04-25 20:51:11 +05:30
Deepesh Garg
ecea9b44a3
fix: Payment entry with TDS in bank reco statement ( #34961 )
2023-04-25 19:17:13 +05:30
Deepesh Garg
b545e3def0
fix: Add company field to lower deduction certificate ( #34914 )
2023-04-25 19:07:45 +05:30
Sagar Sharma
31cdfa395a
Merge branch 'develop' into FIX-ISS-22-23-06298
2023-04-25 13:57:34 +05:30
s-aga-r
e782a054c8
refactor: get_stock_value_on() to get stock value of multiple warehouses at once
2023-04-25 13:54:36 +05:30
Anand Baburajan
ca388ed9cd
fix: value of depreciable assets not updating after manual depr entry [develop] ( #35020 )
...
* fix: value of depreciable assets not updating after manual depr entry
* chore: add asset depr schedule to jv's ignore_doctypes_on_cancel_all
2023-04-25 12:45:05 +05:30
ruthra kumar
20226d0a47
Merge branch 'develop' into revert-33699-tds_report_percentage
2023-04-25 10:43:18 +05:30
ruthra kumar
cb7a99cbaa
Revert "fix: Rate from LDC in TDS reports ( #33699 )"
...
This reverts commit db9beb3cdd
2023-04-25 10:13:07 +05:30
Marica
88647c63ba
Merge branch 'develop' into bank-trans-party-automatch
2023-04-24 12:13:12 +05:30
ruthra kumar
ed14d1ce44
feat: Reconcile Payments in background ( #34596 )
...
* feat: auto reconcile in background
* chore: Option to enable auto reconciliation in settings
* refactor: validate if feature is enabled in settings
* refactor: check for running job while using reconciliation tool
* chore: using doc to get filter values
* chore: use frappe.db.get_value in validations
* chore: cleanup commented out code
* chore: replace get_list with get_all
* chore: use block scope variable
* chore: type information for functions
* refactor: flag to ignore job validation check
* refactor: update parent doc status if all reconciled
* chore: create test_records file
* test: create a bunch of vouchers for testing auto reconcile
* chore: renamed auto_reconcile to process_payment_reconciliation
* chore: another child doctype to hold payments
* chore: remove duplicate field
* chore: add fetched payments to log
* chore: Popup comment message update
* chore: replace get_all with get_value
* chore: replace label in settings page
* chore: remove unit test and records
* refactor: status in reconciliation log
* refactor: set status in log as well
* chore: fix field name
* chore: change triggered job name
* chore: use status field in list view of log
* chore: status while there are no allocations
* refactor: split trigger function into two
* chore: adding cancelled status
* refactor: function trigger queued docs
* chore: cron job scheduled
* chore: fixing accouts settings json file
* chore: typos and variable scope
* chore: use 'pluck' in db call
* chore: remove redundant whitelist decorator
* chore: use single DB call to fetch values
* chore: replace get_all with get_value
* refactor: use raw db calls to fetch reconciliation log records
Using get_doc on `Process Payment Reconciliation Log` is costly when
handling large volumes of invoices.
Use raw frappe.db.get_all to selectively pull status and reconciled count
* chore: update status on successful batch operation
* chore: make payment table readonly
* chore: ability to pause the background job
* chore: remove isolate_each_allocation
* chore: more description in progress bar
* refactor: partially working state
* refactor: update reconcile flag and setting hard limits for fetching
* chore: make allocation editable -- NEED TO REVERT
* chore: pause button
* refactor: skip setter function in Payment Entry for better performan
* refactor: split reconcile function and skip a setter function
1. Split reconcile function into 2
2. While reconciling against payment entry, skip a
set_missing_ref_details setter method
* chore: increase payment limit
* refactor: replace frappe.db.get_all with frappe.db.get_value
* chore: remove unwanted doctypes
* refactor: make allocation table readonly
* perf: update ref_details only for newly linked invoices
* chore: rename skip flag
* refactor(UI): receivable_payable field should auto populate
* refactor: no control statements in finally block
* chore: cleanup section and rename checkbox
* chore: update new fieldname in code
* chore: update error msg
* refactor: start and pause integrated into status
pause checkbox has been removed
* refactor: added cancelled status to the log doctype
1. Moved the status section to the bottom in parent doc
2. Using alerts to indicate Job trigger status
2023-04-22 17:24:35 +05:30
rohitwaghchaure
56d62cae7a
Merge pull request #34980 from rohitwaghchaure/fix-inter-transfer-validation
...
fix: validation for internal transfer entry
2023-04-21 17:45:54 +05:30
Rohit Waghchaure
19911b48fd
fix: validation for internal transfer entry
2023-04-21 16:56:09 +05:30
ruthra kumar
3ec1597860
Merge pull request #34940 from ruthra-kumar/broken_set_exchange_gain_loss_btn_in_payment_entry
...
fix: broken 'set exchange gain/loss' btn in payment entry
2023-04-21 09:47:53 +05:30
Sagar Vora
17ef3c964f
fix: set frappe.flags.company to call regional code accurately
2023-04-20 05:17:30 -07:00
ruthra kumar
fc6486d87d
Merge pull request #34922 from ruthra-kumar/refactor_payment_entry_ref_details
...
refactor: refactor set_missing_values and set_missing_ref_details in Payment Entry
2023-04-20 10:59:50 +05:30
ruthra kumar
df0682fa8c
fix: broken set exchagne gain/loss btn broken in payment entry
2023-04-20 10:39:15 +05:30
ruthra kumar
b7d6e30f63
refactor: update ref details for selected references
...
set_missing_ref_details can update only for selected references
2023-04-19 15:13:10 +05:30
ruthra kumar
11cb2db3fe
refactor: move set_missing_ref_detials out of set_missing_values
2023-04-19 11:54:08 +05:30
ruthra kumar
a3e3fe149d
refactor: checkbox to toggle merging of JE account heads
2023-04-18 08:59:33 +05:30
Marica
fd38e8e0af
Merge branch 'develop' into bank-trans-party-automatch
2023-04-17 16:34:46 +05:30
Deepesh Garg
5c75894065
fix: Advance payment against payment terms ( #34872 )
2023-04-16 17:11:24 +05:30
Devin Slauenwhite
51c4338661
fix(ux): don't throw error when company defaults aren't set ( #34825 )
...
* fix(ux): don't throw error when company defaults aren't set; instead prompt account input.
* fix: translate label and title
2023-04-14 15:20:51 +05:30
Deepesh Garg
66130493eb
fix: Remove unnecessary checkbox from Accounts doctype ( #34821 )
2023-04-14 09:47:15 +05:30
marination
430b247dfc
fix: Remove bank details fields from Shareholder
2023-04-11 01:33:08 +05:30
marination
7ed8f59dc8
test: Match by Account No, IBAN, Party Name, Desc and match correction
2023-04-10 22:11:00 +05:30
Marica
36de35c6d9
Merge branch 'develop' into bank-trans-party-automatch
2023-04-10 20:04:16 +05:30
Deepesh Garg
91a26608ee
fix: Unable to create payment request against purchase invoice ( #34762 )
2023-04-06 12:40:58 +05:30
Marica
fcc8f9f164
Merge branch 'develop' into bank-trans-party-automatch
2023-04-05 17:04:07 +05:30
marination
d7bc192804
fix: Match by both Account No and IBAN & other cleanups
...
- A BT could have both account and iban, and a Supplier could have only IBAN set
- In this case, matching by either (only account) gives no match
- Match by Account OR IBAN, use `or_filters`
- If matched, set both account no. and IBAN in Bank Party Mapper
- Explain AutoMatchParty
- Add type hints to return values
- Use `set_value` to set values in BT after matching since its an after submit event
2023-04-05 15:28:47 +05:30
Lucky-Tsuma
9bf87d708e
fix: payment entry is already created on posawesome. ( #34712 )
2023-04-05 13:52:00 +05:30
Deepesh Garg
fd3fb64aa3
feat: Auto allocate advance payments only against orders ( #34727 )
...
feat: Auto allocate advance payments only againt orders
2023-04-05 12:02:44 +05:30
anandbaburajan
1101b7bfdf
fix: don't include cancelled JVs in assdeprledger report
...
(cherry picked from commit 3896d41e95a2054b4ec76c5f5b2819b3f28ef98e)
2023-04-05 06:04:43 +00:00
marination
aea4315435
chore: Make auto matching party configurable
...
- Checkbox in Accounts settings "Enable Automatic Party Matching"
- Check before invoking automatching methods
- misc: Remove TODO comments
2023-04-04 20:16:14 +05:30
marination
33604550ce
chore: Perform automatch on submit
...
- misc: Clearer naming
2023-04-04 19:42:25 +05:30
marination
27ce789023
feat: Manually Update/Correct Party in Bank Transaction
...
- On updating bank trans.n party after submit, the corresponding mapper doc will be updated too
- The mapper doc in turn will update all linked bank transactions that do not have this updated value
- Added Bank Party Mapper hidden link in Bank Transaction
- Rename field in BPM to `Party Name` as it does not hold description data
- If a BT matches with a BPM record, link that record in the BT
2023-04-04 19:27:01 +05:30
marination
37c1331aba
fix: Don't set description as key in Mapper doc if matched by description
...
- Description is volatile and will keep changing
- It will lead to multiple Bank Party Mapper docs for the same party that will never be referenced again
- Parts of the descripton keep changing which is why it will never match a mapper record
- If matched by desc, dont create mapper record.
2023-04-04 14:03:35 +05:30
marination
3a898289b0
chore: Single query with or filter to search Party Mapper by name/desc
2023-04-03 16:11:00 +05:30
ruthra kumar
1eefd517d1
Merge pull request #34694 from ruthra-kumar/recalculate_difference_on_allocation_change
...
fix(ui): recalculate difference amount on allocation change
2023-04-03 10:03:01 +05:30
Deepesh Garg
4c61ee30bb
fix: Multiple issues in purchase invoice submission ( #34600 )
...
* fix: Multiple issues in purchase invoice submission
* fix: Base grand total calculation
* chore: Calculate base grand total separately only in multi currency docs
* fix: Add gl entry for round off
2023-04-02 09:35:27 +05:30
Kitti U. @ Ecosoft
74b29eb5e2
fix: Bank clearance for case loan (disburstment/repayment) ( #34586 )
2023-04-01 18:50:30 +05:30
Deepesh Garg
1e3eb4deed
Merge pull request #34287 from frappe/early-payment-loss
...
fix: Allocate tax loss to tax account head on early payment discount
2023-04-01 18:49:02 +05:30
ruthra kumar
32a4ca6b6c
fix: recalculate difference amount on allocation change
2023-04-01 09:17:33 +05:30
marination
e7745033df
feat: Party auto-matcher from Bank Transaction data
...
- Created Bank Party Mapper
- Created class to auto match by account/iban or party name/description(fuzzy)
- Automatch and set in transaction or create mapper
- `rapidfuzz` introduced
2023-03-31 16:11:00 +05:30
marination
ad31e02616
feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder)
2023-04-04 11:45:37 +05:30
Deepesh Garg
576575c227
fix: Column value mismatch in COA blank template ( #34658 )
2023-03-31 11:10:50 +05:30
Deepesh Garg
7c42b72ee7
fix: Total debit and credit while importing via Data Import ( #34659 )
2023-03-30 17:28:19 +05:30
akiratfli
07c9b99072
fix: bad strings format for update-translations ( #34592 )
...
Co-authored-by: justin.li <justin.li@lungteh.com>
2023-03-28 17:20:54 +05:30
ruthra kumar
7c13533f30
Merge pull request #34608 from ruthra-kumar/reconciliation_debit_credit_mismatch
...
chore: removing redundant validation
2023-03-28 16:54:37 +05:30
Vishal Dhayagude
7aafc90d58
fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set ( #34525 )
...
* fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set
* fix: minor change added
2023-03-28 16:48:03 +05:30
Devin Slauenwhite
393bc25e2d
fix: don't get zero value entries for exchange rate calculation ( #34475 )
...
* fix: multiply None by float
* chore: remove debug
2023-03-28 16:34:24 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master ( #34597 )
...
fix: Party Name in SOA print when viewd from Customer/Supplier master
2023-03-28 15:36:16 +05:30
Marica
dae40dfbb4
Merge branch 'develop' into early-payment-loss
2023-03-28 15:01:28 +05:30
ruthra kumar
d52f7e2820
fix: removing redundant validation
2023-03-28 13:44:23 +05:30
