Rohit Waghchaure
2c83fff1a1
fix: don't add template item in sales/purchase transaction
2023-01-18 23:29:06 +05:30
mergify[bot]
cc569c955f
fix: the frappe throw message is corrected in the group task validation ( #33698 )
...
fix: the frappe throw message is corrected in the group task validation (#33698 )
2023-01-18 21:47:22 +05:30
Sagar Sharma
f89600aee8
Merge branch 'develop' into refactor/qb/pick-list
2023-01-18 17:52:23 +05:30
Rohit Waghchaure
1de4742ffb
fix: local variable 'stock_rbnb' referenced before assignment
2023-01-18 15:29:39 +05:30
Sagar Sharma
eee3bd2554
Merge branch 'develop' into refactor/qb/pick-list
2023-01-18 13:01:59 +05:30
Deepesh Garg
6b31c27ed6
fix: Missing constructor args in Bank Reco Tool ( #33705 )
2023-01-17 21:03:39 +05:30
Vishal Dhayagude
c4e1f81ccb
Merge branch 'develop' into fg_based_operating_cost
2023-01-17 19:20:37 +05:30
Anand Baburajan
c6cfacc108
Merge branch 'develop' into misc_asset_fixes
2023-01-17 15:09:37 +05:30
Deepesh Garg
db9beb3cdd
fix: Rate from LDC in TDS reports ( #33699 )
2023-01-17 14:53:24 +05:30
Vishal Dhayagude
f19212b5c8
Merge branch 'develop' into fg_based_operating_cost
2023-01-17 13:02:25 +05:30
Anand Baburajan
d97127bff2
Merge branch 'develop' into misc_asset_fixes
2023-01-17 12:57:22 +05:30
Sagar Sharma
eeed3356ac
Merge branch 'develop' into refactor/qb/pick-list
2023-01-17 12:25:16 +05:30
rohitwaghchaure
e68c4e2aa8
Merge pull request #33695 from rohitwaghchaure/fixed-patch-item_reposting_for_incorrect_sl_and_gl
...
fix: patch item_reposting_for_incorrect_sl_and_gl
2023-01-17 12:18:34 +05:30
Rohit Waghchaure
dbde3a3421
fix: patch item_reposting_for_incorrect_sl_and_gl
2023-01-17 11:47:53 +05:30
Anand Baburajan
c4d3a8a600
Merge branch 'develop' into misc_asset_fixes
2023-01-17 11:21:37 +05:30
Sagar Sharma
1cadef97bf
Merge branch 'develop' into refactor/qb/pick-list
2023-01-17 10:08:36 +05:30
Sagar Sharma
fb950417bf
Merge branch 'develop' into dev_fix_bug_from_78b438f6
2023-01-17 10:04:36 +05:30
Deepesh Garg
0639d9e32a
chore: Typo in payment reconciliation ( #33686 )
2023-01-17 08:06:30 +05:30
Florian HENRY
e19161a8ee
fix: Sales ORder Connections on Material Request
2023-01-16 21:03:18 +01:00
anandbaburajan
86cf5c89ab
chore: add depr_entry_posting_status in create_asset
2023-01-17 00:31:21 +05:30
anandbaburajan
cebb5a42f4
chore: add missing /n in options
2023-01-17 00:26:50 +05:30
Anand Baburajan
011a4c3faa
Merge branch 'develop' into misc_asset_fixes
2023-01-17 00:00:09 +05:30
rohitwaghchaure
66ae807a26
Merge pull request #33684 from rohitwaghchaure/fixed-work-order-summary
...
feat: [minor] date type based on filter in Work Order Summary report
2023-01-16 23:57:43 +05:30
rohitwaghchaure
d6915df81d
Merge pull request #33680 from rohitwaghchaure/refactor-picked-qty
...
refactor: picked qty in sales order item
2023-01-16 23:31:56 +05:30
Rohit Waghchaure
20c8873208
feat: provision to select date type based on filter
2023-01-16 23:29:13 +05:30
anandbaburajan
a144bb01fe
chore: stying
2023-01-16 23:26:39 +05:30
Anand Baburajan
070bc8badd
Merge branch 'develop' into misc_asset_fixes
2023-01-16 23:23:12 +05:30
anandbaburajan
cf7b43f7f0
fix: handle_post_depr_entries_fail, show error alert and send email
2023-01-16 23:10:02 +05:30
Rohit Waghchaure
1bcff80074
refactor: picked qty in sales order item
2023-01-16 22:50:16 +05:30
Devin Slauenwhite
179a31ed5e
feat: disable currency exchange api. ( #33593 )
2023-01-16 21:00:10 +05:30
anandbaburajan
61cd0f98fd
fix: asset repair link and improve notes
2023-01-16 18:35:40 +05:30
Vishal Dhayagude
352dcddd6d
Merge branch 'develop' into fg_based_operating_cost
2023-01-16 17:02:31 +05:30
Sagar Sharma
1769b45d4b
Merge branch 'develop' into refactor/qb/pick-list
2023-01-16 16:04:20 +05:30
s-aga-r
0ed6552655
refactor: rewrite pick_list.py queries in QB
2023-01-16 16:01:40 +05:30
Deepesh Garg
adaeba1554
fix(minor): Label updates in Statement of Accounts ( #33639 )
...
fix(minor): Label updates in Satement of Accounts
2023-01-16 14:03:54 +05:30
Deepesh Garg
312625fdc5
fix: Patch to update reference_due_date in Journal Entry ( #33616 )
2023-01-16 13:43:54 +05:30
ruthra kumar
9627b46ee7
Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation
...
perf: improve reconciliation performance for JE with 100s of accounts
2023-01-16 09:41:17 +05:30
ruthra kumar
56aa1866da
Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool
...
fix: attribute error while submitting Repost PLE
2023-01-16 09:36:22 +05:30
Raffael Meyer
dceef0397a
fix: allow to create sales order from expired quotation ( #33582 )
2023-01-16 08:53:37 +05:30
ruthra kumar
be382054e5
revert: Reverting changes done on 33495 ( #33662 )
...
'ordered_qty' will not be fetched from `tabBin`
2023-01-16 08:50:39 +05:30
ruthra kumar
333907b7a5
Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" ( #33646 )
2023-01-16 08:49:35 +05:30
Poruri Sai Rahul
8119442c94
FIX: Remove usage of "six.string_types" ( #33603 )
...
FIX: Remove usage of six.string_types
six is no longer a dependency
2023-01-16 08:47:28 +05:30
s-aga-r
b3759890d7
chore: Sales Order link in Pick List
2023-01-15 21:09:16 +05:30
ruthra kumar
2c50f43cdd
fix: attribute error while submitting Repost PLE
2023-01-15 20:51:54 +05:30
ruthra kumar
828eaf0930
fix: minor filter issue while reconciliation tool from bench console
2023-01-15 18:09:51 +05:30
ruthra kumar
11cf694d9a
perf: improve reconciliation speed on JE's with 1000's of rows
...
1. No need to keep old PLE's on reconciliation.
2. Added Validation to catch debit-credit mismatch on JE's
3. Only update outstanding amount for newly reconciled invoices
2023-01-15 17:51:46 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus ( #33594 )
2023-01-15 17:34:16 +05:30
Deepesh Garg
906ad10d16
fix: Return against internal purchase invoice ( #33635 )
2023-01-15 17:32:57 +05:30
Sagar Sharma
bfbc9ea8f7
Merge branch 'develop' into item-attr-abbr-lowercase
2023-01-15 12:55:01 +05:30
s-aga-r
f70d757b82
fix: zero rm-cost in SCR
2023-01-14 22:24:18 +05:30
Vishal Dhayagude
736afdf85a
Merge branch 'develop' into fg_based_operating_cost
2023-01-13 10:03:50 +05:30
Sagar Sharma
c2b3843d80
Merge branch 'develop' into item-attr-abbr-lowercase
2023-01-13 00:49:21 +05:30
Ritwik Puri
e22d56484d
chore: reuse doc object in test_pick_list_grouping_before_print ( #33636 )
2023-01-13 00:47:26 +05:30
Vishal Dhayagude
d63258ee9b
Merge branch 'develop' into fg_based_operating_cost
2023-01-12 21:50:09 +05:30
unknown
2ca4d3fb71
fix: linting
2023-01-12 20:53:12 +05:30
Anand Baburajan
29088e1777
Merge branch 'develop' into fixed_asset_report_asset_value
2023-01-12 20:30:39 +05:30
Deepesh Garg
afb33f2049
Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation
...
feat: Date filters on bank reconciliation tool
2023-01-12 18:25:05 +05:30
Deepesh Garg
232726288a
chore: fix fieldnames and order
2023-01-12 17:44:07 +05:30
Ritwik Puri
cfb0bb1eaa
fix: only group similar items in print format if group_same_items is checked in pick list ( #33627 )
...
* fix: only group similar items if group same items is checked in pick list
* test: non grouping of locations if group_same_items is false
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2023-01-12 17:25:50 +05:30
ruthra kumar
e0db2670f9
Merge pull request #33622 from ruthra-kumar/fix_change_after_submission_on_error
...
fix: Updating SO throws ordered_qty not allowed to change after submission
2023-01-12 16:59:08 +05:30
s-aga-r
b26e96cdf4
chore: linter
2023-01-12 13:41:53 +05:30
ruthra kumar
391f42db04
fix: Updating SO throws ordered_qty not allowed to change after submission
2023-01-12 13:18:03 +05:30
s-aga-r
f028bd6e69
fix: validate accepted and rejected qty in SCR Item
2023-01-12 12:23:40 +05:30
s-aga-r
a0e2a93f3f
chore: update error msgs for Subcontracted PO
2023-01-12 12:09:28 +05:30
s-aga-r
6878f40d1d
chore: add row-index in error msgs
2023-01-12 12:02:00 +05:30
s-aga-r
434aa594d5
fix: ZeroDivisionError: float division by zero in SCR
2023-01-12 11:49:41 +05:30
unknown
974e12c837
fix: rewrite logic for duplicate check in Item Attribute
...
Previously, Item Attribute values were not checked for case-insensitive duplicates, and Item tttribute abbreviations were forced to be uppercase. This commit fixes both problems.
2023-01-12 07:44:57 +05:30
Vishal Dhayagude
467a2b5cb4
Merge branch 'develop' into fg_based_operating_cost
2023-01-11 22:30:36 +05:30
Vishal
694fc3e20c
fix: hide with_operation on selection on fg_based and vice versa
2023-01-11 18:52:30 +05:30
Sagar Sharma
887ae1c434
Merge branch 'develop' into fix-diff-value
2023-01-11 14:01:51 +05:30
Smit Vora
be05aea101
fix: better comparision of difference value between stock and account
2023-01-11 05:21:13 +00:00
anandbaburajan
aa1f2a7297
fix: asset value in fixed asset register
2023-01-10 23:05:09 +05:30
Smit Vora
e0f5ecdad6
fix: RFQ emails not sent with pdf attachment ( #33604 )
2023-01-10 20:40:12 +05:30
vr-greycube
0f0bc9a462
fix: customer selection not mandatory in purchase invoice to fetch item details ( #33572 )
2023-01-10 20:26:33 +05:30
Deepesh Garg
0ed938a490
fix: Incorrect exchange rate in payment entries ( #33481 )
...
* fix: Incorrect exchange rate in payment entries
* test: Update failing tests
2023-01-10 20:12:43 +05:30
rohitwaghchaure
58ad79d3e8
Merge pull request #33597 from rohitwaghchaure/do-not-check-other-warehouse
...
fix: don't check other warehouse ledgers to calculate valuation rate
2023-01-10 13:56:10 +05:30
Vishal
a5cbdea8e4
fix: minor change in bom.js added
2023-01-10 13:40:12 +05:30
Rohit Waghchaure
ef2bf3c223
fix: don't check other warehouse ledgers to calculate valuation rate
2023-01-10 10:59:50 +05:30
Ankush Menat
8a56df695d
perf: Drop name part from posting sort index ( #33551 )
2023-01-10 09:54:15 +05:30
Vishal
c51f9e0a97
fix: bom.json updated
2023-01-10 07:48:26 +05:30
Vishal
f0c0a64984
fix: test case added for FG_BASED OPERTING COST
2023-01-10 07:43:28 +05:30
Vishal
ddc0127e05
fix: minor changes added
2023-01-10 07:43:20 +05:30
Vishal
b559245f2a
feat: Add operating cost based on bom quanity without creating job card
2023-01-10 07:43:05 +05:30
rohitwaghchaure
59628f1934
Merge pull request #33579 from rtdany10/repack-fg-valuation
...
fix(stock entry): wrong valuation rate in repack
2023-01-10 00:05:56 +05:30
rohitwaghchaure
a424acbfcb
Merge pull request #33577 from rohitwaghchaure/timeout-error-in-purchase-invoice
...
fix: Timeout error while saving the purchase invoice
2023-01-10 00:01:15 +05:30
rohitwaghchaure
d749c4aac2
Revert "feat: Add operating cost based on bom quanity without creating job card"
2023-01-09 23:35:11 +05:30
rohitwaghchaure
20fe1875e7
Merge pull request #33347 from vishdha/fb_based_operating_cost
...
feat: Add operating cost based on bom quanity without creating job card
2023-01-09 23:31:41 +05:30
Gughan Ravikumar
4d5067d6d4
fix(accounts): currency fields no longer read as strings by validation function in Payment Entry ( #33535 )
...
explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function
2023-01-09 23:26:51 +05:30
ruthra kumar
bbe5e5d9d6
fix: incorrect warehouse and selling amount on bundled products ( #33549 )
2023-01-09 22:45:43 +05:30
Sagar Sharma
dd3b79b511
Merge pull request #33562 from ruthra-kumar/better_handling_of_duplicate_bundle_items
...
fix: better handling of duplicate bundle items
2023-01-09 22:22:57 +05:30
Devin Slauenwhite
6bc8bb26b6
fix: customer/supplier quick entry dialog ( #33496 )
...
* fix: readonly primary contact fields.
* refactor: supplier and customer quick entry form into common class.
2023-01-09 22:22:19 +05:30
Rohit Waghchaure
ec171fc7c1
test: test case to check disable last purchase rate
2023-01-09 22:02:35 +05:30
Sagar Sharma
b56c1ed050
Merge branch 'develop' into better_handling_of_duplicate_bundle_items
2023-01-09 21:48:48 +05:30
Deepesh Garg
f056e9e7c5
Merge pull request #33569 from ruthra-kumar/patch_to_update_new_je_type_in_property_setters
...
chore: patch property setters for JE with new entry type
2023-01-09 21:01:52 +05:30
Deepesh Garg
57a6c37833
Merge pull request #32933 from AnandBaburajan/asset_depreciation_schedule
...
feat: separating depreciation schedule from assets into a new doc
2023-01-09 20:47:21 +05:30
sonali
917b2190aa
fix: remove comments
2023-01-09 20:07:24 +05:30
Ankush Menat
fa4af2acce
refactor: convert heatmap queries to QB ( #33581 )
...
Uses new `UnixTimestamp` function, don't backport.
2023-01-09 20:00:22 +05:30
safvanhuzain
99f5e869e0
fix(stock entry): wrong valuation rate in repack
2023-01-09 13:11:37 +00:00
Rohit Waghchaure
05df8579cd
fix: linters issue
2023-01-09 18:23:22 +05:30
Rohit Waghchaure
d1d4671320
feat: provision to disable get last purchase rate
...
fix: set_incoming_rate condition
2023-01-09 18:10:52 +05:30
Rohit Waghchaure
7249657d15
fix: timeout error in the Purchase Invoice
2023-01-09 14:53:54 +05:30
ruthra kumar
789e448f0e
chore: patch property setters for JE with new entry type
2023-01-08 11:45:28 +05:30
Devin Slauenwhite
e35ac4f8c2
fix: move include in manufacturing to manufacturing tab.
2023-01-07 22:47:16 -05:00
ruthra kumar
c717e87c9e
fix: better handling of duplicate bundle items
2023-01-06 16:21:20 +05:30
rohitwaghchaure
525f054c45
Merge pull request #33548 from rohitwaghchaure/fixed-incorrect-wo-status
...
fix: incorrect status in the work order
2023-01-06 16:01:24 +05:30
Rohit Waghchaure
b0baba84a0
fix: incorrect status in the work order
2023-01-06 14:16:18 +05:30
ruthra kumar
51b082b43c
Merge pull request #33537 from ruthra-kumar/sales_partner_in_ar_report
...
refactor: Sales Partner column in AR and AR Summary Report
2023-01-06 12:07:50 +05:30
Vishal
9fd1c3efb4
fix: test case added for FG_BASED OPERTING COST
2023-01-06 11:18:09 +05:30
Vishal
6b0b49ee3f
fix: minor changes added
2023-01-06 11:18:09 +05:30
Vishal
bc1bdd58a7
feat: Add operating cost based on bom quanity without creating job card
2023-01-06 11:18:09 +05:30
s-aga-r
348dc32514
chore: enable No Copy attribute for route in Item Group
2023-01-05 12:25:50 +05:30
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
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
s-aga-r
b425c2d7ec
Merge branch 'develop' into fix/github-issue/28766
2023-01-02 11:25:13 +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
728dc1acf4
Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation"
2022-12-30 11:08:31 +05:30
