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
Sagar Sharma
9ed7594f6e
Merge pull request #33621 from s-aga-r/fix/validation/scr
...
chore: subcontracting validations
2023-01-12 15:49:30 +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
9ab8aa49d6
Merge pull request #33611 from vorasmit/fix-diff-value
...
fix: better comparision of `difference_value` of Stock and Account
2023-01-11 14:52:49 +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
461f8e7724
Merge pull request #33590 from frappe/revert-33347-fb_based_operating_cost
...
Revert "feat: Add operating cost based on bom quanity without creating job card"
2023-01-09 23:37:13 +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
Ankush Menat
7ee151880a
chore: instructions for running forks
...
[skip ci]
2023-01-09 18:16:04 +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
