Sagar Sharma
66723dc5db
Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES
2023-04-20 10:31:29 +05:30
rohitwaghchaure
ad662d38c7
Merge pull request #34937 from rohitwaghchaure/fixed-limit-issue-for-next-stock-reco
...
fix: add limit for get_next_stock_reco
2023-04-20 10:18:23 +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
c88beb76d6
Merge pull request #34901 from s-aga-r/FIX-ISS-23-24-00145
...
fix: add item-code filter for SCR supplied-items batch-no
2023-04-19 19:23:12 +05:30
Sagar Sharma
45c27e4e3d
Merge branch 'develop' into FIX-ISS-23-24-00145
2023-04-19 19:22:42 +05:30
Sagar Sharma
daac4dc182
Merge pull request #34895 from s-aga-r/use-UnixTimestamp
...
fix: use `CombineDatetime` instead of `Timestamp` in QB queries
2023-04-19 19:19:40 +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
ruthra kumar
b7d6e30f63
refactor: update ref details for selected references
...
set_missing_ref_details can update only for selected references
2023-04-19 15:13:10 +05:30
s-aga-r
c86c543fbf
test: add test case for internal PR GL Entries
2023-04-19 13:30:37 +05:30
Sagar Sharma
2c0e22c01d
Merge branch 'develop' into use-UnixTimestamp
2023-04-19 12:57:20 +05:30
s-aga-r
e43bc38e05
refactor: rewrite get_stock_value_on() queries in QB
2023-04-19 12:05:17 +05:30
ruthra kumar
11cb2db3fe
refactor: move set_missing_ref_detials out of set_missing_values
2023-04-19 11:54:08 +05:30
ruthra kumar
eaa5f1fd9d
Merge pull request #34838 from ruthra-kumar/making_similar_ledger_entries_merging_optional
...
refactor: toggle merging similar ledger entries in JE
2023-04-19 09:48:44 +05:30
barredterra
98d51b6c7b
fix: remove empty translations
2023-04-18 18:27:21 +02:00
barredterra
f0a3e61ee9
fix: remove excessive fourth column
2023-04-18 17:27:46 +02:00
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
barredterra
debc013728
fix: remove excessive fourth column
2023-04-18 12:23:54 +02:00
Sagar Sharma
a7c5b33c9f
Merge pull request #34860 from s-aga-r/FIX-ISS-23-24-00171
...
fix: add items field label
2023-04-18 13:04:13 +05:30
s-aga-r
e91abbfbe3
fix: add item-code filter for SCR supplied-items batch-no
2023-04-18 13:03:47 +05: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
Sagar Sharma
a78b4bef0e
Merge branch 'develop' into FIX-ISS-23-24-00171
2023-04-18 11:44:03 +05:30
ruthra kumar
3f537d30bd
chore(patch): by default ledger entries of JE's will not be merged
2023-04-18 10:55:49 +05:30
ruthra kumar
a3e3fe149d
refactor: checkbox to toggle merging of JE account heads
2023-04-18 08:59:33 +05:30
Ankush Menat
cc185bd2fe
chore: update codeowners
...
[skip ci]
2023-04-18 08:40:24 +05:30
Ankush Menat
e4f152a416
fix: whitelist doc method
...
This should've been whitelisted, looks like it was missed out
closes https://github.com/frappe/erpnext/issues/34898
2023-04-18 08:24:22 +05:30
barredterra
aba87db6be
fix: translation files
...
- remove leading "DocType: XXX"
- remove leading path and line number
- add trailing comma (three columns total)
2023-04-17 22:28:53 +02:00
MohsinAli
dd93ea067e
fix: change discuss forum url ( #34891 )
...
[skip ci]
2023-04-17 17:00:52 +05:30
Deepesh Garg
534ea5ad21
fix: Add offers info to website item ( #34873 )
...
* fix: Add offers info to website item
* Revert "fix: Add offers info to website item"
This reverts commit 88b598edb61f0ab97b751581cc2719964e169055.
* fix: Add offer properties to website item
2023-04-17 16:35:22 +05:30
Marica
fd38e8e0af
Merge branch 'develop' into bank-trans-party-automatch
2023-04-17 16:34:46 +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
rohitwaghchaure
4f978a3cbd
Merge pull request #34886 from rohitwaghchaure/fixed-stock-reco-test-case
...
fix: stock reconciliation test case
2023-04-17 15:21:49 +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
Sagar Sharma
db7b78328b
Merge branch 'develop' into FIX-ISS-23-24-00171
2023-04-16 20:13:42 +05:30
