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
rohitwaghchaure
738dd57904
Merge pull request #34461 from s-aga-r/FIX-ISS-22-23-05936
...
fix: incorrect `Opening Value` in `Stock Balance` report
2023-03-28 17:40:25 +05:30
s-aga-r
7d0bc0914d
Merge branch 'develop' into stock-reservation
2023-03-28 12:25:17 +05:30
s-aga-r
beb425e1ff
chore: add Stock Reservation Qty column in Stock Balance Report
2023-03-27 21:03:35 +05:30
Devin Slauenwhite
3c553b0938
feat: don't reserve qty on sales return
2023-03-27 10:37:54 -04:00
Devin Slauenwhite
17f8080168
chore: revert get_reserve_qty method
2023-03-27 10:37:04 -04:00
s-aga-r
3d75e3f434
chore: add Stock Reservation Qty column in Stock Projected Qty Report
2023-03-27 19:12:08 +05:30
s-aga-r
00ac49f81b
refactor(minor): SRE functions
2023-03-27 12:18:40 +05:30
s-aga-r
22a9c8ad55
fix(ux): SRE filters in DN Items
2023-03-27 11:07:24 +05:30
s-aga-r
b95a49e4c2
fix: validate DN against SRE
2023-03-27 10:46:07 +05:30
s-aga-r
3602d1909e
fix: map DN items based on SRE
2023-03-26 17:33:01 +05:30
s-aga-r
15cb99290c
chore: add SRE ref in DN dashboard
2023-03-26 16:53:31 +05:30
s-aga-r
cdc625806d
chore: add field Against Stock Reservation Entry in DN Item
2023-03-26 16:53:28 +05:30
=
1142e69d1a
Merge branch 'develop' into fix-reserve-qty
...
# Conflicts:
# erpnext/selling/doctype/selling_settings/selling_settings.json
2023-03-24 23:50:50 -04:00
s-aga-r
be9fa8c047
fix: don't allow to disable Stock Reservation if SRE exists
2023-03-24 21:39:36 +05:30
s-aga-r
48108b5b41
chore: add fields Serial No and Batch No in SRE
2023-03-24 16:23:38 +05:30
s-aga-r
7b6e4d44b7
chore: remove Valuation Rate field from SRE
2023-03-24 16:09:38 +05:30
s-aga-r
c80ce99972
feat: configuration to allow partial reservation
2023-03-23 19:53:17 +05:30
s-aga-r
ee074883bb
chore: add Partially Reserved status in SRE
2023-03-23 19:50:34 +05:30
s-aga-r
4ad55382cf
chore: add field Voucher Qty in SRE
2023-03-23 19:37:57 +05:30
s-aga-r
f8c477ca5c
chore: rename status from Submitted to Reserved
2023-03-23 13:05:43 +05:30
s-aga-r
fd746288f8
chore: add field Available Qty to Reserve in SRE
2023-03-23 13:05:41 +05:30
s-aga-r
30d566a787
fix: update Reserved Qty in SO Item on SRE cancel
2023-03-21 23:49:01 +05:30
s-aga-r
c2ba8b1b54
chore: make SRE a submittable DocType
2023-03-21 20:16:07 +05:30
s-aga-r
1b7fb6d7e7
chore: make Stock UOM required in SRE
2023-03-20 22:41:22 +05:30
s-aga-r
4848a054a8
chore: make Submitted default status for Stock Reservation Entry
2023-03-20 22:40:06 +05:30
s-aga-r
2946de40d8
fix: make Project and Is Cancelled field read-only in SRE
2023-03-20 21:18:37 +05:30
s-aga-r
0d1332942c
feat: add Status and Delivered Qty fields in Stock Reservation Entry
2023-03-20 19:01:37 +05:30
Ankush Menat
109a9f1390
perf: index against_sales_invoice field on DN items ( #34509 )
...
This is used on Sales invoice dashboard and takes a lot of time to load
as db size increases.
Results:
Before: ~10-20 seconds to load dashboard
After: few milliseconds because of index
[skip ci]
2023-03-20 14:46:26 +05:30
s-aga-r
da1455198e
chore: field validation for Stock Reservation Entry
2023-03-20 13:42:11 +05:30
s-aga-r
7eb2075265
feat: add settings for Stock Reservation in Stock Settings
2023-03-20 11:45:35 +05:30
s-aga-r
085d9ce004
feat: add DocType Stock Reservation Entry
2023-03-20 11:20:30 +05:30
Sagar Sharma
a07a5572ea
Merge branch 'develop' into FIX-ISS-22-23-05936
2023-03-17 16:18:54 +05:30
Danny
ca10e2bb9f
fix: bad strings format for command get-untraslated ( #34361 )
...
* fix: bad string foramt
* fix: bad string format
* fix: pre-commit format
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-03-17 16:13:32 +05:30
s-aga-r
b04a101c11
fix: incorrect Opening Value in Stock Balance report
2023-03-17 13:53:49 +05:30
