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
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
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
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
Rohit Waghchaure
f9f662679f
test: added test case
2023-06-15 18:09:56 +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
Gursheen Anand
033e4e84f5
fix: modify voucher details for liability entries
2023-06-14 14:20:42 +05:30
Gursheen Anand
ba4ab06ae3
fix: changed account types in controller method
2023-06-14 12:39:16 +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
