6251 Commits

Author	SHA1	Message	Date
Sagar Vora	57038c3969	fix: set stock UOM in args to ensure item price is fetched	2022-11-09 18:56:09 +05:30
Rohit Waghchaure	7278387879	fix: test cases	2022-11-09 01:28:40 +05:30
Rohit Waghchaure	4082149f0e	fix: Purchase Receipt timeout error	2022-11-08 20:59:20 +05:30
Sagar Sharma	84ab100d86	chore: remove debugger from stock_entry_list.js	2022-11-08 12:05:15 +05:30
Nihantra C. Patel	8355c1092c	fix: Increase columns width in Warehouse wise Item Balance Age and Value	2022-11-07 11:45:47 +05:30
Deepesh Garg	8d30ebb12b	fix: Disable tax included prices for internal transfers (#32794) ... * fix: Disable tax-included prices for internal transfers	2022-11-05 20:51:15 +05:30
Sagar Sharma	3ca9d53d1b	refactor: rewrite query in QB ... (cherry picked from commit 2f145f99129503359b9a79c247fe69e30ac1bf8e)	2022-11-05 06:12:40 +00:00
Bhavesh Maheshwari	f4779df9b3	fix: mysql syntax issue ... (cherry picked from commit 4d9bbd4c9c06811086e0ae4e2c16763fe7d171a3)	2022-11-05 06:12:40 +00:00
rohitwaghchaure	441f082fcb	Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality ... fix: Scan Barcode UX	2022-11-04 11:04:40 +05:30
Deepesh Garg	8581b7820d	Merge pull request #32713 from ernestoruiz89/patch-9 ... fix: add missing translation function on report related documents	2022-11-03 09:46:43 +05:30
Rohit Waghchaure	e1f9ba78e5	fix: Scan Barcode UX	2022-11-02 15:37:46 +05:30
Sagar Sharma	be4593c1d9	Merge branch 'develop' into fix/github-issue/30339	2022-11-02 11:50:51 +05:30
Rohit Waghchaure	3f2728e3f7	test: run tmate	2022-11-01 22:20:13 +05:30
Rohit Waghchaure	ddd1b4be3f	fix: test cases	2022-11-01 19:30:37 +05:30
Sagar Sharma	9fb3fb4c83	fix: use flt instead of cint in get_batch_no	2022-11-01 10:45:13 +05:30
rohitwaghchaure	1033d34964	Merge pull request #32730 from rohitwaghchaure/duplicate-custom-fields-inventory-dimension ... fix: duplicate custom fields for inventory dimension	2022-10-31 22:25:29 +05:30
Rohit Waghchaure	45ededbed5	fix: duplicate custom fields for inventory dimension	2022-10-31 15:33:23 +05:30
Sagar Sharma	15ebf4a0cf	fix: add Sales Order reference in Material Request Dashboard	2022-10-29 12:01:37 +05:30
Deepesh Garg	b6ade62211	Merge pull request #32662 from s-aga-r/refactor/stock/remaining-reports ... refactor: rewrite stock reports queries in qb	2022-10-28 21:05:15 +05:30
Vishal Dhayagude	db0f2c0b10	Merge branch 'develop' into pr_dashboard	2022-10-28 13:36:43 +05:30
Vishal	e8c0157017	chore: minor linting issue fixed	2022-10-28 11:59:10 +05:30
Vishal	a04c44fe34	chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking	2022-10-28 11:36:14 +05:30
Sagar Sharma	334b158f0b	Merge branch 'develop' into refactor/stock/remaining-reports	2022-10-28 11:27:42 +05:30
Deepesh Garg	4cd65027c4	fix: Add condition for discount section collapse	2022-10-26 16:48:24 +05:30
Ernesto Ruiz	4c7fa9482d	fix: correct linters	2022-10-25 22:39:05 -06:00
Ernesto Ruiz	9c529c61bb	fix: correct linters	2022-10-25 22:35:37 -06:00
Ernesto Ruiz	c1e608d9ef	fix: add translate function to period in stock_analytics.py	2022-10-25 22:09:02 -06:00
Ernesto Ruiz	71a0ae2e59	fix: refactor code for better translatable string in stock_ageing.py	2022-10-25 22:05:25 -06:00
Sagar Sharma	26c00f8dd3	Merge branch 'develop' into refactor/stock/remaining-reports	2022-10-21 15:19:23 +05:30
Sagar Sharma	40bd121593	refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB	2022-10-21 14:49:12 +05:30
Sagar Sharma	cde785f1bb	refactor: rewrite Product Bundle Balance Report queries in QB	2022-10-21 14:49:09 +05:30
Sagar Sharma	feaa2dbba8	refactor: rewrite Stock Ledger Report queries in QB	2022-10-21 13:12:34 +05:30
Ankush Menat	11207c4e56	fix: dont update item info twice ... [skip ci]	2022-10-20 16:18:48 +05:30
Devin Slauenwhite	b88e850d55	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>	2022-10-20 15:56:07 +05:30
Deepesh Garg	796f2d3c09	fix: Billing Address for inter-company purchase docs	2022-10-19 23:50:39 +05:30
Sagar Sharma	582e1bf10c	Merge branch 'develop' into refactor/stock/reports	2022-10-17 16:30:43 +05:30
Rohit Waghchaure	2481574a28	chore: seperate function to apply filter for warehouse in case of QB	2022-10-17 14:25:23 +05:30
Rohit Waghchaure	6381e75fa5	fix: group warehouse filter not working for Batchwise Balance history report	2022-10-17 12:17:05 +05:30
Sagar Sharma	3c1bd90d0d	Merge branch 'develop' into refactor/stock/reports	2022-10-14 11:57:04 +05:30
ruthra kumar	2d0217abd5	Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost ... fix: deduplicate Payment Ledger on Item value repost	2022-10-13 14:01:59 +05:30
Sagar Sharma	bb7897caab	Merge branch 'develop' into refactor/stock/reports	2022-10-12 19:21:15 +05:30
Rohit Waghchaure	692462d7c8	fix: removed unnecessary imports	2022-10-12 16:30:48 +05:30
Deepesh Garg	43c2bd1351	Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes ... fix: Incoming rate precision fixes for intra company transfer	2022-10-12 16:23:16 +05:30
ruthra kumar	eb819368aa	test: dedeplication on payment ledger upon repost	2022-10-12 16:08:59 +05:30
Rohit Waghchaure	3266e54e33	fix: consider outgoingrate while valuation rate calculate	2022-10-12 15:44:53 +05:30
Rohit Waghchaure	683a47f7a1	fix: consider sales rate as incoming rate for transit warehouse in purchase flow	2022-10-12 15:44:53 +05:30
Deepesh Garg	c8d2181498	chore: Increase precision for other doc fields	2022-10-12 14:17:55 +05:30
Sagar Sharma	59edf64951	Merge branch 'develop' into refactor/stock/reports	2022-10-12 13:30:00 +05:30
Rohan	43037d893d	fix: type-cast while saving an item (#32549)	2022-10-12 13:07:58 +05:30
Sagar Sharma	16aef53470	Merge branch 'develop' into refactor/stock/reports	2022-10-12 00:38:40 +05:30
Deepesh Garg	38b34f2a45	Merge pull request #32408 from nabinhait/sales-purchase-tab-break ... feat: Tab Breaks in all Sales and Purchase cycle transactions	2022-10-11 16:02:45 +05:30
Deepesh Garg	dc20b21fb5	test: Internal tranfer precision loss test	2022-10-11 14:54:27 +05:30
ruthra kumar	633c2a289e	Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save ... fix: Value error on validation of POS invoices with Serial Nos	2022-10-11 14:42:47 +05:30
Nabin Hait	e71c417f7e	fix: minor cleanup	2022-10-11 13:21:27 +05:30
Nabin Hait	5389a35798	fix: more fields reordering related to Tab Break	2022-10-11 13:21:07 +05:30
Nabin Hait	35f836c4b7	feat: Tab Break in Purchase Receipt	2022-10-11 13:18:21 +05:30
Nabin Hait	2172c5034a	feat: Tab Break in Material Request	2022-10-11 13:18:21 +05:30
Nabin Hait	7546562139	feat: Tab Break in Quotation	2022-10-11 13:18:21 +05:30
Nabin Hait	f6613e1e4c	feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order	2022-10-11 13:18:21 +05:30
ruthra kumar	4b908ebcd6	fix: value error on pos submit	2022-10-11 11:21:11 +05:30
Sagar Sharma	60befcd8a8	Merge branch 'develop' into fix/quality-inspection/status	2022-10-08 13:34:21 +05:30
Sagar Sharma	4992e4a2b8	fix(test): test_rejected_qi_validation	2022-10-08 13:33:36 +05:30
Sagar Sharma	fcc1272d42	test: add test cases for Quality Inspection status	2022-10-08 13:33:36 +05:30
Sagar Sharma	2657ece2cd	fix: set Quality Inspection status based on readings status	2022-10-08 13:33:22 +05:30
rohitwaghchaure	73a9791401	Merge branch 'develop' into provision-to-return-components	2022-10-07 23:50:05 +05:30
Rohit Waghchaure	d59ed24e6c	feat: provision to return non consumed components against the work order	2022-10-07 22:45:53 +05:30
Sagar Sharma	f0f2413932	Merge branch 'develop' into refactor/stock/reports	2022-10-07 09:59:56 +05:30
Sagar Sharma	8103856a41	refactor: rewrite Warehouse wise Item Balance Age and Value Report queries in QB	2022-10-07 09:59:35 +05:30
Sagar Sharma	7c759b193c	refactor: rewrite Total Stock Summary Report queries in QB	2022-10-07 09:59:28 +05:30
Sagar Sharma	d7c3b7633a	fix: make readings status mandatory in Quality Inspection	2022-10-06 22:36:37 +05:30
Ankush Menat	8376fbc982	fix: Explicitly update modified (#32519) ... * fix: Explicitly update modified required after https://github.com/frappe/frappe/pull/18301 * chore: fix broken translations	2022-10-06 20:35:33 +05:30
Sagar Sharma	d3c073dc25	refactor: rewrite Supplier-Wise Sales Analytics Report queries in QB	2022-10-06 17:42:31 +05:30
Sagar Sharma	c18f13a45b	refactor: rewrite Stock Projected Qty Report queries in QB	2022-10-06 17:04:50 +05:30
Deepesh Garg	fbdd1f39e7	Merge pull request #32499 from rohitwaghchaure/fixed-TooManyWritesError-for-reposting ... fix: TooManyWritesError during reposting of stock	2022-10-05 16:05:12 +05:30
Rohit Waghchaure	aaabba9b1e	fix: TooManyWritesError during reposting of stock	2022-10-05 10:58:21 +05:30
Sagar Sharma	39707757a6	chore: add Manual Inspection field in Quality Inspection DocType	2022-10-04 23:16:16 +05:30
Sagar Sharma	e295d0c091	Merge branch 'develop' into fix/pick-list/picked-qty	2022-10-03 14:20:05 +05:30
Sagar Sharma	ba02209f1d	fix: pick list picked-qty for batch item	2022-10-03 14:12:42 +05:30
Rohit Waghchaure	0b1727cf79	fix: not able to return sold expired batches	2022-10-03 12:06:32 +05:30
Sagar Sharma	ca2958a999	Merge branch 'develop' into fix/item/update-stock	2022-09-30 16:36:46 +05:30
Sagar Sharma	6d0842465b	fix: don't allow to update Maintain Stock if the item has a BOM	2022-09-30 15:18:10 +05:30
Sagar Sharma	774097bd10	Merge branch 'develop' into item_dashboard_create_new	2022-09-30 12:37:58 +05:30
Rohit Waghchaure	3656f7d06f	test: added test case	2022-09-29 14:01:51 +05:30
Deepesh Garg	0439e41a44	fix: Item details fetching on making transaction from item dashboard	2022-09-28 14:54:53 +05:30
Sagar Sharma	376febb9d1	Merge branch 'develop' into fix/work-order/finish-button	2022-09-27 15:36:15 +05:30
Rohit Waghchaure	a4a86ee23f	fix: allow to return expired batches using purchase return	2022-09-27 13:55:27 +05:30
Sagar Sharma	9049db41ae	fix: For Quantity error msg in Stock Entry	2022-09-27 12:00:50 +05:30
Sagar Sharma	e312d17eae	refactor: rewrite Item Prices Report queries in QB	2022-09-26 17:50:17 +05:30
hendrik	f41d1500b0	fix: report chart field type ... * fix: report chart field type Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2022-09-26 17:47:24 +05:30
Sagar Sharma	afb323b01c	Merge branch 'develop' into refactor/stock/report/incorrect-stock-value	2022-09-26 17:09:22 +05:30
Sagar Sharma	b93331e844	refactor: rewrite Incorrect Stock Value Report queries in QB	2022-09-26 09:44:29 +05:30
Sagar Sharma	22299d2382	refactor: rewrite Item Price Stock Report queries in QB	2022-09-26 09:40:49 +05:30
Sagar Sharma	bb59346651	refactor: rewrite Delayed Item Report queries in QB	2022-09-23 15:47:26 +05:30
Sagar Sharma	1c1f991d2f	refactor: rewrite Batch-Wise Balance History Report queries in QB	2022-09-23 14:57:44 +05:30
Sagar Sharma	2c9d9577e3	refactor: rewrite Batch Item Expiry Status Report queries in QB	2022-09-23 14:06:37 +05:30
Deepesh Garg	d4b01f6ffd	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule	2022-09-20 14:58:48 +05:30
Sagar Sharma	3dc754cac2	test: add test cases for Item Shortage Report	2022-09-20 10:48:05 +05:30
Sagar Sharma	f0a78aa559	refactor: rewrite Item Shortage Report queries in QB	2022-09-20 10:47:55 +05:30
Sagar Sharma	3a9c08e7c9	fix: po_detail or sco_rm_detail not getting set while while mapping SE	2022-09-19 18:47:46 +05:30
Sagar Sharma	b90875575c	fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor	2022-09-18 11:37:07 +05:30
Sagar Sharma	2f97370b8e	fix: sco_rm_detail in Stock Entry	2022-09-17 14:29:42 +05:30
Maharshi Patel	8c5b420aea	fix: remove no_copy for ignore_pricing_rule	2022-09-16 18:26:00 +05:30
Nabin Hait	a5b5885933	fix: test cases	2022-09-15 11:19:14 +05:30
Sagar Sharma	bf1fa014f4	test: add test case for item master maintain-stock	2022-09-13 22:12:56 +05:30
Sagar Sharma	7b878ea3d8	fix: unknown column error while updating value of maintain-stock in item master	2022-09-13 21:52:58 +05:30
Nabin Hait	e24a4b18c4	Merge branch 'SaiFi0102-asset-capitalization' into develop	2022-09-13 15:00:21 +05:30
Nabin Hait	58d430fe3e	feat: Asset Capitalization ... - manual selection of entry type - GLE cleanup with smaller functions - GLE considering periodical inventory - test cases	2022-09-13 14:56:21 +05:30
Ankush Menat	fffc245922	fix(UX): make Item attachments public by default (#32196)	2022-09-13 13:41:00 +05:30
Ahmad	4f1cc41b86	fix: pick_list - picked qty getting set to 1 ... (cherry picked from commit 3256e2b8b7cee0e7b95ca58a6f22f96090e2ffaa)	2022-09-12 16:49:45 +00:00
rohitwaghchaure	8f787c08a2	fix: customer code max characters limit issue (#32177)	2022-09-12 16:48:53 +05:30
Sagar Sharma	2e314a20f1	Merge branch 'develop' into fix/stock-entry/sco	2022-09-09 13:48:14 +05:30
Sagar Sharma	9a3dcb9ad1	fix: validate Subcontracting Order in Stock Entry	2022-09-09 13:46:50 +05:30
Sagar Sharma	30909a9b79	fix: status filter for Subcontracting Order in Stock Entry	2022-09-09 13:45:31 +05:30
Sagar Sharma	b49caf170c	Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor	2022-09-09 11:37:12 +05:30
Rohit Waghchaure	a03b4ce213	fix: reposting not working for internal transferred purchase receipt	2022-09-08 19:16:00 +05:30
rohitwaghchaure	72d5366e96	Merge pull request #31918 from s-aga-r/fix/subcontracting-receipt/gl-entries ... fix: Subcontracting Receipt GL Entries	2022-09-08 10:17:12 +05:30
Rohit Waghchaure	f1c4aea7b5	fix: option to start reposting from repost item valuation	2022-09-07 16:38:17 +05:30
Sagar Sharma	f19049e643	Merge branch 'develop' into fix/subcontracting-receipt/gl-entries	2022-09-07 14:55:56 +05:30
Sagar Sharma	01c2e4d2cf	Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor	2022-09-07 14:52:16 +05:30
rohitwaghchaure	5b02adbd33	Merge pull request #32113 from rohitwaghchaure/fixed-internal-transfer-flow ... fix: internal transfer flow	2022-09-07 14:26:14 +05:30
Devin Slauenwhite	aab2c9c682	fix: require barcode item barcode. (#31957) ... * fix: require barcode item barcode. * fix: make supplier mandatory in Item Supplier DocType Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-09-07 12:59:46 +05:30
Rohit Waghchaure	b4a102d119	fix: internal transfer flow	2022-09-07 12:48:18 +05:30
Sagar Sharma	2f00413864	fix: consider Stock Entry purpose while getting total supplied qty	2022-09-06 16:42:15 +05:30
rohitwaghchaure	c6380a25d6	Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent ... fix: inventory dimension issues	2022-09-06 10:45:36 +05:30
Rohit Waghchaure	75fcab04b1	test: test cases for PI and DN	2022-09-06 01:42:57 +05:30
HENRY Florian	86395c6adb	feat: better Item Price list view (#31954) ... * feat: better Item Price list view	2022-09-04 16:25:03 +05:30
Rohit Waghchaure	237299948a	fix: fetch from parent not working for custom field	2022-09-03 17:27:00 +05:30
rohitwaghchaure	0efc6a9abe	Merge pull request #32065 from rohitwaghchaure/not-able-to-make-variant-item ... fix: not able to make variant item	2022-09-03 11:52:56 +05:30
Rohit Waghchaure	92b0f9cd7e	fix: not able to make variant item	2022-09-03 11:42:04 +05:30
Sagar Sharma	9dbaaa33f5	fix: AD not getting copied from SCO while creating a SE (#32004)	2022-08-29 15:07:20 +05:30
Sagar Sharma	af5cbc881f	chore: allow return of components in SCO (#31994) ... chore: allow return of components in sco	2022-08-26 22:49:40 +05:30
Sagar Sharma	8566832dd5	fix: add validation for PO in Stock Entry (#31974)	2022-08-25 15:05:13 +05:30
rohitwaghchaure	b27f3ab327	Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order ... fix: material request connection on work order	2022-08-25 12:29:10 +05:30
Rohit Waghchaure	9ab10def49	fix: material request connection on work order	2022-08-25 12:13:17 +05:30
Deepesh Garg	9b626d06fc	Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no ... fix: Add docstatus filter for voucher_no in Repost Item Valuation	2022-08-25 10:49:29 +05:30
Solufyin	0e26df331c	fix: Route condition set for stock ledger (#31935)	2022-08-24 13:28:55 +05:30
Sagar Sharma	f4673941e0	chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py	2022-08-21 21:26:06 +05:30
Sagar Sharma	520306dc87	fix: Add docstatus filter for voucher_no in Repost Item Valuation	2022-08-21 12:09:08 +05:30
Sagar Sharma	f92f3e0208	chore: add option for "Subcontracting Receipt" in "Voucher Type"	2022-08-19 20:52:26 +05:30
Sagar Sharma	256b4245d5	chore: add additional-cost table in SCR	2022-08-18 20:59:30 +05:30
Sagar Sharma	eabd3135f0	fix: base_amount and exchange_rate in additional-cost table	2022-08-18 17:16:29 +05:30
Deepesh Garg	1a6508972e	fix: Make expense account editable in Purchase Receipt Item (#31730) ... Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-08-18 10:59:39 +05:30
Sagar Sharma	f1a612245c	fix: Transit filter for Default Target Warehouse in SE (#31839)	2022-08-17 16:44:12 +05:30
rohitwaghchaure	396667b702	Merge pull request #31860 from rohitwaghchaure/delete-custom-fields-on-dimension-delete ... fix: delete custom fields on deletion of inventory dimension	2022-08-17 15:43:54 +05:30
Rohit Waghchaure	0b39a0123e	fix: delete custom fields on deletion of inventory dimension	2022-08-17 14:55:02 +05:30
rohitwaghchaure	dd08045f28	Merge pull request #31863 from rohitwaghchaure/allow-to-make-material-issue ... fix: not able to issue expired batches	2022-08-17 14:45:14 +05:30
Rohit Waghchaure	795c94384a	fix: not able to issue expired batches	2022-08-17 14:03:55 +05:30
Rohit Waghchaure	ddd24ea8c8	fix: incorrect incoming rate set for inter transfer purchase receipt	2022-08-09 14:50:20 +05:30
Marica	1a2ffc7c6e	Merge pull request #31601 from pps190/pref-wh-wise-stock-value ... perf: reduce db calls for warehouse wise stock value chart	2022-07-27 17:47:43 +05:30
Rohit Waghchaure	5da7e01db2	fix: dont show zero qty available items in stock ageing report	2022-07-22 17:54:46 +05:30
Marica	6883fc95ae	Merge pull request #31579 from pps190/fix-pl-customer-name ... fix: display customer name on picking list	2022-07-21 18:38:08 +05:30
rohitwaghchaure	5a3999e236	Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension ... feat: Inventory Dimension	2022-07-20 19:47:14 +05:30
Rohit Waghchaure	289e6cd4ce	fix: change frappe.db.sql to frappe.qb	2022-07-20 16:02:13 +05:30
Rohit Waghchaure	e576f7f07e	test: test cases for inventory dimension	2022-07-20 16:02:13 +05:30
Rohit Waghchaure	dbec5cff00	feat: Inventory Dimension	2022-07-20 16:02:13 +05:30
Rucha Mahabal	f222284c33	Merge branch 'develop' into hr-separation	2022-07-20 15:47:40 +05:30
Nabin Hait	e1fa723eef	fix: set args to empty list if None to avoid enumerate error	2022-07-20 15:19:09 +05:30
Rucha Mahabal	f2532a6aaa	Merge branch 'develop' into hr-separation	2022-07-20 14:22:27 +05:30
Devin Slauenwhite	7083b3148b	fix: make customer_name field read only.	2022-07-19 11:02:43 -04:00
Devin Slauenwhite	d3f0897420	Merge branch 'develop' into fix-pl-customer-name	2022-07-19 11:01:28 -04:00
rohitwaghchaure	60dbd6a246	Merge pull request #31631 from rohitwaghchaure/slow-stock-reposting-issue ... fix: slow stock reposting	2022-07-19 18:47:23 +05:30
Rohit Waghchaure	1d80d37ccf	fix: slow stock reposting	2022-07-19 16:36:22 +05:30
Marica	2a2db8c64a	Merge branch 'develop' into lcv-future-stock-update	2022-07-19 12:53:51 +05:30
Devin Slauenwhite	1e20358c28	fix: sum stock_value and group by warehouse	2022-07-14 18:53:50 -04:00
Devin Slauenwhite	bc3023318e	chore: remove unused import	2022-07-14 18:09:52 -04:00
Devin Slauenwhite	73ade04dcf	pref: reduce count of db calls from n to 2	2022-07-14 18:09:08 -04:00
Devin Slauenwhite	0a633a212d	fix: display customer name on picking list	2022-07-12 13:05:40 -04:00
Rucha Mahabal	d8aa1c59f1	Merge branch 'develop' into hr-separation	2022-07-12 19:27:19 +05:30
marination	de9ea70ce3	test: LCV impact on future stock balancees	2022-07-12 13:00:00 +05:30
Ankush Menat	2224b6503b	chore: typo ... [skip ci]	2022-07-12 12:39:22 +05:30
Ankush Menat	4ec85cb2f0	test: don't silently fail reposts in tests (#31559)	2022-07-08 19:28:03 +05:30
Rucha Mahabal	ef02e58859	Merge branch 'develop' into hr-separation	2022-07-07 13:46:54 +05:30
Sagar Sharma	f9885746a8	Merge branch 'develop' into subcontracting	2022-07-07 09:56:23 +05:30
rohitwaghchaure	96f46b220b	Merge branch 'develop' into fixed-time-out-error-reposting	2022-07-05 19:23:46 +05:30
Deepesh Garg	37f7801cfb	Merge pull request #29884 from resilient-tech/remove-india ... refactor: remove India specific code	2022-07-05 18:50:41 +05:30
Rohit Waghchaure	78c8bb251e	fix: timeout error while reposting	2022-07-05 18:45:13 +05:30
rohitwaghchaure	d5b0b5e798	Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials ... fix: test case	2022-07-05 15:10:59 +05:30
Rohit Waghchaure	7282c8e65b	fix: test case	2022-07-05 15:10:28 +05:30
Sagar Sharma	f75d35ed60	Merge branch 'develop' into subcontracting	2022-07-05 11:25:08 +05:30
Deepesh Garg	60aad31162	fix: Incorrect provisional expense booking while reposting	2022-07-04 18:38:26 +05:30
marination	7a5fd71a6c	fix: LCV updates wrong future qty/Bin qty ... - As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated - This just doubly shifts all future qty which is then fixed by a repost - Until the repost balance values are wrong - Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin	2022-07-04 17:46:54 +05:30
Sagar Vora	05351bee8b	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-07-03 18:07:44 +05:30
Sagar Sharma	fd162f9b14	fix: supplier warehouse in PR	2022-07-01 16:51:19 +05:30
Sagar Sharma	6589c5f5e9	Merge branch 'develop' into subcontracting	2022-06-29 17:29:24 +05:30
Rucha Mahabal	ef63c61ebd	Merge branch 'develop' into hr-separation	2022-06-29 12:35:51 +05:30
Devin Slauenwhite	cdf631b9de	fix: validate item dashboard material transfer entry (#31473)	2022-06-29 12:06:47 +05:30
Sagar Sharma	78ff1783b1	Merge branch 'develop' into subcontracting	2022-06-28 22:20:32 +05:30
Rucha Mahabal	6a65c8aff4	Merge branch 'develop' into hr-separation	2022-06-28 11:51:59 +05:30
Sagar Vora	0810674c8a	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-06-24 13:08:40 +05:30
Rucha Mahabal	edb528ce41	chore: Remove code for Expense Claim from Project, Task, Delivery Trip ... - Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup - Remove Expense Claim calculation from `update_costing` in project - Remove `update_total_expense_claim` from task - Remove Expense Claim references from employee form tour - Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed - Update delivery trip tests	2022-06-23 19:48:42 +05:30
Devin Slauenwhite	ef6480803b	chore: linter	2022-06-22 14:10:40 -04:00
Devin Slauenwhite	199b8dd0e3	Merge branch 'develop' into fix-reserve-qty	2022-06-22 14:06:35 -04:00
rohitwaghchaure	186224a12a	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-21 22:45:05 +05:30
Sagar Sharma	912d26361d	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-21 13:23:37 +05:30
Deepesh Garg	f572c20009	Merge branch 'develop' into internal_trasfer_precision_loss	2022-06-21 10:45:02 +05:30
s-aga-r	f6ef3068d7	Merge branch 'develop' into subcontracting	2022-06-20 23:10:31 +05:30
s-aga-r	6d89b2fa28	refactor: backport old subcontracting code	2022-06-20 23:10:02 +05:30
Sagar Vora	ec9861266e	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-06-19 22:57:22 +05:30
Devin Slauenwhite	179e2d2c74	fix: reset selling setting	2022-06-17 15:29:32 -04:00
Devin Slauenwhite	591b5917a9	fix: re-assign after append query	2022-06-17 15:27:17 -04:00
Devin Slauenwhite	0328874018	fix: syntax missing )	2022-06-17 14:45:33 -04:00
Devin Slauenwhite	7855a59843	Merge branch 'develop' into fix-reserve-qty	2022-06-17 14:39:31 -04:00
Devin Slauenwhite	494bbf0124	feat: add checkbox to reserve qty on sales return	2022-06-17 13:51:33 -04:00
Devin Slauenwhite	f3f26d2c78	refactor: get_reserved_qty query builder	2022-06-17 11:51:21 -04:00
Devin Slauenwhite	d259c2e36a	fix: merge conflict	2022-06-17 11:50:54 -04:00
Conor	ea28ed1bb3	refactor: if() to CASE WHEN (#31360) ... * refactor: if() to CASE WHEN * fix: remove duplicate order by * fix: remove extraneous table * style: reformat to black spec Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-17 21:17:48 +05:30
Devin Slauenwhite	f39422afd8	Merge branch 'develop' into fix-reserve-qty ... # Conflicts: # erpnext/patches.txt # erpnext/public/js/utils/barcode_scanner.js # erpnext/regional/report/gstr_1/gstr_1.py # erpnext/stock/doctype/delivery_note/test_delivery_note.py	2022-06-17 08:04:52 -04:00
Conor	74a782d81d	refactor: DB independent quoting and truthy/falsy values (#31358) ... * refactor: DB independent quoting and truthy/falsy values * style: reformat to black spec * fix: ifnull -> coalesce * fix: coalesce -> Coalesce * fix: revert pypika comparison * refactor: convert queries to QB * fix: incorrect value types for query `=` query makes no sense with list of values * fix: remove warehouse docstatus condition * fix: keep using base rate as rate Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-17 17:01:27 +05:30
s-aga-r	ca24b5287e	chore: make "is_subcontracted" field read-only in PR and PI	2022-06-17 16:47:49 +05:30
s-aga-r	5002f1f1e5	feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI	2022-06-17 16:47:41 +05:30
Marica	d6078aa911	fix: Respect system precision for user facing balance qty values (#30837) ... * fix: Respect system precision for user facing balance qty values - `get_precision` -> `set_precision` - Use system wide currency precision for `stock_value` - Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users * fix: Consider system precision when validating future negative qty * test: Immediate Negative Qty precision test - Test for Immediate Negative Qty precision - Stock Entry Negative Qty message: Format available qty in system precision - Pass `stock_uom` as confugrable option in `make_item` * test: Future Negative Qty validation with precision * fix: Use `get_field_precision` for currency precision as it used to - `get_field_precision` defaults to number format for precision (maintain old behaviour) - Don't pass `currency` to `get_field_precision` as its not used anymore	2022-06-17 15:13:13 +05:30
Ankush Menat	74007c8e91	fix(UX): hide irrelevant UOM fields (#31392) ... fix(UX): hide UOM-related fields if they are inconsequential	2022-06-17 15:10:21 +05:30
rohitwaghchaure	2ec133df6d	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-17 15:02:07 +05:30
Sagar Vora	1a3997a566	fix: transaction date gets unset in material request (#31327) ... * fix: set date correctly in material request * fix: use only `transaction_date` in `get_item_details`	2022-06-16 22:33:47 +05:30
Ankush Menat	86919d2a6d	test: silent test failure in stock assertions (#31377) ... If actual values are not present then test is silently passing, # of actual values should be at least equal to expected values.	2022-06-15 21:19:09 +05:30
Ankush Menat	5c6f22f275	refactor: simpler batching for GLE reposting (#31374) ... * refactor: simpler batching for GLE reposting * test: add "actual" test for chunked GLE reposting	2022-06-15 19:30:26 +05:30
Rushabh Mehta	c0f9b34ede	fix(minor): move variants to separate tab (#31354) ... * fix(minor): move variants to separate tab * fix(minor): variants tab * fix(minor): add counts Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-15 16:08:05 +05:30
Marica	fafdaff4d4	Merge branch 'develop' into so-to-wo-bom	2022-06-15 12:58:13 +05:30
Conor	b8f728a40a	refactor: use CURRENT_DATE instead of CURDATE() (#31356) ... * refactor: use CURRENT_DATE instead of CURDATE() * style: reformat to black spec * refactor: use QB for auto_close queries Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-15 12:07:33 +05:30
Conor	2a9105f26f	refactor: DB independent capitalization of test cases (#31359)	2022-06-15 11:24:24 +05:30
rohitwaghchaure	a4c2c3e02f	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-15 09:41:01 +05:30
Sagar Sharma	406114374b	Merge branch 'develop' into subcontracting	2022-06-14 06:44:29 -07:00
s-aga-r	9a68af36ec	Merge branch 'develop' into subcontracting	2022-06-14 19:13:10 +05:30
Marica	639e4c5714	Merge branch 'develop' into so-to-wo-bom	2022-06-14 18:22:11 +05:30
Ankush Menat	2535d5edd0	perf: GLE reposting with progress and chunking (#31343) ... If stock voucher count goes >1000 then fetching all gles and reposting them all at once requires much more memory and can cause crash. - This PR ensures that GLE reposting is done in chunks of 100 vouchers. - This PR also starts keeping track of how many such chunks were processed so in future progress is resumed in event of timeout.	2022-06-14 18:20:33 +05:30
marination	9f2d325e67	fix: Pick Template BOM if variant BOM absent in WO popup from SO ... - Use `get_default_bom` in sales_order.py (reduce duplicate utility functions) - Remove redundant if else in `get_work_order_items` - `get_default_bom`: If no BOM and template exists try to fetch template BOM - test: `get_work_order_items` via SO and if right BOM is picked	2022-06-14 17:20:44 +05:30
Conor	00ef499739	refactor: use db independent offset syntax (#31345) ... * chore: use db independent offset syntax * fix: typo * style: reformat code to black spec Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-14 10:49:07 +05:30
marination	fa1d9d548e	fix: Supplied Qty not updated on Stock Entry cancel ... - Loop over PO supplied items and update them as data from SE will exclude a row if supplied qty becomes 0 on cancel - Use DB API insteaf of raw SQL	2022-06-13 17:59:03 +05:30
Sagar Sharma	f755430098	Merge branch 'develop' into subcontracting	2022-06-13 03:00:53 -07:00
Ankush Menat	1646fbe478	refactor: remove add_fetch (#31315) ... - Sales Team already had fetch from set up - Set up fetch from on sales partner in sales transaction Reason for removal: the JS code applies arbitrarily to any field called "sales_person"	2022-06-10 13:52:17 +05:30
Ankush Menat	65b21ee7d6	fix: internal transfer GLE validation	2022-06-08 19:26:40 +05:30
Rushabh Mehta	b29edb302c	Merge pull request #31284 from rmehta/item-form-cleanup ... fix(ux): Add tabs in Item	2022-06-08 17:01:57 +05:30
Sagar Sharma	f7a52f76d4	Merge branch 'develop' into subcontracting	2022-06-08 04:27:24 -07:00
Rushabh Mehta	5c6937865c	fix(ux): Add tabs in Item	2022-06-08 16:30:44 +05:30
Ankush Menat	7726271e2a	fix: purchase invoice return GLe ... voucher_wise_stock_value contains tuples and the condition was looking for string, so it's never triggered. Caused by https://github.com/frappe/erpnext/pull/24200	2022-06-07 12:08:20 +05:30
Ankush Menat	293eb8d722	test: create stock test mixin for assertion/utils	2022-06-07 11:35:51 +05:30
Rohit Waghchaure	d94ff3ede8	test: test cases to cover batch, serialized raw materials	2022-06-06 17:57:52 +05:30
Sagar Sharma	74fae72939	Merge branch 'develop' into subcontracting	2022-06-06 10:27:25 +05:30
Deepesh Garg	21de550549	Merge pull request #31219 from deepeshgarg007/group_filter_cost_center ... fix: Parent dimension filters in orders	2022-06-06 08:58:40 +05:30
Rohit Waghchaure	333c62de72	fix: transferred batches are not fetched while making Manufacture stock entry	2022-06-06 01:19:58 +05:30
s-aga-r	992ba974e2	Merge branch 'develop' into subcontracting	2022-06-03 13:25:49 +05:30
Deepesh Garg	3f376cc3a5	fix: Parent dimension filters in orders	2022-06-02 13:57:54 +05:30
Ankush Menat	3974fbbb6e	feat: UOM specific barcodes (#30988)	2022-06-01 16:43:56 +05:30
maharshivpatel	b3ccc4bfb9	fix: Auto Insert Item Price If Missing when discount & blank UOM (#31168) ... * fix: Auto Insert Item Price If Missing when discount and blank UOM fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom * unit tests added for item with discount I have added test for auto_insert_price where discount is used. * unit test issue fixed fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters. Co-authored-by: Ankush Menat <me@ankush.dev>	2022-05-31 19:48:30 +05:30
Ankush Menat	a1b7a7983a	refactor!: drop naming series tool (#31183)	2022-05-31 15:35:40 +05:30
Saqib Ansari	08bf0baaae	chore!: remove unused bill no & date from purchase receipt (#31163)	2022-05-30 14:50:50 +05:30
Ankush Menat	e3c0d0134e	Merge pull request #31101 from alyf-de/fix-warehouse-js ... fix: Improve button labels in Warehouse	2022-05-26 18:14:49 +05:30
Ankush Menat	47b539e638	fix: skip existing batch number during autogen (#31140)	2022-05-26 16:20:56 +05:30
Sagar Sharma	bcaac8f90f	Merge branch 'develop' into subcontracting	2022-05-26 15:01:23 +05:30
Deepesh Garg	ac17ecb84b	Merge branch 'develop' into party_account_currency_check	2022-05-25 16:21:06 +05:30
Deepesh Garg	bc34737709	chore: Update test case	2022-05-25 15:42:47 +05:30
Sagar Sharma	4ff734c25a	Merge branch 'develop' into subcontracting	2022-05-25 12:32:33 +05:30
Devin Slauenwhite	55276f11f8	fix: don't fetch item_code if already exists. (#31113) ... fix: check if item_code exists before fetching	2022-05-25 09:35:22 +05:30
barredterra	1e9f9c452f	style: format	2022-05-24 13:31:29 +02:00
barredterra	1b16eb7667	refactor: set queries during setup	2022-05-24 13:30:59 +02:00
Raffael Meyer	e77c379cbb	fix: remove unsupported arguments ... Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-05-24 11:52:23 +02:00
Ankush Menat	1ecb8f4a67	chore: disable feed for material request	2022-05-24 14:32:56 +05:30
Ankush Menat	ecb39d81e0	chore: error logging for auto material requests (#31103)	2022-05-23 20:06:24 +05:30
barredterra	a6ddd86d31	fix: improve labels, simplify logic	2022-05-23 15:25:00 +02:00
barredterra	c704ad889d	style: format warehouse js	2022-05-23 15:18:24 +02:00
Ankush Menat	1a58b788e5	Merge branch 'develop' into jc-excess-transfer-config	2022-05-21 14:32:44 +05:30
Sagar Sharma	213113bc00	Merge branch 'develop' into subcontracting	2022-05-20 12:13:13 +05:30
Sagar Sharma	323bdf85ce	feat: SL and GL reposting	2022-05-20 10:45:34 +05:30
Sagar Sharma	fcc09592b9	refactor!: Stock Ledger Entry	2022-05-20 10:45:34 +05:30
Sagar Sharma	6c794afbe7	refactor!: Item Alternative	2022-05-20 10:45:34 +05:30
Sagar Sharma	f09fc46059	refactor!: Purchase Receipt	2022-05-20 10:45:33 +05:30
Sagar Sharma	73484448f2	refactor!: Stock Entry	2022-05-20 10:45:33 +05:30
Sagar Sharma	70a1f40624	feat: New DocType "Subcontracting Receipt"	2022-05-20 10:45:33 +05:30
Sagar Sharma	409df263e8	refactor!: change "is_subcontracted" field type from "Select" to "Check"	2022-05-20 10:45:33 +05:30
Sagar Sharma	249726b845	feat: New DocType "Subcontracting Order"	2022-05-20 10:45:33 +05:30
Sagar Sharma	68c21d9895	feat: Add fields "subcontracting_order" and "sco_rm_detail" in SE and SE Detail	2022-05-20 10:45:33 +05:30
Sagar Sharma	77db843692	refactor!: Make required changes to create SCO from PO	2022-05-20 10:45:30 +05:30
Ankush Menat	6d6616dbcd	fix: always update item_name for stock entry (#31068) ... If item_name is already set and for some reason becomes outdated then it's not updated in backend. Fix: always set item_name and stock_uom when fetching item details	2022-05-19 14:25:47 +05:30
Devin Slauenwhite	5a402a5709	fix(test): use unique item in sales order.	2022-05-17 13:32:26 -04:00
marination	e07ce6efe0	fix: Job Card excess transfer behaviour ... - Block excess transfer of items if not allowed in settings - Behaviour made consistent with js behaviour (button disappears if not pending and not allowed in settings) - Test for same case	2022-05-17 17:39:45 +05:30
Devin Slauenwhite	4d0fa85a75	fix(test): update_prevdoc_status	2022-05-16 19:45:59 -04:00
Devin Slauenwhite	47f867b77a	test: don't reserve qty on sales return.	2022-05-16 14:27:45 -04:00
Devin Slauenwhite	1d1c975da1	Merge remote-tracking branch 'upstream/develop' into fix-reserve-qty	2022-05-16 11:10:28 -04:00
Ankush Menat	3714e36b44	fix: disable pricing rules for internal transfers (#31034) ... * fix: disable pricing rules for internal transfers * fix: only apply validation on internal transfers Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: internal_party_field undefined Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-05-16 18:09:14 +05:30
Marica	06c036f49f	Merge pull request #30834 from ankush/transfer_precision ... fix: precision loss when transferring	2022-05-16 16:00:06 +05:30
Ankush Menat	6bd1cb9235	fix: remove item attribute limit from variant selector	2022-05-16 12:28:52 +05:30
Ankush Menat	80d959c579	fix: dont fail repost for recoverable errors (#30979) ... recoverable erros: 1. timeout 2. lock/deadlocks	2022-05-16 11:23:35 +05:30
Deepesh Garg	34de20f6ee	Merge pull request #30987 from ankush/internal_transfer_with_margin ... fix: prevent bypassing forced valuation rate	2022-05-15 20:49:55 +05:30
Devin Slauenwhite	695e2bcfbc	fix: don't reserve qty on sales return.	2022-05-14 11:06:24 -04:00
Ankush Menat	b08180092e	fix(patch): avoid checking for return field if it doesnt exits (#30995) ... fix(patch): avoid checking for qty field if it doesnt exits	2022-05-13 11:55:47 +05:30
Ankush Menat	ee0a277540	fix: prevent bypassing forced valuation rate ... if you edit "margin_rate_or_amount" after saving DN then based on selected margin the rate gets updated which isn't valuation rate.	2022-05-12 19:01:26 +05:30
Marica	5b8c7438cc	Merge pull request #30945 from ankush/stock_analytics_fix ... fix: stock analytics report shows incorrect data there's no stock movement in a period	2022-05-12 12:26:54 +05:30
Ankush Menat	b1c90e9949	fix: stock transfer value when precision differs	2022-05-12 11:09:30 +05:30
Marica	3d96ad2afa	Merge pull request #30950 from marination/actual-qty-total-js-reactive ... fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`)	2022-05-11 20:13:54 +05:30
Ankush Menat	2f1d118f36	fix: disable serial no scanning for picklist ... Current design of picklist doc doesn't have "picked serial no" so it doesn't make much sense to scan it. Instead it should increment qty only. Might add this in future after fixing UX problems	2022-05-11 18:56:22 +05:30
Ankush Menat	372d2d870e	fix: better message for picked qty shortfall	2022-05-11 18:43:10 +05:30
Ankush Menat	d3121fd845	fix(UX): hide scan section for non-draft docs	2022-05-11 18:40:44 +05:30
Ankush Menat	a4f0be6c5e	Merge branch 'develop' into feat-picklist-scan	2022-05-11 18:38:53 +05:30
Marica	d024f72ab8	Merge branch 'develop' into actual-qty-total-js-reactive	2022-05-11 18:02:20 +05:30
marination	4fa15b50ca	test: Test for mapped SE and fix for failing tests ... - Remove `set_missing_values` from mapper util function since a lot of item data is set after this function is run - `split_batch` can skip `set_missing_values` since no warehouses are set on mapping and relies on user input	2022-05-11 17:58:48 +05:30
Sagar Sharma	1a70701eca	fix: per_billed for return DN (#30868) ... * fix: per_billed for return DN * chore: move patch from v14 to v13	2022-05-11 16:49:28 +05:30
marination	90a8e924f5	fix: set_missing_values in SE and re-use the same on all SE mappings ... - `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount - Re-use `set_missing_values` wherever SE is doc is being mapped	2022-05-11 14:54:22 +05:30
Ankush Menat	f6d6463a33	chore: fifo queue vs qty after transaction comparison report	2022-05-11 14:43:03 +05:30
Ankush Menat	198b91f8d4	fix: only carry-forward balances till today's period ... Showing data in future doesn't make sense. Only carry-forward till last bucket that contains today's day.	2022-05-10 15:38:02 +05:30
Ankush Menat	287b255ad6	fix: batch_no doesn't maintain qty_after_transaction	2022-05-10 15:38:02 +05:30
Ankush Menat	6ab0046e9c	fix: consider previous balance is missing ... Also remove `total`, total of total is a meaningless value.	2022-05-10 15:38:02 +05:30
Ankush Menat	d81422fb58	test: basic test for stock analytics report	2022-05-10 15:38:02 +05:30
Ankush Menat	d25841369d	Merge pull request #30913 from ankush/against_voucher_processing ... fix: double future qty updates	2022-05-10 14:46:37 +05:30
marination	a65b20d976	style: Spaces to Tabs ... (cherry picked from commit a2fff8741e7ea928c4152d8f867db3ef9eb08b19)	2022-05-09 13:32:45 +00:00
marination	9fd673e498	fix: Remove commit from stock entry test. The assertion is not important ... (cherry picked from commit c449b35cc11615fc7d9e616c2038b9e90c3957d6)	2022-05-09 13:32:44 +00:00
marination	64f3b4d68b	fix: Wrap SLE actual_qty in flt to avoid NoneType operation ... - Since Batch cancellation SLEs do not set qtys (will fix separately), `merge_similar_entries` gets `actual_qty` as None - This causes NoneType operation error on tests that cancel batch-serial reco - Modified tests to avoid using commit and rollback explicitly (cherry picked from commit d53228b153437f9dedcb1229bf579411f3122729)	2022-05-09 13:32:43 +00:00
marination	de3d90c5ab	fix: Item Alternative Test ... (cherry picked from commit 964de1fc69b32d377f8c2a6f15d6ab7381669606)	2022-05-09 13:32:42 +00:00
marination	14ea40d270	chore: Tests for Stock Reconciliation ... (cherry picked from commit 5bc5af1066e0bb4bead98598ed4bf9911d340734)	2022-05-09 13:32:41 +00:00
marination	3bc3cf34eb	chore: Tests for Stock Entry ... (cherry picked from commit a144548db95ec829b953ca6305fe898b1a9cdeb0)	2022-05-09 13:32:40 +00:00
marination	577df1753e	fix: Unlink and delete batch created from stock reco on cancel ... (cherry picked from commit fc353231065f1c33890d5b7e55c2e4e2506d986d)	2022-05-09 13:32:37 +00:00
Ankush Menat	7e2fbc050a	fix: sort before picking next stock reco	2022-05-09 13:16:02 +05:30
marination	1ce45f623e	fix: Set actual qty and basic rate in SE on warehouse triggers (get_warehouse_details) ... - set `actual_qty` on source and target warehouse change	2022-05-09 13:00:00 +05:30
Ankush Menat	ae842d8145	chore: remove datettime formatting from debug report ... This hides some information that would otherwise help during debugging	2022-05-09 11:29:00 +05:30
Ankush Menat	7c839c4503	fix: double future qty updates ... update_qty_in_future_sle is reprocessing rows which are already processed by process_sle_against_current_voucher	2022-05-09 11:28:21 +05:30
Devin Slauenwhite	e9cf5cb4b0	feat: add prompt qty flag to pick list	2022-05-05 10:47:06 -04:00
Ankush Menat	d48ab81622	fix: auto-fulfill picking list when not in scan mode	2022-05-04 12:43:31 -04:00
Devin Slauenwhite	7ae89dedd5	fix: cleanup dont_allow_new_row logic	2022-05-04 11:06:16 -04:00
Devin Slauenwhite	4a19c1c19d	Revert "fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it" ... This reverts commit c2335ec0	2022-05-04 10:29:52 -04:00
Devin Slauenwhite	5d8e3f264c	Merge branch 'feat-picklist-scan' of /home/devin/repos/erpnext into feat-picklist-scan	2022-05-03 16:28:54 -04:00
Devin Slauenwhite	c2335ec0d8	fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it	2022-05-03 16:28:28 -04:00
Devin Slauenwhite	afb841c771	Merge branch 'develop' into feat-picklist-scan	2022-05-03 11:15:42 -04:00
Ankush Menat	59a5090843	fix(UX): misleading stock entry lables (#30870) ... * fix(UX): misleading stock entry lables * chore: field labels [skip ci] Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-05-02 15:11:14 +05:30
Rushabh Mehta	548afba8bb	fix(minor): update frappe.error_log to new API (#30864) ... * fix(minor): update frappe.error_log to new API * refactor: changes for updated log_error api Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-05-02 15:04:26 +05:30
Ankush Menat	dcda55641b	fix: convert default_item_manufacturer to link field (#30835)	2022-05-02 13:58:22 +05:30
Deepesh Garg	19d66e5219	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency	2022-04-30 22:15:27 +05:30
Devin Slauenwhite	5ff471e22f	fix: linter	2022-04-29 16:39:33 -04:00
Devin Slauenwhite	fa1378dd49	fix: prevent user from proceeding without all qty picked.	2022-04-29 16:38:52 -04:00
Devin Slauenwhite	5f8f83c6d8	fix: warn user pick list is not complete instead of auto fulfilling picked_qty.	2022-04-29 16:28:49 -04:00
Devin Slauenwhite	2554cdceeb	revert: scan_mode flag	2022-04-29 13:45:59 -04:00
Devin Slauenwhite	24d8f62b21	revert: barcode scan field from pick list item.	2022-04-29 13:40:48 -04:00
Devin Slauenwhite	8053f2dbcd	feat: increment picked_qty on scan_barcode	2022-04-27 22:10:15 -04:00
Devin Slauenwhite	e04fbb6a99	feat: pick list scan fields	2022-04-27 22:02:04 -04:00
Ankush Menat	777f0204dd	test: create new item instead of using with _Test Item (#30827) ... Unnecessary dependency causes flake in stock. The test was reposting all entries for item just to test some behavior that is best tested on a newly created item _anyway_.	2022-04-27 17:47:40 +05:30
Ankush Menat	ebd5f0b1bb	chore: make picked qty read only	2022-04-27 14:53:20 +05:30
Ankush Menat	8207697e43	fix: compare against stock qty while validating ... Other changes: - only allow whole number of bundles to get picked	2022-04-27 12:51:18 +05:30
Ankush Menat	9e60acdf56	test: test bundle - picklist behaviour	2022-04-27 12:05:15 +05:30
Ankush Menat	ee54ece8fd	test: product bundle fixture	2022-04-27 12:05:15 +05:30
Ankush Menat	1ac275ce61	feat: transfer picklist stock info to packing list	2022-04-27 12:05:15 +05:30
Ankush Menat	41aa4b3524	fix: round off bundle qty ... This is to accomodate bundles that might allow floating point qty.	2022-04-27 12:05:15 +05:30
Ankush Menat	25485edfd9	refactor: remove unnecssary vars ... also remove misleading docstring	2022-04-27 12:05:15 +05:30
Ankush Menat	23cb0d684d	feat: create DN from pick list with bundle items	2022-04-27 12:05:15 +05:30
Ankush Menat	f574121741	refactor: simpler check for non-SO items	2022-04-27 12:05:15 +05:30
Ankush Menat	277b51b404	refactor: groupby using keys instead of int index	2022-04-27 12:05:15 +05:30
Ankush Menat	3ddad6891a	refactor: simplify needlessly complicated code	2022-04-27 12:05:15 +05:30
Ankush Menat	60bc26fdbe	feat: back-update min picked qty for a bundle	2022-04-27 12:05:15 +05:30
Ankush Menat	c3fc0a4f55	perf: single update per Sales Order. ... For each SO item the sales order picking status was being updated, this isn't required and wasteful.	2022-04-27 12:05:15 +05:30
Ankush Menat	e64cc66df7	refactor: sales order status update ... - rename badly named variables - support updated packed items	2022-04-27 12:05:15 +05:30
Ankush Menat	36c5e8a14f	feat: Pick list from SO with Product Bundle	2022-04-27 12:05:15 +05:30
Ankush Menat	7d5682020a	test: bundles in picklist	2022-04-27 12:05:15 +05:30
Ankush Menat	5c3f9019cc	refactor: misc pick list refactors ... - make tracking fields read only and no-copy 🤦 - collapse print settings section, most users configure it once and forget about it, not need to show this. - call pick list grouping function directly - use get_descendants_of instead of obscure db function	2022-04-27 12:05:15 +05:30
marination	e2a163d4e9	fix: Use account_type == 'Stock' to filter stock accounts	2022-04-26 17:50:51 +05:30
marination	44331f4f1f	chore: Warn users about multiple warehouse accounts ... - Get distinct accounts that warehouse value has been booked against - If same account as the one being set, ignore - If not same account or multiple accounts: warn user that it makes it harder to track mismatches	2022-04-26 17:43:33 +05:30
Deepesh Garg	00ace8f62c	Merge branch 'develop' into accounting_dimension_consistency	2022-04-26 14:26:08 +05:30
Deepesh Garg	82a0635c66	fix: Consistent accounting dimensions across Sales and Purchase docs	2022-04-26 14:01:13 +05:30
Ankush Menat	7e555d3d8c	fix: item price query for postgres ... postgres doesn't like bad type comparisons and doesn't have `isnull` funciton	2022-04-26 11:47:02 +05:30
Ankush Menat	7d2587c0a9	fix: nullish check and table name	2022-04-26 11:03:32 +05:30
Ankush Menat	ce75fe0ec4	fix: out of range date value	2022-04-26 11:03:32 +05:30
Ankush Menat	e1c1687661	refactor: use db agnostic CombineDatetime	2022-04-26 11:03:32 +05:30
Ankush Menat	d6a43a39ae	test: tie breaking in SLEs (#30796) ... [skip ci]	2022-04-25 11:46:01 +05:30
Ankush Menat	d5ab626a31	Merge pull request #30726 from ankush/dependent_gle_reposting ... fix: dependent gle reposting	2022-04-21 18:06:40 +05:30
Ankush Menat	ee3036651a	fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) ... [skip ci]	2022-04-21 16:34:31 +05:30
Ankush Menat	9734329094	test: discard local future SLE cache between tests	2022-04-19 17:40:28 +05:30
Ankush Menat	b24920c0e9	fix: correct sorting while updating bin	2022-04-19 17:38:36 +05:30
Ankush Menat	d2882ea436	test: use disposable item codes in tests ... dependency causes flake	2022-04-19 17:38:36 +05:30
Ankush Menat	8f519545b0	test: repost queue progress	2022-04-19 17:38:36 +05:30
Ankush Menat	ecdb49314f	fix: dependent GLE reposting	2022-04-19 17:38:36 +05:30
Ankush Menat	a2af2daca7	test: dependent GL entry reposting	2022-04-19 17:38:36 +05:30
Ankush Menat	afc5a55a23	refactor: repost error handling	2022-04-19 17:38:36 +05:30
Ankush Menat	9af2d68945	refactor: convert queries to ORM/QB, add types	2022-04-14 18:05:38 +05:30
Ankush Menat	ba29323e11	test: increase assertions to cover all cases	2022-04-14 18:05:38 +05:30
Ankush Menat	e278ee359a	test: item attribute columns	2022-04-14 18:05:38 +05:30
Ankush Menat	febc74a21b	refactor: rewrite stock balance query to QB	2022-04-14 18:05:35 +05:30
Ankush Menat	8a499e95d3	test: uom conversion in stock balance report	2022-04-14 18:01:43 +05:30
Ankush Menat	af0ea7b532	test: assert balanaces against SLE	2022-04-14 18:01:42 +05:30
Ankush Menat	f4766ae4eb	test: opening balance in stock balance report	2022-04-14 18:01:42 +05:30
Ankush Menat	8b2432dfa0	test: stock balance report tests	2022-04-14 18:01:42 +05:30
Ankush Menat	64ac22af82	refactor: add filter type info	2022-04-14 18:01:42 +05:30
Marica	87117313a1	Merge branch 'develop' into values-out-of-sync-jv	2022-04-14 13:41:27 +05:30
marination	d75d5ebe8d	chore: Remove Values Out of Sync from Repost hourly job ... - It runs after repost (after commiting), so it has 0 impact on repost itself - Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed" - The check is inaccurate also, so best to remove this - Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily	2022-04-14 12:30:06 +05:30
Deepesh Garg	065c38152a	Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting	2022-04-14 12:04:21 +05:30
Deepesh Garg	ad171c6225	test: Update test case	2022-04-14 12:03:12 +05:30
Ankush Menat	79fbc2c504	test: flaky PR close test (#30709)	2022-04-13 20:42:25 +05:30
Deepesh Garg	3ce64170db	feat: Item-wise provisional accounting for service items	2022-04-11 14:35:22 +05:30
marination	dfff4beaf4	fix: Handle multiple item transfer in separate SEs against WO ... - Check for pending qty in child items to show/hide "Start" button - If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0	2022-04-11 14:10:57 +05:30
Ankush Menat	8138e53cf3	test: flaky picklist tests	2022-04-10 17:50:57 +05:30
Ankush Menat	af6b07f9b9	fix: block cancellation of SL/GL entries (#30652) ... Individual GL/SLEs aren't supposed to be cancelled by users.	2022-04-08 18:05:04 +05:30
Ankush Menat	d74181630a	test: prevent cancelling RIV of cancelled voucher	2022-04-08 14:57:55 +05:30
Ankush Menat	a281998bcb	fix: prevent deleting repost queue for cancelled transactions	2022-04-08 14:57:55 +05:30
Ankush Menat	49560d20bc	fix: remove bad defaults from BOM operation (#30644) ... [skip ci]	2022-04-08 11:23:02 +05:30
Ankush Menat	f1fd4e5c27	test: cant_change validations on item	2022-04-07 17:30:12 +05:30
Ankush Menat	fba68541d6	refactor(Item): linked doc checking	2022-04-07 17:30:12 +05:30
Ankush Menat	2f1e98d1e8	feat: show Stock Reconciliation links on item dashboard	2022-04-07 17:30:12 +05:30
Ankush Menat	be04eaf723	fix: warehouse naming when suffix is present (#30621)	2022-04-07 13:21:08 +05:30
Ankush Menat	e4c6d6a1a6	fix: strip html tags before checking for empty description (#30619)	2022-04-07 12:53:10 +05:30
Marica	ff7d81020c	Merge pull request #30578 from marination/e-com-acessibility ... chore: Accessibility for E-commerce Doctypes	2022-04-05 18:11:59 +05:30
marination	d4301d6d2f	chore: Accessibility for E-commerce Doctypes ... - Add Website Item routing button and dashboard link in Item master - Group Item variant buttons together	2022-04-05 12:07:50 +05:30
Ankush Menat	a9811c601c	Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr ... fix: if accepted warehouse not selected during rejection then stock ledger not created	2022-04-04 18:26:17 +05:30
Rohit Waghchaure	ac5df1abbe	test: test case to validate rejected qty without accepted warehouse	2022-04-04 17:57:57 +05:30
Ankush Menat	de83511091	fix(ux): refresh update to zero val checkbox (#30567)	2022-04-04 17:29:51 +05:30
Ankush Menat	12c01e2975	fix: maintain FIFO queue even if outgoing_rate is not found (#30560)	2022-04-04 15:22:15 +05:30
Ankush Menat	52eb0a93bb	Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype ... refactor!: change "is_subcontracted" field type from "Select" to "Check"	2022-04-04 14:01:20 +05:30
Ankush Menat	a896895a9e	fix: bulk fix (~330) missing translations	2022-04-04 13:59:51 +05:30
Sagar Sharma	e80cd29d2e	Merge branch 'develop' into is-subcontracted-fieldtype	2022-04-04 13:31:46 +05:30
Ankush Menat	e8118fcdf1	fix: doctype layout based on expected tab-order	2022-04-04 12:06:35 +05:30
Ankush Menat	deca1aaf06	fix: dont fetch qty in reco if batch is required	2022-04-04 12:06:35 +05:30
Ankush Menat	f83a1c1989	fix: dont reset barcode in scan mode	2022-04-04 12:06:35 +05:30
Ankush Menat	1736ab57ac	feat: Barcode scanning in Stock Reconciliation ... [skip ci]	2022-04-04 12:06:35 +05:30
Ankush Menat	c8ead0a7ab	fix: dont send empty serial no in get_item_details ... [skip ci]	2022-04-01 21:11:03 +05:30
Ankush Menat	47f27a5171	refactor: move scan api to stock utils; add item_info	2022-04-01 21:11:03 +05:30
Ankush Menat	9bf427985f	fix!: remove barcode field triggers ... use "scan barcode" field instead for scanning [skip ci]	2022-04-01 21:11:03 +05:30
Ankush Menat	6c5b01c60d	perf: index barcode for faster scans (#30543)	2022-04-01 15:27:46 +05:30
Sagar Sharma	0a3cdc2623	chore: rename "is_subcontracted" field label to "Is Subcontracted"	2022-04-01 13:22:54 +05:30
Sagar Sharma	d074c93ac7	refactor!: change "is_subcontracted" field type from "Select" to "Check"	2022-04-01 13:22:44 +05:30
Rohit Waghchaure	2f51011f91	test: test case to check pick list name has mapped or not	2022-03-31 18:47:09 +05:30
Rohit Waghchaure	2f63ae2ee9	feat: minor, pick list item reference on delivery note item table	2022-03-31 18:43:42 +05:30
Ankush Menat	b981fae5a4	fix: remove naming series from bin, repost queue (#30497) ... Removing naming series from: 1. Bin 2. Repost queue These doctypes are not user facing and dont really need naming series. Current implementation of naming makes stock transaction sequential if these documents are to be created during submission.	2022-03-30 21:46:15 +05:30
Ankush Menat	8ab226a2fc	test: add class to uniquely id item dashboard (#30487)	2022-03-30 13:20:54 +05:30
Marica	7e719a12f1	Merge pull request #30377 from marination/stock-entry-items-idx ... fix: Dont set `idx` while adding WO items to Stock Entry	2022-03-30 11:14:18 +05:30
Saqib Ansari	87dc9c6331	Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation ... fix: credit limit validation in delivery note	2022-03-30 11:08:25 +05:30
Ankush Menat	b80fac03af	fix: validate 0 transfer qty in stock entry (#30476)	2022-03-29 17:19:22 +05:30
Ankush Menat	b12fe0f15b	fix: dont check for failed repost while freezing (#30472) ... [skip ci]	2022-03-29 13:54:26 +05:30
Saqib Ansari	c122882884	fix: credit limit validation in delivery note	2022-03-29 13:36:00 +05:30
marination	639d380c1f	chore: Remove redundant idx query and value setting ... - idx can be removed from `select_columns` as it is already in the main query - setting idx to '' is not required as it is not used further	2022-03-28 21:00:00 +05:30
Ankush Menat	40d7418dca	Merge branch 'develop' into stock-entry-items-idx	2022-03-28 20:21:21 +05:30
Ankush Menat	494bd9ef78	style: format code with black	2022-03-28 18:52:46 +05:30
Ankush Menat	c34847e801	refactor: dont hardcode child table "items"	2022-03-28 12:07:00 +05:30
Ankush Menat	69ae2661d2	fix: update picked qty on cancellation	2022-03-28 10:43:32 +05:30
Ankush Menat	f06ef17b5d	fix: copy has_batch_no and has_serial_no while duplicating	2022-03-25 16:18:58 +05:30
Ankush Menat	f4b39b87e3	fix(UX): use autocomplete for variant fields	2022-03-25 16:18:58 +05:30
Saqib Ansari	9a0f5bff65	Merge branch 'develop' into fix-pos-issues-again	2022-03-25 10:52:08 +05:30
Ankush Menat	788d492757	test: basic item and wh capacity dashboard tests	2022-03-25 10:51:19 +05:30
Saqib Ansari	cb4873c019	fix: sider issues	2022-03-24 17:56:27 +05:30
Saqib Ansari	4aabe97565	Merge branch 'develop' into fix-pos-issues-again	2022-03-24 11:18:13 +05:30
marination	a787ebb732	fix: Dont set idx while adding WO items to Stock Entry ... - `idx` must be computed by base document's `self.append()` function, so do not set it	2022-03-23 14:59:27 +05:30
Deepesh Garg	3a1e31592e	Merge branch 'develop' into ignore_price_list	2022-03-23 09:27:44 +05:30
Deepesh Garg	66ca085e39	fix: Changing item prices on converting orders/receipts to invoices	2022-03-22 23:03:41 +05:30
Saqib Ansari	f2ae63cbfd	fix(pos): remove returned sr. nos. from pos reserved sr. nos. list	2022-03-22 17:41:49 +05:30
Ankush Menat	41db43cdc5	fix: consider full integer batch nos	2022-03-22 16:40:17 +05:30
Ankush Menat	a18c687844	fix: ignore already fetched serial no ... exclude_sr_nos is sent as JSON string of list, so load it before operating on it.	2022-03-22 16:40:17 +05:30
Ankush Menat	d3be84bfe8	test: correct use of test decorator	2022-03-21 15:40:34 +05:30
Ankush Menat	c2aad115c1	fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) ... * fix: dont rename GLE/SLE that dont have naming series * test: tests for deferred naming of ledgers	2022-03-20 19:26:34 +05:30
HENRY Florian	ca8d757691	fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307)	2022-03-20 15:27:00 +05:30
Ankush Menat	4859574233	perf: Single query to delete bins instead of N	2022-03-19 20:55:27 +05:30
Ankush Menat	684d9d66d1	test: warehouse conversion and treeview test	2022-03-19 20:55:27 +05:30
Ankush Menat	953afda01b	refactor(warehouse): raw query to ORM	2022-03-19 20:55:27 +05:30
Ankush Menat	4b695915f4	refactor: Use QB for serial fetching query	2022-03-19 20:55:27 +05:30
Ankush Menat	a585dff6fd	refactor: batch no filter handling	2022-03-19 20:55:27 +05:30
Ankush Menat	b9eec331e3	test: auto serial fetching	2022-03-19 20:55:27 +05:30
Ankush Menat	4f8bb91eae	fix: sort serial nos before sending	2022-03-19 20:55:27 +05:30
Ankush Menat	0a533d6ccc	fix: skip already selected serials in sr selector	2022-03-19 20:55:27 +05:30
mergify[bot]	c2cbd407c1	fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) ... * fix: Allow on Submit for Material Request Item Required Date * chore: whitespace (cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb) Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-03-19 20:31:06 +05:30
Ankush Menat	5a9bf9ffd6	fix: respect db multi_tenancy while fetching precision (#30301) ... [skip ci]	2022-03-18 17:29:09 +05:30
rohitwaghchaure	da16ee159a	Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN ... feat: Create single PL/DN from several SO.	2022-03-17 15:39:45 +05:30
Ankush Menat	76187d175f	refactor: call repost directly during tests (#30277) ... enqueue(now=frappe.flags.in_test) is always true in test, this change avoids confusion.	2022-03-16 19:50:56 +05:30
Noah Jacob	2a0ca7c91a	refactor: removed unrequired code and test for standalone delivery note serial return (#30276)	2022-03-16 19:27:47 +05:30
Ankush Menat	b93ce78df1	chore: dont supress errors server side ... not required after https://github.com/frappe/frappe/pull/16284	2022-03-16 17:50:34 +05:30
Krithi Ramani	a12895ec03	corrected spacing	2022-03-16 13:56:54 +05:30
Ankush Menat	b46d6e3c05	test: packed item return scenarios	2022-03-16 13:36:53 +05:30
Ankush Menat	b781e8b7d1	revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" ... This reverts commit 20216fa9f1.	2022-03-16 13:36:53 +05:30
Krithi Ramani	0211f27e83	as per review comments - changed for loop	2022-03-16 12:28:30 +05:30
Krithi Ramani	e970616b51	removed semicolon for break statement	2022-03-15 21:52:34 +05:30
Krithi Ramani	f33a725a9e	fixed spacings	2022-03-15 15:35:51 +05:30
Deepesh Garg	07715118cf	Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable ... fix: Do not update ignore prcing rule check implicitly	2022-03-14 21:46:24 +05:30
Ankush Menat	8e559f01c8	test: refactor BOM quality template test	2022-03-14 18:28:08 +05:30
Florian HENRY	9415229e8d	fix: BOM - clear Quality Inspection Template according to Inspection Quality Required ... Squashed commit of the following: commit b73fa210b234d2c8067db2c32f94f362b89afe5a Author: Florian HENRY <florian.henry@open-concept.pro> Date: Mon Mar 14 08:30:24 2022 +0100 add json tes commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Mon Mar 14 08:30:06 2022 +0100 better test commit 42061146658598da02eda7cb781bd2cf44c8ca34 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 16:12:57 2022 +0100 update test commit 6259c0957566600b044fcd4a5e14e69cdff71020 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 13:59:13 2022 +0100 update test commit cbc4ad9566f6f7f01dd622651458fea309d80954 Merge: faa44b3fdd 94d0f8d4e7 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 12:46:48 2022 +0100 Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190 commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3 Author: Florian HENRY <florian.henry@open-concept.pro> Date: Fri Mar 11 12:03:35 2022 +0100 fix: clear Quality Inspection Template according to Inspection Quality Required	2022-03-14 18:25:00 +05:30
Krithi Ramani	466df6bdb7	to enable selection of SO irrespective of customer,removed validation for customer	2022-03-14 17:29:02 +05:30
Krithi Ramani	61eb9b6c68	feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase	2022-03-14 17:20:49 +05:30
Ankush Menat	02d64a32c2	fix(ux): negative stock warning	2022-03-14 17:16:39 +05:30
Deepesh Garg	2b6e7963f6	Merge branch 'develop' into implicit_pricing_rule_enable	2022-03-14 15:49:21 +05:30
Noah Jacob	60c4593f7b	chore: removed unrequired batch_no parameter while fetching stock_balance	2022-03-14 15:36:56 +05:30
Noah Jacob	00797fa02d	test: checking balance serial nos in stock ledger report	2022-03-14 15:36:56 +05:30
Noah Jacob	e8ba1f4e74	fix: incorrect balance serial no in stock ledger report	2022-03-14 15:36:56 +05:30
Saqib Ansari	c1740ced97	fix: cannot create multicurrency sales order with product bundles (#30166)	2022-03-14 13:43:55 +05:30
Ankush Menat	91fd9d917a	test: negative fifo test	2022-03-14 10:25:18 +05:30
Ankush Menat	1a256c62c4	fix: attach sr no si standalone credit note	2022-03-13 19:00:34 +05:30
Deepesh Garg	96b5cedcf8	fix: Do not update ignore prcing rule check implicitly	2022-03-13 17:48:37 +05:30
Deepesh Garg	e4e38ad60b	Merge branch 'develop' into sales_purchase_retrun_optimization	2022-03-13 12:45:10 +05:30
mergify[bot]	b085e96a12	revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807) ... * Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing changes made to c7b491843476bca89be02851ccafb7e409876609. * fix: linter (cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b) # Conflicts: # erpnext/patches.txt Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-03-11 18:28:50 +05:30
Ankush Menat	472fe8e319	test: submit PR directly	2022-03-10 18:08:29 +05:30
Ankush Menat	7dd10367f4	fix: only update valuation rate if not None	2022-03-10 18:08:29 +05:30
Ankush Menat	73901aad6f	fix: handle duplicate bins during item merge renames	2022-03-10 17:01:22 +05:30
Ankush Menat	b4d4ae6aa3	test: refactor item merge test and disable commits	2022-03-10 17:01:22 +05:30
Ankush Menat	4126455975	fix: dont reset UOM in MR on every get_item_detail call (#30164)	2022-03-10 15:43:09 +05:30
Deepesh Garg	a5befb6bf8	fix: Update modified timestamp	2022-03-10 14:18:54 +05:30
Himanshu	5193a63781	fix: do not reset asset_category (#29696)	2022-03-10 13:43:35 +05:30
Deepesh Garg	395b15058c	fix: Sales and Purchase retrun optimization	2022-03-10 10:50:03 +05:30
Chillar Anand	fe4b6771b5	refactor: Remove dead code (#30140)	2022-03-09 17:16:05 +05:30
Ankush Menat	64905188c4	fix: dont fetch entire barcode table in get_item_details (#30131)	2022-03-09 15:37:14 +05:30
Deepesh Garg	e829f65fde	Merge pull request #30102 from deepeshgarg007/pick_list_query ... fix: Ambigous column in picklist query	2022-03-09 10:17:26 +05:30
mergify[bot]	7a3d30161f	fix: translate error message titles (#30105) ... (cherry picked from commit 456ebc32f00be56cc9972cc76ac412776581060a) Co-authored-by: Türker Tunalı <turker.tunali@gmail.com>	2022-03-08 10:42:30 +05:30
Deepesh Garg	d9d4c2ce79	fix: Remove unintentional changes	2022-03-08 07:56:44 +05:30
Deepesh Garg	517fbf1d1f	fix: Ambigous column in picklist query	2022-03-07 22:31:42 +05:30
Marica	7579981fb5	Merge pull request #29987 from marination/mr-to-order-and-receive-report ... fix: Get MRs that are yet to be received but fully ordered in Report `Requested Items to Order and Receive`	2022-03-07 10:18:28 +05:30
Sagar Vora	3d45f3a6a8	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-03-03 10:20:50 +05:30
Saqib Ansari	cd2513ceec	Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items ... feat: update ordered qty for packed items	2022-03-02 17:10:20 +05:30
Ankush Menat	55a966ec41	chore: get stock reco qty from SR instead of SLE (#30059) ... [skip ci]	2022-03-02 14:49:45 +05:30
Ankush Menat	701878f60b	revert "fix: FIFO valuation in case of multi-item entries" ... This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0. This is huge performance regression for large docs.	2022-03-02 13:11:04 +05:30
Ankush Menat	2f71c5bcca	test: repack FIFO rates	2022-03-02 13:11:04 +05:30
Ankush Menat	ccd2ce56b1	fix: FIFO valuation in case of multi-item entries	2022-03-02 13:11:04 +05:30
Ankush Menat	b3b7cdfb49	test: FIFO transfer for multi-batch transaction	2022-03-02 13:11:04 +05:30
Ankush Menat	5d85b35f41	test: fix flaky bin value test	2022-03-02 12:32:54 +05:30
Ankush Menat	eb8495a401	docs: explain make_sl_entries arguments	2022-03-02 12:27:18 +05:30
Ankush Menat	efc4b943f8	fix: ignore serial no during landed cost voucher	2022-03-02 12:27:18 +05:30
Marica	e0d5c6118f	Merge branch 'develop' into mr-to-order-and-receive-report	2022-03-02 12:14:50 +05:30
Saqib Ansari	89f87cee87	Merge branch 'develop' into ordered-qty-for-packed-items	2022-03-02 12:13:56 +05:30
marination	e6952cb7f9	refactor: Convert to QB, added test file, removed white space ... - Converted mysql raw query to qb - Test file for Report Requested Items to Order and Receive - Removed white space and edited copyright year	2022-03-01 17:15:04 +05:30
Ankush Menat	d22a1d440c	fix: track changes on warehouse	2022-03-01 13:08:25 +05:30
Ankush Menat	b0d1e6db54	test(refactor): use FrappeTestCase	2022-02-28 17:23:32 +05:30
Ankush Menat	3cc47d5ba5	fix: correct fieldname for source warehouse	2022-02-28 13:06:56 +05:30
Ankush Menat	0bed592777	fix: open stock entry instead of submitting from item dashboard	2022-02-28 13:06:56 +05:30
Ankush Menat	88a21ca7d2	fix: only show child warehouses for transfer	2022-02-28 13:06:56 +05:30
Deepesh Garg	1b186682ea	Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check	2022-02-28 12:42:21 +05:30
Saqib Ansari	cde711151e	Merge branch 'develop' into ordered-qty-for-packed-items	2022-02-28 11:35:42 +05:30
Sagar Sharma	77ffcd3aed	fix(ux): make "allow zero valuation rate" readonly if "s_warehouse" is set (#29681) ... * chore: make allow zero valuation rate readonly if s_warehouse is set * fix: setting the checkbox to zero whenever the source warehouse is set * fix: remove allow_on_submit and refresh trigger Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-02-26 11:25:02 +05:30
Sagar Vora	5159e2e6c5	refactor: remove India specific code	2022-02-25 11:36:18 +05:30
Deepesh Garg	0373914704	fix: Commission not applied while making Sales Order from Quotation	2022-02-24 14:42:56 +05:30
Marica	4d8d4acec4	Merge pull request #29913 from marination/item-merge-bundles ... fix: Block merging items if both have product bundles	2022-02-23 16:59:22 +05:30
marination	a33f04ea41	fix: Check if both old and new items have bundles before merging ... - If only one has bundle against it, they can be merged	2022-02-23 16:26:20 +05:30
Marica	8b1ef7bcc6	Merge pull request #29964 from marination/fox-flaky-stock-reports-test ... chore: Rollback after each test, due to premature commit via `remove_user_permission`	2022-02-23 15:18:39 +05:30
marination	5ff3705872	test: Make Variant if absent in test_variant_work_order, keep test atomic	2022-02-23 14:54:16 +05:30
Ankush Menat	9c7df2eec5	fix: ignore duplicates explicitly	2022-02-23 14:27:45 +05:30
marination	bf8743713d	chore: Rollback after each test, due to premature commit via remove_user_permission ... - `remove_user_permission` in `test_warehouse_user` calls delete_doc that enqueues dynamic link deletion - Execution of background job eventually commits - While in the test suite it runs sequentially in the same thread and commits whatever was done until then - Which is why the rollback in `tearDownClass` is quite useless here - This premature commit causes many illegal transactions caught by `assertRaises` to be committed in the db - This creates faulty/dirty ledgers and breaks reports, as outiside the test suite this shouldn't/wouldn't happen - Rollback after each test, and for `test_warehouse_user` in particular, manually cancel transaction	2022-02-23 14:03:48 +05:30
Marica	0fde2f522e	Merge branch 'develop' into item-merge-bundles	2022-02-23 00:28:51 +05:30
Ankush Menat	5d403449bd	test: move report tests to subttest (#29945) ... Basically failfast=False but for sub-tests	2022-02-22 19:24:49 +05:30
Saqib Ansari	3ee1383802	Merge branch 'develop' into ordered-qty-for-packed-items	2022-02-22 18:45:31 +05:30
Ankush Menat	745f7bc5f0	docs: add human readable specifications for stock ledger (#29308) ... * docs: add human readable specifications for stock ledger * docs: reposting technical implementation notes	2022-02-22 17:03:11 +05:30
Ankush Menat	7f55226a58	fix: remove customer field value when MR is not customer provided (#29938)	2022-02-22 16:55:43 +05:30
Saqib Ansari	8005fee656	feat: update ordered qty for packed items	2022-02-22 15:06:19 +05:30
Ankush Menat	9661058cc7	fix: only set batchwise valuation flag if new batch	2022-02-21 19:04:10 +05:30
Ankush Menat	af9fa049c7	fix: batchwise valuation can only be used by FIFO/LIFO	2022-02-21 18:02:40 +05:30
Ankush Menat	75fb561698	test: force correct flag in test data	2022-02-21 18:02:40 +05:30
Ankush Menat	f38690f703	fix: check if Moving average item can use batchwise valuation	2022-02-21 18:02:40 +05:30
Ankush Menat	6b0bc35063	test: mixed moving average items	2022-02-21 18:02:40 +05:30
Ankush Menat	609d2fccad	fix: reset stock value if no qty	2022-02-21 18:02:40 +05:30
Ankush Menat	35483242b3	fix: extend round_off_if_near_zero fix to other methods	2022-02-21 18:02:40 +05:30
Ankush Menat	76b395d62e	test: old/new mix batches valuation consumption	2022-02-21 18:02:40 +05:30
Ankush Menat	b1555fd477	chore: batch flag and consumption rate in invariant report	2022-02-21 18:02:40 +05:30
Ankush Menat	b534fee2c7	refactor: use queue difference instead of actual values	2022-02-21 18:02:40 +05:30
Ankush Menat	aba7a7ce4e	fix: handle negative inventory inside a batch	2022-02-21 18:02:40 +05:30
Ankush Menat	d7ca83ef0b	refactor: code duplication for fallback rates	2022-02-21 18:02:40 +05:30
Ankush Menat	c5bd34d238	test: multi-batch stock entry	2022-02-21 18:02:40 +05:30
Ankush Menat	60b8bae85f	test: batch wise valuation for transfer and intermediate	2022-02-21 18:02:40 +05:30
18alantom	683ef8a603	test: more tests for batchwise valuation ... Co-Authored-By: Ankush Menat <ankush@frappe.io>	2022-02-21 18:02:40 +05:30
Ankush Menat	d130233ffc	test: fix expected test failures	2022-02-21 18:02:40 +05:30
Ankush Menat	102fff24c8	refactor: convert query to QB and make creation optional	2022-02-21 18:02:40 +05:30
Ankush Menat	ab926521bd	fix: correct incoming rate for batched items	2022-02-21 18:02:40 +05:30
Ankush Menat	342d09a671	feat: get_valuation_rate batch wise ... This function is used to show valuation rate on frontend and also as fallback in case values aren't available. Add "batch_no" param to get batch specific valuation rates. Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>	2022-02-21 18:02:40 +05:30
Ankush Menat	ce0514c8db	feat: batch wise valuation rates ... start with most used case: negative inventory isn't enabled - simple addition of qty and value when new batch qty is added - fetch outgoing rate from stock movement of specific batch	2022-02-21 18:02:40 +05:30
18alantom	f4af75f60b	feat: batchwise valuation flag ... This is required to avoid breaking behaviour in valuation of old batches	2022-02-21 18:02:40 +05:30
Ankush Menat	00e8565868	fix: round off increments in numeric item variant	2022-02-21 17:42:34 +05:30