s-aga-r
57c3216683
refactor: rewrite get_available_item_locations_for_serial_and_batched_item query in QB
2023-01-21 14:05:51 +05:30
s-aga-r
5b76e8b193
refactor: rewrite get_available_item_locations_for_serialized_item query in QB
2023-01-21 12:45:39 +05:30
s-aga-r
58dd40a2d7
refactor: rewrite get_available_item_locations_for_other_item query in QB
2023-01-21 12:15:45 +05:30
s-aga-r
29bf787313
refactor: rewrite get_picked_items_qty query in QB
2023-01-21 11:28:23 +05:30
rohitwaghchaure
b5d2eedfa6
Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item
...
fix: incorrect actual qty for the packed item
2023-01-20 23:38:55 +05:30
Rohit Waghchaure
02566a02a8
fix: incorrect actual qty for the packed item
2023-01-20 22:38:56 +05:30
Deepesh Garg
597ef0a498
fix: Short closed order, receipt and delivery note status on cancellation ( #33743 )
...
* fix: Short closed order, receipt and delivery note status on cancellation
* test: Cancelled status check
2023-01-20 19:44:06 +05:30
Sagar Sharma
333b2ae721
Merge branch 'develop' into item-attr-abbr-lowercase
2023-01-19 12:55:49 +05:30
rohitwaghchaure
ecfebfec57
Merge pull request #33723 from rohitwaghchaure/fixed-issue-of-item-variant
...
fix: don't add template item in sales/purchase transaction
2023-01-19 12:42:04 +05:30
Rohit Waghchaure
2c83fff1a1
fix: don't add template item in sales/purchase transaction
2023-01-18 23:29:06 +05:30
Sagar Sharma
1cadef97bf
Merge branch 'develop' into refactor/qb/pick-list
2023-01-17 10:08:36 +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
1bcff80074
refactor: picked qty in sales order item
2023-01-16 22:50:16 +05:30
s-aga-r
0ed6552655
refactor: rewrite pick_list.py queries in QB
2023-01-16 16:01:40 +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
s-aga-r
b3759890d7
chore: Sales Order link in Pick List
2023-01-15 21:09:16 +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
unknown
2ca4d3fb71
fix: linting
2023-01-12 20:53:12 +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
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
Smit Vora
be05aea101
fix: better comparision of difference value between stock and account
2023-01-11 05:21:13 +00:00
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
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
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
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
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
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
Rohit Waghchaure
b0baba84a0
fix: incorrect status in the work order
2023-01-06 14:16:18 +05:30
Rohit Waghchaure
ae039777f9
refactor: revamp process loss feature & added tab breaks
2023-01-03 19:05:41 +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
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
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
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
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
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
Deepesh Garg
8263bf9a9a
fix: Random behaviour while picking items using picklist ( #33449 )
2022-12-27 14:59:35 +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
rohitwaghchaure
1ed2230e4c
Merge pull request #33382 from rohitwaghchaure/fixed-pick-list-issue
...
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-12-20 09:47:29 +05:30
rohitwaghchaure
eaa04abe29
Merge pull request #33387 from rohitwaghchaure/audit-to-fix-incorrect-valuation-entry
...
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation
2022-12-20 09:46:57 +05:30
Rohit Waghchaure
f31612376a
test: added test case to validate audit for incorrect entries
2022-12-20 00:14:41 +05:30
Rohit Waghchaure
b1721b79ce
fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation
2022-12-19 23:33:44 +05:30
rohitwaghchaure
7851adb49a
Merge branch 'develop' into fixed-pick-list-issue
2022-12-19 23:32:06 +05:30
Ankush Menat
88ce11f03d
fix: incorrect type hints ( #33381 )
...
[skip ci]
2022-12-19 16:44:19 +05:30
Rohit Waghchaure
2b4eae5f84
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-12-19 16:24:55 +05:30
rohitwaghchaure
da1d8da355
Merge pull request #33355 from rohitwaghchaure/fixed-do-not-show-disabled-items
...
fix: disabled items showing in the report Itemwise Recommended Reorder Level
2022-12-15 18:08:05 +05:30
rohitwaghchaure
5cbbb5d59e
Merge pull request #33354 from rohitwaghchaure/fixed-trivial-discount-amount
...
fix: unsupported operand type(s) for +: 'int' and 'NoneType'
2022-12-15 17:13:46 +05:30
Rohit Waghchaure
ae31ff1c48
fix: disabled items showing in the report 'Itemwise Recommended Reorder Level
...
'
2022-12-15 17:05:53 +05:30
Rohit Waghchaure
0f28074e5a
fix: unsupported operand type(s) for +: 'int' and 'NoneType'
2022-12-15 16:36:47 +05:30
Deepesh Garg
076527bb88
Merge pull request #33305 from barredterra/incoterm-named-place
...
feat: incoterm named place
2022-12-15 11:59:54 +05:30
Rohit Waghchaure
410a58b3de
fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args'
2022-12-14 15:33:36 +05:30
barredterra
e057e1dfe7
feat: incoterm named place
2022-12-12 18:49:47 +01:00
Ankush Menat
915e0347b0
chore!: remove activity log feeds ( #33294 )
...
- This contains little to no information and practically no one uses this.
- Also causes a lot of problem by adding way too many feeds in activity
log to the point where activity page doesn't even load.
2022-12-12 15:14:30 +05:30
Deepesh Garg
6db52930d8
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-08 18:05:05 +05:30
Deepesh Garg
6192af5cf0
chore: Update tests
2022-12-08 18:04:40 +05:30
Rohit Waghchaure
f598da7c81
fix: total value in Warehouse Wise Stock Balance
2022-12-08 00:55:45 +05:30
rohitwaghchaure
7cbb6c4de9
Merge pull request #33236 from rohitwaghchaure/feat-warehouse-wise-stock-balance
...
feat: warehouse wise stock balance
2022-12-06 17:58:31 +05:30
Rohit Waghchaure
861aa9e08a
feat: warehouse wise stock balance
2022-12-06 17:33:33 +05:30
Deepesh Garg
b1242bc56c
chore: Update tests
2022-12-06 15:14:48 +05:30
Deepesh Garg
af1f98e188
Merge branch 'develop' of https://github.com/frappe/erpnext into bundle_item_rates
2022-12-06 13:59:51 +05:30
Deepesh Garg
e5566b31d5
chore: Consider bundle qty as well
2022-12-06 13:59:45 +05:30
Deepesh Garg
921f8edde8
Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate
...
fix: Allow item rate updates for non-stock invoices
2022-12-06 09:12:24 +05:30
Rohit Waghchaure
713330cbf6
fix: non empty FG batch picked while completing work order
2022-12-05 18:15:13 +05:30
Deepesh Garg
55c0770280
Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule
2022-12-05 15:43:29 +05:30
Deepesh Garg
ef9d126254
fix: Allow item rate udpates for non-stock invoices
2022-12-05 10:17:19 +05:30
Deepesh Garg
b741ae143c
fix: Reapply pricing rule on qty change
2022-12-02 17:14:06 +05:30
rohitwaghchaure
66dbf94151
Merge pull request #33199 from s-aga-r/refactor/warehouse-tree
...
refactor: remove `balance` from `Warehouse Tree`
2022-12-02 14:24:07 +05:30
rohitwaghchaure
295ce0e8e9
Merge pull request #33193 from rohitwaghchaure/clear-repost-logs
...
fix: clear repost logs using Log Settings
2022-12-02 13:55:59 +05:30
Rohit Waghchaure
2cce6f2a34
fix: test case
2022-12-02 12:43:31 +05:30
Rohit Waghchaure
5949a7ecff
fix: default clear repost logs
2022-12-01 23:35:21 +05:30
s-aga-r
3ce8386ca3
refactor: remove balance from Warehouse Tree
2022-12-01 19:44:49 +05:30
Deepesh Garg
2106de0fa5
Merge pull request #33170 from deepeshgarg007/se_alert_develop
...
fix(UX): Alert on change of item rate in Stock Entry
2022-12-01 18:16:55 +05:30
Deepesh Garg
826f45ad60
fix: Bundle item rates
2022-12-01 16:11:10 +05:30
Deepesh Garg
64e5a79a91
fix: Error on making stock entry from material request
2022-11-30 19:35:30 +05:30
Deepesh Garg
4bd9289d7d
fix(UX): Alert on change of item rate in Stock Entry
2022-11-29 19:21:48 +05:30
Sagar Sharma
ce7720b14c
Merge branch 'develop' into repost-item-valuation
2022-11-29 11:03:22 +05:30
rohitwaghchaure
6dd84cb977
Merge pull request #33013 from rtdany10/riv-validation
...
fix: validate repost item valuation against accounts freeze date
2022-11-29 10:40:48 +05:30
Deepesh Garg
a7b7d0d99d
Merge pull request #33116 from shariquerik/show-batch-selector-only-once
...
fix: only show serial no batch selector only once
2022-11-29 10:20:30 +05:30
rohitwaghchaure
a222b0a6ae
Merge pull request #33144 from rohitwaghchaure/fixed-incorrect-stock-balance-qty
...
fix: incorrect balance qty
2022-11-29 08:48:03 +05:30
Rohit Waghchaure
b606a9684b
test: test case for serialized batched item
2022-11-29 00:08:07 +05:30
Rohit Waghchaure
b2105a8be7
fix: incorrect balance qty
2022-11-28 23:13:30 +05:30
Sagar Sharma
ec95a9b760
Merge branch 'develop' into repost-item-valuation
2022-11-28 21:33:58 +05:30
s-aga-r
4e10352b48
chore: make posting_date and posting_time read-only if based_on is set to Transaction
2022-11-28 21:22:22 +05:30
s-aga-r
eeec008547
fix: reset voucher_type and voucher_no if based_on is set to Item and Warehouse
2022-11-28 21:22:20 +05:30
s-aga-r
eeda264eb6
fix: reposting error AttributeError: 'datetime.timedelta' object has no attribute 'replace'
2022-11-28 20:59:14 +05:30
s-aga-r
ba77da0874
fix: validation msg in stock entry
2022-11-28 18:01:30 +05:30
Sagar Sharma
10a2121361
Merge branch 'develop' into show-batch-selector-only-once
2022-11-26 10:09:10 +05:30
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms
2022-11-25 16:50:55 +01:00
Shariq Ansari
0f87d329d6
fix: only show serial no batch selector only once
2022-11-25 17:03:00 +05:30
Sagar Sharma
4e7613d4ce
Merge branch 'develop' into fix/github-issue/20496
2022-11-24 20:43:52 +05:30
s-aga-r
df0fee2312
fix: MR Item description and item_name gets reset on qty change
2022-11-24 20:42:57 +05:30
Dany Robert
88a0aa4077
chore: pre-commit
2022-11-23 19:04:11 +05:30
Dany Robert
b482e3876d
fix: check for session user rather than owner
2022-11-23 18:59:15 +05:30
Rohit Waghchaure
be19e4f621
fix: Valuation Rate column UX in stock ledger report
2022-11-23 16:44:18 +05:30
rohitwaghchaure
68424887e4
Merge pull request #33077 from rohitwaghchaure/ux-for-inventory-dimension
...
fix: UX for inventory dimension
2022-11-23 09:53:49 +05:30
Deepesh Garg
89631fa744
Merge pull request #32958 from pps190/fix-item-price-brand
...
fix: link `Item Price` brand to `Brand` doctype.
2022-11-19 19:14:39 +05:30
Sagar Sharma
cbfd8da848
Merge branch 'develop' into internal_transfer
2022-11-18 10:38:37 +05:30
barredterra
77105306f2
feat: add incoterm to purchasing transactions
2022-11-17 22:18:26 +01:00
barredterra
029f22c549
feat: add incoterm to sales transactions
2022-11-17 22:17:59 +01:00
barredterra
d2563ee973
feat: create incoterms and migrate shipments
2022-11-17 22:16:43 +01:00
Sabu Siyad
546c809cbe
fix: use list() on self mutating iteration
...
https://github.com/frappe/erpnext/issues/30325
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
2022-11-17 17:46:49 +05:30
Sagar Sharma
29a8d9a9b4
Merge branch 'develop' into internal_transfer
2022-11-17 16:42:18 +05:30
Dany Robert
be15419bd5
chore: pre-commit
2022-11-17 11:00:34 +01:00
Dany Robert
61f05132db
feat: validate repost item valuation against accounts freeze date
2022-11-17 11:00:01 +01:00
Ankush Menat
fd3c7903ba
chore: typo
2022-11-17 14:18:05 +05:30
Ankush Menat
34e4903ed7
refactor: search queries ( #33004 )
...
- guard clauses for readability
- use values or format
2022-11-17 13:04:42 +05:30
Vishal
d86afddb60
fix: minor issue fixed
2022-11-16 13:53:21 +05:30
Vishal
71412f6877
fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt
2022-11-16 13:53:21 +05:30
Devin Slauenwhite
3a35651441
fix: naming
2022-11-15 08:26:16 -05:00
Rohit Waghchaure
0a69523940
fix: UX for inventory dimension
2022-11-15 15:57:30 +05:30
Devin Slauenwhite
cee069d426
fix: link to brand doctype.
2022-11-14 17:38:46 -05:00
Sagar Sharma
4e9a63423f
Merge pull request #32913 from resilient-tech/fix-item-price-fetch
...
fix: set stock UOM in args to ensure item price is fetched
2022-11-12 10:08:44 +05:30
rohitwaghchaure
8ae9c1d192
Merge pull request #32895 from rohitwaghchaure/fixed-performance-issue-for-purchase-receipt
...
fix: Purchase Receipt timeout error
2022-11-10 22:41:54 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods ( #32914 )
...
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```
Required after: https://github.com/frappe/frappe/pull/18815
2022-11-09 20:09:06 +05:30
Sagar Vora
57038c3969
fix: set stock UOM in args to ensure item price is fetched
2022-11-09 18:56:09 +05:30
Rohit Waghchaure
7278387879
fix: test cases
2022-11-09 01:28:40 +05:30
Rohit Waghchaure
4082149f0e
fix: Purchase Receipt timeout error
2022-11-08 20:59:20 +05:30
Sagar Sharma
84ab100d86
chore: remove debugger from stock_entry_list.js
2022-11-08 12:05:15 +05:30
Nihantra C. Patel
8355c1092c
fix: Increase columns width in Warehouse wise Item Balance Age and Value
2022-11-07 11:45:47 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers ( #32794 )
...
* fix: Disable tax-included prices for internal transfers
2022-11-05 20:51:15 +05:30
Sagar Sharma
3ca9d53d1b
refactor: rewrite query in QB
...
(cherry picked from commit 2f145f99129503359b9a79c247fe69e30ac1bf8e)
2022-11-05 06:12:40 +00:00
Bhavesh Maheshwari
f4779df9b3
fix: mysql syntax issue
...
(cherry picked from commit 4d9bbd4c9c06811086e0ae4e2c16763fe7d171a3)
2022-11-05 06:12:40 +00:00
rohitwaghchaure
441f082fcb
Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality
...
fix: Scan Barcode UX
2022-11-04 11:04:40 +05:30
Deepesh Garg
8581b7820d
Merge pull request #32713 from ernestoruiz89/patch-9
...
fix: add missing translation function on report related documents
2022-11-03 09:46:43 +05:30
Rohit Waghchaure
e1f9ba78e5
fix: Scan Barcode UX
2022-11-02 15:37:46 +05:30
Sagar Sharma
be4593c1d9
Merge branch 'develop' into fix/github-issue/30339
2022-11-02 11:50:51 +05:30
Rohit Waghchaure
3f2728e3f7
test: run tmate
2022-11-01 22:20:13 +05:30
Rohit Waghchaure
ddd1b4be3f
fix: test cases
2022-11-01 19:30:37 +05:30
Sagar Sharma
9fb3fb4c83
fix: use flt instead of cint in get_batch_no
2022-11-01 10:45:13 +05:30
rohitwaghchaure
1033d34964
Merge pull request #32730 from rohitwaghchaure/duplicate-custom-fields-inventory-dimension
...
fix: duplicate custom fields for inventory dimension
2022-10-31 22:25:29 +05:30
Rohit Waghchaure
45ededbed5
fix: duplicate custom fields for inventory dimension
2022-10-31 15:33:23 +05:30
Sagar Sharma
15ebf4a0cf
fix: add Sales Order reference in Material Request Dashboard
2022-10-29 12:01:37 +05:30
