Commit Graph

6251 Commits

Author SHA1 Message Date
Rohit Waghchaure
0489e30244 fix: item list view not working 2023-05-16 00:48:52 +05:30
rohitwaghchaure
8afbb06a33
Merge branch 'develop' into FIX-ISS-23-24-00368 2023-05-15 13:42:20 +05:30
Rohit Waghchaure
38aaba5720 fix: inventory dimension for inter company transfer return use case 2023-05-13 13:00:05 +05:30
Sagar Sharma
81a57e4e41
Merge branch 'develop' into stock-reservation 2023-05-13 09:44:06 +05:30
Sagar Sharma
9b617cc062
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-13 09:43:54 +05:30
Sagar Sharma
e17eeec619
Merge branch 'develop' into FIX-ISS-23-24-00368 2023-05-13 09:43:44 +05:30
Rohit Waghchaure
6798b900ef fix: inventory dimension for material transfer not working 2023-05-13 01:44:06 +05:30
Sagar Sharma
b22f9a234b
Merge branch 'develop' into FIX-ISS-23-24-00368 2023-05-12 11:55:12 +05:30
Sagar Sharma
9c72c2a6cb refactor: use calculate_items_qty_and_amount() to update scr items rate 2023-05-12 11:50:27 +05:30
Sagar Sharma
46c1bef446
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-12 11:06:00 +05:30
Rohit Waghchaure
2d6f112727 fix: test case 2023-05-12 10:51:14 +05:30
Rohit Waghchaure
7a3801578c fix: enqueue submit/cancel action for stock entry to avoid time out error 2023-05-11 23:20:12 +05:30
rohitwaghchaure
5d43b35d20
Merge pull request #35230 from rohitwaghchaure/fixed-serial-no-issue-stock-reco
fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too Long error
2023-05-09 19:54:24 +05:30
Rohit Waghchaure
1a673fd424 fix: Changed type of column 'serial_no' in Stock Reconciliation to fix Data too long error 2023-05-09 18:45:19 +05:30
rohitwaghchaure
d5f123f2e1
Merge pull request #35220 from rohitwaghchaure/fixed-performance-issue-for-ste-mr
fix: added search index to improve performance
2023-05-09 14:33:56 +05:30
Rohit Waghchaure
80ea22b56c fix: added search index to improve performance 2023-05-09 12:42:17 +05:30
Sagar Sharma
12785101d9
Merge branch 'develop' into stock-reservation 2023-05-08 16:47:40 +05:30
Sagar Sharma
2e9278ef90
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-08 16:47:30 +05:30
rohitwaghchaure
328c3369a2
Merge pull request #35200 from rohitwaghchaure/fixed-accepted-warehouse-and-supplier-warehouse-issue
fix: error regarding accepted and supplier warehouse
2023-05-08 09:23:54 +05:30
Rohit Waghchaure
15f5f98858 fix: error regarding accepted and supplier warehouse 2023-05-07 20:27:17 +05:30
rohitwaghchaure
40e3747b93
Merge branch 'develop' into fixed-order-of-reposting-entry 2023-05-07 01:39:23 +05:30
Rohit Waghchaure
c8a4791d9b fix: pick the in progress reposting entries first 2023-05-06 20:09:15 +05:30
Hossein Yousefian
27d71e9ec1
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-05-06 08:12:36 +03:30
Rohit Waghchaure
8167b24219 fix: not allow to transfer excess materials against the job card 2023-05-04 18:24:16 +05:30
rohitwaghchaure
3993bfd510
Merge pull request #35161 from rohitwaghchaure/configure-notify-reposting-role
feat: configuration to notify reposting errors to specific role
2023-05-04 17:35:14 +05:30
rohitwaghchaure
2bf771683c
Merge pull request #35158 from rohitwaghchaure/fixed-internal-trasfer-condition
fix: internal transfer condition
2023-05-04 17:01:58 +05:30
Rohit Waghchaure
c7b62011db feat: configuration to notify reposting errors to specific role 2023-05-04 16:49:14 +05:30
Rohit Waghchaure
b5a2ccf21d fix: internal transfer condition 2023-05-04 15:38:35 +05:30
Rohit Waghchaure
06e91e758f feat: reserve qty against production plan raw materials in BIN 2023-05-03 18:21:23 +05:30
s-aga-r
7548bb3fbe Merge branch 'develop' into stock-reservation 2023-05-03 12:06:11 +05:30
s-aga-r
a6cb6c6f47 fix: recalculate costs in SCR while reposting 2023-05-03 11:33:52 +05:30
Sagar Sharma
862041dc0e
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-02 19:11:33 +05:30
rohitwaghchaure
9aa646512a
Merge pull request #35123 from rohitwaghchaure/fixed-performance-issue-delivery-note
fix: timeout error while submitting delivery note
2023-05-01 23:30:14 +05:30
Rohit Waghchaure
2d5ccc07b1 fix: timeout error while submitting delivery note 2023-05-01 21:17:18 +05:30
rohitwaghchaure
a10aab35ff
Merge pull request #35118 from rohitwaghchaure/fixed-don-not-allow-to-repost-valuation
fix: don't allow to make reposting for the closed period
2023-05-01 20:41:14 +05:30
Rohit Waghchaure
f751727149 fix: don't allow to make reposting for the closed period 2023-05-01 18:48:29 +05:30
Sagar Sharma
424bd701f3
Merge branch 'develop' into PACKING-SLIP-FOR-DN-PACKED-ITEMS 2023-05-01 08:05:18 +05:30
s-aga-r
bbcb65894b refactor: use get_product_bundle_list() to get all product bundle at once 2023-05-01 08:04:03 +05:30
s-aga-r
ba61292dfc test: add test case for packed qty validation on DN submit 2023-05-01 07:25:36 +05:30
s-aga-r
699532647d refactor: validate_packed_qty() 2023-04-28 23:03:33 +05:30
s-aga-r
b0eb9ea7bd refactor(minor): use set_onload to get unpacked items details 2023-04-28 22:47:27 +05:30
s-aga-r
7742c592c5 test: add test cases for Packing Slip 2023-04-28 21:51:15 +05:30
s-aga-r
da00fc0f16 fix(ux): don't show Create > Packing Slip button if items are already packed 2023-04-28 18:28:28 +05:30
s-aga-r
8d1bccada4 fix(ux): remove Get Items button from Packing Slip 2023-04-28 18:02:24 +05:30
s-aga-r
e75aa4e291 fix(ux): get items on selecting DN in Packing Slip 2023-04-28 17:59:34 +05:30
s-aga-r
269cc96c41 refactor: move js validations to py 2023-04-28 17:47:36 +05:30
s-aga-r
90701c7ae9 fix: validate Packing Slip Item Qty with DN Items 2023-04-28 17:05:51 +05:30
s-aga-r
9e5b102768 fix: make DN item reference mandatory for Packing Slip Item 2023-04-28 15:41:59 +05:30
s-aga-r
372bce4567 fix: Packing Slip Item Qty 2023-04-28 15:26:02 +05:30
Rohit Waghchaure
bdf2f7416a fix: not able to create delivery note from sales order 2023-04-28 15:16:02 +05:30
s-aga-r
0add90e7ec chore: enable no_copy for dn_detail and pi_detail in Packing Slip Item 2023-04-28 15:05:28 +05:30
s-aga-r
77f1e8ce78 fix: update Packed Qty in DN on submit and cancel of Packing Slip 2023-04-28 15:04:41 +05:30
s-aga-r
e6fc281acf feat: add field Packed Qty in Delivery Note Item and Packed Item 2023-04-28 13:20:47 +05:30
s-aga-r
75fe9dd3ea fix: don't map items twice
* don't explicitly map Delivery Note Item custom fields to Packing Slip Item, get auto-mapped while mapping the doc.
* call Packing List `set_missing_values` after mapping the doc.
* refactor `get_recommended_case_no`, use `frappe.db.get_value` instead of `frappe.db.sql`.
2023-04-28 10:53:17 +05:30
s-aga-r
ee9f97ca7c fix: remove duplicate items validation 2023-04-28 09:07:03 +05:30
s-aga-r
b62bf78814 refactor: packing_slip.js 2023-04-27 19:43:37 +05:30
s-aga-r
380dd73065 fix: map Packed Items while creating Packing Slip 2023-04-27 18:37:32 +05:30
s-aga-r
eca77134ae feat: add field pi_detail in Packing Slip 2023-04-27 15:48:02 +05:30
HarryPaulo
3be1ab9b8d
fix: allow submit delivery note when the sales order was billed... (#34910) 2023-04-25 21:54:41 +05:30
Sagar Sharma
31cdfa395a
Merge branch 'develop' into FIX-ISS-22-23-06298 2023-04-25 13:57:34 +05:30
s-aga-r
e782a054c8 refactor: get_stock_value_on() to get stock value of multiple warehouses at once 2023-04-25 13:54:36 +05:30
rohitwaghchaure
7a63fbef4f
Revert "fix: Incorrect difference value in Stock and Account Value Comparison…" 2023-04-25 12:01:26 +05:30
Sagar Sharma
58dbf7fc24
Merge branch 'develop' into stock-reservation 2023-04-24 22:58:16 +05:30
s-aga-r
bf4a57a37c fix: miscellaneous
fix: don't reserve stock in group warehouse
fix: partial reservation in multiple warehouses
feat: add prompt to select warehouse and qty for reservation in SO
2023-04-24 22:19:09 +05:30
rohitwaghchaure
291845e461
Merge pull request #35015 from rohitwaghchaure/incorrect-or-cond-delivery-note-issue
fix: incorrect OR condition causing timeout error (For more than 50 line items)
2023-04-24 18:06:59 +05:30
Rohit Waghchaure
379b215aea fix: incorrect OR condition causing timeout error 2023-04-24 17:32:32 +05:30
Rohit Waghchaure
f2253dd645 fix: duplicate reposting entries of same voucher 2023-04-22 11:16:12 +05:30
s-aga-r
0cd10a50d2 Merge branch 'develop' into stock-reservation 2023-04-22 10:04:46 +05:30
s-aga-r
b70273b988 chore: remove Enable Stock Reservation field description 2023-04-22 08:49:31 +05:30
rohitwaghchaure
56d62cae7a
Merge pull request #34980 from rohitwaghchaure/fix-inter-transfer-validation
fix: validation for internal transfer entry
2023-04-21 17:45:54 +05:30
s-aga-r
7e8fd8f324 chore: update reserved stock SLE validation 2023-04-21 17:44:44 +05:30
Rohit Waghchaure
19911b48fd fix: validation for internal transfer entry 2023-04-21 16:56:09 +05:30
s-aga-r
9a37ac6c25 refactor: sum up SLE value in query 2023-04-21 13:28:14 +05:30
Deepesh Garg
a02705ded7
chore: Move source and campaign to more info section (#34946) 2023-04-21 13:25:32 +05:30
Hossein Yousefian
984eb2a0dd
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-04-20 16:50:34 +03:30
Rohit Waghchaure
c3b5dcb767 fix: stock entry type issue 2023-04-20 16:39:26 +05:30
Deepesh Garg
ea6eeace80
fix: filtering via batch no(#34950)
* fix: filtering via batch no
2023-04-20 12:48:44 +05:30
Sagar Sharma
66723dc5db
Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES 2023-04-20 10:31:29 +05:30
s-aga-r
11c8503180 fix(test): test_backdated_stock_reco_cancellation_future_negative_stock 2023-04-20 09:59:11 +05:30
Rohit Waghchaure
fcfa8842a7 fix: limit stock reco issue 2023-04-20 09:48:15 +05:30
rohitwaghchaure
3df4edc5c5
Merge branch 'develop' into get_incoming_rate_v14_fix 2023-04-19 21:07:54 +05:30
rohitwaghchaure
dd238aa5b4
Merge pull request #34929 from rohitwaghchaure/fixed-stock-and-account-value-report
fix: Incorrect difference value in Stock and Account Value Comparison…
2023-04-19 21:07:25 +05:30
Rohit Waghchaure
a77182645f fix: Incorrect difference value in Stock and Account Value Comparison report 2023-04-19 20:35:14 +05:30
Sagar Sharma
6519514db4
Merge branch 'develop' into use-UnixTimestamp 2023-04-19 18:23:29 +05:30
Vishal Dhayagude
59f3fedbf7
fix: batch qty conversion factor issue fixed in pos transaction (#34917) 2023-04-19 15:57:28 +05:30
s-aga-r
c86c543fbf test: add test case for internal PR GL Entries 2023-04-19 13:30:37 +05:30
s-aga-r
e43bc38e05 refactor: rewrite get_stock_value_on() queries in QB 2023-04-19 12:05:17 +05:30
s-aga-r
6fca9adcd4 fix: internal Purchase Receipt GL Entries 2023-04-18 18:38:28 +05:30
Hossein Yousefian
13d4f85923
get_incoming_rate_voucher_no_fix 2023-04-18 14:50:09 +03:30
Hossein Yousefian
bbd44e6e7e
Merge branch 'frappe:develop' into get_incoming_rate_zero_in_rate_fix 2023-04-18 14:47:19 +03:30
Sagar Sharma
d07d67a968
Merge branch 'develop' into use-UnixTimestamp 2023-04-18 12:56:25 +05:30
s-aga-r
91a398a191 fix: use CombineDatetime instead of Timestamp in QB queries 2023-04-18 12:55:16 +05:30
s-aga-r
a527221709 test: add test case for consumption of reserved stock 2023-04-17 15:33:55 +05:30
s-aga-r
2ed7d8a1fb fix: don't allow Stock Reconciliation for items having reserved stock 2023-04-17 15:33:55 +05:30
s-aga-r
dc9bb772cb refactor(test): use change_settings instead of update_stock_settings 2023-04-17 15:33:55 +05:30
s-aga-r
a87bb78d72 fix: don't allow to enable Stock Reservation and Negative Stock simultaneously 2023-04-17 15:33:55 +05:30
s-aga-r
73f16752a6 chore: conflicts 2023-04-17 15:33:55 +05:30
s-aga-r
866f98ac15 test: Stock Reservation for Serial and Batch Items 2023-04-17 15:33:46 +05:30
Rohit Waghchaure
6bccd8644e fix: stock reco test case 2023-04-17 14:22:35 +05:30
rohitwaghchaure
9fd8b8e53a
Merge pull request #34851 from rohitwaghchaure/fixed-too-many-writes-error-in-stock-reco
fix: too many writes error while making backdated stock reconciliation
2023-04-17 12:01:36 +05:30
rohitwaghchaure
9f399f8741
Merge pull request #34882 from rohitwaghchaure/filter-to-hide-disabled-warehouses
fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report
2023-04-17 12:00:57 +05:30
Rohit Waghchaure
9ceb1f6bda fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report 2023-04-17 11:05:32 +05:30
Rohit Waghchaure
d9dd64b4d2 fix: linters issues 2023-04-16 23:25:51 +05:30
Hossein Yousefian
1d162ffb87
get_incoming_rate_zero_in_rate_fix 2023-04-16 11:03:16 +03:30
s-aga-r
fb3271c624 fix: unable to change company for manual Serial No entry 2023-04-14 15:59:35 +05:30
Rohit Waghchaure
7bfc8f1236 fix: too many writes error while making backdated stock reconciliation 2023-04-14 15:12:58 +05:30
Deepesh Garg
a7051cb9b5
fix: Don't use stale item details (#34847) 2023-04-14 09:59:42 +05:30
s-aga-r
e65b6d47e4 fix: disable Stock Reservation by default 2023-04-12 15:12:56 +05:30
s-aga-r
f0acb2049b fix: don't allow to deliver/transfer reserved stock 2023-04-12 14:13:54 +05:30
s-aga-r
56097807b4 fix: Stock Reservation validation in Stock Settings 2023-04-12 13:58:11 +05:30
Rohit Waghchaure
6851b5ba97 fix: reposting record not created for backdated stock reco 2023-04-11 14:35:33 +05:30
s-aga-r
51946c5528 chore: linter 2023-04-11 12:46:59 +05:30
s-aga-r
a14a6002e7 Merge branch 'develop' into stock-reservation 2023-04-11 10:00:39 +05:30
s-aga-r
a918adaa33 test: add test cases for SRE 2023-04-11 08:29:59 +05:30
Deepesh Garg
6f6928fa7b
fix: Item tax validity comparison fixes (#34784)
fix: Item tax validity comparsion fixes
2023-04-09 09:38:13 +05:30
Sagar Sharma
299fb2619f
Merge branch 'develop' into refactor-batch 2023-04-08 11:15:08 +05:30
s-aga-r
4a9a5f03fc Merge branch 'develop' into refactor-batch 2023-04-08 11:06:27 +05:30
Sagar Sharma
ba553dba62
Merge pull request #34739 from resilient-tech/item-tax-override-remove
chore!: remove override to set item tax based on HSN code
2023-04-07 21:39:08 +05:30
Sagar Sharma
f7fb001126
Merge branch 'develop' into FIX-ISS-22-23-06306 2023-04-06 15:59:32 +05:30
s-aga-r
a575bd50ef test: add test cases for internal PR received qty 2023-04-06 15:26:19 +05:30
Rohit Waghchaure
82a136f991 fix: UX for stock entry, bom and work order 2023-04-06 12:51:32 +05:30
s-aga-r
0d1df26b88 chore: add Delivery Note Item in Purchase Receipt Status Updater 2023-04-06 09:31:46 +05:30
s-aga-r
bc39dfab5d feat: add Received Qty field in Delivery Note Item 2023-04-06 09:29:44 +05:30
rohitwaghchaure
8503d581a5
Merge pull request #34743 from rohitwaghchaure/fix-incorrect-balance-qty
fix: incorrect stock balance quantity for batch item
2023-04-05 23:21:44 +05:30
s-aga-r
ac24d778e8 refactor: add Docstrings for functions 2023-04-05 19:48:15 +05:30
Rohit Waghchaure
ef4bd77196 fix: incorrect stock balance quantity for batch item 2023-04-05 00:02:45 +05:30
Sagar Vora
9c66ebb108 chore!: remove override to set item tax based on HSN code 2023-04-04 18:02:55 +05:30
rohitwaghchaure
12325cb685
Merge pull request #31271 from dj12djdjs/fix-reserve-qty
fix(stock): don't reserve qty on sales return.
2023-04-04 06:21:30 +05:30
s-aga-r
d5f0a7fcbb refactor(minor): stock reservation entry 2023-04-02 19:23:22 +05:30
Deepesh Garg
4c61ee30bb
fix: Multiple issues in purchase invoice submission (#34600)
* fix: Multiple issues in purchase invoice submission

* fix: Base grand total calculation

* chore: Calculate base grand total separately only in multi currency docs

* fix: Add gl entry for round off
2023-04-02 09:35:27 +05:30
s-aga-r
8f3d5d24e1 chore: notify user on Reservation and Unreservation of Stock 2023-04-01 16:21:50 +05:30
s-aga-r
ee322c4904 fix(ux): Allow Partial Reservation depends on Enable Stock Reservation 2023-04-01 15:55:10 +05:30
s-aga-r
de1492759d feat: add option to reserve stock in SO 2023-03-31 21:42:13 +05:30
s-aga-r
0ae400c986 feat: add option to unreserve stock in SO 2023-03-31 15:38:16 +05:30
s-aga-r
4d8ae41553 chore: make Reserve Stock on Sales Order Submission disabled by default 2023-03-31 12:50:13 +05:30
s-aga-r
06d1bc4d12 Revert "chore: add SRE ref in DN dashboard"
This reverts commit 15cb99290c.
2023-03-31 12:20:52 +05:30
s-aga-r
2d3997b2d7 refactor: remove Against Stock Reservation Entry field from DN Item 2023-03-31 12:16:59 +05:30
rohitwaghchaure
edb0666b2c
Merge branch 'develop' into fix-reserve-qty 2023-03-30 17:26:32 +05:30
rohitwaghchaure
c4a0842a4f
Merge pull request #34636 from rohitwaghchaure/posting-time-issue
fix: posting time issue
2023-03-30 17:25:47 +05:30
rohitwaghchaure
06eac67796
Merge pull request #34664 from rohitwaghchaure/fixed-incorrect-balance-qty-stock-ledger
fix: incorrect balance qty in the stock ledger report
2023-03-30 17:25:35 +05:30
s-aga-r
1a84a0c411 fix: DN Item group warehouse validation against SRE 2023-03-30 16:42:27 +05:30
Rohit Waghchaure
345e6facbe fix: posting time issue 2023-03-30 16:34:34 +05:30
s-aga-r
e286d05904 fix: SRE Available Qty to Reserve for Group Warehouse 2023-03-30 16:26:42 +05:30
Rohit Waghchaure
cbdaab940d fix: incorrect balance qty in the stock ledger report 2023-03-30 16:20:42 +05:30
Rohit Waghchaure
17131e5a02 fix: serial no with zero quantity issue in stock reco 2023-03-30 11:47:32 +05:30
s-aga-r
72e32f1ae4 refactor: remove Posting Date and Posting Time columns from SRE 2023-03-29 18:42:44 +05:30
s-aga-r
2522198129 Revert "chore: add fields Serial No and Batch No in SRE"
This reverts commit 48108b5b41.
2023-03-29 18:33:03 +05:30
s-aga-r
6b24551672 Revert "chore: add Stock Reservation Qty column in Stock Projected Qty Report"
This reverts commit 3d75e3f434.
2023-03-29 18:33:03 +05:30
s-aga-r
3fcaa21110 refactor(minor): stock_reservation_entry.py 2023-03-29 18:33:01 +05:30
s-aga-r
517b5f8567 refactor: rewrite batch.py queries in QB 2023-03-29 14:02:09 +05:30