Commit Graph

6296 Commits

Author SHA1 Message Date
Rohit Waghchaure
6417ae0ee8 fix: user shouldn't able to make item price for item template 2023-02-23 20:21:50 +05:30
rohitwaghchaure
3692f960d0
Merge pull request #34172 from rohitwaghchaure/zero-rate-adjust-issue-using-lcv
fix: zero division error while making LCV
2023-02-23 10:54:01 +05:30
Rohit Waghchaure
80e94a08cf fix: zero division error while making LCV 2023-02-22 13:29:06 +05:30
Sagar Sharma
77b88961f6
Merge branch 'develop' into dn-create-button 2023-02-21 10:19:09 +05:30
rohitwaghchaure
5e9620b98b
Merge pull request #34139 from rohitwaghchaure/fixed-stock-ledger-report-filter-issue
fix: inventory dimension filter not overriding with existing filter for stock ledger report
2023-02-20 13:04:23 +05:30
rohitwaghchaure
3871cf7110
Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue
fix: purchase invoice performance issue
2023-02-20 12:47:07 +05:30
Rohit Waghchaure
0e388ba872 fix: inventory dimension filter not overriding with existing filter for stock ledger report 2023-02-20 12:28:43 +05:30
s-aga-r
44ee9f0f19 chore: Linters 2023-02-20 11:43:32 +05:30
s-aga-r
1b010add26 fix(ux): ReferenceError: me is not defined Delivery Note 2023-02-20 11:17:49 +05:30
Sagar Sharma
c8fda8a8b5
Merge branch 'develop' into github-issue-33344 2023-02-19 22:17:20 +05:30
Johannes Obermeier
2a90fad710
feat(stock): Support more barcodes in an item by validate the barcode with the barcodenumber module (#33863)
feat(stock): Support more barcodes in an article by validate the barcode with the barcodenumber module
2023-02-19 19:36:05 +05:30
Sagar Sharma
2959285c82
Merge branch 'develop' into fix-reserve-qty 2023-02-19 12:45:39 +05:30
Sagar Sharma
07c6ad6fa7
Merge branch 'develop' into github-issue-33344 2023-02-18 22:24:06 +05:30
s-aga-r
35489fbbf9 refactor: remove method get_serial_no_batchwise from get_item_details.py 2023-02-18 22:23:53 +05:30
s-aga-r
6b144baa69 refactor: rewrite get_item_details.py queries in QB 2023-02-18 22:23:51 +05:30
rohitwaghchaure
dff9655d46
Merge pull request #34115 from rohitwaghchaure/fixed-convert-to-item-warehouse-reposting
feat: provision to convert transaction based reposting to item wareho…
2023-02-18 21:31:20 +05:30
Rohit Waghchaure
f1383b5ef9 feat: provision to convert transaction based reposting to item warehouse based reposting 2023-02-18 19:31:48 +05:30
rohitwaghchaure
47264481ad
Merge branch 'develop' into purchase-invoice-performance-issue 2023-02-17 16:41:30 +05:30
HENRY Florian
4d79ffe3c6
fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053)
* fix: Delivery Note field label set

* fix: Item field label de-duplicate name

* fix: Payment Entry field label de-duplicate name

* fix: Pruicing Rule field label de-duplicate name

* fix: Project field label de-duplicate name

* fix: Timesheet field label de-duplicate name

* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

* Update erpnext/stock/doctype/item/item.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2023-02-16 13:46:19 +05:30
s-aga-r
6c6195bae6 fix: create Delivery Trip from Delivery Note list 2023-02-15 22:37:26 +05:30
Sagar Sharma
46afbb594a
Merge branch 'develop' into fix-reserve-qty 2023-02-15 21:37:30 +05:30
rohitwaghchaure
9235918d65
Merge pull request #34061 from rohitwaghchaure/feat-allow-to-make-in-transit-entry
feat: allow to make in transit transfer entry from material request
2023-02-15 09:08:22 +05:30
Devin Slauenwhite
4c5147f270 Merge: upstream/develop into pps190/fix-reserve-qty 2023-02-14 10:22:54 -05:00
Rohit Waghchaure
5b6128848f feat: allow to make in transit transfer entry from material request 2023-02-14 19:03:07 +05:30
Sagar Sharma
5faa62c49a
Merge branch 'develop' into fix-so-on-hold 2023-02-14 11:06:10 +05:30
HENRY Florian
231fe4156f
fix: should never get cutomer price on purchase document (#34002)
* fix: never get cutomer price on purchase document

chores: syntax

chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details

chores: syntax

* feat: add test for get_item_detail price list oriented

* feat: add test for get_item_detail price price oriented

* feat: add test for get_item_detail price price oriented

* chore: clean test code
2023-02-13 20:56:05 +05:30
Sagar Sharma
b0e8dfc1d0
Merge branch 'develop' into fix-so-on-hold 2023-02-12 13:37:21 +05:30
s-aga-r
d76759e066 fix: update reserved_qty when Sales Order marked as Hold 2023-02-12 13:36:26 +05:30
Akshay
185c543b73
chore: typo in stock_entry get_uom_details (#33998)
fix: typo in stock_entry get_uom_details
2023-02-10 20:42:35 +05:30
Devin Slauenwhite
5685492995 Merge remote-tracking branch 'frappe/develop' into fix-reserve-qty
# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
2023-02-09 13:48:18 -05:00
Sagar Sharma
2fedd595a9
Merge branch 'develop' into github-issue-33533 2023-02-05 09:36:17 +05:30
rohitwaghchaure
7d794bc70a
Merge branch 'develop' into fixed-negative-stock-error 2023-02-04 22:35:58 +05:30
s-aga-r
dc0ddf8d7e fix: stock entry from item dashboard (stock levels) 2023-02-03 18:08:34 +05:30
s-aga-r
56356ffbb9 chore: add Item Name column in Warehouse wise Item Balance Age and Value report 2023-02-03 12:28:23 +05:30
s-aga-r
d7a665cb84 chore: column width in Warehouse wise Item Balance Age and Value report 2023-02-03 12:27:41 +05:30
Rohit Waghchaure
9ae7578b07 test: test case 2023-02-02 18:54:42 +05:30
Rohit Waghchaure
6d513e2519 fix: negative stock error 2023-02-02 18:40:15 +05:30
rohitwaghchaure
fbf2d7e9de
Merge pull request #33918 from rohitwaghchaure/fixed-incorrect-bin-qty
fix: incorrect actual qty in Bin
2023-02-01 18:22:56 +05:30
Rohit Waghchaure
f8c852c54c fix: incorrect actual qty in Bin 2023-02-01 17:49:11 +05:30
Gavin D'souza
3518d4be1d fix(update_billing_percentage): Remove permlevel checks on aggregated
value
2023-02-01 12:58:08 +05:30
rohitwaghchaure
c5834c1db4
Merge pull request #33896 from rohitwaghchaure/inventory-dimension-mandatory
feat: mandatory and mandatory depends on in inventory dimension
2023-01-31 15:18:14 +05:30
rohitwaghchaure
ddb4396117
Merge pull request #33715 from s-aga-r/fix-pick-list
fix: consider existing pick-list
2023-01-31 15:10:19 +05:30
s-aga-r
6ffdeb1af8 fix: consider stock_qty if picked_qty is zero 2023-01-31 14:39:57 +05:30
Rohit Waghchaure
22d0e1373b test: added test case 2023-01-31 14:36:26 +05:30
Rohit Waghchaure
423f2b5627 feat: mandatory and mandatory depends on in inventory dimension 2023-01-31 14:19:14 +05:30
Sagar Sharma
57c8871de0
Merge branch 'develop' into fix-pick-list 2023-01-31 12:38:58 +05:30
s-aga-r
0b76a26c8a refactor: test_consider_existing_pick_list() 2023-01-31 12:38:30 +05:30
s-aga-r
bb7fe795fe test: add test cases 2023-01-31 12:38:30 +05:30
s-aga-r
207eeefc85 fix(test): test_pick_list_for_items_with_multiple_UOM() 2023-01-31 12:38:30 +05:30
s-aga-r
5138ef0160 fix: pymysql.err.ProgrammingError 2023-01-31 12:38:30 +05:30
s-aga-r
7b3d496ce0 fix: get_picked_items_details 2023-01-31 12:38:30 +05:30
s-aga-r
be41052dc8 chore: add status field in Pick List 2023-01-31 12:38:30 +05:30
s-aga-r
b642718f08 fix: consider existing pick list 2023-01-31 12:38:27 +05:30
s-aga-r
6b781d78e0 fix: amount in Material Request 2023-01-30 12:51:59 +05:30
rohitwaghchaure
1b967f37af
Merge pull request #33845 from rohitwaghchaure/fixed-item-not-fetching-issue
fix: item rate not fetching
2023-01-28 15:10:02 +05:30
Rohit Waghchaure
0d7f98b496 fix: item rate not fetching 2023-01-28 13:51:33 +05:30
Daizy Modi
da323cbb40
fix: use correct filter name in item_query (#33814) 2023-01-25 17:32:21 +05:30
Sagar Vora
1f4fa90072
Revert "fix: use correct filter name in reports" 2023-01-25 16:19:44 +05:30
Daizy Modi
def759d2e8 fix: use correct filter name in reports 2023-01-25 15:57:39 +05:30
Rohit Waghchaure
92d857d49c fix: purchase invoice performance issue 2023-01-24 22:32:07 +05:30
s-aga-r
9ae3a54ce9 chore: add method get_picked_items_details() 2023-01-23 13:48:26 +05:30
rohitwaghchaure
b3a216c8f8
Merge pull request #33785 from rohitwaghchaure/get-items-from-transit-entry
feat: get items from Transit Stock Entry
2023-01-23 13:03:53 +05:30
Rohit Waghchaure
62141b0b63 feat: get items from Transit Stock Entry 2023-01-23 12:01:57 +05:30
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
Deepesh Garg
b6ade62211
Merge pull request #32662 from s-aga-r/refactor/stock/remaining-reports
refactor: rewrite stock reports queries in qb
2022-10-28 21:05:15 +05:30
Vishal Dhayagude
db0f2c0b10
Merge branch 'develop' into pr_dashboard 2022-10-28 13:36:43 +05:30
Vishal
e8c0157017 chore: minor linting issue fixed 2022-10-28 11:59:10 +05:30
Vishal
a04c44fe34 chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking 2022-10-28 11:36:14 +05:30
Sagar Sharma
334b158f0b
Merge branch 'develop' into refactor/stock/remaining-reports 2022-10-28 11:27:42 +05:30
Deepesh Garg
4cd65027c4 fix: Add condition for discount section collapse 2022-10-26 16:48:24 +05:30
Ernesto Ruiz
4c7fa9482d
fix: correct linters 2022-10-25 22:39:05 -06:00
Ernesto Ruiz
9c529c61bb
fix: correct linters 2022-10-25 22:35:37 -06:00
Ernesto Ruiz
c1e608d9ef
fix: add translate function to period in stock_analytics.py 2022-10-25 22:09:02 -06:00
Ernesto Ruiz
71a0ae2e59
fix: refactor code for better translatable string in stock_ageing.py 2022-10-25 22:05:25 -06:00
Sagar Sharma
26c00f8dd3
Merge branch 'develop' into refactor/stock/remaining-reports 2022-10-21 15:19:23 +05:30
Sagar Sharma
40bd121593 refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB 2022-10-21 14:49:12 +05:30
Sagar Sharma
cde785f1bb refactor: rewrite Product Bundle Balance Report queries in QB 2022-10-21 14:49:09 +05:30
Sagar Sharma
feaa2dbba8 refactor: rewrite Stock Ledger Report queries in QB 2022-10-21 13:12:34 +05:30
Ankush Menat
11207c4e56 fix: dont update item info twice
[skip ci]
2022-10-20 16:18:48 +05:30
Devin Slauenwhite
b88e850d55
perf: cache barcode scan result (#32629)
* perf: cache barcode scan result

* feat: BarcodeScanResult type

* fix: use safe `get_value` `set_value`

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-10-20 15:56:07 +05:30
Deepesh Garg
796f2d3c09 fix: Billing Address for inter-company purchase docs 2022-10-19 23:50:39 +05:30
Sagar Sharma
582e1bf10c Merge branch 'develop' into refactor/stock/reports 2022-10-17 16:30:43 +05:30
Rohit Waghchaure
2481574a28 chore: seperate function to apply filter for warehouse in case of QB 2022-10-17 14:25:23 +05:30
Rohit Waghchaure
6381e75fa5 fix: group warehouse filter not working for Batchwise Balance history report 2022-10-17 12:17:05 +05:30
Sagar Sharma
3c1bd90d0d
Merge branch 'develop' into refactor/stock/reports 2022-10-14 11:57:04 +05:30
ruthra kumar
2d0217abd5
Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost
fix: deduplicate Payment Ledger on Item value repost
2022-10-13 14:01:59 +05:30
Sagar Sharma
bb7897caab
Merge branch 'develop' into refactor/stock/reports 2022-10-12 19:21:15 +05:30
Rohit Waghchaure
692462d7c8 fix: removed unnecessary imports 2022-10-12 16:30:48 +05:30
Deepesh Garg
43c2bd1351
Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes
fix: Incoming rate precision fixes for intra company transfer
2022-10-12 16:23:16 +05:30
ruthra kumar
eb819368aa test: dedeplication on payment ledger upon repost 2022-10-12 16:08:59 +05:30
Rohit Waghchaure
3266e54e33 fix: consider outgoingrate while valuation rate calculate 2022-10-12 15:44:53 +05:30
Rohit Waghchaure
683a47f7a1 fix: consider sales rate as incoming rate for transit warehouse in purchase flow 2022-10-12 15:44:53 +05:30
Deepesh Garg
c8d2181498 chore: Increase precision for other doc fields 2022-10-12 14:17:55 +05:30
Sagar Sharma
59edf64951
Merge branch 'develop' into refactor/stock/reports 2022-10-12 13:30:00 +05:30
Rohan
43037d893d
fix: type-cast while saving an item (#32549) 2022-10-12 13:07:58 +05:30
Sagar Sharma
16aef53470
Merge branch 'develop' into refactor/stock/reports 2022-10-12 00:38:40 +05:30
Deepesh Garg
38b34f2a45
Merge pull request #32408 from nabinhait/sales-purchase-tab-break
feat: Tab Breaks in all Sales and Purchase cycle transactions
2022-10-11 16:02:45 +05:30
Deepesh Garg
dc20b21fb5 test: Internal tranfer precision loss test 2022-10-11 14:54:27 +05:30
ruthra kumar
633c2a289e
Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save
fix: Value error on validation of POS invoices with Serial Nos
2022-10-11 14:42:47 +05:30
Nabin Hait
e71c417f7e fix: minor cleanup 2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798 fix: more fields reordering related to Tab Break 2022-10-11 13:21:07 +05:30
Nabin Hait
35f836c4b7 feat: Tab Break in Purchase Receipt 2022-10-11 13:18:21 +05:30
Nabin Hait
2172c5034a feat: Tab Break in Material Request 2022-10-11 13:18:21 +05:30
Nabin Hait
7546562139 feat: Tab Break in Quotation 2022-10-11 13:18:21 +05:30
Nabin Hait
f6613e1e4c feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order 2022-10-11 13:18:21 +05:30
ruthra kumar
4b908ebcd6 fix: value error on pos submit 2022-10-11 11:21:11 +05:30
Sagar Sharma
60befcd8a8
Merge branch 'develop' into fix/quality-inspection/status 2022-10-08 13:34:21 +05:30
Sagar Sharma
4992e4a2b8 fix(test): test_rejected_qi_validation 2022-10-08 13:33:36 +05:30
Sagar Sharma
fcc1272d42 test: add test cases for Quality Inspection status 2022-10-08 13:33:36 +05:30
Sagar Sharma
2657ece2cd fix: set Quality Inspection status based on readings status 2022-10-08 13:33:22 +05:30
rohitwaghchaure
73a9791401
Merge branch 'develop' into provision-to-return-components 2022-10-07 23:50:05 +05:30
Rohit Waghchaure
d59ed24e6c feat: provision to return non consumed components against the work order 2022-10-07 22:45:53 +05:30
Sagar Sharma
f0f2413932
Merge branch 'develop' into refactor/stock/reports 2022-10-07 09:59:56 +05:30
Sagar Sharma
8103856a41 refactor: rewrite Warehouse wise Item Balance Age and Value Report queries in QB 2022-10-07 09:59:35 +05:30
Sagar Sharma
7c759b193c refactor: rewrite Total Stock Summary Report queries in QB 2022-10-07 09:59:28 +05:30
Sagar Sharma
d7c3b7633a fix: make readings status mandatory in Quality Inspection 2022-10-06 22:36:37 +05:30
Ankush Menat
8376fbc982
fix: Explicitly update modified (#32519)
* fix: Explicitly update modified

required after https://github.com/frappe/frappe/pull/18301

* chore: fix broken translations
2022-10-06 20:35:33 +05:30
Sagar Sharma
d3c073dc25 refactor: rewrite Supplier-Wise Sales Analytics Report queries in QB 2022-10-06 17:42:31 +05:30
Sagar Sharma
c18f13a45b refactor: rewrite Stock Projected Qty Report queries in QB 2022-10-06 17:04:50 +05:30
Deepesh Garg
fbdd1f39e7
Merge pull request #32499 from rohitwaghchaure/fixed-TooManyWritesError-for-reposting
fix: TooManyWritesError during reposting of stock
2022-10-05 16:05:12 +05:30
Rohit Waghchaure
aaabba9b1e fix: TooManyWritesError during reposting of stock 2022-10-05 10:58:21 +05:30
Sagar Sharma
39707757a6 chore: add Manual Inspection field in Quality Inspection DocType 2022-10-04 23:16:16 +05:30
Sagar Sharma
e295d0c091
Merge branch 'develop' into fix/pick-list/picked-qty 2022-10-03 14:20:05 +05:30
Sagar Sharma
ba02209f1d fix: pick list picked-qty for batch item 2022-10-03 14:12:42 +05:30
Rohit Waghchaure
0b1727cf79 fix: not able to return sold expired batches 2022-10-03 12:06:32 +05:30
Sagar Sharma
ca2958a999
Merge branch 'develop' into fix/item/update-stock 2022-09-30 16:36:46 +05:30
Sagar Sharma
6d0842465b fix: don't allow to update Maintain Stock if the item has a BOM 2022-09-30 15:18:10 +05:30
Sagar Sharma
774097bd10
Merge branch 'develop' into item_dashboard_create_new 2022-09-30 12:37:58 +05:30
Rohit Waghchaure
3656f7d06f test: added test case 2022-09-29 14:01:51 +05:30
Deepesh Garg
0439e41a44 fix: Item details fetching on making transaction from item dashboard 2022-09-28 14:54:53 +05:30
Sagar Sharma
376febb9d1
Merge branch 'develop' into fix/work-order/finish-button 2022-09-27 15:36:15 +05:30
Rohit Waghchaure
a4a86ee23f fix: allow to return expired batches using purchase return 2022-09-27 13:55:27 +05:30
Sagar Sharma
9049db41ae fix: For Quantity error msg in Stock Entry 2022-09-27 12:00:50 +05:30
Sagar Sharma
e312d17eae refactor: rewrite Item Prices Report queries in QB 2022-09-26 17:50:17 +05:30
hendrik
f41d1500b0
fix: report chart field type
* fix: report chart field type

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-09-26 17:47:24 +05:30
Sagar Sharma
afb323b01c
Merge branch 'develop' into refactor/stock/report/incorrect-stock-value 2022-09-26 17:09:22 +05:30
Sagar Sharma
b93331e844 refactor: rewrite Incorrect Stock Value Report queries in QB 2022-09-26 09:44:29 +05:30
Sagar Sharma
22299d2382 refactor: rewrite Item Price Stock Report queries in QB 2022-09-26 09:40:49 +05:30
Sagar Sharma
bb59346651 refactor: rewrite Delayed Item Report queries in QB 2022-09-23 15:47:26 +05:30
Sagar Sharma
1c1f991d2f refactor: rewrite Batch-Wise Balance History Report queries in QB 2022-09-23 14:57:44 +05:30
Sagar Sharma
2c9d9577e3 refactor: rewrite Batch Item Expiry Status Report queries in QB 2022-09-23 14:06:37 +05:30
Deepesh Garg
d4b01f6ffd Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule 2022-09-20 14:58:48 +05:30
Sagar Sharma
3dc754cac2 test: add test cases for Item Shortage Report 2022-09-20 10:48:05 +05:30
Sagar Sharma
f0a78aa559 refactor: rewrite Item Shortage Report queries in QB 2022-09-20 10:47:55 +05:30
Sagar Sharma
3a9c08e7c9 fix: po_detail or sco_rm_detail not getting set while while mapping SE 2022-09-19 18:47:46 +05:30
Sagar Sharma
b90875575c fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor 2022-09-18 11:37:07 +05:30
Sagar Sharma
2f97370b8e fix: sco_rm_detail in Stock Entry 2022-09-17 14:29:42 +05:30
Maharshi Patel
8c5b420aea fix: remove no_copy for ignore_pricing_rule 2022-09-16 18:26:00 +05:30
Nabin Hait
a5b5885933 fix: test cases 2022-09-15 11:19:14 +05:30
Sagar Sharma
bf1fa014f4 test: add test case for item master maintain-stock 2022-09-13 22:12:56 +05:30
Sagar Sharma
7b878ea3d8 fix: unknown column error while updating value of maintain-stock in item master 2022-09-13 21:52:58 +05:30
Nabin Hait
e24a4b18c4 Merge branch 'SaiFi0102-asset-capitalization' into develop 2022-09-13 15:00:21 +05:30
Nabin Hait
58d430fe3e feat: Asset Capitalization
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
2022-09-13 14:56:21 +05:30
Ankush Menat
fffc245922
fix(UX): make Item attachments public by default (#32196) 2022-09-13 13:41:00 +05:30
Ahmad
4f1cc41b86 fix: pick_list - picked qty getting set to 1
(cherry picked from commit 3256e2b8b7cee0e7b95ca58a6f22f96090e2ffaa)
2022-09-12 16:49:45 +00:00
rohitwaghchaure
8f787c08a2
fix: customer code max characters limit issue (#32177) 2022-09-12 16:48:53 +05:30
Sagar Sharma
2e314a20f1
Merge branch 'develop' into fix/stock-entry/sco 2022-09-09 13:48:14 +05:30
Sagar Sharma
9a3dcb9ad1 fix: validate Subcontracting Order in Stock Entry 2022-09-09 13:46:50 +05:30
Sagar Sharma
30909a9b79 fix: status filter for Subcontracting Order in Stock Entry 2022-09-09 13:45:31 +05:30
Sagar Sharma
b49caf170c
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor 2022-09-09 11:37:12 +05:30
Rohit Waghchaure
a03b4ce213 fix: reposting not working for internal transferred purchase receipt 2022-09-08 19:16:00 +05:30
rohitwaghchaure
72d5366e96
Merge pull request #31918 from s-aga-r/fix/subcontracting-receipt/gl-entries
fix: Subcontracting Receipt GL Entries
2022-09-08 10:17:12 +05:30
Rohit Waghchaure
f1c4aea7b5 fix: option to start reposting from repost item valuation 2022-09-07 16:38:17 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries 2022-09-07 14:55:56 +05:30
Sagar Sharma
01c2e4d2cf
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor 2022-09-07 14:52:16 +05:30
rohitwaghchaure
5b02adbd33
Merge pull request #32113 from rohitwaghchaure/fixed-internal-transfer-flow
fix: internal transfer flow
2022-09-07 14:26:14 +05:30
Devin Slauenwhite
aab2c9c682
fix: require barcode item barcode. (#31957)
* fix: require barcode item barcode.

* fix: make supplier mandatory in Item Supplier DocType

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-09-07 12:59:46 +05:30
Rohit Waghchaure
b4a102d119 fix: internal transfer flow 2022-09-07 12:48:18 +05:30
Sagar Sharma
2f00413864 fix: consider Stock Entry purpose while getting total supplied qty 2022-09-06 16:42:15 +05:30
rohitwaghchaure
c6380a25d6
Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent
fix: inventory dimension issues
2022-09-06 10:45:36 +05:30
Rohit Waghchaure
75fcab04b1 test: test cases for PI and DN 2022-09-06 01:42:57 +05:30
HENRY Florian
86395c6adb
feat: better Item Price list view (#31954)
* feat: better Item Price list view
2022-09-04 16:25:03 +05:30
Rohit Waghchaure
237299948a fix: fetch from parent not working for custom field 2022-09-03 17:27:00 +05:30
rohitwaghchaure
0efc6a9abe
Merge pull request #32065 from rohitwaghchaure/not-able-to-make-variant-item
fix: not able to make variant item
2022-09-03 11:52:56 +05:30
Rohit Waghchaure
92b0f9cd7e fix: not able to make variant item 2022-09-03 11:42:04 +05:30
Sagar Sharma
9dbaaa33f5
fix: AD not getting copied from SCO while creating a SE (#32004) 2022-08-29 15:07:20 +05:30
Sagar Sharma
af5cbc881f
chore: allow return of components in SCO (#31994)
chore: allow return of components in sco
2022-08-26 22:49:40 +05:30
Sagar Sharma
8566832dd5
fix: add validation for PO in Stock Entry (#31974) 2022-08-25 15:05:13 +05:30
rohitwaghchaure
b27f3ab327
Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order
fix: material request connection on work order
2022-08-25 12:29:10 +05:30
Rohit Waghchaure
9ab10def49 fix: material request connection on work order 2022-08-25 12:13:17 +05:30
Deepesh Garg
9b626d06fc
Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no
fix: Add docstatus filter for voucher_no in Repost Item Valuation
2022-08-25 10:49:29 +05:30
Solufyin
0e26df331c
fix: Route condition set for stock ledger (#31935) 2022-08-24 13:28:55 +05:30
Sagar Sharma
f4673941e0 chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py 2022-08-21 21:26:06 +05:30
Sagar Sharma
520306dc87 fix: Add docstatus filter for voucher_no in Repost Item Valuation 2022-08-21 12:09:08 +05:30
Sagar Sharma
f92f3e0208 chore: add option for "Subcontracting Receipt" in "Voucher Type" 2022-08-19 20:52:26 +05:30
Sagar Sharma
256b4245d5 chore: add additional-cost table in SCR 2022-08-18 20:59:30 +05:30
Sagar Sharma
eabd3135f0 fix: base_amount and exchange_rate in additional-cost table 2022-08-18 17:16:29 +05:30
Deepesh Garg
1a6508972e
fix: Make expense account editable in Purchase Receipt Item (#31730)
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-08-18 10:59:39 +05:30
Sagar Sharma
f1a612245c
fix: Transit filter for Default Target Warehouse in SE (#31839) 2022-08-17 16:44:12 +05:30
rohitwaghchaure
396667b702
Merge pull request #31860 from rohitwaghchaure/delete-custom-fields-on-dimension-delete
fix: delete custom fields on deletion of inventory dimension
2022-08-17 15:43:54 +05:30
Rohit Waghchaure
0b39a0123e fix: delete custom fields on deletion of inventory dimension 2022-08-17 14:55:02 +05:30
rohitwaghchaure
dd08045f28
Merge pull request #31863 from rohitwaghchaure/allow-to-make-material-issue
fix: not able to issue expired batches
2022-08-17 14:45:14 +05:30
Rohit Waghchaure
795c94384a fix: not able to issue expired batches 2022-08-17 14:03:55 +05:30
Rohit Waghchaure
ddd24ea8c8 fix: incorrect incoming rate set for inter transfer purchase receipt 2022-08-09 14:50:20 +05:30
Marica
1a2ffc7c6e
Merge pull request #31601 from pps190/pref-wh-wise-stock-value
perf: reduce db calls for warehouse wise stock value chart
2022-07-27 17:47:43 +05:30
Rohit Waghchaure
5da7e01db2 fix: dont show zero qty available items in stock ageing report 2022-07-22 17:54:46 +05:30
Marica
6883fc95ae
Merge pull request #31579 from pps190/fix-pl-customer-name
fix: display customer name on picking list
2022-07-21 18:38:08 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension
feat: Inventory Dimension
2022-07-20 19:47:14 +05:30
Rohit Waghchaure
289e6cd4ce fix: change frappe.db.sql to frappe.qb 2022-07-20 16:02:13 +05:30
Rohit Waghchaure
e576f7f07e test: test cases for inventory dimension 2022-07-20 16:02:13 +05:30
Rohit Waghchaure
dbec5cff00 feat: Inventory Dimension 2022-07-20 16:02:13 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation 2022-07-20 15:47:40 +05:30
Nabin Hait
e1fa723eef fix: set args to empty list if None to avoid enumerate error 2022-07-20 15:19:09 +05:30
Rucha Mahabal
f2532a6aaa
Merge branch 'develop' into hr-separation 2022-07-20 14:22:27 +05:30
Devin Slauenwhite
7083b3148b
fix: make customer_name field read only. 2022-07-19 11:02:43 -04:00
Devin Slauenwhite
d3f0897420
Merge branch 'develop' into fix-pl-customer-name 2022-07-19 11:01:28 -04:00
rohitwaghchaure
60dbd6a246
Merge pull request #31631 from rohitwaghchaure/slow-stock-reposting-issue
fix: slow stock reposting
2022-07-19 18:47:23 +05:30
Rohit Waghchaure
1d80d37ccf fix: slow stock reposting 2022-07-19 16:36:22 +05:30
Marica
2a2db8c64a
Merge branch 'develop' into lcv-future-stock-update 2022-07-19 12:53:51 +05:30
Devin Slauenwhite
1e20358c28 fix: sum stock_value and group by warehouse 2022-07-14 18:53:50 -04:00
Devin Slauenwhite
bc3023318e chore: remove unused import 2022-07-14 18:09:52 -04:00
Devin Slauenwhite
73ade04dcf pref: reduce count of db calls from n to 2 2022-07-14 18:09:08 -04:00
Devin Slauenwhite
0a633a212d fix: display customer name on picking list 2022-07-12 13:05:40 -04:00
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
marination
de9ea70ce3 test: LCV impact on future stock balancees 2022-07-12 13:00:00 +05:30
Ankush Menat
2224b6503b
chore: typo
[skip ci]
2022-07-12 12:39:22 +05:30
Ankush Menat
4ec85cb2f0
test: don't silently fail reposts in tests (#31559) 2022-07-08 19:28:03 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting 2022-07-07 09:56:23 +05:30
rohitwaghchaure
96f46b220b
Merge branch 'develop' into fixed-time-out-error-reposting 2022-07-05 19:23:46 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Rohit Waghchaure
78c8bb251e fix: timeout error while reposting 2022-07-05 18:45:13 +05:30
rohitwaghchaure
d5b0b5e798
Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials
fix: test case
2022-07-05 15:10:59 +05:30
Rohit Waghchaure
7282c8e65b fix: test case 2022-07-05 15:10:28 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting 2022-07-05 11:25:08 +05:30
Deepesh Garg
60aad31162 fix: Incorrect provisional expense booking while reposting 2022-07-04 18:38:26 +05:30
marination
7a5fd71a6c fix: LCV updates wrong future qty/Bin qty
- As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated
- This just doubly shifts all future qty which is then fixed by a repost
- Until the repost balance values are wrong
- Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin
2022-07-04 17:46:54 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Sagar Sharma
fd162f9b14 fix: supplier warehouse in PR 2022-07-01 16:51:19 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting 2022-06-29 17:29:24 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation 2022-06-29 12:35:51 +05:30
Devin Slauenwhite
cdf631b9de
fix: validate item dashboard material transfer entry (#31473) 2022-06-29 12:06:47 +05:30
Sagar Sharma
78ff1783b1 Merge branch 'develop' into subcontracting 2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Sagar Vora
0810674c8a Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-24 13:08:40 +05:30
Rucha Mahabal
edb528ce41 chore: Remove code for Expense Claim from Project, Task, Delivery Trip
- Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup

- Remove Expense Claim calculation from `update_costing` in project

- Remove `update_total_expense_claim` from task

- Remove Expense Claim references from employee form tour

- Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed

- Update delivery trip tests
2022-06-23 19:48:42 +05:30
Devin Slauenwhite
ef6480803b chore: linter 2022-06-22 14:10:40 -04:00
Devin Slauenwhite
199b8dd0e3
Merge branch 'develop' into fix-reserve-qty 2022-06-22 14:06:35 -04:00
rohitwaghchaure
186224a12a
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 22:45:05 +05:30
Sagar Sharma
912d26361d
Merge branch 'develop' into fixed-transferred-materials-are-not-consumed 2022-06-21 13:23:37 +05:30
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30
s-aga-r
f6ef3068d7 Merge branch 'develop' into subcontracting 2022-06-20 23:10:31 +05:30
s-aga-r
6d89b2fa28 refactor: backport old subcontracting code 2022-06-20 23:10:02 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Devin Slauenwhite
179e2d2c74 fix: reset selling setting 2022-06-17 15:29:32 -04:00
Devin Slauenwhite
591b5917a9 fix: re-assign after append query 2022-06-17 15:27:17 -04:00
Devin Slauenwhite
0328874018 fix: syntax missing ) 2022-06-17 14:45:33 -04:00
Devin Slauenwhite
7855a59843
Merge branch 'develop' into fix-reserve-qty 2022-06-17 14:39:31 -04:00
Devin Slauenwhite
494bbf0124 feat: add checkbox to reserve qty on sales return 2022-06-17 13:51:33 -04:00
Devin Slauenwhite
f3f26d2c78 refactor: get_reserved_qty query builder 2022-06-17 11:51:21 -04:00
Devin Slauenwhite
d259c2e36a fix: merge conflict 2022-06-17 11:50:54 -04:00