rohitwaghchaure
f6da6ece0a
Merge pull request #33524 from rohitwaghchaure/revamp-process-loss-feature
...
refactor: revamp process loss feature & added tab breaks
2023-01-04 18:37:32 +05:30
ruthra kumar
ee94127974
refactor: Sales Partner column in AR and AR Summary Report
2023-01-04 12:41:02 +05:30
Anand Baburajan
3ae47ab32c
Merge branch 'develop' into asset_depreciation_schedule
2023-01-04 01:34:08 +05:30
Rohit Waghchaure
524c0994e0
test: test cases for process loss
2023-01-03 22:47:52 +05:30
Deepesh Garg
c78399c618
fix: Missing opening entry in general ledger ( #33519 )
2023-01-03 21:35:03 +05:30
Deepesh Garg
1a83a67d41
fix: Get payment entry button not visible in Bank Clearance doc ( #33518 )
2023-01-03 21:34:49 +05:30
Rohit Waghchaure
ae039777f9
refactor: revamp process loss feature & added tab breaks
2023-01-03 19:05:41 +05:30
Sagar Sharma
d3b74a868e
Merge pull request #33514 from s-aga-r/fix/github-issue/33417
...
fix: set `supplier` details while mapping SE(Send to Subcontractor)
2023-01-03 18:57:07 +05:30
Sagar Sharma
9f59330fa9
Merge branch 'develop' into fix/github-issue/33417
2023-01-03 18:51:27 +05:30
Deepesh Garg
a3ab8f973a
fix: Deferred revenue date comparison ( #33515 )
2023-01-03 17:51:41 +05:30
s-aga-r
751bdc98ed
fix: set supplier details while mapping SE(Send to Subcontractor)
2023-01-03 17:17:23 +05:30
Deepesh Garg
9a3d947e89
fix: Exchange gain and loss booking on multi-currency invoice reconciliation ( #32900 )
...
* fix: Exchange gain and loss booking on multi-curreny invoice reconciliation
* test: Update test cases
* chore: Ignore SQL linting rule
* chore: Joural Entry for exchange gainand loss booking
* chore: Journal entry for exchange gain loss booking
* test: Update test case
* chore: Default exchange gain and loss account
2023-01-03 16:55:15 +05:30
Anand Baburajan
d9c91fa072
Merge branch 'develop' into asset_depreciation_schedule
2023-01-03 15:10:07 +05:30
anandbaburajan
312e51e8b2
chore: more refactoring and adding test for duplicate asset_depr_schedule
2023-01-03 15:09:04 +05:30
anandbaburajan
adb5249257
chore: fix patch
2023-01-03 13:03:12 +05:30
anandbaburajan
7b6b5ae581
chore: refactoring patch
2023-01-03 09:21:08 +05:30
anandbaburajan
e501c2db51
chore: just testing patch
2023-01-02 21:11:53 +05:30
anandbaburajan
357c17214d
chore: fix patch
2023-01-02 20:32:29 +05:30
rohitwaghchaure
6a4e25c1f9
Merge pull request #33504 from rohitwaghchaure/fixed-incorrect-picked-qty-in-so
...
fix: [concurrency issue] incorrect picked qty in sales order
2023-01-02 20:12:05 +05:30
Rohit Waghchaure
aba83849a6
fix: [concurrency issue] incorrect picked qty in sales order
2023-01-02 18:46:22 +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
ruthra kumar
23fbe86d51
refactor: Show Balance in COA based on Accounts Settings
2023-01-02 13:32:01 +05:30
ruthra kumar
1b78fae6fc
refactor: show balance checkbox in Accounts Settings
2023-01-02 13:31:56 +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
sonali
12822f7c36
fix: data format
2022-12-30 14:06:19 +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
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
s-aga-r
c716dcc01e
fix: consider child nodes while getting bin details
2022-12-29 14:01:42 +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
