sonali
d65243eb65
feat: consolidated auto bank reconciliation
...
Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.
2022-12-29 16:12:25 +05:30
sonali
c764f14f53
fix: pre-commit
2022-12-29 13:58:06 +05:30
sonali
35c29e0226
fix: pre-commit
2022-12-29 13:45:15 +05:30
sonali
f1810803e1
fix: passing from_date and to_date filters in test cases
...
passing from_date and to_date filters in test_linked_payments and test_debit_credit_output for unit testing
2022-12-29 13:07:06 +05:30
sonali
e2614b8a21
fix: pre-commit
2022-12-29 12:21:45 +05:30
sonali
3aaa2f5326
fix: filtered as per reference date
...
On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick.
Also sorted the bank transactions and bank entries as per ascending order date wise.
2022-12-29 12:05:22 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) ( #32714 )
...
* fix: Set default uom conversion factor to 1 for invoices
* chore: set default conversion_factor as 1
* chore: remove print statements
2022-12-29 10:41:36 +05:30
ruthra kumar
e3a0ce5d63
fix: use base_net_amount in case of missing stock qty ( #33457 )
2022-12-29 09:34:51 +05:30
Dany Robert
cabaed9ed2
fix(pricing rule): consider child tables in condition ( #33469 )
2022-12-28 18:05:55 +05:30
Anand Baburajan
6f4e6fafa9
Merge branch 'develop' into asset_depreciation_schedule
2022-12-27 07:36:32 +05:30
anandbaburajan
6d791cabd1
chore: more refactoring
2022-12-26 22:13:11 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry ( #33411 )
2022-12-26 10:17:55 +05:30
anandbaburajan
03662be150
chore: have different functions for draft. active and cancelled depr schedules
2022-12-25 18:05:19 +05:30
ruthra kumar
a0484793c3
refactor: remove unrelated filters from Supplier Ledger Summary
...
Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger
2022-12-24 11:20:39 +05:30
ruthra kumar
bfa511cb65
refactor: hidden columns to help framework handle user permissions
...
'territory', 'supplier_group', 'customer_group' have been added as
hidden columns to handle 'user permission' based access control.
2022-12-24 10:30:30 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule
2022-12-23 11:02:17 +05:30
ruthra kumar
8f5d8e0474
Merge pull request #33418 from ruthra-kumar/filter_issue_in_ar_ap_report
...
fix: payment terms and sales partner filter issue in Accounts Receivable report
2022-12-22 11:38:38 +05:30
ruthra kumar
13c4420f42
fix: payment terms and sales partner filter issue in AR/AP report
2022-12-22 10:55:22 +05:30
ruthra kumar
a26698b88e
Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item
...
fix: TypeError on GP Report due to multiple warehouse on bundled items
2022-12-21 18:26:40 +05:30
ruthra kumar
5918bb03f7
test: type error on bundled products with different warehouses
2022-12-21 17:47:57 +05:30
ruthra kumar
e684eb32d0
fix: typerror on multi warehouse in Packed Items
...
DN(with bundled item with varying warehouses)-> Sales Invoice.
2022-12-21 15:09:55 +05:30
sonali
81e5f71172
fix: json issue
2022-12-21 14:02:54 +05:30
Deepesh Garg
ade83cbab3
fix: Consolidated financial report
2022-12-20 16:45:46 +05:30
Deepesh Garg
1da14b7ec3
Merge pull request #33393 from deepeshgarg007/cc_filter_cashflow_report
...
fix: Cost center filter not working in cash flow report
2022-12-20 13:46:18 +05:30
Deepesh Garg
31c95deb88
chore: More fixes
2022-12-20 11:45:51 +05:30
Deepesh Garg
ff48634cbb
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow
2022-12-20 11:42:15 +05:30
Deepesh Garg
e25b98b620
chore: Update test case
2022-12-20 11:42:05 +05:30
Deepesh Garg
068df9f815
chore: remove print statement
2022-12-20 10:00:53 +05:30
Deepesh Garg
d0dbfec052
fix: Cost center filter not working in cash flow report
2022-12-20 09:59:27 +05:30
ruthra kumar
65db9cea25
Merge pull request #33380 from ruthra-kumar/err_for_invoices_should_reflect_in_ar_ap_report
...
fix: ERR journals should reported in AR/AP
2022-12-18 16:56:19 +05:30
ruthra kumar
2ed86760d7
test: err for party should be in AR/AP report
2022-12-18 12:40:07 +05:30
ruthra kumar
b09eade3e4
fix: ERR journals reported in AR/AP
...
Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report
2022-12-18 06:38:23 +05:30
Deepesh Garg
6238fd9d9e
Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center
...
fix: Cost Center for tax withholding invoices
2022-12-17 19:24:34 +05:30
sonali
05b6fce03d
feat:filters on bank reconciliation
...
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
2022-12-17 17:15:28 +05:30
Deepesh Garg
2a4eec245a
Merge pull request #33371 from deepeshgarg007/coa_import_srbnb
...
fix: Unable to import COA through importer
2022-12-17 16:42:37 +05:30
Deepesh Garg
3b66920342
fix: Unable to import COA through importer
2022-12-16 19:22:29 +05:30
Deepesh Garg
6bb22c703a
Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision
...
fix: use highest precision for exchange rate.
2022-12-16 15:43:36 +05:30
Deepesh Garg
b76129c1dd
Merge pull request #33286 from artykbasar/develop
...
Subscription Cost center value is fixed to Default value(Bug fix)
2022-12-16 14:44:51 +05:30
sonali
408c89df03
Feat:Filter on Payment Entries and Journal Entries
...
Applying filters on Payement entries and Journal Entries as per reference date and posting date
2022-12-15 18:09:57 +05:30
ruthra kumar
d126c8030f
Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool
...
fix: paid invoices shows up as outstanding when 'cost_center' filter is applied
2022-12-15 15:02:18 +05:30
Anand Baburajan
246d3b4075
Merge branch 'develop' into asset_depreciation_schedule
2022-12-15 14:51:16 +05:30
ruthra kumar
a998a8a2da
test: cost center should not affect outstanding calculation
2022-12-15 14:28:33 +05:30
Deepesh Garg
dc178984ae
fix: Payment Request flow fixes from Order to Payment Entry
2022-12-15 14:15:20 +05:30
Deepesh Garg
3a8a467edb
Merge pull request #33329 from Gokulnath17/Gokulnath_dev
...
fix: in gross profit report
2022-12-15 12:01:39 +05:30
Deepesh Garg
076527bb88
Merge pull request #33305 from barredterra/incoterm-named-place
...
feat: incoterm named place
2022-12-15 11:59:54 +05:30
Gokulnath
f73976946e
Merge branch 'develop' into Gokulnath_dev
2022-12-15 10:22:49 +05:30
Deepesh Garg
b7e9942681
Merge pull request #33309 from barredterra/refactor-validate_payment_against_negative_invoice
...
refactor: translatable strings and guard clause
2022-12-15 09:21:16 +05:30
Deepesh Garg
26277cfcf3
chore: resolve errors in test
2022-12-14 21:22:48 +05:30
Deepesh Garg
973ef33eb5
fix: Cost Center for tax withholding invoices
2022-12-14 20:41:00 +05:30
ruthra kumar
8eb93004f7
fix: cost_center filter fix for 'Get Outstanding Invoice' in PE
2022-12-14 16:16:22 +05:30
ruthra kumar
6d9d730759
fix: cost_center filter gives incorrect output
...
filtering on cost center gives invoices that are reconciled as having outstanding
2022-12-14 16:05:15 +05:30
Gokulnath17
41fc3be339
fixes in gross profit report
2022-12-14 10:46:11 +05:30
Anand Baburajan
8534390627
Merge branch 'develop' into asset_depreciation_schedule
2022-12-13 20:49:06 +05:30
anandbaburajan
22ef342ac7
chore: fixing all tests
2022-12-13 20:48:34 +05:30
anandbaburajan
df134c7c5b
chore: fixing some tests
2022-12-13 16:26:33 +05:30
ruthra kumar
3db446e35a
Merge pull request #33313 from nabinhait/tax_detail_report_perm_issue
...
fix: Permission issue in Tax Detail report
2022-12-13 14:27:08 +05:30
Nabin Hait
aa787e4030
fix: Permission issue in Tax Detail report
2022-12-13 13:16:24 +05:30
ruthra kumar
2175784142
Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet
...
fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch
2022-12-13 09:04:13 +05:30
barredterra
f20370c5ef
refactor: translatable strings and guard clause
2022-12-13 02:36:12 +01:00
barredterra
e057e1dfe7
feat: incoterm named place
2022-12-12 18:49:47 +01:00
ruthra kumar
7b3316dc31
fix: incorrect balance on parent company due to key mismatch
2022-12-12 20:15:59 +05:30
anandbaburajan
b997d1eb87
chore: add some validation, shorten some function names
2022-12-12 17:25:38 +05:30
Anand Baburajan
f8cd424559
Merge branch 'develop' into asset_depreciation_schedule
2022-12-12 16:36:59 +05:30
anandbaburajan
ec6505d747
chore: fix some bugs, refactor some functions, add proper notes
2022-12-12 16:35:30 +05:30
Ankush Menat
915e0347b0
chore!: remove activity log feeds ( #33294 )
...
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
log to the point where activity page doesn't even load.
2022-12-12 15:14:30 +05:30
Ankush Menat
593626f502
perf: add indexes on payment entry reference ( #33288 )
...
Adds index on:
1. reference doctype
2. reference name
*Why not composite index?*
There are three type of queries on this doctype
- filtering ref_doctype - doctype index helps here
- filtering ref_name - name index helps here
- filtering both - name index helps here too. Since it has sufficiently
high cardinality. Composite index wont help in case where ref_doctype
isn't specfied.
[skip ci]
2022-12-12 12:58:11 +05:30
artykbasar
d512919f5c
Subscription Cost center value is fixed to Default value(Bug fix)
...
self.cost_center
field value keeps changing to
erpnext.get_default_cost_center(self.get("company"))
after validation of this doctype. This overrides the user input.
simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.
2022-12-11 08:51:34 +00:00
anandbaburajan
90e1b9cb3d
chore: fix asset depr schedule notes
2022-12-09 16:18:40 +05:30
anandbaburajan
16365bfca3
chore: more refactoring
2022-12-09 14:04:00 +05:30
Devin Slauenwhite
2010b1b6e8
fix: use highest precision for exchange rate.
2022-12-08 16:26:07 -05:00
anandbaburajan
1fd73af744
chore: refactor some reports
2022-12-09 00:28:34 +05:30
Deepesh Garg
6db52930d8
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-08 18:05:05 +05:30
Deepesh Garg
6192af5cf0
chore: Update tests
2022-12-08 18:04:40 +05:30
sonali
8e7c8a6482
Update bank_reconciliation_tool.json
...
Adding fields in bank reconciliation tool
2022-12-08 17:23:08 +05:30
Ankush Menat
0b86b1baca
refactor: make payments app a soft dependency ( #33245 )
...
refactor: make payment app a soft dependency
2022-12-08 16:40:13 +05:30
sonali
447272aa4d
Filters on Bank Reconciliation
...
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 16:11:53 +05:30
sonali
e5a1189bec
Update bank_reconciliation_tool.py
...
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order.
Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
2022-12-08 13:29:28 +05:30
anandbaburajan
18fc2b5695
chore: fix bug in unlink_asset_reference
2022-12-06 23:34:56 +05:30
Deepesh Garg
c1a82dc9e5
Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report
...
fix: key error while filtering on date range and reporting on foreign currency
2022-12-06 15:42:53 +05:30
ruthra kumar
a6794c3606
fix: key error on p/l and balance sheet reports on foreign currency
2022-12-06 13:48:46 +05:30
ruthra kumar
19db7e2989
fix: replace sql code with fields list in get_cached_value
2022-12-06 13:48:46 +05:30
Deepesh Garg
3aa6f97420
Merge pull request #33216 from barredterra/validate-accounts-dates
...
refactor: validate dates in accounts module
2022-12-06 12:33:01 +05:30
Deepesh Garg
921f8edde8
Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate
...
fix: Allow item rate updates for non-stock invoices
2022-12-06 09:12:24 +05:30
Raffael Meyer
8301d3b13f
Merge branch 'develop' into key_error_in_profit_loss_report
2022-12-06 02:08:47 +01:00
barredterra
a26a29f33b
fix: incorrect dates in test records
2022-12-05 19:49:05 +01:00
Raffael Meyer
e526a0e282
Merge branch 'develop' into validate-accounts-dates
2022-12-05 19:37:54 +01:00
ruthra kumar
3814db02eb
fix: data import mandatory account_head, charge_type
2022-12-05 16:24:05 +05:30
Deepesh Garg
5f821b93a5
chore: Add POS Invoices
2022-12-05 15:43:03 +05:30
Deepesh Garg
ef9d126254
fix: Allow item rate udpates for non-stock invoices
2022-12-05 10:17:19 +05:30
barredterra
eb66b749b2
refactor: validate dates in accounts module
2022-12-04 14:41:21 +01:00
Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
Deepesh Garg
f54838ab56
fix: Buying and selling check in pricing rule
2022-12-01 21:23:17 +05:30
anandbaburajan
f20238fa3e
chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data
2022-12-01 15:15:32 +05:30
ruthra kumar
9b8d6fe411
fix: key error while filtering on date range and different currency
2022-12-01 13:38:41 +05:30
Deepesh Garg
3eb1ed19a1
fix: Tax withholding net total for PI in reports
2022-11-29 13:10:31 +05:30
Deepesh Garg
8253f4379f
Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection
...
fix(pos): warehouse selection
2022-11-29 10:15:31 +05:30
Deepesh Garg
bdb15c3331
Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter
...
fix(pos): filter on customer groups
2022-11-29 09:55:56 +05:30
Deepesh Garg
8112493c3c
Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix
...
fix(ux): Action buttons in Bank Reconciliation
2022-11-29 09:23:21 +05:30
Deepesh Garg
6ebe8ad60d
fix(ux): Action buttons in Bank Reconciliation
2022-11-28 17:37:41 +05:30
Deepesh Garg
f6126069ee
Merge pull request #33129 from deepeshgarg007/accounts_settings_fix
...
chore: Supplier invoice no field description
2022-11-28 13:05:12 +05:30
Deepesh Garg
4f2ece34df
chore: Supplier invoice no field description
2022-11-27 21:50:26 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
anandbaburajan
7d09440579
chore: more refactoring
2022-11-25 16:49:44 +05:30
Sabu Siyad
cc63415887
fix(pos): filter on customer groups
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-25 15:10:01 +05:30
anandbaburajan
4e63ba3ac6
chore: refactor schedules in journal_entry
2022-11-24 17:39:11 +05:30
Sabu Siyad
4ad0e2ed7e
feat(pos): invoice: fitler warehouse by company
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-24 16:11:26 +05:30
Sabu Siyad
95a620a30d
fix(pos): warehouse should be in company
...
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-24 15:40:05 +05:30
Deepesh Garg
3724f2287c
Merge pull request #33092 from deepeshgarg007/debit_credit_issue
...
fix: Debit and Credit not equal while submitting PI containing asset item
2022-11-24 14:42:56 +05:30
Deepesh Garg
dc8d635120
fix: Debit and Credit not equal while submitting PI containing asset item
2022-11-23 20:29:12 +05:30
Deepesh Garg
7a7b8c2284
Merge pull request #32836 from resilient-tech/perf-fix-get-cached-value-for-accounts
...
perf: use `get_cached_value` instead of `db.get_value` in accounts module
2022-11-23 18:20:48 +05:30
Deepesh Garg
a3c81da890
Merge pull request #33062 from nabinhait/pcv-rounding-issue
...
fix: create rounding gl entry for PCV during gle post processing
2022-11-23 10:36:04 +05:30
Deepesh Garg
06c9c679e6
Merge pull request #33063 from niralisatapara/tds_purchase_order
...
feat: item wise tds in purchase order
2022-11-23 09:52:00 +05:30
Deepesh Garg
34e775136d
Merge pull request #33069 from deepeshgarg007/jv_filter
...
fix: Remove unnecessary filters from Journal Entry
2022-11-22 20:15:12 +05:30
Deepesh Garg
eb74362263
Merge pull request #33068 from deepeshgarg007/payment_button_visibility
...
fix: Don't show payment button for invoices on hold
2022-11-22 20:14:41 +05:30
niralisatapara
46e8cdf31a
feat: item wise tds calculation for purchase order.
2022-11-22 14:15:36 +05:30
Deepesh Garg
e96be712b8
chore: Rearrange supplier invoice section in Purchase Invoice
2022-11-22 12:50:00 +05:30
Deepesh Garg
cd88a53533
fix: Remove unnecessary filters from Journal Entry
2022-11-21 22:21:03 +05:30
Deepesh Garg
1b9e83251f
fix: Don't show payment button for invoices on hold
2022-11-21 21:50:55 +05:30
Nabin Hait
022d8d5d79
fix: create rounding gl entry for PCV during gle post processing
2022-11-21 15:16:53 +05:30
Deepesh Garg
15e74c5d7b
fix: Viewing account ledger from party master
2022-11-20 20:30:24 +05:30
Deepesh Garg
26dcde2931
Merge pull request #32999 from ruthra-kumar/exchange_rate_reval_company_currency
...
fix: incorrect currency in Exchange rate revaluation
2022-11-19 18:30:03 +05:30
Deepesh Garg
f96c66bbc0
Merge pull request #33032 from deepeshgarg007/dimension_report_filtering
...
fix: Accounting Dimension filtering for Sales and Purchase Report
2022-11-19 18:19:37 +05:30
gavin
dd2493a541
fix(realtime): Restrict updates to only last modified or current user ( #33034 )
2022-11-18 17:17:54 +05:30
ruthra kumar
5caaccc94b
fix: always send account currency in response
2022-11-18 17:10:39 +05:30
ruthra kumar
68b04e2577
fix: incorrect currency in Exchange rate revaluation
2022-11-18 17:10:39 +05:30
Deepesh Garg
df096688f7
Merge pull request #33014 from deepeshgarg007/multi_invoice_payment
...
fix: Bulk payment generation against invoices
2022-11-18 15:10:35 +05:30
Deepesh Garg
8b394afaa9
fix: Accounting Dimension filtering for Sales and Purchase Report
2022-11-18 15:07:12 +05:30
barredterra
77105306f2
feat: add incoterm to purchasing transactions
2022-11-17 22:18:26 +01:00
barredterra
029f22c549
feat: add incoterm to sales transactions
2022-11-17 22:17:59 +01:00
Sagar Vora
48413b0778
fix: reduce function call
2022-11-18 02:22:43 +05:30
Sagar Vora
66ac65482d
fix: add missing comma
2022-11-18 02:16:56 +05:30
Sagar Vora
8ae58ed427
fix: use doc_before_save and other changes
2022-11-18 02:13:16 +05:30
Daizy Modi
fdfe5cbf93
fix: use get_cached_value to avoid db call with db.exists
2022-11-17 19:14:10 +05:30
Daizy Modi
678a4c33da
fix: resolved merge conflicts
2022-11-17 19:13:10 +05:30
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer
2022-11-17 16:42:18 +05:30
Deepesh Garg
2dfe849c7d
fix: Bulk payment generation against invoices
2022-11-17 15:53:56 +05:30
Deepesh Garg
3a523b56bf
Merge pull request #32983 from deepeshgarg007/journal_entry_template_fix
...
fix: Opening journal entry templates
2022-11-16 20:41:07 +05:30
Vishal
71412f6877
fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt
2022-11-16 13:53:21 +05:30
Nabin Hait
b89b07d0ff
fix: Validate for deferred revenue only if sales invoice needs repost
2022-11-16 12:16:23 +05:30
Deepesh Garg
33b61aef5a
fix: Opening journal entry templates
2022-11-16 11:57:17 +05:30
Gavin D'souza
35088bb4c4
chore(payment_entry): Remove dead validations
...
(cherry picked from commit e1ecc9a81973d20084f5a053d8d0155354079b2e)
2022-11-15 08:34:08 +00:00
Deepesh Garg
a0d9e1bd57
Merge pull request #32962 from deepeshgarg007/return_write_off
...
fix: Write Off section visibility for non POS Invoices
2022-11-15 13:01:06 +05:30
Deepesh Garg
9f5d613c78
fix: Write Off section visibility for non POS Invoices
2022-11-15 09:45:39 +05:30
Deepesh Garg
a1a992b0dd
Merge pull request #32956 from deepeshgarg007/acc_dimension_filter_label
...
fix: Label for applicable dimension table
2022-11-15 09:24:30 +05:30
Deepesh Garg
8c13f70fc5
fix: Label for applicable dimension table
2022-11-14 20:39:40 +05:30
Sagar Vora
b06345af46
fix: check type for reference name
2022-11-13 19:58:49 +05:30
Deepesh Garg
a2260a3dc2
Merge branch 'develop' into bg_query
2022-11-13 19:47:43 +05:30
Deepesh Garg
6b93b3f12a
Merge pull request #32866 from ruthra-kumar/gross_profit_fix_buying_amount
...
fix: incorrect buying amount on Gross Profit
2022-11-13 19:15:03 +05:30
Deepesh Garg
4b9921782b
chore: Remove qb doc reference
2022-11-13 18:48:32 +05:30
Deepesh Garg
42a59d5c17
chore: Remove raw SQL query
2022-11-12 17:32:04 +05:30
