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
Devin Slauenwhite
123920d0bc
feat: add after_refresh hook to item dashboard ( #33372 )
...
* fix: return promise
* fix: use after_refresh hook instead of promise
# Because there is already a before_refresh hook. I think it makes sense to do the same for after.
2022-12-29 10:31:26 +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
Sagar Sharma
882f92e732
Merge pull request #33465 from s-aga-r/fix/po-fg_item_qty
...
fix: `fg_item_qty` in non-subcontracted PO
2022-12-28 15:27:18 +05:30
s-aga-r
6f5824cb21
fix: fg_item_qty in non-subcontracted PO
2022-12-28 14:54:24 +05:30
Sabu Siyad
8e271fd719
feat(exotel): make use of CustomField in API ( #33338 )
...
* feat(exotel): pass kwargs for `make_a_call`
https://developer.exotel.com/api/make-a-call-api#call-agent
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
* feat(exotel): map custom field to doctype
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-12-28 08:11:28 +05:30
Deepesh Garg
0b75aa5390
fix: Default dimensions on fetching items from BOM ( #33439 )
2022-12-27 17:53:43 +05:30
Deepesh Garg
d2686ce75b
fix: Multiple rows for same warehouse and batches in pick list ( #33456 )
2022-12-27 17:42:03 +05:30
anandbaburajan
21a09e7431
chore: fix patch
2022-12-27 15:01:42 +05:30
anandbaburajan
97f8588202
chore: fix patch name
2022-12-27 15:01:42 +05:30
anandbaburajan
c916fb0513
chore: fix module name in patch
2022-12-27 15:01:42 +05:30
anandbaburajan
57adcc0b03
chore: move patch to pre_model_sync
2022-12-27 15:01:42 +05:30
Anand Baburajan
4ff70db668
Merge branch 'develop' into asset_depreciation_schedule
2022-12-27 14:59:53 +05:30
Deepesh Garg
8263bf9a9a
fix: Random behaviour while picking items using picklist ( #33449 )
2022-12-27 14:59:35 +05:30
anandbaburajan
482116db9f
chore: improve tests
2022-12-27 10:03:32 +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
Sagar Sharma
4e2291f52d
Merge pull request #33437 from s-aga-r/fix/purchase-order/shipping_address
...
fix: `shipping_address` in PO for non-drop ship item
2022-12-26 21:20:40 +05:30
Sagar Sharma
88edc412e3
Merge branch 'develop' into fix/purchase-order/shipping_address
2022-12-26 12:00:39 +05:30
s-aga-r
67a7ccf3ce
fix: shipping_address for non-drop shipping item
2022-12-26 11:57:50 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry ( #33411 )
2022-12-26 10:17:55 +05:30
Solufyin
7d9f3f23dd
fix: Customer Primary Contact ( #33424 )
...
Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>
2022-12-26 10:15:10 +05:30
Sagar Sharma
9858d9d968
Merge pull request #33434 from s-aga-r/fix/github-issue/32258
...
fix(ux): `shipping_address` in PO
2022-12-25 19:40:09 +05:30
Sagar Sharma
32f3b64a89
Merge branch 'develop' into fix/github-issue/32258
2022-12-25 18:12:08 +05:30
s-aga-r
7e1b6b3c2a
fix: shipping_address in PO
2022-12-25 18:11:05 +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
a31e9d3afe
Merge pull request #33402 from ruthra-kumar/hidden_party_detail_fields_for_better_handling_of_permission
...
refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission
2022-12-25 16:25:13 +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
89229d9b58
refactor: additional doctype access for 'Accounts User' role
2022-12-24 11:20:16 +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
rohitwaghchaure
40769998c6
Merge pull request #33422 from rohitwaghchaure/fix-stock-entry-submit-performance
...
fix: timeout error while submitting stock entry
2022-12-23 13:57:25 +05:30
Rohit Waghchaure
a05c47e499
fix: timeout error while submitting stock entry
...
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-12-23 13:27:32 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule
2022-12-23 11:02:17 +05:30
anandbaburajan
3e91a56c19
chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed
2022-12-23 11:01:18 +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
sonali
6b5276398e
fix: linters
2022-12-21 13:32:16 +05:30
sonali
645869e6ff
feat: added arguments of posting date and reference date
2022-12-21 12:58:30 +05:30
Deepesh Garg
76be35aaea
Merge pull request #33406 from deepeshgarg007/cs_cf_report_fix
...
fix: Consolidated financial report
2022-12-20 18:22:58 +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
925387550e
Merge pull request #33350 from deepeshgarg007/payment_request_flow
...
fix: Payment Request flow fixes from Order to Payment Entry
2022-12-20 13:45:15 +05:30
