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 |
|