nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,507 Commits 479 Branches 1,767 Tags
v14.8.0
Commit Graph

5721 Commits

Author SHA1 Message Date
Devin Slauenwhite
a198a55d2d fix: naming 
(cherry picked from commit 3a35651441)
 2022-11-19 13:45:19 +00:00
Devin Slauenwhite
b428307e9f fix: link to brand doctype. 
(cherry picked from commit cee069d426)
 2022-11-19 13:45:19 +00:00
Vishal
c356d2cabd fix: minor issue fixed 
(cherry picked from commit d86afddb60)
 2022-11-18 07:46:48 +00:00
Vishal
eaf09503a9 fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt 
(cherry picked from commit 71412f6877)
 2022-11-18 07:46:47 +00:00
Sabu Siyad
eb968d7f02 fix: use list() on self mutating iteration 
https://github.com/frappe/erpnext/issues/30325

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
(cherry picked from commit 546c809cbe)
 2022-11-18 04:55:43 +00:00
Ankush Menat
00558af873 chore: typo 2022-11-17 14:24:59 +05:30
mergify[bot]
4c0b5ceb9e refactor: search queries (backport #33004) (#33007) 
refactor: search queries (#33004)

- guard clauses for readability
- use values or format

(cherry picked from commit 34e4903ed7)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-17 13:06:46 +05:30
Sagar Vora
a4187b9d8f fix: set stock UOM in args to ensure item price is fetched 
(cherry picked from commit 57038c3969)
 2022-11-12 04:39:25 +00:00
Rohit Waghchaure
071ee5d81c fix: test cases 
(cherry picked from commit 7278387879)
 2022-11-10 17:13:36 +00:00
Rohit Waghchaure
0d5b7269d4 fix: Purchase Receipt timeout error 
(cherry picked from commit 4082149f0e)
 2022-11-10 17:13:35 +00:00
mergify[bot]
f8b7cfa6dd refactor: Remove usage of deprecated methods (backport #32914) (#32915) 
* 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

(cherry picked from commit 7e1742956c)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py

* chore: conflicts

* style: black


Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-11-10 11:09:13 +05:30
Sagar Sharma
beef0510ee chore: remove debugger from stock_entry_list.js 
(cherry picked from commit 84ab100d86)
 2022-11-08 06:40:55 +00:00
Nihantra C. Patel
0b09c31cb0 fix: Increase columns width in Warehouse wise Item Balance Age and Value 
(cherry picked from commit 8355c1092c)
 2022-11-07 08:05:38 +00:00
Deepesh Garg
6838e5ea3b fix: Disable tax included prices for internal transfers (#32794) 
* fix: Disable tax-included prices for internal transfers

(cherry picked from commit 8d30ebb12b)
 2022-11-05 15:22:07 +00:00
Sagar Sharma
d443925b1e Merge branch 'version-14-hotfix' into patch-2 2022-11-05 10:29:11 +05:30
Sagar Sharma
2f145f9912 refactor: rewrite query in QB 2022-11-05 10:28:06 +05:30
Rohit Waghchaure
1944f4df4d fix: Scan Barcode UX 
(cherry picked from commit e1f9ba78e5)

# Conflicts:
#	erpnext/public/js/utils/barcode_scanner.js
 2022-11-04 05:36:09 +00:00
Bhavesh Maheshwari
4d9bbd4c9c fix: mysql syntax issue 2022-11-03 10:59:20 +05:30
Ernesto Ruiz
8f6f9a429a fix: correct linters 
(cherry picked from commit 4c7fa9482d)
 2022-11-03 04:17:23 +00:00
Ernesto Ruiz
440e20859f fix: correct linters 
(cherry picked from commit 9c529c61bb)
 2022-11-03 04:17:22 +00:00
Ernesto Ruiz
b0c06d5a04 fix: add translate function to period in stock_analytics.py 
(cherry picked from commit c1e608d9ef)
 2022-11-03 04:17:20 +00:00
Ernesto Ruiz
0ead51642f fix: refactor code for better translatable string in stock_ageing.py 
(cherry picked from commit 71a0ae2e59)
 2022-11-03 04:17:20 +00:00
Sagar Sharma
611dcc11d2 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32788 2022-11-02 17:49:26 +05:30
Rohit Waghchaure
d3fbe3074d test: run tmate 
(cherry picked from commit 3f2728e3f7)
 2022-11-02 11:44:05 +00:00
Rohit Waghchaure
0feec4ca8a fix: test cases 
(cherry picked from commit ddd1b4be3f)
 2022-11-02 11:44:05 +00:00
Sagar Sharma
6510464482 fix: use flt instead of cint in get_batch_no 
(cherry picked from commit 9fb3fb4c83)
 2022-11-02 10:25:26 +00:00
Rohit Waghchaure
1152ac3ff1 fix: duplicate custom fields for inventory dimension 
(cherry picked from commit 45ededbed5)
 2022-10-31 16:56:17 +00:00
Sagar Sharma
fc6389280c fix: add Sales Order reference in Material Request Dashboard 
(cherry picked from commit 15ebf4a0cf)
 2022-10-29 07:07:25 +00:00
Sagar Sharma
98428f0bce refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB 
(cherry picked from commit 40bd121593)
 2022-10-28 15:36:01 +00:00
Sagar Sharma
a4b99a34cb refactor: rewrite Product Bundle Balance Report queries in QB 
(cherry picked from commit cde785f1bb)
 2022-10-28 15:36:01 +00:00
Sagar Sharma
c4587d8caa refactor: rewrite Stock Ledger Report queries in QB 
(cherry picked from commit feaa2dbba8)
 2022-10-28 15:36:01 +00:00
Vishal
0ab69c0e32 chore: minor linting issue fixed 
(cherry picked from commit e8c0157017)
 2022-10-28 08:54:44 +00:00
Vishal
de3996e411 chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking 
(cherry picked from commit a04c44fe34)
 2022-10-28 08:54:44 +00:00
Deepesh Garg
953f78d6a9 fix: Add condition for discount section collapse 
(cherry picked from commit 4cd65027c4)
 2022-10-28 05:55:06 +00:00
Deepesh Garg
dbbebd2a73 Merge pull request #32663 from frappe/mergify/bp/version-14-hotfix/pr-32659 
fix: Billing Address for inter-company purchase docs (backport #32659)
 2022-10-20 17:21:24 +05:30
Ankush Menat
887690449d fix: dont update item info twice 
[skip ci]
 2022-10-20 16:19:40 +05:30
mergify[bot]
3300856fb4 perf: cache barcode scan result (backport #32629) (#32672) 
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>
(cherry picked from commit b88e850d55)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2022-10-20 15:57:21 +05:30
Deepesh Garg
f8934faa73 fix: Billing Address for inter-company purchase docs 
(cherry picked from commit 796f2d3c09)
 2022-10-20 06:29:32 +00:00
Sagar Sharma
831f60f439 fix: linter 2022-10-18 14:27:56 +05:30
Sagar Sharma
469813d3e1 chore: conflicts 2022-10-18 14:18:44 +05:30
Sagar Sharma
656008dd66 refactor: rewrite Warehouse wise Item Balance Age and Value Report queries in QB 
(cherry picked from commit 8103856a41)
 2022-10-18 08:22:56 +00:00
Sagar Sharma
362bf5fc19 refactor: rewrite Total Stock Summary Report queries in QB 
(cherry picked from commit 7c759b193c)
 2022-10-18 08:22:56 +00:00
Sagar Sharma
8af90b2421 refactor: rewrite Supplier-Wise Sales Analytics Report queries in QB 
(cherry picked from commit d3c073dc25)
 2022-10-18 08:22:55 +00:00
Sagar Sharma
6903fb68d3 refactor: rewrite Stock Projected Qty Report queries in QB 
(cherry picked from commit c18f13a45b)
 2022-10-18 08:22:55 +00:00
Sagar Sharma
907a41a8da refactor: rewrite Item Prices Report queries in QB 
(cherry picked from commit e312d17eae)
 2022-10-18 08:22:55 +00:00
Sagar Sharma
e62fdf4af0 refactor: rewrite Delayed Item Report queries in QB 
(cherry picked from commit bb59346651)
 2022-10-18 08:22:55 +00:00
Sagar Sharma
720370537f refactor: rewrite Batch-Wise Balance History Report queries in QB 
(cherry picked from commit 1c1f991d2f)

# Conflicts:
#	erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
 2022-10-18 08:22:54 +00:00
Sagar Sharma
5a85c2d661 refactor: rewrite Batch Item Expiry Status Report queries in QB 
(cherry picked from commit 2c9d9577e3)
 2022-10-18 08:22:54 +00:00
Rohit Waghchaure
1ee0d990e5 chore: seperate function to apply filter for warehouse in case of QB 
(cherry picked from commit 2481574a28)
 2022-10-17 09:43:30 +00:00
Rohit Waghchaure
faedd85b66 fix: group warehouse filter not working for Batchwise Balance history report 
(cherry picked from commit 6381e75fa5)
 2022-10-17 09:43:29 +00:00