anandbaburajan
357c17214d
chore: fix patch
2023-01-02 20:32:29 +05:30
Anand Baburajan
72c2e77a5d
Merge branch 'develop' into asset_depreciation_schedule
2023-01-02 17:07:58 +05:30
anandbaburajan
7c5168eeac
chore: allow manually submitting and cancelling asset depr schedule
2023-01-02 17:07:28 +05:30
ruthra kumar
914b23038c
refactor: Exchange rate revaluation to handle accounts with zero account balance ( #33165 )
...
* refactor: new type for JE - Exchange Gain or Loss
* refactor: skip few validations for Exchanage Gain Or Loss type Jour
* refactor: ERR create 2 journals for handling zero and non-zero compa
1. Additional check box accounts table to identify accounts with zero balance
2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal
* refactor: skips few validation for allowing 0 debit/credit
* fix: General Ledger presentaion currency
* test: fix test case in general ledger
* test: fix failing test case in AR report
2023-01-02 14:33:14 +05:30
Sagar Sharma
a7b011aed4
Merge pull request #33444 from s-aga-r/fix/github-issue/28766
...
fix: consider child nodes while getting bin details
2023-01-02 11:54:11 +05:30
s-aga-r
b425c2d7ec
Merge branch 'develop' into fix/github-issue/28766
2023-01-02 11:25:13 +05:30
Sagar Sharma
332f4dc028
Merge pull request #33495 from dj12djdjs/fix-get-bin-details
...
fix(stock): missing ordered_qty in get_bin_details
2023-01-02 11:14:25 +05:30
Sagar Sharma
e18b0ebe92
Merge branch 'develop' into fix-get-bin-details
2023-01-02 10:49:29 +05:30
Sagar Sharma
49025db33c
Merge branch 'develop' into fix/github-issue/28766
2023-01-02 10:27:42 +05:30
Marc de Lima Lucio
3c393bfdc5
fix: javascript: execution blocked by undefined route options ( #33405 )
...
Some implementations of DocField.get_route_options_for_new_doc() returned no value instead of an empty object in some cases, which caused a JavaScript error.
2023-01-02 09:18:25 +05:30
MOHAMMED NIYAS
d054f37602
feat: calculate hours ( #33464 )
...
* feat: calculate hours
* chore: Linting Issues
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-01-02 09:17:14 +05:30
Sabu Siyad
010718ffed
fix(ecommerce/cart): explicitly set frappe.boot ( #33431 )
...
related: https://github.com/frappe/frappe/pull/18323
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2023-01-02 08:58:01 +05:30
Devin Slauenwhite
98c39c4f5f
fix: update payment entry references ( #33274 )
...
* fix: set_amounts after deductions and losses are set
* test: difference_amount changes after update_references_in_payment_entry
* chore: linter
* fix: use kwargs instad of destructing a dict
[skip ci]
* fix(test): test payment entry difference_amount after payment reconciliation.
2023-01-02 08:55:12 +05:30
Sagar Sharma
7126d71627
Merge branch 'develop' into fix/github-issue/28766
2023-01-01 22:24:47 +05:30
Devin Slauenwhite
239a5f8bf4
test: get_item_details contains bin details
2022-12-31 15:41:07 -05:00
Devin Slauenwhite
8d62cdfd5f
fix: add missing 'ordered_qty' to get_bin_details
2022-12-31 14:14:25 -05:00
Deepesh Garg
bb4725e9b5
Merge pull request #33488 from deepeshgarg007/multi_currency_bank_reco
...
fix: Multi-currency issues in Bank Reconciliation Tool
2022-12-31 13:05:25 +05:30
Deepesh Garg
ad53ecf2b4
fix: Multi-currency issues in Bank Recociliation Tool
2022-12-30 13:37:41 +05:30
Gughan Ravikumar
48a9cd5ef3
fix: allow arbitary items in Quotation ans Sales Order ( #33430 )
...
fix: allow arbitary items in Quotation ans Sales Order
2022-12-30 13:16:40 +05:30
rohitwaghchaure
6e1ef4f3d0
Merge pull request #33487 from frappe/revert-33387-audit-to-fix-incorrect-valuation-entry
...
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation"
2022-12-30 12:58:36 +05:30
rohitwaghchaure
728dc1acf4
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation"
2022-12-30 11:08:31 +05:30
Sagar Sharma
d072169340
Merge branch 'develop' into fix/github-issue/28766
2022-12-29 16:38:53 +05:30
s-aga-r
c3911a592a
chore: use frappe.qb instead of frappe.db.get_value
2022-12-29 16:38:08 +05:30
s-aga-r
c716dcc01e
fix: consider child nodes while getting bin details
2022-12-29 14:01:42 +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
