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
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
Rohit Waghchaure
6851b5ba97
fix: reposting record not created for backdated stock reco
2023-04-11 14:35:33 +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
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
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
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
Rohit Waghchaure
345e6facbe
fix: posting time issue
2023-03-30 16:34:34 +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
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
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
=
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
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
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
Sagar Sharma
e0b288fbf0
Merge branch 'develop' into FIX-34354
2023-03-14 18:19:38 +05:30
Johannes Obermeier
70c78d0d67
fix: incorrect EAN validation, EAN can be an EAN8, EAN12 or EAN13 code ( #34250 )
...
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-14 15:27:05 +05:30
s-aga-r
22ad9a1903
chore: Allow Zero Valuation Rate msg in SE
2023-03-14 14:33:03 +05:30
Ankush Menat
b8a61be080
test: fix hypothesis tests ( #34416 )
2023-03-13 15:16:30 +05:30
s-aga-r
baef5ae1ef
chore: Alternative Item Code error msg
2023-03-08 20:07:30 +05:30
s-aga-r
8ad9e99cea
perf: update_completed_qty() in material_request.py
2023-03-07 10:50:11 +05:30
s-aga-r
70de444b7b
fix: Stock Reconciliation actual_qty
2023-03-04 17:06:07 +05:30
s-aga-r
e6a02719f7
fix: update inventory dimensions before returning sle
2023-03-04 16:02:50 +05:30
s-aga-r
0e1b7760a8
fix: Inventory Dimension for Stock Reconciliation
2023-03-04 01:05:55 +05:30
Sagar Sharma
6e9d001819
Merge branch 'develop' into github-issue-33344
2023-03-02 12:09:21 +05:30
Ankush Menat
330ae419be
fix!: Parse float as per number format in quality inspection ( #34259 )
...
fix: Parse float as per number format in quality inspection
2023-03-02 11:59:18 +05:30
Rohit Waghchaure
a8445da02a
fix: labels name
2023-02-28 15:47:45 +05:30
s-aga-r
58c027d4cc
chore: Linters
2023-02-28 15:14:34 +05:30
Rohit Waghchaure
eab775ef32
feat: adjust purchase receipt valuation rate as per purchase invoice rate
2023-02-28 14:11:55 +05:30
Sagar Sharma
ecd15d2a65
Merge branch 'develop' into github-issue-33344
2023-02-27 16:57:29 +05:30
s-aga-r
c09a61f360
fix: set from_warehouse and to_warehouse while mapping SE
2023-02-27 12:26:21 +05:30
rohitwaghchaure
6d6e3cb015
Merge pull request #34206 from rohitwaghchaure/fixed-trivial-error-for-stock-reposting
...
fix: not able to repost gl entries
2023-02-24 21:10:27 +05:30
Rohit Waghchaure
7d10dd9ea8
fix: not able to repost gl entries
2023-02-24 17:50:00 +05:30
rohitwaghchaure
04f00fd141
Merge pull request #34199 from rohitwaghchaure/fixed-converison-factor-issue
...
fix: conversion factor not set
2023-02-24 14:56:36 +05:30
Rohit Waghchaure
8e46aebc50
fix: conversion factor not set
2023-02-24 14:49:05 +05:30
rohitwaghchaure
670304fe8e
Merge pull request #34189 from rohitwaghchaure/prevent-to-make-item-price-for-template
...
fix: user shouldn't able to make item price for item template
2023-02-23 20:47:48 +05:30
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
