6260 Commits

Author	SHA1	Message	Date
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
marination	530f9f7029	test: Item Merging with Product Bundles	2022-02-21 16:48:04 +05:30
marination	28cc2dbb72	fix: Block merging items if both have product bundles	2022-02-21 16:14:40 +05:30
Marica	d1a283fd79	Merge branch 'develop' into repack-entry-stock-ageing	2022-02-18 18:54:23 +05:30
marination	d5be536740	test: Negative Stock, over consumption & over production with split rows, balance precision	2022-02-18 18:53:05 +05:30
marination	ed4a6c6cc6	fix: Range Qty precision	2022-02-18 18:52:42 +05:30
marination	d3fbbcfed3	fix: Precision of available qty and negative stock in transfer bucket ... - Maintain only positive values in transfer bucket - Use it to neutralize/add stock to fifo queue	2022-02-18 16:33:28 +05:30
Ankush Menat	d9fc3f3d90	test: putaway rule re-application shouldn't do anything	2022-02-17 12:26:51 +05:30
Ankush Menat	b000e93744	fix: avoid updating items table if no change due to putaway	2022-02-17 12:26:51 +05:30
Marica	c3c9a8d445	Merge branch 'develop' into so-mr-wo-back-update	2022-02-16 13:39:58 +05:30
Marica	201a38bfbf	Merge branch 'develop' into item-variants-perf	2022-02-16 13:03:32 +05:30
marination	f6233e77c6	chore: Add transfer bucket working to .md file	2022-02-15 20:30:16 +05:30
marination	ea3b7de867	test: Stock Ageing FIFO buckets for Repack entry with same item	2022-02-15 18:41:42 +05:30
marination	799671c748	fix: Transfer Bucket logic for Repack Entry with split batch rows	2022-02-15 18:41:08 +05:30
marination	18731622c4	fix: Update SO via Work Order made from MR (attached to SO) ... - Add SO Item reference in WO from MR (that was made from SO)	2022-02-15 12:50:56 +05:30
Ankush Menat	1e9766433a	fix: get_item_details overrides parentype (#29799)	2022-02-15 10:57:06 +05:30
Marica	cd728fc9e7	Merge branch 'develop' into fifo-slot-by-wh	2022-02-14 20:42:57 +05:30
marination	f221a0d253	test: Cover back to back recos from different warehouses	2022-02-14 20:14:14 +05:30
Saqib Ansari	3713ae75ab	fix: incorrect pricing rule filtering on selecting first item	2022-02-14 13:31:37 +05:30
Ankush Menat	eb8b424722	feat: item-wise negative stock setting (#29761)	2022-02-12 13:08:28 +05:30
marination	f62b3207ff	fix: Generate Wh wise FIFO Queue and later aggregate if required ... - Back to back stock recos cause incorrect qty calculation across warehouses - Hard to differentiate how much of the qty is reset by the reco - Maintain Queue and balances warehouse wise and later aggregate for accurate values	2022-02-11 18:14:28 +05:30
Ankush Menat	77be98295c	fix: update bin modified timestamp when updating qty ... These timestamps are used for writing integrations hence whenever bin is updated timestamp should update to reliabily use Bin for integration logic.	2022-02-11 11:54:58 +05:30
Ankush Menat	1553fa9c90	refactor!: drop deprecated and dead code	2022-02-11 11:23:37 +05:30
Ankush Menat	2abc1c244e	Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc ... fix: Reserved for Production calculation considered closed work orders	2022-02-09 15:59:52 +05:30
Ankush Menat	a8bf3a3f0d	refactor: move reserve quantity computation to work order	2022-02-09 11:26:03 +05:30
aaronmenezes	6a8b7eeffe	fix: Reserved for Production calculation considered closed work orders	2022-02-08 19:25:49 +05:30
Ankush Menat	befcca4183	Merge branch 'develop' into lifo_valuation	2022-02-08 17:38:06 +05:30
Bhavesh Maheshwari	3969840ee8	fix: ignore rate validation for work order ... (cherry picked from commit f29aed7f7130b805810075db1e5e1003e997bef8)	2022-02-08 14:01:41 +05:30
marination	a64228741d	fix: Trim spaces from attributes (multi-variant creation) & explicit method for building cache ... - Multiple Item Variants creation fails due to extra spaces in attributes from popup. Clean them before passing to server side - Mention explicit method to build variants cache to avoid ambiguity between old method path (pre-refactor)	2022-02-08 11:15:19 +05:30
Mohammed Yusuf Shaikh	a3e69cf75d	feat: Bulk Transaction Processing (#28580) ... * feat: Bulk Transaction Processing * fix: add flags to ignore validations and exception handling correction * fix: remove duplicate code, added logger functionality and improved notifications * fix: linting and sider issues * test: added tests * fix: linter issues * fix: failing test case * fix: sider issues and test cases * refactor: mapping function calls to create order/invoice * fix: added more test cases to increase coverage * fix: test cases * fix: sider issue * fix: rename doctype, improve formatting and minor refactor * fix: update doctype name in hooks and sider issues * fix: entry log test case * fix: typos, translations and company name in tests * fix: linter issues and translations * fix: linter issue * fix: split into separate function for marking failed transaction * fix: typos, retry failed transaction logic and make log read only * fix: hide retry button when no failed transactions and remove test cases not rrelevant * fix: sider issues and indentation to tabs Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-02-08 01:00:37 +05:30
Deepesh Garg	2280ae5554	Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290 ... fix: billed amount in delivery note items (backport #29290)	2022-02-07 23:49:19 +05:30
Deepesh Garg	529cc72863	Merge pull request #29656 from ankush/credit_debit_pr ... fix: dont ignore items that dont have SVD	2022-02-07 23:46:07 +05:30
Ankush Menat	f82d7eb73f	test: commit item/warehouse creation to db	2022-02-07 22:55:56 +05:30
Ankush Menat	43f8ee1dd1	chore: drop dead field from stock reconciliation	2022-02-07 22:55:56 +05:30
Ankush Menat	699519f7b6	test: product bundle reposting	2022-02-07 22:55:56 +05:30
Ankush Menat	853e658dcc	test: move bundle info to class variables	2022-02-07 22:55:56 +05:30
Ankush Menat	1022db0474	fix: merge stock ledger item warehouse with doc's	2022-02-07 22:55:56 +05:30
Ankush Menat	5e6227e3d8	fix(ux): make stock entry type the title field (#29674)	2022-02-07 13:19:08 +05:30
Umair Sayed	104a55aff1	feat: Tab views in Stocks and Accounts Settings (#29638) ... * tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings. * chore: undo changes to creation timestamp happened because of a bug in fw Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>	2022-02-07 10:42:55 +05:30
Ankush Menat	f089d39675	refactor: better method name ... Co-authored-by: gavin <gavin18d@gmail.com>	2022-02-06 20:12:15 +05:30
Ankush Menat	3e5f940686	test: e2e test for LIFO valuation	2022-02-06 20:12:15 +05:30
Ankush Menat	61c5ad44d3	refactor: get incoming fifo/lifo rate functions ... Re-use same logic for computing incoming rate.	2022-02-06 20:12:15 +05:30
Ankush Menat	97e18a1cd0	feat: allow selecting LIFO valuation	2022-02-06 20:12:11 +05:30
Ankush Menat	9c49d2d3aa	feat: LIFOValuation class for handling LIFO	2022-02-06 20:12:11 +05:30
Ankush Menat	b855030e7c	refactor: valuation class to allow extending	2022-02-06 20:12:11 +05:30
Ankush Menat	d1f5753885	test: check when PR moves stock from neg to pos	2022-02-05 23:35:28 +05:30
Ankush Menat	c88c368880	fix: dont ignore items that dont have SVD ... When items go from negative to positive stock value diff can be zero but item might have taxes / need divisional loss adjustment.	2022-02-05 22:54:18 +05:30
Ankush Menat	69c65afd72	test: regression test for LCV GL entries	2022-02-05 20:58:56 +05:30
Ankush Menat	8858c703a8	fix: ignore cancelled svd while updating GLE for PR ... This happens because LCV cancels and reposts entries so unless filtered by non-cancelled entries you can randomly get old values.	2022-02-05 20:58:56 +05:30
marination	bd41a99c8a	fix: Regenerate packed items on newly mapped doc ... - Cannot determine action on newly mapped DN that hasnt been inserted - Rows could have been deleted, updated, added, etc. before first save - In this case , reset packing table	2022-02-04 22:06:56 +05:30
Marica	79ab8e6459	Merge pull request #29456 from marination/product-bundle-packing-list-logic ... fix: Incorrect packing list for recurring items & code cleanup	2022-02-03 22:09:52 +05:30
Ankush Menat	04f6426dbf	feat: show stock value difference in stock ledger report (#29607)	2022-02-03 17:14:57 +05:30
marination	f18ec2d947	fix: (Linter) import sequence	2022-02-03 17:07:11 +05:30
Marica	e9fc6c3249	Merge branch 'develop' into product-bundle-packing-list-logic	2022-02-03 17:02:57 +05:30
marination	4e7b4dc9a8	test: Packed Items test file	2022-02-03 17:01:33 +05:30
Marica	780e29b42e	Merge branch 'develop' into e-commerce-refactor-develop	2022-02-02 10:45:14 +05:30
Deepesh Garg	528c71382f	feat: Provisional accounting for expenses (#29451) ... * feat: Provisonal accounting for expenses * fix: Method for provisional accounting entry * chore: Add test case * fix: Remove test case * fix: Use company doctype * fix: Add provisional expense account field in Purchase Receipt Item * fix: Test case * fix: Move provisional expense account to parent * fix: Patch	2022-02-01 14:42:55 +05:30
marination	2933cf243a	fix: Failing test, sider and linter ... - Remove unused imports - fix test `test_product_list_attribute_filter_builder`	2022-02-01 12:08:33 +05:30
Sagar Sharma	ce0b84f54d	refactor: use frappe.qb instead of sql ... (cherry picked from commit 0a9ec9f591f8b4d0e630a3c902b69c9996f080dd)	2022-02-01 05:39:39 +00:00
Sagar Sharma	b50036c04a	fix: consider returned_qty while updating billed_amt ... (cherry picked from commit 63aaa1e357280b24c537a502a479f7bb7a6654e4)	2022-02-01 05:39:37 +00:00
marination	7bc087ed44	fix: Merge conflicts, Linter and Server Test ... - Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050 - Resolve Linter issues (imports and spaces) - Include customer_reviews.js in bundle, move it to /public/js	2022-02-01 10:51:50 +05:30
marination	9fb61efba8	chore: Fix imports and formatting (linter) & Sider (unused import)	2022-02-01 00:54:54 +05:30
Ankush Menat	6cd7c47409	Merge branch 'develop' into e-commerce-refactor-develop	2022-01-31 17:14:36 +05:30
Ankush Menat	a254201696	chore: revert manual handling of stock level section (#29537)	2022-01-31 15:37:19 +05:30
Ankush Menat	a1e7771cdd	fix: ignore None item/wh whie updating reservation	2022-01-30 18:43:02 +05:30
Ankush Menat	08810dbcce	fix: add unique constraint on bin at db level	2022-01-30 18:42:59 +05:30
Ankush Menat	b20df3745e	refactor: reusable clean_serial_nos	2022-01-29 14:01:21 +05:30
marination	2f4d266ee1	refactor: Price fetching and updation logic ... - fetch price from price list, use item master valuation rate as fallback fo0r packed item - use a item code, item row name map to maintain cumulative price - reset table if item in a row is replaced - loop over items table only to set price, lesser iterations than packed items table	2022-01-28 19:03:40 +05:30
marination	2c14ab0439	chore: Break updation logic into smaller functions ... - Smaller functions for updation - All calls visible from parent function to avoid context switching due to nested calls	2022-01-28 13:25:55 +05:30
mergify[bot]	0dafa8a12a	fix: stock ledger rendering glitch ... undefined Issue (cherry picked from commit f38004219518e901eb736780b181c19fe88ce823) Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>	2022-01-27 20:23:24 +05:30
marination	4c677eafe9	fix: Linter and minor code refactor ... - Create an indexed map of stale packed items table to avoid loops to check if packed item row exists - Reset packed items if row deletion takes place - Renamed functions to self-explain them - Split long function - Reduce function calls inside function (makes it harder to follow through)	2022-01-26 01:10:24 +05:30
Ankush Menat	f5f3552abb	test: cover more reports in test	2022-01-25 23:22:14 +05:30
marination	f8a5786542	chore: SQL to QB & accomodate Update Items ... - `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty) - converted more raw sql to qb and ORM	2022-01-25 19:51:47 +05:30
marination	3f48fc1898	fix: Incorrect packing list for recurring items & code cleanup ... - Fix Incorrect packing list for recurring items in the Items table - Re-organised functions based on external use and order of use - Deleted `clean_packing_list` function and reduced no.of loops - Raw SQL to QB - Minor formatting changes	2022-01-25 18:38:41 +05:30
rohitwaghchaure	19b1b7f8cc	Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry ... fix: incorrect raw materials quantity in manufacture stock entry	2022-01-24 12:13:54 +05:30
Rohit Waghchaure	f8d232ac26	fix: incorrect raw materials quantity in manufacture stock entry	2022-01-24 11:35:06 +05:30
mergify[bot]	8e3cd1ab31	fix: Don't delete barcode while saving Item (#29411) (#29417) ... (cherry picked from commit 096e7b9ec5e3b67983cfa3a06335fba435f88c97) Co-authored-by: Britlog <info@britlog.com>	2022-01-23 17:04:55 +05:30
Saqib Ansari	58cc3b32fa	Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase	2022-01-21 15:33:13 +05:30
Ankush Menat	4fa93e246e	test: create and cancel sr no with stock reco	2022-01-21 15:27:10 +05:30
Ankush Menat	33c4a0b5a9	fix: bad default for non-existing serial nos ... serial_no field should have empty string if it doesn't have any serial nos	2022-01-21 15:27:10 +05:30
Saqib Ansari	a09259f175	Merge branch 'develop' into grouped-asset-purchase	2022-01-21 14:20:27 +05:30
Noah Jacob	20216fa9f1	fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607) ... * fix: updated packed_items getting fetched on sales return * fix: updated test cases for product bundle returns * fix: moved calculate_mapped_packed_items_return to stock.utils * fix: updated packed_items getting fetched on Return/Credit Note * refactor: change var name to avoid `self` * fix: check item code before assigning parent item Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-01-21 11:50:13 +05:30
Saqib Ansari	35a6b58c12	feat: purchase grouped asset	2022-01-18 13:10:23 +05:30
Ankush Menat	fabe0bce15	fix: enable allow negative stock by default in reposts (#29331) ... Negative stock validation is done BEFORE reposting as such it's not required to be performed again and most likely this fails on old intermediate data where user has no clue why it failed.	2022-01-18 11:48:44 +05:30
Marica	dbda10e092	Merge pull request #28987 from ankush/fix/srvaluation ... fix: incorrect serial no valuation	2022-01-17 16:55:21 +05:30
Ankush Menat	3db8d908dc	Merge pull request #29278 from shariquerik/update-workspace-json ... fix: Updating public workspace json based on new design	2022-01-17 13:25:16 +05:30
rohitwaghchaure	9088984481	Merge pull request #29304 from ankush/fix/zero_valued_reposts ... fix: dont update sle values from get_gl_entries	2022-01-17 11:59:17 +05:30
Ankush Menat	66bf21f143	fix(patch): sle.serial_no = "\n" causes incorrect queue (#29306) ... This happens due to old data.	2022-01-16 20:45:59 +05:30
Ankush Menat	82ea958730	fix: ignore cancelled SLEs (#29303)	2022-01-16 20:19:04 +05:30
Ankush Menat	5d27a7672e	test: serial no valuation test case	2022-01-16 17:54:12 +05:30
Ankush Menat	0272397e54	test: make sure zero incoming rate is maintained while consuming	2022-01-16 13:24:40 +05:30
Ankush Menat	b0cf6195e9	fix: only add stock queue if FIFO (#29302)	2022-01-16 13:02:23 +05:30
Ankush Menat	b9642a1036	fix: incorrect incoming rate computation for sr no	2022-01-16 12:39:34 +05:30
Dany Robert	2b681f04fd	fix: exclude existing serial numbers while auto creating new #29292 ... fix: exclude existing serial numbers while auto creating new	2022-01-15 20:08:11 +05:30
Shariq Ansari	bc187c121a	fix: updated standard workspace json files	2022-01-13 19:24:11 +05:30
marination	c49dff385a	test: Check for FinishedGoodError if 0 FG in repack entry	2022-01-13 15:02:59 +05:30
marination	3922a39591	test: Basic test one item repacked into two ... - Also run fg validation and fg marking after checking purpose, avoid unnecessary calls	2022-01-13 14:36:21 +05:30
marination	eac7b5d5aa	fix: Allow multiple fg in repack entry	2022-01-13 13:44:20 +05:30
Ankush Menat	eb8d08b411	fix: remove all stock UOM conversion when changing stock UOM	2022-01-12 19:41:28 +05:30
Marica	efcfb825d7	Merge pull request #29257 from marination/fix-reset-wh-defaults ... fix: Avoid resetting Default wh fields for Manufacture Entry	2022-01-12 16:44:33 +05:30
rohitwaghchaure	71466c6456	Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture ... fix: incorrect scrap item qty	2022-01-12 13:13:30 +05:30
Rohit Waghchaure	8f0b2fa90e	fix: incorrect scrap item qty	2022-01-12 11:30:20 +05:30
Marica	b5abf68b0d	Merge branch 'develop' into e-commerce-refactor-develop	2022-01-12 02:52:03 +05:30
Ankush Menat	24fc487dd8	fix: incorrect serial no valuation report showing cancelled entries (#29172)	2022-01-06 17:03:34 +05:30
Subin Tom	7385497219	fix: using get_batch_qty method to get available_qty	2022-01-03 16:57:00 +05:30
Subin Tom	267da48889	fix: added Sum() in query	2022-01-03 16:40:11 +05:30
Saqib Ansari	568550874d	Merge branch 'develop' into pos-batch-no-stock-validation	2022-01-03 14:46:29 +05:30
rohitwaghchaure	f02e6b4631	fix: incorrect posting time fetching incorrect qty (#29103)	2022-01-03 14:28:34 +05:30
Ankush Menat	087ebcae5a	Merge pull request #29014 from ankush/rename_sr_no ... fix!: disable renaming on serial nos	2021-12-28 15:34:50 +05:30
Marica	02b9541b43	Merge branch 'develop' into independent-manu-entry	2021-12-28 13:26:00 +05:30
marination	22809a2838	fix: Avoid Impact on Repack Entry ... - Repack entries must be considered for fg/scrap checkbox auto set - This must be avoided only for Manufacture entries, due to confusion between scrap and fg - No scrap in repack, so its straight forward	2021-12-28 13:23:27 +05:30
marination	7d0340e660	fix: Sider	2021-12-28 13:06:35 +05:30
marination	6ca978c18b	fix: Linter (extra line after import)	2021-12-28 11:46:46 +05:30
marination	098f72e7ec	test: Stock Ageing FIFO Slot generation	2021-12-28 02:33:54 +05:30
Marica	0eb38a4b13	Merge branch 'develop' into stock-ageing-negative-stock	2021-12-28 01:29:01 +05:30
marination	c007f84ade	chore: Added .md file to explain stock ageing business logic	2021-12-28 01:27:24 +05:30
marination	878fd377c2	chore: Use frappe.qb for query	2021-12-27 21:09:05 +05:30
Deepesh Garg	ab09dc545e	fix(UX): Optimize rate updation of changing price list ... (cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)	2021-12-24 14:03:47 +00:00
Ankush Menat	7987a46509	chore: add running stock value difference in invariant report (#29012) ... [skip ci]	2021-12-23 21:13:22 +05:30
Ankush Menat	db7aef2fef	style: better labels for SLE fields (#28988) ... * style: better labels for SLE fields * style: rename stock queue field [skip ci] Co-Authored-by: marination <maricadsouza221197@gmail.com>	2021-12-21 17:39:27 +05:30
Saqib	7f786e44a1	Merge branch 'develop' into pos-batch-no-stock-validation	2021-12-21 17:05:43 +05:30
Marica	d7c4b8a383	Merge branch 'develop' into independent-manu-entry	2021-12-21 12:55:12 +05:30
marination	24a35c69c0	fix: Sider and Server side test ... - args passed to wrong function - missing space around '='	2021-12-21 12:52:03 +05:30
Ankush Menat	d7148adee5	test: remove unnecessary creation of companies #28965 ... test: remove unnecessary creation of companies	2021-12-20 22:00:31 +05:30
Marica	d209e5d6c5	Merge branch 'develop' into independent-manu-entry	2021-12-20 21:55:38 +05:30
marination	8951a5c267	fix: Linter (imports)	2021-12-20 21:53:47 +05:30
marination	0f43792dbb	fix: Stock Ageing Report - Negative Opening Stock ... - Consider negative opening stock in logic and neutralise it with +ve stock - minor code refactor: class for FIFOSlots to generate chronological FIFO queue	2021-12-20 21:33:59 +05:30
Ankush Menat	2bb7bca464	test: bin qty on backdated SR	2021-12-20 20:05:49 +05:30
Ankush Menat	ff9a6e8e89	fix: correct bin qty on backdated transactions ... When making a backdated transactions current balance qty depends on evaluation of whole ledger inbetween, instead of doing that just fetch the last sle's qty_after_transaction when future transactions are detected against SLE fix: don't update bin's actual_qty 1. it's already updated by repost_current_voucher 2. update if future sle exists	2021-12-20 20:05:49 +05:30
Ankush Menat	f5d5281119	chore: drop deprecated qunit tests	2021-12-20 17:03:10 +05:30
Ankush Menat	107b404105	chore: rename FifoValuation to FIFOValuation	2021-12-20 13:20:03 +05:30
Ankush Menat	745caf911a	perf: specify slots on FIFO queue	2021-12-20 13:20:03 +05:30
Ankush Menat	aa0e163b1f	test: hypothesis tests for FIFO queue	2021-12-20 13:20:03 +05:30
Ankush Menat	9d177433cb	fix: return consumed bin on collapsing queue	2021-12-20 13:20:03 +05:30
Ankush Menat	a00d8d02b2	refactor: outgoing rate and defaults for remove_stock	2021-12-20 13:20:03 +05:30
Ankush Menat	db1c0889d3	feat: get consumed bins from Fifo queue on pop	2021-12-20 13:20:03 +05:30
Ankush Menat	1833f7ab81	test: FifoValuation tests	2021-12-20 13:20:03 +05:30
Ankush Menat	e6e679cf7a	fix: round off if near zero while popping from queue	2021-12-20 13:20:03 +05:30
Ankush Menat	a71b476652	feat: repr, eq and iter for fifo queue	2021-12-20 13:20:03 +05:30
Ankush Menat	4b29fb6d08	refactor: move Fifo Valuation to a new class	2021-12-20 13:20:03 +05:30
Ankush Menat	6ba8f7644d	chore: ledger invariant check report (#28921)	2021-12-16 22:31:31 +05:30
Subin Tom	68beee2a00	fix: replaced sql query with frappe.qb	2021-12-16 13:26:21 +05:30
Subin Tom	9f235526d4	fix: Validation in POS for item batch no stock quantity	2021-12-15 22:34:44 +05:30
DeeMysterio	2be62c279f	feat: provision to have limited parameters for in-process quality ins… (#28549) ... * feat: provision to have limited parameters for in-process quality inspection * chore: formatting	2021-12-15 19:41:30 +05:30
Ankush Menat	228e011819	perf: remove forcing of posting sort index on stock balance (#28902) ... mysql is generally smart enough to figure out which index is better based on cardinality of index. While posting sort index is better for low item high # of SLE scenario it's bad for high item variety each with lower count of SLEs.	2021-12-15 19:18:41 +05:30
Saqib	56bc8a52f4	Merge branch 'develop' into home-onboarding	2021-12-15 10:40:40 +05:30
Ankush Menat	66960cf050	fix: remove set only once from valuation method (#28876)	2021-12-14 17:12:46 +05:30
Ankush Menat	80f1a8c645	fix: incorrect logic for "Reserved Qty for Production" (#28880) ... * fix: reservation for production incorrect The query uses case to decide what fields to compute reservation on, this case is outermost case hence the very first Work order's "Skip transfer" is considered for ALL work orders. Solution: move the case inside Sum. Steps to reproduce: 1. Make work order for more than 1 qty (with | without skip transfer) 2. Create manufacture and transfer entries. 3. Keep checking reserved quantities during this process. * test: use default warehouse for testing reservation	2021-12-14 17:02:42 +05:30
aaronmenezes	304aa44feb	fix: Nonstock item showing in Itemwise Recommended Reorder Level report (#28873)	2021-12-14 15:18:03 +05:30
Ankush Menat	534c64abcd	fix: packing slip incorrect item value (#28862)	2021-12-14 11:55:09 +05:30
Jannat Patel	74d086ffd1	Merge branch 'develop' into home-onboarding	2021-12-13 17:51:38 +05:30
Ankush Menat	75bc404cbe	test: stock frozen validation	2021-12-10 12:39:38 +05:30
Ankush Menat	d37541d3fb	fix: ensure that reposting is finished before freezing stock/account	2021-12-10 12:31:49 +05:30
Sagar Sharma	6485ac4e59	fix: misleading "Set Default X" fields after saving (#28798) ... * fix: misleading "Set Default X" fields after saving * refactor: remove unncessary code and minor formatting * fix: extend to more doctypes and correct fieldnames Co-authored-by: Ankush Menat <ankush@frappe.io>	2021-12-09 17:04:00 +05:30
Ankush Menat	c64d5028b4	fix: deduplicate after finishing the repost (#28803) ... Not really a bug but avoids potential of prematurely skipping something if failure occurs and failure isn't resolved.	2021-12-09 13:45:44 +05:30
Ankush Menat	96a019ec49	test: add multi-batch negative qty test	2021-12-08 15:52:40 +05:30
Ankush Menat	f0152d03a4	test: simplfy test and expect specific exception	2021-12-08 15:52:40 +05:30
Ankush Menat	9c90b7a40d	refactor: remove redundant batch qty validation ... This check was only checking total sum, which is problamatic when making backdated entries that can cause intermediate values to go negative while overall values stay positive.	2021-12-08 15:52:40 +05:30
Ankush Menat	5eba57528c	fix: check future negative stock for batches ... batch's ledger is only maintained in form of `actual_qty` on batch's SLEs. To validate if batch has any negative qty in future, cumulative total of `actual_qty` is required to ensure it never goes negative.	2021-12-08 15:52:40 +05:30
18alantom	1cbeba5f1d	test: check execution of illegal stock entry seq	2021-12-08 15:52:40 +05:30
Ankush Menat	ca230e4267	test: index test should pass without calling function #28771 ... test: index test should pass without calling function [skip ci]	2021-12-07 15:11:31 +05:30
rohitwaghchaure	fc4e6a2bed	Merge pull request #28710 from noahjacob/calc_outgoing_stock_entry ... fix: incorrect outgoing rates when material_consumption enabled	2021-12-04 12:34:33 +05:30
Ankush Menat	ba5a7ffd60	fix: weird item sorting by idx	2021-12-03 19:08:06 +05:30
Ankush Menat	5caf411be3	fix: remove autocommit from item rename	2021-12-03 18:47:53 +05:30
Ankush Menat	72dbc3d6b8	fix!: dont allow renaming warehouse primary key	2021-12-03 18:47:53 +05:30
Noah Jacob	35346de162	test: added tests for manufacture stock entry when material_consumption is enabled	2021-12-03 17:21:49 +05:30
Noah Jacob	7f3e6d149a	fix: incorrect outgoing rates when material_consumption enabled	2021-12-03 15:11:18 +05:30
Ankush Menat	cef84c25a7	refactor: simplify the way SLEs are submitted	2021-12-03 14:51:25 +05:30
Ankush Menat	97060c45e9	refactor: replace misleading variable name	2021-12-03 14:51:25 +05:30
Ankush Menat	a37c99a23d	fix: dont requeue repost immediately and clear progress (#28684)	2021-12-02 14:51:04 +05:30
Jannat Patel	427938f87b	fix: new item form tour for home onboarding	2021-12-02 11:25:47 +05:30
Ganga Manoj	dc3449c304	Merge branch 'develop' into product-bundle-fixes	2021-12-01 23:27:40 +05:30
Sagar Vora	ab280f7142	fix: update modified timestamp for delivery note #28657 ... fix: update `modified` timestamp for delivery note	2021-12-01 11:01:49 +05:30
GangaManoj	a473e1dbe9	fix: Add item to packing list	2021-12-01 01:29:35 +05:30
Raffael Meyer	e10ab1626c	feat: Grant commission on certain items only (#27467) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-11-30 17:54:18 +05:30
Ankush Menat	aeb62af544	fix(ux): remove attachment limits	2021-11-30 12:46:53 +05:30
Saqib	c0cc72ec1d	fix: incorrect discount amount set when item is replaced (#28556)	2021-11-29 15:05:06 +05:30
Ankush Menat	c7701ace80	chore: correct docstrings	2021-11-29 13:04:29 +05:30
Ankush Menat	f862339024	fix: use get_all instead of get_list for child tables	2021-11-29 13:04:29 +05:30
Jannat Patel	8cc1dc8079	Merge branch 'develop' into home-onboarding	2021-11-29 10:24:06 +05:30
Ankush Menat	69a17b9e51	refactor: move Bin queries to qb/orm (#28522)	2021-11-27 20:07:02 +05:30
Noah Jacob	7ff30a4b2b	fix: incorrect balance for warehouses (#28583)	2021-11-26 17:33:57 +05:30
marination	dfff972a78	fix: Linter (imports)	2021-11-26 13:29:05 +05:30
Marica	26207d9517	Merge branch 'develop' into independent-manu-entry	2021-11-26 13:20:33 +05:30
marination	affb29194b	test: Independent Manufacture Entry ... - Check validations - Check if FG basic rate is calculated correctly	2021-11-26 13:19:04 +05:30
Ganga Manoj	a1055d6bd3	Merge branch 'develop' into product-bundle-fixes	2021-11-25 20:00:30 +05:30
Ankush Menat	87f2dcfb59	fix: total stock summary UI glitch #28564 ... fix: total stock summary UI glitch	2021-11-25 19:38:44 +05:30
Ankush Menat	ed94f0f3f2	refactor: deduplicate during repost background job	2021-11-25 16:37:19 +05:30
Ankush Menat	55631dd0d6	test: item-wh deduplication in reposting	2021-11-25 16:37:19 +05:30
Ankush Menat	0d0e24a5f5	perf: skip unnecessary item-wh reposts ... Using basic idea that repost with older posting date will also take care of subsequent posting dates... When Item-WH reposts are queued: 1. If another repost with same item-wh but older posting date exists then skip current one. 2. If another repost with same item-wh but newer posting date exists then skip another one.	2021-11-25 16:37:19 +05:30
Ankush Menat	1d3842f03a	fix: dont erase voucher_type and voucher_no for item_wh repost ... kept for tracability.	2021-11-25 16:37:19 +05:30
Ankush Menat	a5a8c9104f	perf: index for item-sh on repost item valuation ... Item-WH based reposting requires querying existing similar repost. Assuming there is only 1 max extra entry with same params just indexing item-WH is sufficient to speed up the query.	2021-11-25 16:37:19 +05:30
Ankush Menat	45dd46be3d	feat: option to select reposting method ... In current implementation selecting Item-Warehouse based reposting is better for few users, who don't use depenent SLEs but have frequent transactions involving same items. This change lets them switch to item-warehouse based reposting if required. Only use this if you understand technicalities of stock reposting. This is experimental but will become mainstream in coming days.	2021-11-25 16:37:19 +05:30
Ankush Menat	a36c249d3d	test: item-wh repost creation	2021-11-25 16:37:19 +05:30
marination	8c9779d69d	fix: Dont auto set is finished item or is scrap itm checkbox for independent entry ... - System cant differentiate between scrap and FG when WO is absent, so dont auto set - User must set it manually - `validate_finished_goods` checks this	2021-11-25 13:23:10 +05:30
marination	d6bc121999	fix: Validate Finished Goods for Independent Manufacture entries as well ... - Check if FG exists even if WO is absent - Check if multiple FGs are there, block.	2021-11-25 13:18:58 +05:30
GangaManoj	8370042f82	fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles	2021-11-24 21:06:23 +05:30
Jannat Patel	5b2ba24563	fix: company tour	2021-11-24 19:19:45 +05:30
Saqib	136dd4f801	Merge branch 'develop' into product-bundle-fixes	2021-11-24 11:27:12 +05:30
GangaManoj	0803f87660	fix: Fix Product Bundle price calculation when there are multiple Product Bundles	2021-11-24 06:07:58 +05:30
Ankush Menat	0df9cf9526	chore: remove dead/irrelevant links from workspace (#28519) ... * chore: remove dead link to shopify settings * chore: unlink "debug" reports from stock dashboard	2021-11-23 15:08:51 +05:30
Ankush Menat	c436e30ee6	fix: don't use cached doc while reposting	2021-11-22 12:40:18 +05:30
Ankush Menat	aa024fc9da	fix: ignore permissions while creating repost ... If user reached this code then they already have permission to create stock transaction, hence ignore permission checks while creating/cancelling repost item valuation entries.	2021-11-22 12:40:18 +05:30
Ankush Menat	42f1dd98dd	fix: restrict repost valuation to manager roles	2021-11-22 12:40:18 +05:30
marination	23486a929d	fix: (style) Warehouse Capacity Dashboard UI ... - Made refresh button icon visible - Edit Capacity button size and alignment - Medium font on dashboard	2021-11-17 14:21:37 +05:30
Marica	612bb5c749	Merge branch 'develop' into se-required-items-from-jc	2021-11-16 18:03:40 +05:30
marination	1bb135b2d3	fix: Sider and CI ... - Incorrect path and Settings in price_list.py import due to merge - Extra space removed in website_item.py - Changed client side namespace to `erpnext.e_commerce.*`	2021-11-16 17:23:39 +05:30
marination	9aeb211142	chore: Remove Home Page is Products and Sider fixes ... - Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings - Removed hooks trigger to reset home page as products - Sider: duplicate color attribute, shift `return` to next line, over-indentation	2021-11-16 17:21:46 +05:30
marination	80fbe16be8	test: Product Query & Filter Engine, Item Group Page ... - Test for ProductQuery engine and ProductFilters engine - Test for engine for Item Group too - Renamed ‘product_configurator’ to ‘variant_selector’ - Cleaned up filters.py - Modal freeze backdrop lighter only in cart, since there’s nothing over it - Fixed unusual spacing in variant selector dialog - Made `get_child_groups_for_website` more readable - Replaced ‘Configure’ with ‘Select’ for variant selection	2021-11-16 17:21:17 +05:30
marination	4d254a7ad3	test: Website Item (Item full page) ... - Tests for website item. Desk tests and portal tests - Allow guests on method `get_offer_details` - Fetch stock details only if `show_stock_availability` is enabled - Validation for duplicate web items on item merge - Separate method for `validate_properties_before_merge` - Common error title and exception `DataValidationError` for merge validations on Item	2021-11-16 17:10:07 +05:30
marination	3fd929c4ee	test: Website Item basic test & removed product configurator tests ... - Sider fixes: missing semicolons - Added two basic tests for Website Item - Commented Product Configurator tests, needs to re-written fully	2021-11-16 17:09:34 +05:30
marination	64322199df	fix: Remove Website Item from Item Dashboard ... - Install breaks on CI, will add later	2021-11-16 17:03:58 +05:30
marination	16abfd4410	fix: Sync Website Items on Item Change, Short Website Description ... - Added Short Description in Website Item for List View - Update Website Item on Item info change - Un-publish Web Item if Item is disabled - Removed unnecessary dependency on Item from query engine - Rearranged item detail fields in Website Item - Added Link to Website Item on Item Dashboard	2021-11-16 16:55:12 +05:30
marination	f9929ed8a6	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-11-16 16:06:07 +05:30
Marica	4afcbfdc08	Merge branch 'develop' into pr-return-ux	2021-11-16 15:15:48 +05:30
marination	293f6cbafd	fix: Sider, Linter and Server Side Test ... - Fix Server side PR test - linter: re-arrange imports - sider: avoid single line multi statement - Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt - Removed unused variables in test_purchase_receipt	2021-11-16 14:36:15 +05:30
Ahmed Shareef	952fc87c99	refactor: fix help section background in dark mode (#28406)	2021-11-16 14:30:13 +05:30
Ankush Menat	ed99aca36f	test: basic test for serialize reco cancel	2021-11-16 10:00:18 +05:30
Ankush Menat	8c85012a70	fix: can not cancel stock reconciliation with sr no	2021-11-16 10:00:18 +05:30
Rohan	043e3255d6	fix: remove item-item group name validation (#28392)	2021-11-15 19:41:17 +05:30
Ankush Menat	7fcaeca403	fix: don't make naming series mandatory for items ... Item variants are an exception, hence this needs to be checked conditionally.	2021-11-15 18:18:22 +05:30
marination	05ec7cce82	test: Purchase Receipt Received Qty	2021-11-15 17:49:14 +05:30
marination	afe1c45f7f	fix: Sider + Fields UX ... - remove extra space (sider) - PR: Bring rejected qty in grid view - PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM` - PI: Move `Accepted Qty in Stock UOM` under Stock UOM	2021-11-15 17:17:29 +05:30
Marica	18f9e3558e	Merge branch 'develop' into se-required-items-from-jc	2021-11-11 11:14:37 +05:30
Ankush Menat	12e81df2b7	fix: default value for allow neg stock in repost_item_valuation ... Negative stock can be toggled back after queuing transactions, this causes failure when repost is executed. Now allow_negative_stock stock is set at time of queuing the repost job. This means setting changes done afterwards won't affect already submitted reposts.	2021-11-10 13:05:14 +05:30
Ankush Menat	e498389b00	fix: ignore cancelled entries in incorrect balance qty report	2021-11-10 12:09:51 +05:30
Ankush Menat	fdfa39c231	fix: avoid mutating iterator while iterating over it	2021-11-09 18:04:50 +05:30
Marica	031178224f	Merge branch 'develop' into se-required-items-from-jc	2021-11-09 17:33:20 +05:30
marination	e8d0c25dff	fix: Partial Trabsfers against JC ... - Fixed transferred qty not back updating on JC if partial transfer - Partial transfer not mapping pending qty from JC correctly in SE - tests for above cases - minor code cleanup	2021-11-09 17:29:29 +05:30
Anupam Kumar	092936d8ba	Merge branch 'develop' into manufacturing-work-order-stop	2021-11-09 10:51:09 +05:30
Anupam	663a7afe4d	fix: get_planned_qty chnages	2021-11-09 10:50:38 +05:30
marination	5fb5a757cf	refactor: (ux) Accepted/Rejected/Received Qty UX	2021-11-08 13:23:42 +05:30
mergify[bot]	c0b889b94d	fix: auto update price list rate (#28255) (#28256) ... * fix: auto update price list rate * fix: hide field when auto insert isn't enabled (cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e) Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com> [skip ci]	2021-11-07 17:42:51 +05:30
Ankush Menat	8fe5feb6a4	chore: remove all six compat code	2021-11-05 11:16:29 +05:30
Ankush Menat	6098e92ba9	chore: remove utf-8 compat code	2021-11-05 11:16:29 +05:30
mergify[bot]	25f647f067	fix: Bulk update of valid upto field wasn't working (bp #28242) ... * fix: Bulk update of valid upto field wasn't working Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem. * chore: extend fix and cleanup whitespace Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05) Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>	2021-11-04 21:46:48 +05:30
Marica	51fb543f67	Merge branch 'develop' into se-required-items-from-jc	2021-11-08 18:05:11 +05:30
Noah Jacob	cb064b06ad	fix: added job_card_item link in material request (#28222) ... * fix: added job_card_item links in material request * fix: add no copy to row references	2021-11-03 11:53:57 +00:00
marination	3da03028f3	fix: Pull Items that are in JC in Stock Entry against JC ... - Check if items pulled in stock entry are present in Job Card - Code cleanup and removed redundant checks Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-11-03 17:05:57 +05:30
marination	48886ee705	chore: Add comment above fix for future reference	2021-11-02 15:57:41 +05:30
marination	048210a8f6	fix: Remove warehouse filter on Batch field for Material Receipt	2021-11-02 15:49:58 +05:30
Ankush Menat	1eab3a44f6	fix(ux): stock levels take time after item merge ... Item merge creates a repost and depending on number of entries it can take from 1 to n hours for it to finish. (depending upon queued up reposts) Added message so users don't feel confused till this operation is finished.	2021-11-01 15:32:59 +05:30
Ankush Menat	f7ffe04a4b	fix: use warehouse to find company	2021-11-01 14:13:56 +05:30
Ankush Menat	a0727b2e82	fix: pass company while fetching valuation rate ... If company is not supplied and valuation rate is 0, then default company is used for checking if perpetual inventory is enabled or not. This makes little sense as different companies can have different setting for perpetual inventory.	2021-11-01 14:13:56 +05:30
Ankush Menat	ff9cfe0d14	fix: sort by creation to break tie	2021-10-29 16:56:15 +05:30
Ankush Menat	f4b60a48f5	refactor: simplify sr no fetching	2021-10-29 16:56:15 +05:30
Ankush Menat	2aa019ae4c	fix: fetch serial nos from ledger unconditionally	2021-10-29 16:56:15 +05:30
Noah Jacob	deb6b38fab	refactor: replaced db.sql with qb	2021-10-29 16:56:15 +05:30
Noah Jacob	b44945380d	fix: incorrect amount of serial_nos fetched	2021-10-29 16:56:15 +05:30
Ankush Menat	b01635e1da	refactor!: remove hub #28117 ... refactor!: remove hub	2021-10-28 14:07:15 +05:30
Ankush Menat	5902762ec8	fix(ux): alternative item two way validation	2021-10-27 19:46:06 +05:30
Saqib	879a1fca76	perf(minor): improve sales invoice submission (#27916) ... * perf: skip get_pricing_rules if no pricing rule exists * perf: fetch mode of payments data in single query * perf: get total company stock only for purchase order * perf: skip insertion of stock ledger entry * fix: undo changes to allow negative stock flag * fix: sider Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-27 11:42:50 +05:30
Ankush Menat	479ecb8de0	test: picklist item grouping	2021-10-27 11:10:52 +05:30
Ankush Menat	6942900555	refactor: use defaultdict and enumeration	2021-10-27 11:10:52 +05:30
Diksha Jadhav	f2d136e574	feat(pick list): group items based on item code and warehouse before printing picklist	2021-10-27 11:10:52 +05:30
Noah Jacob	fdaf93f76c	refactor: shows opening balance from filtered from_date (#26877) ... * refactor: shows opening balance from filtered from_date * refactor: opening balance considered from filtered from_date in stock ledger * fix: check if stock reco is opening and misc cleanups	2021-10-23 21:04:42 +05:30
Alan	2849297471	refactor: move process loss report to manufacturing (#28043) ... * refactor: move process loss report to manufacturing * test: fix process loss report test Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-21 11:07:47 +05:30
Ankush Menat	da3635b94f	test: execute manufacturing reports	2021-10-20 20:35:11 +05:30
Ankush Menat	126ba16740	fix: remove debug from query	2021-10-20 20:35:11 +05:30
marination	a9341672cf	test: Include serial no with spaces in it in sanitation test	2021-10-14 19:49:13 +05:30
Shariq Ansari	790c1cda6f	fix: Removing unused fields from workspace JSON files #27612 ... fix: Removing unused fields from workspace JSON files	2021-10-13 16:18:20 +05:30
Ankush Menat	4ebae7c5dc	Merge branch 'develop' into optimize-get-item-details	2021-10-12 20:39:49 +05:30
Ankush Menat	7bafa11d57	fix: undo changes to allow negative stock flag	2021-10-12 20:39:10 +05:30
Deepesh Garg	6f107da165	perf: Add indexes in stock queries and speed up bin updation #27758 ... perf: Add indexes in stock queries and speed up bin updation	2021-10-12 20:15:55 +05:30
marination	fd6f3c6b88	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-10-12 18:24:21 +05:30
marination	71f4b98d0c	chore: Sider and Semgrep	2021-10-12 17:52:54 +05:30
marination	3d5f029e51	fix: Sider and Tests	2021-10-12 17:33:22 +05:30
marination	22f41a17b7	chore: Removed Shopping Cart Module ... - Moved all files and web templates from Shopping Cart to E-commerce module - Made Shopping Cart module obsolete - Moved select E-commerce related files from Portal to E-commerce module - Minor cleanups - Fixed Shopping Cart and Product Configurator tests	2021-10-12 16:54:11 +05:30
Ankush Menat	8d69ec72a6	fix: remove transaction commit from tests	2021-10-12 16:17:15 +05:30
Ankush Menat	acdb26a4bb	refactor: rollback after full test	2021-10-12 16:17:15 +05:30
Ankush Menat	06fa35a9c1	test: add custom TestCase class and use in stock	2021-10-12 16:17:15 +05:30
marination	37a246e738	chore: Patches for Website Item ... - Patch to make website item from item - Patch to move Products and Shopping Cart Settings into E Commerce Settings - Patch to move products in Homepage from Item to Website Item - Minor cleanup, replacing/removing references to Item website fields (obsolete)	2021-10-12 16:16:17 +05:30
marination	f1ce418bdc	fix: Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings ... - Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings - Consider 'Hide Variants' in ProductQuery Engine - Added docstrings - Remove `get_e_commerce_settings`, redundant	2021-10-12 16:09:50 +05:30
marination	b38339c979	fix: Sider and indexing (minor)	2021-10-12 16:06:13 +05:30
marination	025574d9b5	chore: Removing Item's Website section & references ... - Removed old onboarding slide json and `create_onboarding_docs` methods - Removed website sections from Item master - Removed references to item website fields - Shifted Item doctype website methods to Website Item - Removed WebsiteGenerator from Item doctype - Website Items in Homepage Products section - Removed redundant code from item_group.py - Fix: Item field filters won’t appear in website	2021-10-12 16:03:19 +05:30
marination	eef9cf152f	chore: Drive E-commerce via Website Item ... - Removed Shopping Cart Settings - Portal fully driven via E Commerce Settings - All Item listing querying will happen via ProductQuery engine only - Product Listing via Website Items - removed redundant code - Moved all website logic from Item to Website Item	2021-10-12 15:48:06 +05:30
marination	939b0dd67d	feat: E-commerce Refactor ... - Created "Website Item" to handle website related information - Publishing Item new flow - Created "E Commerce Settings" - Removed Products Settings	2021-10-12 15:16:21 +05:30
Saqib Ansari	c7fc609236	perf: skip insertion of stock ledger entry	2021-10-12 13:30:40 +05:30
Saqib Ansari	eb3aae870f	perf: get total company stock only for purchase order	2021-10-12 13:29:32 +05:30
Noah Jacob	4bbe434d43	Merge pull request #27800 from noahjacob/buy_on ... refactor: updated buying onboarding tours.	2021-10-11 15:33:58 +05:30
Ankush Menat	6019f60d0a	fix(perf): index creation on voucher_detail_no (#27866) ... voucher_detail_no is supposed to have an index, it was added on on_doctype_update function of table, however this function is only called if DocType itself is updated and `on_update` is called on DocType. Stock ledger Entry doctype hasn't changed since addition of this index in function. Before: Lack of this index was causing full table scan in get_future_sle_to_fix function. (~50 seconds in a reposting job) After: Single row is fetched (~0.5 second in full reposting job) Learnings: 1. Add simple indexes via doctype only 2. For complex indexes always change doctype.json file for it to take effect.	2021-10-08 16:12:15 +05:30
Deepesh Garg	fabbf68e0e	Merge pull request #27872 from 18alantom/fix-make-billing-address-not-read-only ... fix: remove readonly from billing address	2021-10-08 15:07:15 +05:30
18alantom	41fefa356f	fix: remove readonly from billing address	2021-10-08 14:31:13 +05:30
Chillar Anand	772d4753e7	refactor: Clean up mutable defaults and add CI check (#27828) ... * refactor: Clean up mutable defaults and add CI check	2021-10-06 16:58:48 +00:00
Alan	d4b2471cea	fix: use ceil in case of whole uoms for reorder qty (#27834) ... * fix: use ceil in case of whole uoms for reorder qty * fix: cache uom query	2021-10-06 18:16:33 +05:30
mergify[bot]	233bf5dd29	fix: using DN for transfer w/o internal customer (backport #27798) (backport #27805) (#27807) ... * fix: using DN for transfer w/o internal customer (backport #27798) (#27805) * fix: using DN for transfer w/o internal customer (#27798) This used to be work before though not "advertised", since a lot of users have started using it as feature, it can't be broken now. (cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e) * fix(ux): use toast instead of popup Co-authored-by: Ankush Menat <ankush@iwebnotes.com> (cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc) # Conflicts: # erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py * fix: resolve conflict * fix: resolve conflicts Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-05 16:16:21 +05:30
Noah Jacob	3132dcd94a	fix: batch_no not mapped from PR to Stock Entry (#27794)	2021-10-05 14:40:40 +05:30
Noah Jacob	f5e0cad6a1	refactor: updated onboarding cards and tours	2021-10-05 13:24:22 +05:30
Alan	7da777880b	fix: add (uom, brand) Item details in an Item Price (#27561) ... * fix: add (uom, brand) and update (uom) Item details in an Item Price * fix: order of query interpolation args Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: named interpolation, remove item price * fix: sql error Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-10-05 12:35:23 +05:30
Alan	5c372202d5	fix: set item uom as stock_uom if it isn't set (#27623) ... * fix: set item uom as stock_uom if it isn't set	2021-10-04 22:38:04 +05:30
Ankush Menat	a04f9c904e	fix: option to limit reposting in certain timeslot (#27725)	2021-10-01 13:05:36 +05:30
Ankush Menat	4685ed5a8c	fix: distribution of additional costs in mfg stock entry (#27629) ... * refactor: remove unnecessary list comprehensions * fix: correct cost distribution logic While apportioning costs same condition should be present on both sides so total value is representative of all items to be apportioned. Here while calculating incoming_items_cost only FG items are considered, but while apportioning all items with to_warehouse are considered. Solution: only apportion additional cost on FG items * test: test cost distribution * fix: patch for additional cost fix(patch): consider PCV while patching - consider Period closing voucher while patching - recomute rates for SLE of affected stock entries consider only FG/scrap item SLEs for recomputation of rates * fix: remove client side logic for addn cost All of this is done in python code hence removed client side code.	2021-09-30 09:58:59 +05:30
Deepesh Garg	b39f8a6215	fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) ... * fix: Ignore user permission for Represents Company field in Sales and Purchase docs * fix: Ignore user permission for fiscal year company	2021-09-29 15:54:35 +05:30
Alan	b91333afdd	fix: set item.qty as mandatory in picklist (#27680)	2021-09-28 06:41:37 +00:00
rohitwaghchaure	bf2a590332	fix: View Stock / Accounting Ledger button not showing in the stock entry (#27570)	2021-09-17 18:39:21 +05:30
Saqib	e03d9aa889	fix: unecessary keyword args were passed in mapper functions (#27563)	2021-09-17 13:03:27 +05:30
Marica	41f11eca72	fix: Remove duplicates from customer_code field (#27555)	2021-09-17 10:27:29 +05:30
Saqib	5eba1ccd51	fix: no validation on item defaults (#27393) ... * fix: no validation on item defaults * fix: cache value while validating * test: item default company relation * fix: reorder validations * refactor: add guard conditions on update_defaults * test: add default warehouse for item group * fix: validate item defaults for item groups Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-09-16 17:31:37 +05:30
Marica	9b388883d3	fix: Validate if item exists on uploading items in stock reco (#27538) ... * fix: Validate if item exists on uploading items in stock reco - Uploading non existent item in stock reco and then changing warehouse or batch gave an error - Check for non existent item * chore: translation Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-09-16 15:47:17 +05:30
rohitwaghchaure	e6a1ad8016	fix: not able to submit stock entry with 350 items (#27523)	2021-09-15 20:42:47 +05:30
Ankush Menat	70c203d19e	test: automated test for running all stock reports (#27510) ... * test: automated test for running all stock reports These test do not assert correctness, they just check that "execute" function is working with sane filters. * test: make report execution test modular	2021-09-15 19:24:35 +05:30
Frappe PR Bot	d4d5e2786f	fix: Maintain same rate in Stock Ledger until stock become positive (#27227) (#27478) ... * fix: Maintain same rate in Stock Ledger until stock become positive * fix: Maintain same rate in Stock Ledger until stock become positive (cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-09-15 17:07:58 +05:30
rohitwaghchaure	c5a77f60ed	feat: provision to add scrap item in job card (#27483)	2021-09-15 16:45:57 +05:30
Marica	de9f78350b	Merge branch 'develop' into job-card-excess-transfer	2021-09-14 16:50:06 +05:30
marination	9520215e2b	feat: Handle Excess/Multiple Item Transfer against Job Card ... - Hide MR/Material Transfer buttons in JC if cancelled - Show MR/Material transfer buttons if pending to transfer or excess transfer allowed - Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC - Set status to Completed in JC in case of excess transfer too - During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead - Job card section and excess transfer allowance checkbox in Manufacturing Settings - Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same) - Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError	2021-09-14 12:33:21 +05:30
Saqib	7292f5476d	feat: (get_items_from) filter material request item in purchase order (#27449)	2021-09-13 12:13:43 +05:30
Ankush Menat	d743c41b54	fix(ux): apply proper filtering in stock reports (#27411) ... * fix(ux): apply proper filtering in stock reports Stock Balance: apply company filter to warehouse field Stock Ageing: apply company filter to warehouse field * fix: unnecessary parens Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-09-12 16:38:18 +05:30
Ankush Menat	6ef879fca2	fix(ux): clean invalid fields from variant setting (#27412)	2021-09-12 16:36:51 +05:30
Marica	61a1356109	fix: Check if Item is serialised before trying to fetch SN and set SO in it (#27358)	2021-09-07 14:42:17 +05:30
Marica	0f2a52078c	fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog (#27326)	2021-09-06 13:14:09 +05:30
rohitwaghchaure	7b4a65484a	fix: manually added weight per unit reset to zero after save (#27330)	2021-09-03 22:00:14 +05:30
Chillar Anand	915b34391c	chore: Clean up imports (#27302) ... * chore: Added isort to pre-commit config * chore: Sort imports with isort * chore: Clean up imports with pycln * chore: Sort imports with isort * chore: Fix import issues * chore: Clean up sider issues * chore: Remove import errors from flake8 ignore list * chore: Clean up lint issues	2021-09-02 16:44:59 +05:30
Saqib	a158b825fc	Merge pull request #27124 from GangaManoj/gross-profit-product-bundle ... feat: Improve Product Bundle handling	2021-09-02 11:12:56 +05:30
Ankush Menat	81eb6fde07	Merge pull request #27288 from ankush/strict_linting ... chore: cleanup linting errors and introduce strict linting checks	2021-09-01 19:32:49 +05:30
Marica	9506c14d35	fix: Zero division error while fetching unconsumed materials (#27293) ... `	2021-09-01 18:49:12 +05:30
Ankush Menat	b147b85e6a	chore: whitespace / eof fixes	2021-09-01 16:57:21 +05:30
GangaManoj	bc79084dac	fix: Add Product Bundle field in Items table	2021-09-01 16:06:47 +05:30
GangaManoj	816ba55b74	fix: Make Rate read-only by default	2021-09-01 15:11:08 +05:30
Ankush Menat	9fec0a5c68	refactor: itemgetter instead of assigned lambda	2021-09-01 15:02:29 +05:30
Ankush Menat	694ae81618	fix: remove bare excepts	2021-09-01 15:02:28 +05:30
Alan	9dc0843cbd	fix: translate labels (#27282) ... [skip ci]	2021-09-01 12:58:34 +05:30
Ganga Manoj	82118975e2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-31 22:08:10 +05:30
Ankush Menat	c1d986a0c6	fix: revert "refactor: simplify initialize_previous_data" (#27270) ... This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.	2021-08-31 19:43:42 +05:30
Alan	88aa7b824e	fix: pass labels through translation function (#27252)	2021-08-31 15:16:04 +05:30
Dany Robert	5fd04101d4	fix: Stock Ageing report issues for serialized items (#27228) ... * fix: incorrect calculation in get_range_age * fix: remove serial numbers not in stock from fifo_queue * refactor: make serial_no condition explicit * refactor: reduce code duplication Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-30 18:11:33 +05:30
GangaManoj	e44567754d	fix: Display Packed/Bundle Items table only if it exists	2021-08-27 20:16:13 +05:30
GangaManoj	a7be02fe32	fix: Only add Item to packed_items list if it's not already there	2021-08-27 20:02:36 +05:30
Kamal Johnson	a285b5b78b	feat: Accounts, Selling & Assets Onboarding cleanup (#27112) ... * refactor: company form fields arrangement * refactor: accounts onboarding steps * refactor: re-arrange fields & modify labels in company form * feat: onbording steps for accounts module * fix: updated onboarding steps for selling module * fix: remove unwanted steps from accounts * feat: add more onboarding steps * feat: Refactor onboarding-module for accounting workspace * feat: Add basic asset onboarding steps * feat: Add basic asset item form tour * feat: Add basic selling onboarding-steps * feat: Add basic form tour for purchase recipt * feat: Add basic form tour for existing asset * feat: Adding asset category form tour * feat: Add form tour for asset category * feat: Refactor sales taxes and charges template form tour with new method * refactor: Remove old form tour for accounts settings * refactor: Change asset category form tour with new tour method * refactor: Change asset item form tour with new tour method * refactor: Change purchase receipt form tour with new tour method * refactor: Change asset form tour with new tour method * refactor: Remove old form tour for selling settings * refactor: general fix/typo in onboarding steps * Apply suggestions from code review Co-authored-by: Nabin Hait <nabinhait@gmail.com> * refactor: Remove old form tour method for sales order. * fix: removed duplicate section break * fix: Removed duplicate fields Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Anuja <anuja.pawar20@gmail.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-27 15:47:11 +05:30
Saqib	8008598eb2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-27 14:48:54 +05:30
GangaManoj	c33f5cad01	fix: Hide Rate of Bundle Items while printing	2021-08-27 01:21:52 +05:30
GangaManoj	99e6e2ce3f	fix: Make Rate column read only by default	2021-08-27 01:15:01 +05:30
GangaManoj	e506cd6a2f	fix: Enable Fetch If Empty for Rate	2021-08-27 01:06:48 +05:30
GangaManoj	d4405c5e52	fix: Calculate Product Bundle price based on the prices of its child items	2021-08-27 01:02:34 +05:30
Noah Jacob	422f67a4c9	refactor: update manufacturing module onboarding (#26945) ... * refactor: updated manufacturing onboarding cards * refactor: added form tours * refactor: updated form tours and card descriptions * Fix: Case of description Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-26 21:40:48 +05:30
Ankush Menat	ae55eab599	chore: remove deprecated and empty QUnit tests (#27179) ... * chore: remove deprecated and empty QUnit tests * ci: fix UI test config Testing library was added on Frappe, in order to reuse command testing library has to be installed during setup process.	2021-08-26 20:43:06 +05:30
Ankush Menat	a9852a5483	fix(ux): hide irrelevant fields for asset items (#26274)	2021-08-26 20:02:51 +05:30
Marica	73b686a498	Merge pull request #27169 from marination/internal-customer-util ... fix: Remove duplicate `create_internal_customer` utility	2021-08-26 16:42:28 +05:30
Ankush Menat	e7109c18db	fix: negative qty validation on stock reco cancellation (#27170) ... * test: negative stock validation on SR cancel * fix: negative stock setting ignored in stock reco In stock reconcilation cancellation negative stock setting is ignored as `db.get_value` is returning string `'0'` which is not casted to int/bool for further logic. This causes negative qty, which evantually gets caught by reposting but by design this should stop cancellation. * test: typo and minor refactor	2021-08-26 16:40:45 +05:30
marination	501b91a608	fix: internal customer util returns str not doc object	2021-08-26 16:18:23 +05:30
Marica	e11bfe7da4	Merge pull request #27111 from 18alantom/feat-bom-process-loss-fp ... feat: add provision for process loss in manufac (frontport #26151)	2021-08-26 16:10:05 +05:30
marination	45edfd9d50	fix: Remove duplicate create_internal_customer util ... - Introduced via https://github.com/frappe/erpnext/pull/27086	2021-08-26 15:53:52 +05:30
Marica	f4dc9ee2aa	fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) ... * fix: Dont create inward SLE against SI unless is internal customer enabled - Check if is internal customer enabled apart from target warehouse - Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal * test: Use internal customer for delivery of bundle items to target warehouse - created `create_internal_customer` util - reused it in delivery note and sales invoice tests - use internal customer for target warehouse test in delivery note	2021-08-26 13:12:51 +05:30
18alantom	e20d21924c	Merge branch 'develop' into feat-bom-process-loss-fp	2021-08-26 13:05:59 +05:30
rohitwaghchaure	fe4540d74d	fix: allow to change rate manually in case of stand-alone credit note (#27036) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-26 12:52:36 +05:30
18alantom	c7e11c89ff	fix: get filters to work ... - reorder and rename columns - add work order filter	2021-08-25 18:58:56 +05:30
18alantom	dbea840ecf	fix: re-order tour to circumvent glitchy save highlight	2021-08-25 16:34:31 +05:30
GangaManoj	e4c25bf4bb	fix: Return if there are no Items	2021-08-25 15:40:42 +05:30
Ganga Manoj	3e5bbc9aa6	Merge branch 'develop' into gross-profit-product-bundle	2021-08-25 00:55:47 +05:30
GangaManoj	77352ae47e	fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled	2021-08-25 00:12:43 +05:30
GangaManoj	129df6e129	fix: Update Product Bundle rate based on its updated amount	2021-08-24 21:55:54 +05:30
GangaManoj	31482a08dc	fix: Update Product Bundle price based on the rates of its child Items	2021-08-24 21:42:44 +05:30
18alantom	aff9aee29c	Merge branch 'develop' into feat-bom-process-loss-fp	2021-08-24 20:15:51 +05:30
18alantom	8f73d587f9	feat: process loss report, fix set pl query condition	2021-08-24 18:38:23 +05:30
GangaManoj	b4b6d10b5d	fix: Add editable Rate column	2021-08-24 17:59:11 +05:30
Marica	774f305713	Merge branch 'develop' into update-stock-onboarding-fp	2021-08-24 16:23:42 +05:30
18alantom	ad735522cb	fix: rename form tours to doctype names, remove tours from js controllers	2021-08-24 14:54:38 +05:30
Ankush Menat	c09d8a2809	fix(ux): keep stock entry title & purpose in sync (#27043) ... Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>	2021-08-24 12:20:34 +05:30
Ankush Menat	0dff0beaba	fix: stock analytics report date range issues and add company filter (#27014) ... * test: tests for correct get_period_date_ranges * fix: stock analytics report date range issues - Upon selecting second half of month with Monthly filter, data from that period was missing. - Solution: "round down" the date as per expected frequency. * chore: drop py2 and fix misleading docstring * test: fix test to avoid FY clash * feat: add company filter in stock analytics report [skip ci] Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-24 12:16:46 +05:30
rohitwaghchaure	db385261f0	Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom ... fix: stock ledger report not working if include UOM selected in filter	2021-08-24 10:16:35 +05:30
rohitwaghchaure	da3220e38e	Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom	2021-08-24 08:50:49 +05:30
rohitwaghchaure	129a0fc8b2	Merge branch 'develop' into fixed-donot-overrride-batch-no	2021-08-23 18:07:22 +05:30
Rohit Waghchaure	e1f070437a	fix: selected batch no changed on updation of qty	2021-08-23 14:27:55 +05:30
Rohit Waghchaure	098d349bf4	fix: stock ledger report not working if include uom selected in filter	2021-08-23 13:36:13 +05:30
18alantom	810bce8da2	Merge branch 'develop' into update-stock-onboarding-fp	2021-08-20 16:31:27 +05:30
18alantom	f4487c3ae5	refactor: use Form Tour doc instead of controller form tour ... note - keeping controller form tours as a fallback, new form tours seem to work only for Stock Settings	2021-08-20 16:25:20 +05:30
18alantom	77ebbdd172	fix: minor changes ... - remove Is Group from warehouse - change stock entry type - link to stock entry type - add posting date to stock reco - change report to Stock Projected Qty - highlight quality inspection action - remove allow neg highlight	2021-08-20 16:21:33 +05:30
Saqib	153fe1cdb4	refactor: scan barcode field scanning (#26990)	2021-08-20 11:09:51 +05:30
Nabin Hait	b8c998119b	Merge pull request #27040 from marination/cart-pl-exchange-rate ... fix: Shopping cart Exchange rate validation	2021-08-20 10:56:10 +05:30
marination	45617ae22f	fix: Shopping cart Exchange rate validation ... - Use `get_exchange_rate` to check for price list exchange rate in cart settings - Move cart exchange rate validation for Price List from hooks to doc event - Call cart exchange rate validation on PL update only if PL is in cart and currency is changed	2021-08-19 20:01:05 +05:30
Noah Jacob	cf8d2d97dd	fix: Incorrect mandatory error message for warehouse	2021-08-19 15:43:20 +05:30
Ankush Menat	4551d7d602	chore: mass trailing whitespace and EOF fixes	2021-08-19 13:43:28 +05:30
18alantom	cc177f3415	fix: wo tests, sider, account for pl in se validation	2021-08-17 16:49:00 +05:30
18alantom	55acb2e843	fix: sider	2021-08-17 16:37:34 +05:30
18alantom	cdf253aeb4	fix: add more validations, remove source wh req for pl item	2021-08-17 16:36:32 +05:30
18alantom	8ecb146231	test: add bom tests for process loss val, add se test for qty calc	2021-08-17 16:36:24 +05:30
18alantom	3df8d0cdf0	fix: add warehouse and unset is scrap for process loss items	2021-08-17 16:29:42 +05:30
18alantom	b6dc0efa27	feat: add provision for process loss in manufac	2021-08-17 16:23:19 +05:30
Rohit Waghchaure	eb1e3181a4	fix: conflicts while merging brnach version-13 to develop	2021-08-17 10:53:19 +05:30
18alantom	f7b747e19c	refactor: reduce steps, reword cards	2021-08-16 15:14:36 +05:30
18alantom	599c1024a2	fix: semgrep, remove trailing and leading whitespaces	2021-08-16 15:14:22 +05:30
18alantom	95992a7ea5	refactor: fix typo, remove target warehouse cause SE Type dependency	2021-08-16 15:13:45 +05:30
18alantom	37466631f2	refactor: reorder steps according to stock settings refactor	2021-08-16 15:13:14 +05:30
18alantom	9581836885	refactor: add watch video step for stock opening balance	2021-08-16 15:13:05 +05:30
18alantom	1d67d20185	refactor: remove DN, PR; change wording, add/remove steps in tour	2021-08-16 15:12:57 +05:30
18alantom	51d2317bb5	refactor: sider/semgrep	2021-08-16 15:12:28 +05:30
18alantom	1851232e3c	refactor: move trailing whitespace out of translate func	2021-08-16 15:12:23 +05:30
18alantom	0b669b3d7e	refactor: add form tour for stock module onboarding	2021-08-16 15:12:16 +05:30
18alantom	23e1d2b536	refactor: update stock onboarding	2021-08-16 15:12:09 +05:30
Deepesh Garg	7145e9d183	Merge pull request #26359 from GangaManoj/enable-discount-accounting ... feat: Enable discount accounting	2021-08-14 18:05:29 +05:30
Deepesh Garg	5122948450	Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting	2021-08-13 16:00:20 +05:30
Marica	2e6899fbe4	fix: Copy previous balance dict object instead of assigning (#26942) ... - Due to plain assignment, dict mutation gave wrong monthly values (cherry picked from commit fe2a34f171)	2021-08-13 10:08:41 +00:00
Marica	fe2a34f171	fix: Copy previous balance dict object instead of assigning (#26942) ... - Due to plain assignment, dict mutation gave wrong monthly values	2021-08-13 15:37:45 +05:30
Shariq Ansari	b32c2fa561	fix: updated erpnext wspace json files (#26380) ... * fix: updated erpnext wspace json files * fix: updated wspace json files * fix: updated wspace json files * fix: removed padding code from wspace json files * fix: Updated restrict_to_domain in wspace json Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-08-13 12:19:16 +05:30
Noah Jacob	b8658d003f	fix: from_warehouse getting set to None (#26920)	2021-08-12 20:03:28 +05:30
Marica	08e4026456	fix: Stock Analytics Report must consider warehouse during calculation (#26908) ... * fix: Stock Analytics Report must consider warehouse during calculation * fix: Brand filter in Stock Analytics (cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)	2021-08-12 05:02:42 +00:00
Deepesh Garg	f037bae8ea	Merge pull request #26397 from GangaManoj/po-payment-terms ... feat: Fetch Payment Terms from linked Sales/Purchase Order	2021-08-11 22:28:34 +05:30
Deepesh Garg	a7054560da	Merge branch 'develop' into po-payment-terms	2021-08-11 19:31:30 +05:30
Marica	42899d69ea	Merge branch 'develop' into stock-analytics	2021-08-11 18:44:29 +05:30
Ankush	9152715f90	perf: various minor perf fixes for ledger postings (#26775) ... * perf: only validate if voucher is journal entry * perf: optimize merge GLE - Order fields such that comparison will fail faster - Break out of loops if not matched * perf: don't try to match SLE if count mismatch * refactor: simplify initialize_previous_data * perf: use cache for fetching valuation_method These are set only once fields * refactor: simplify get_future_stock_vouchers * refactor: simplify get_voucherwise_gl_entries * perf: fetch only required fields for GL comparison `select *` fetches all fields, output of this function is only used for comparing. * perf: reorder conditions in PL cost center check * perf: reduce query while validating new gle * perf: use cache for validating warehouse props These properties don't change often, no need to query everytime. * perf: use cached stock settings to validate SLE * docs: update misleading docstring Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-08-11 11:17:50 +05:30
marination	eb2050b407	fix: Brand filter in Stock Analytics	2021-08-10 20:37:09 +05:30
marination	55d8aaf0b6	fix: Stock Analytics Report must consider warehouse during calculation	2021-08-10 19:01:05 +05:30
Marica	173c4c8564	Merge branch 'develop' into test-asset-lcv	2021-08-10 14:38:31 +05:30
marination	510e31952d	test: Serial no sanitation	2021-08-10 14:35:51 +05:30
marination	f22b858253	fix: Clean Serial No input on Server Side	2021-08-10 14:35:41 +05:30
Marica	fd12f65047	Merge pull request #26854 from marination/asset-lcv-gl-entry-hotfix ... fix: Faulty Gl Entry for Asset LCVs (#26803)	2021-08-10 14:07:12 +05:30
marination	948386d85d	test: Serial no sanitation	2021-08-10 14:00:55 +05:30
Marica	f6ea00e029	Merge branch 'develop' into serial-no-space	2021-08-10 13:17:08 +05:30
marination	06b6b7e3cc	fix: Set CWIP Account in company at the start to avoid flaky test	2021-08-10 13:14:32 +05:30
marination	9ca2febd88	fix: Set CWIP Account in company at the start to avoid flaky test	2021-08-10 13:10:46 +05:30
Deepesh Garg	25a2f2b90e	Merge pull request #26579 from deepeshgarg007/discount_accounting_v13 ... feat: Enable discount accounting	2021-08-10 11:48:14 +05:30
rohitwaghchaure	c5e7673277	Merge pull request #26814 from noahjacob/mr_allowance_feat_v13 ... feat: over transfer allowance for material transfers (bp #26264)	2021-08-10 11:32:43 +05:30
Deepesh Garg	9b561ea839	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13	2021-08-10 10:38:14 +05:30
Deepesh Garg	cd980f5e6b	Merge pull request #26723 from GangaManoj/backport-po-payment-terms ... feat: Fetch Payment Terms from linked Sales/Purchase Order	2021-08-10 10:34:39 +05:30
Afshan	f5b5be9644	Merge branch 'develop' into po-payment-terms	2021-08-10 09:32:08 +05:30
Deepesh Garg	bcf56e64ba	fix: Ignore default payment term templates when coping payment terms from orders	2021-08-09 18:53:14 +05:30
GangaManoj	1200872c7e	fix: Disable automcatically_fetch_payment_terms after running its associated tests	2021-08-09 18:53:13 +05:30
Ankush	9f5111809d	test: fix flaky purchase receipt test (#26859) (#26860) ... # Conflicts: # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py	2021-08-09 15:35:26 +05:30
Ankush	7ba8c821a1	test: fix flaky purchase receipt test (#26859)	2021-08-09 15:14:26 +05:30
Frappe PR Bot	ea83e2b45f	fix: validate python expressions (#26835) (#26856) ... (cherry picked from commit 07337d5c78) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 14:48:59 +05:30
Ankush	07337d5c78	fix: validate python expressions (#26835)	2021-08-09 12:38:40 +05:30
Marica	a8166c06c7	fix: Faulty Gl Entry for Asset LCVs (#26803) ... * fix: Faulty Gl Entry for Asset LCVs - Both Gl entries were crediting in their respective accounts - Asset Account must be debited into * fix: Use keyword arguments instead of positional for better readability * chore: Test for LCV for draft asset created via Purchase Receipt	2021-08-09 12:38:12 +05:30
Marica	ab8f0cab4d	fix: Faulty Gl Entry for Asset LCVs (#26803) ... * fix: Faulty Gl Entry for Asset LCVs - Both Gl entries were crediting in their respective accounts - Asset Account must be debited into * fix: Use keyword arguments instead of positional for better readability * chore: Test for LCV for draft asset created via Purchase Receipt	2021-08-09 12:24:04 +05:30
Frappe PR Bot	210441d9b5	fix: price list with 0 value are ignored (bp #26655) ... * fix: price list with 0 value are ignored Steps to reproduce: 1. Create 2 item price for two different supplier. One of them should be zero. 2. Create PO 3. Add supplier with non-zero price and add item. 4. change supplier. Price won't change. If price was non-zero it would've changed. Root cause: falsiness check instead of null value check is used for checking if price list value exists. 0 is evaluated as false. * refactor: make get_price_list_rate function pure (cherry picked from commit 16d4de5130) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-09 11:34:33 +05:30
Marica	4c929b6994	Merge branch 'develop' into serial-no-space	2021-08-09 10:50:09 +05:30
Ankush	16d4de5130	fix: price list with 0 value are ignored (#26655) ... * fix: price list with 0 value are ignored Steps to reproduce: 1. Create 2 item price for two different supplier. One of them should be zero. 2. Create PO 3. Add supplier with non-zero price and add item. 4. change supplier. Price won't change. If price was non-zero it would've changed. Root cause: falsiness check instead of null value check is used for checking if price list value exists. 0 is evaluated as false. * refactor: make get_price_list_rate function pure	2021-08-09 10:41:24 +05:30
Deepesh Garg	a59a761f99	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms	2021-08-06 23:55:01 +05:30
Deepesh Garg	0bba425fe3	fix: Ignore default payment term templates when coping payment terms from orders	2021-08-06 23:53:16 +05:30
Frappe PR Bot	aec7846407	test: fix pricelist tests (#26839) (#26840) ... problem: exchange rate API is returning exchange rates for "_Test currency". These tests were relying on failure of that function. (cherry picked from commit 27a29eb6bc) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-06 21:55:01 +05:30
Ankush	27a29eb6bc	test: fix pricelist tests (#26839) ... problem: exchange rate API is returning exchange rates for "_Test currency". These tests were relying on failure of that function.	2021-08-06 21:34:44 +05:30
Frappe PR Bot	9ea24db20a	test: use item that allows fractional UOM in test (#26837) (#26838) ... (cherry picked from commit 614336fe1d) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-06 21:14:40 +05:30
Ankush	614336fe1d	test: use item that allows fractional UOM in test (#26837)	2021-08-06 19:36:21 +05:30
Saqib	668f442139	Merge branch 'develop' into po-payment-terms	2021-08-06 13:42:10 +05:30
Frappe PR Bot	2e352834a2	fix: fetching of item tax from hsn code (#26736) (#26792) ... * fix: fetching of item tax from hsn code (cherry picked from commit 3a50490c04) Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-08-06 10:59:29 +05:30
GangaManoj	0b11420147	fix: Disable automcatically_fetch_payment_terms after running its associated tests	2021-08-05 00:35:45 +05:30
GangaManoj	23c104555b	fix: Remove irrelevant code	2021-08-05 00:28:42 +05:30
Noah Jacob	673bc58193	test: test case for over transfer of materials	2021-08-04 18:48:24 +05:30
Noah Jacob	8fced95f8c	feat: over transfer allowance for material transfers	2021-08-04 18:48:24 +05:30
Frappe PR Bot	85815f989c	fix: Reset weight_per_unit on replacing Item (#26619) (#26791) ... * fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details * fix: Set weight_uom in get_item_details as Item's default weight_uom (cherry picked from commit 471f48f64d) Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>	2021-08-03 20:06:07 +05:30
Saqib	3a50490c04	fix: fetching of item tax from hsn code (#26736) ... * fix: fetching of item tax from hsn code	2021-08-03 15:57:11 +05:30
Ganga Manoj	471f48f64d	fix: Reset weight_per_unit on replacing Item (#26619) ... * fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details * fix: Set weight_uom in get_item_details as Item's default weight_uom	2021-08-03 14:39:38 +05:30
Frappe PR Bot	373ed1f65c	fix: remove limit from stock balance report (#26773) (#26779) ... (cherry picked from commit b3740e9afc) Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-08-03 13:28:50 +05:30
Deepesh Garg	db40d88fc2	Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new ... feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-08-02 21:11:50 +05:30
Subin Tom	8800aaaee7	feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill	2021-08-02 20:36:37 +05:30
Ankush	b3740e9afc	fix: remove limit from stock balance report (#26773)	2021-08-02 20:13:26 +05:30
rohitwaghchaure	31fe5f5b92	fix: added progress bar in repost item valuation (#26680)	2021-08-02 11:01:30 +05:30
Rohit Waghchaure	343143037c	fix: conflicts	2021-08-01 14:45:24 +05:30
rohitwaghchaure	41da6f0d13	Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt ... fix: COGS account in purchase receipt	2021-07-31 14:50:47 +05:30
Rohit Waghchaure	2a14f255cf	fix: COGS account in purchase receipt	2021-07-31 11:14:14 +05:30
Marica	7cbd755951	Merge branch 'develop' into serial-no-space	2021-07-30 14:09:19 +05:30
Marica	0eed394f5e	Merge branch 'develop' into stock-reco-fetch-non-empty-stock	2021-07-29 19:54:56 +05:30
rohitwaghchaure	22eac9bd0c	Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop ... fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:50:00 +05:30
rohitwaghchaure	b7bbefee15	Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report ... fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:49:42 +05:30
Ankush	57cd273f7c	fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26719) ... * fix: correct field for GLE against account in PR * fix: remove incorrect field check from reposting	2021-07-29 19:49:36 +05:30
Ankush	c7df759324	fix: empty "against account" in Purchase Receipt GLE bp #26712 (#26718) ... * fix: correct field for GLE against account in PR * fix: remove incorrect field check from reposting	2021-07-29 19:49:12 +05:30
marination	533ee9a401	feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse ... - Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock - fix: Items fetched twice due to Item Defaults - Improved code readability	2021-07-29 19:39:32 +05:30
GangaManoj	57df4a3aa1	fix: Rename tests	2021-07-29 19:27:54 +05:30
GangaManoj	0413a5aafd	fix: Add test to check if payment terms are fetched when creating a Purchase Invoice	2021-07-29 19:27:52 +05:30
GangaManoj	293c5e10c3	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-29 19:26:39 +05:30
GangaManoj	def7cc6cb3	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-29 19:26:39 +05:30
GangaManoj	b389c9e375	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-29 19:25:29 +05:30
Rohit Waghchaure	a6d276a06f	fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:16:20 +05:30
Rohit Waghchaure	c1c5a4ae17	fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 19:15:34 +05:30
Deepesh Garg	8b7e3775c2	Merge pull request #26712 from ankush/against_acc_pr ... fix: empty "against account" in Purchase Receipt GLE	2021-07-29 19:10:38 +05:30
Rohit Waghchaure	379ce70126	fix: remove cancelled entries from Stock and Account Value comparison report	2021-07-29 18:06:17 +05:30
Saqib	bbb96899a5	Merge branch 'develop' into po-payment-terms	2021-07-29 17:23:09 +05:30
Ankush Menat	c3e739caf8	fix: correct field for GLE against account in PR	2021-07-29 15:34:18 +05:30
Rohit Waghchaure	56b81565fa	fix: added progress bar in repost item valuation	2021-07-27 22:11:30 +05:30
Noah Jacob	ba18a96b0c	test: test case for over transfer of materials	2021-07-26 18:12:40 +05:30
Noah Jacob	bc82344fc7	feat: over transfer allowance for material transfers	2021-07-26 18:12:37 +05:30
GangaManoj	aed39a23dc	fix: Rename tests	2021-07-23 03:45:59 +05:30
GangaManoj	13e7103ee0	fix: Add test to check if payment terms are fetched when creating a Purchase Invoice	2021-07-23 03:44:56 +05:30
GangaManoj	9c07454f91	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-23 03:23:29 +05:30
marination	eecfc4c0ae	fix: Clean Serial No input on Server Side	2021-07-22 13:23:54 +05:30
GangaManoj	4323f4bcac	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-22 05:57:42 +05:30
rohitwaghchaure	ac6bfeaa8d	Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report ... fix: incorrect valuation rate calculation in gross profit report	2021-07-21 19:35:55 +05:30
GangaManoj	d6f409addc	fix: Sider issues	2021-07-21 14:23:52 +05:30
GangaManoj	ee025b501f	fix: Filter options for Default Discount Account	2021-07-21 14:21:16 +05:30
GangaManoj	546c8d125c	fix: Move Default Discount Account field to Item Defaults	2021-07-21 14:21:16 +05:30
GangaManoj	cdfefa261e	feat: Assign Item's Default Discount Account if present	2021-07-21 14:20:06 +05:30
GangaManoj	acb9e207ec	feat: Add Default Discount Account field	2021-07-21 14:20:06 +05:30
Deepesh Garg	3e109840f9	Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales ... feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-07-21 10:52:10 +05:30
Subin Tom	013b352639	fix: Price list rate not fetched for return sales invoice fixed (#26559) ... Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-07-20 21:03:11 +05:30
Subin Tom	2d225e621f	fix: Price list rate not fetched for return sales invoice fixed (#26560) ... Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>	2021-07-20 20:41:04 +05:30
Rohit Waghchaure	c14aa45720	fix: incorrect valuation rate calculation in gross profit report	2021-07-20 18:19:15 +05:30
Ankush	92273cade0	fix(ux): item description should fall back to name (#26339) (#26552) ... Don't set item description = item code from front end. This is already being set to item_name in before_insert and item_name is better fallback than item code for description. Also fixed wrong condition for erasing description while duplicating item.	2021-07-19 20:44:05 +05:30
Ankush	80e269887d	fix(ux): item description should fall back to name (#26339) ... Don't set item description = item code from front end. This is already being set to item_name in before_insert and item_name is better fallback than item code for description. Also fixed wrong condition for erasing description while duplicating item.	2021-07-19 20:42:44 +05:30
GangaManoj	cde0cc0678	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-17 22:53:21 +05:30
Ganga Manoj	bfb7256143	Merge branch 'develop' into enable-discount-accounting	2021-07-17 20:01:09 +05:30
Nabin Hait	11475487fb	fix: merge conflict	2021-07-16 15:58:50 +05:30
Rohit Waghchaure	56e4a88956	fix: added patch to fix missing FG item	2021-07-16 15:06:57 +05:30
Nabin Hait	9ddf33715e	Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item ... fix: added patch to fix missing FG item	2021-07-16 15:05:23 +05:30
Noah Jacob	3362c080b6	fix: validation check when no conversion_factor (#26527)	2021-07-16 15:00:08 +05:30
Rohit Waghchaure	13e9aa5956	fix: added patch to fix missing FG item	2021-07-16 14:34:24 +05:30
Rohit Waghchaure	0c6ca09e06	fix: added patch to fix missing FG item	2021-07-16 14:33:25 +05:30
Rohit Waghchaure	df5c2b9aaf	fix: FG item not fetched in manufacture entry	2021-07-16 11:35:14 +05:30
GangaManoj	6bff653cf0	fix: Sider issues	2021-07-16 02:18:45 +05:30
Rohit Waghchaure	a748dd9261	feat: provision to make subcontracted purchase order from the production plan	2021-07-15 19:01:36 +05:30
Noah Jacob	d8668f78f4	fix: validation check when no conversion_factor (#26219)	2021-07-15 18:32:15 +05:30
Rohit Waghchaure	9997cce1ea	fix: FG item not fetched in manufacture entry	2021-07-15 15:32:21 +05:30
rohitwaghchaure	4d444559ff	Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item ... fix: FG item not fetched in manufacture entry	2021-07-15 15:32:05 +05:30
Rohit Waghchaure	74b97b5ec9	fix: FG item not fetched in manufacture entry	2021-07-15 14:52:21 +05:30
Noah Jacob	03f4db0606	fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26488) ... * fix(ux): added filter for valid batch nos. * fix: not validating batch no if entry type stock reconciliation * test: validate batch_no	2021-07-14 16:28:54 +05:30
Noah Jacob	2c67894135	fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) (#26487) ... * fix(ux): added filter for valid batch nos. * fix: not validating batch no if entry type stock reconciliation * test: validate batch_no	2021-07-14 16:28:40 +05:30
Noah Jacob	c932baeb32	fix: validation check for batch for stock reconciliation type in stock entry (#26370) ... * fix(ux): added filter for valid batch nos. * fix: not validating batch no if entry type stock reconciliation * test: validate batch_no	2021-07-14 16:25:42 +05:30
Saqib	bb493a0602	Merge pull request #26159 from GangaManoj/asset-credit-note	2021-07-14 12:02:02 +05:30
rohitwaghchaure	96eb147bb6	Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue ... fix: multi-currency issue	2021-07-13 23:01:30 +05:30
rohitwaghchaure	bd8699b8a9	Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre ... fix: multi-currency issue	2021-07-13 16:05:36 +05:30
Rohit Waghchaure	4acbeecbbe	fix: multi-currency issue	2021-07-13 15:35:30 +05:30
Rohit Waghchaure	0d190bb930	fix: multi-currency issue	2021-07-13 15:32:39 +05:30
Subin Tom	5265ba39f0	feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill	2021-07-13 14:58:17 +05:30
rohitwaghchaure	84f23ac8d2	Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group ... feat: report to show cogs by item groups	2021-07-13 11:24:59 +05:30
GangaManoj	b85d3017a1	fix: Filter options for Default Discount Account	2021-07-13 01:45:20 +05:30
GangaManoj	0b7d8fb3af	fix: Move Default Discount Account field to Item Defaults	2021-07-13 01:45:20 +05:30
Nabin Hait	97bce3af9a	refactor: Optimized code for reposting item valuation	2021-07-12 13:33:08 +05:30
Nabin Hait	0003938f2b	refactor: Optimized code for reposting item valuation	2021-07-12 13:29:20 +05:30
Nabin Hait	01aada6c90	refactor: Optimized code for reposting item valuation	2021-07-12 13:28:19 +05:30
Nabin Hait	45e6cffa4f	refactor: Optimized code for reposting item valuation	2021-07-12 13:26:08 +05:30
rohitwaghchaure	e2c97b1a2b	Merge pull request #26351 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt-develop ... fix: stock entry with putaway rule not working	2021-07-12 12:49:25 +05:30
Ankush	caacd0ad2c	fix: stock levels disapperaing on refresh (bp #26305) ... refresh_section removes all sections with `custom` class, added different class to avoid this behaviour. # Conflicts: # erpnext/stock/doctype/item/item.js	2021-07-12 10:20:19 +05:30
Ankush Menat	b99469cdab	fix: stock levels disapperaing on refresh ... refresh_section removes all sections with `custom` class, added different class to avoid this behaviour.	2021-07-12 10:09:50 +05:30
Marica	f7748e4109	Merge pull request #26133 from marination/qi-rejection ... feat: Optionally allow rejected quality inspection on submission	2021-07-10 21:04:32 +05:30
marination	f67f13c384	chore: Test case for QI Rejection in Stock Entry ... - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 21:02:36 +05:30
marination	9ac9a4ef21	feat: Optionally allow rejected quality inspection on submission	2021-07-10 21:02:03 +05:30
marination	c8a825c478	chore: Test case for QI Rejection in Stock Entry ... - Use `get_single_value` instead of `get_doc` in validation - Test Case to check impact of stock settings on SE with rejected qi	2021-07-10 18:26:36 +05:30
Marica	eb0dea09bb	Merge pull request #26333 from marination/lcv-validate-invoice ... fix: Validate LCV for Invoices without Update Stock	2021-07-09 13:41:34 +05:30
marination	98173038b5	fix: Rename function and tweak logic ... - Dont validate PI on `else`	2021-07-09 13:38:23 +05:30
marination	86f5dfbb8f	fix: Validate LCV for Invoices without Update Stock	2021-07-09 13:38:15 +05:30
Marica	01be96adb2	Merge branch 'version-13-hotfix' into qi-rejection	2021-07-09 13:30:21 +05:30
marination	bf462abb00	fix: Rename function and tweak logic ... - Dont validate PI on `else`	2021-07-09 13:12:33 +05:30
Saqib	f6f924b340	Merge branch 'develop' into asset-credit-note	2021-07-09 10:38:50 +05:30
Alan	257cbd3b92	fix: track changes on batch (#26382)	2021-07-08 18:44:30 +05:30
GangaManoj	298b43c177	fix: Let create_item() make items that are fixed assets	2021-07-07 20:56:15 +05:30
Saqib	9910968398	Merge branch 'develop' into enable-discount-accounting	2021-07-07 12:56:11 +05:30
Rohit Waghchaure	dd1b2995a8	fix: stock entry with putaway rule not working	2021-07-07 00:16:35 +05:30
rohitwaghchaure	2bdc0e8993	Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt ... fix: stock entry with putaway rule not working	2021-07-07 00:15:26 +05:30
Rohit Waghchaure	0bd190b885	fix: stock entry with putaway rule not working	2021-07-07 00:14:51 +05:30
Saqib	422325bb74	test: fetching of previous sle (#26352)	2021-07-06 18:37:12 +05:30
Saqib	f9e9d86955	test: fetching of previous sle (#26352)	2021-07-06 18:09:21 +05:30
Noah Jacob	5e99aa7f65	fix: stock_rbnb not defined (#26354)	2021-07-06 18:00:35 +05:30
GangaManoj	657e9b5320	feat: Assign Item's Default Discount Account if present	2021-07-06 16:51:12 +05:30
GangaManoj	ef667a9a64	feat: Add Default Discount Account field	2021-07-06 16:29:19 +05:30
Deepesh Garg	381c05eb87	Merge pull request #26322 from deepeshgarg007/party_dashboard_develop ... fix: Do not consider cancelled entries in party dashboard	2021-07-06 16:13:49 +05:30
Noah Jacob	0734901a89	fix: stock_rbnb not defined (#26345)	2021-07-06 15:56:10 +05:30
Deepesh Garg	8985231a96	fix: Rewrite tests	2021-07-06 15:34:47 +05:30
marination	44c1e8da06	chore: Test to block backdated reco causing future scarcity	2021-07-05 21:59:28 +05:30
marination	e8c9ab4b01	chore: Test for backdated reco qty reposting	2021-07-05 21:59:14 +05:30
marination	8c441263f8	fix: Sider	2021-07-05 21:59:04 +05:30
marination	4038977e2e	fix: Handle Stock Reco cancellation and limit reposting ... - Handled cancellation of reco with and without prior SLE - Repost / Recalculate balance qty only till next stock reco	2021-07-05 21:58:57 +05:30
marination	8418c4bfe0	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-07-05 21:58:50 +05:30
marination	57d06a86f8	chore: Test to block backdated reco causing future scarcity	2021-07-05 21:56:57 +05:30
Marica	4f51b56928	Merge branch 'version-13-hotfix' into stock-reco-repost_qty	2021-07-05 20:26:01 +05:30
marination	fa9e67502c	chore: Test for backdated reco qty reposting	2021-07-05 20:23:00 +05:30
marination	c69bc54297	fix: Validate LCV for Invoices without Update Stock	2021-07-05 14:24:38 +05:30
marination	311e277204	fix: Sider	2021-07-02 18:11:13 +05:30
marination	4503a38361	fix: Handle Stock Reco cancellation and limit reposting ... - Handled cancellation of reco with and without prior SLE - Repost / Recalculate balance qty only till next stock reco	2021-07-02 17:13:45 +05:30
18alantom	865900fd2d	refactor: add type hints, remove comment, sort imports	2021-07-01 14:37:37 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Deepesh Garg	cf7af62b05	fix: Code cleanup	2021-06-30 14:14:32 +05:30
Rohit Waghchaure	815e6ec846	fix: minor removed unused file	2021-06-30 11:35:50 +05:30
rohitwaghchaure	2a1d1e1cb1	Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement ... feat: provision to make subcontracted purchase order from the production plan	2021-06-30 11:15:11 +05:30
Rohit Waghchaure	46b67b901b	fix: incorrect valuation rate in stock reconciliation	2021-06-30 00:31:00 +05:30
Rohit Waghchaure	61690775a8	feat: provision to make subcontracted purchase order from the production plan	2021-06-29 19:59:20 +05:30
GangaManoj	d748e7f49c	fix: Create common function for fetching conversion rate details of linked docs	2021-06-28 22:39:43 +05:30
GangaManoj	506d5ac3d5	fix: Make exchange rate handling more efficient	2021-06-28 22:39:43 +05:30
GangaManoj	a826fb8f95	fix(Purchase Receipt): Remove print statements	2021-06-28 22:38:59 +05:30
GangaManoj	5314445d58	fix(Purchase Receipt): Add test for exchange rate difference handling	2021-06-28 22:02:57 +05:30
GangaManoj	d97505b277	fix(Purchase Receipt): Resolve difference caused by change in exchange rate	2021-06-28 22:02:22 +05:30
rohitwaghchaure	9bcc402f41	Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre ... fix: fetch batch items in stock reconciliation	2021-06-28 15:18:07 +05:30
Rohit Waghchaure	478360397d	fix: fetch batch items in stock reco	2021-06-26 22:31:03 +05:30
Rohit Waghchaure	5d5dc56f94	fix: removed values out of sync validation from stock transactions	2021-06-26 22:29:19 +05:30
rohitwaghchaure	c1853ddf73	Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission ... fix: removed values out of sync validation from stock transactions	2021-06-26 22:28:42 +05:30
Rohit Waghchaure	170f2ad056	fix: removed values out of sync validation from stock transactions	2021-06-26 21:42:47 +05:30
Rohit Waghchaure	e5c47f8957	fix: fetch batch items in stock reco	2021-06-26 17:40:27 +05:30
18alantom	98c9b0e9ed	refactor: remove unused func, sider fixes	2021-06-25 16:13:09 +05:30
Deepesh Garg	8dd99c02cc	fix: Check for is None	2021-06-25 14:27:50 +05:30
Deepesh Garg	cae42b48f1	fix: Error while fetching item taxes	2021-06-25 14:27:43 +05:30
Deepesh Garg	6eb8d19cc9	fix: Check for is None	2021-06-25 14:02:12 +05:30
Deepesh Garg	cd36ba7e64	fix: Error while fetching item taxes	2021-06-25 14:02:04 +05:30
Deepesh Garg	e955a4ee72	fix: Check for is None	2021-06-25 13:38:06 +05:30
Deepesh Garg	2ca9b765ef	fix: Error while fetching item taxes	2021-06-25 13:34:00 +05:30
Alan	37a25308ae	fix: add validation for 'for_qty' else throws errors (#25829) (#26214) ... * fix: add validation for 'for_qty' else throws errors * fix: check if for_qty is None * fix: check purpose * fix: add purpose to pick list get_doc * fix: set as read only to prevent se from picking up value * chore: undo changes to doctype modified timestamp	2021-06-25 12:40:38 +05:30
Deepesh Garg	3239f774bd	Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop ... fix: User is not able to change item tax template	2021-06-25 10:46:14 +05:30
Deepesh Garg	8cdd7ce7b6	fix: Add python 3 compatible string types	2021-06-24 21:13:10 +05:30
Alan	8958f55890	fix: add validation for 'for_qty' else throws errors (#25829) ... * fix: add validation for 'for_qty' else throws errors * fix: check if for_qty is None * fix: check purpose * fix: add purpose to pick list get_doc * fix: set as read only to prevent se from picking up value Co-authored-by: Ankush <ankushmenat@gmail.com> * chore: undo changes to doctype modified timestamp Co-authored-by: Ankush <ankushmenat@gmail.com>	2021-06-24 21:01:55 +05:30
Ankush	21e44b19f0	perf: don't query unless required (bp #26175) ... re-order conditionals so queries are not evaluated unless required. # Conflicts: # erpnext/stock/doctype/batch/batch.py	2021-06-24 20:58:07 +05:30
Ankush	2ea750eadd	perf: don't query unless required (#26175) ... re-order conditionals so queries are not evaluated unless required.	2021-06-24 20:29:18 +05:30
Deepesh Garg	b4b76b75cd	Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix ... fix: User is not able to change item tax template	2021-06-24 19:55:49 +05:30
Ankush	5708b7140b	fix: batch nos in packed items (bp #26105) ... * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:38:37 +05:30
Saqib	3b5978cdb8	Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix ... fix: purchase receipt gl entries with same item code	2021-06-24 19:29:08 +05:30
Deepesh Garg	e21e435a0d	fix: Add python 3 compatible string types	2021-06-24 19:17:58 +05:30
Ankush	7a63d782db	fix: batch nos in packed items (#26105) ... * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:07:16 +05:30
Deepesh Garg	11591b3e3e	Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13 ... fix: purchase receipt gl entries with same item code	2021-06-24 18:36:23 +05:30
Rohit Waghchaure	2330c41cca	fix: total time calculation	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	57307443f0	is corrective job card	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	c878389050	fix: or condition filter in the get_all	2021-06-24 18:14:18 +05:30
Rohit Waghchaure	fcab53b238	fix: skip job card	2021-06-24 18:07:31 +05:30
Rohit Waghchaure	6e81489095	feat: Job Card Enhancements	2021-06-24 18:07:30 +05:30
Saqib Ansari	f6dce4df73	test: service item purchase with perpetual inventory enabled	2021-06-24 17:41:52 +05:30
Saqib	c10fea8a59	Merge branch 'develop' into pr-item-gl-fix	2021-06-24 17:39:36 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184)	2021-06-24 14:26:36 +05:30
Deepesh Garg	269962a8dc	fix: Check if item tax template exists	2021-06-24 10:40:07 +05:30
Deepesh Garg	808f83f385	fix: Make item tax templates optional	2021-06-24 10:39:58 +05:30
Deepesh Garg	94d460412a	fix: User is not able to change item tax template	2021-06-24 10:39:49 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837)	2021-06-24 10:09:02 +05:30
Deepesh Garg	7e006496dd	fix: Check if item tax template exists	2021-06-23 22:52:51 +05:30
Deepesh Garg	c9c1d10435	fix: Make item tax templates optional	2021-06-23 22:47:29 +05:30
Deepesh Garg	1f7b95f390	fix: User is not able to change item tax template	2021-06-23 20:56:27 +05:30
rohitwaghchaure	b4863bfa50	Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report ... feat: Incorrect valuation rate report for serialized items	2021-06-23 16:52:51 +05:30
Saqib	46ae97dfd3	Merge branch 'develop' into pr-item-gl-fix	2021-06-23 11:02:48 +05:30
marination	ea2c02738d	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-06-22 21:44:50 +05:30
Noah Jacob	ce72d0c2c1	fix: fixed rounding off ordered percent to 100 in condition (#26148)	2021-06-22 17:54:16 +05:30
Noah Jacob	c05496a5a7	fix: fixed rounding off ordered percent to 100 in condition (#26152)	2021-06-22 17:53:53 +05:30
marination	49ec0e5ac3	feat: Optionally allow rejected quality inspection on submission	2021-06-21 16:18:35 +05:30
Ankush	7dae0fbe95	fix: status indicator for delivery notes (bp #26062) ... On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:19:47 +05:30
Saqib Ansari	9b54aee43e	test: service item purchase with perpetual inventory enabled	2021-06-21 11:18:56 +05:30
Ankush	e78364c191	fix: status indicator for delivery notes (#26062) ... On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:15:16 +05:30
Rohit Waghchaure	e5fb23972a	fix: available qty for consumption	2021-06-20 15:28:25 +05:30
Rohit Waghchaure	110e152fa3	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-20 15:28:23 +05:30
Rohit Waghchaure	6bbc8ec3e8	fix: code cleanup and convert public method to private for subcontracting class	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	d755b29943	fix: toggle consumed qty field based on condition	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	21b58ef045	fix: semgrep error	2021-06-20 15:27:04 +05:30
Rohit Waghchaure	7b7ceaadd9	feat: subcontract code refactor and enhancement	2021-06-20 15:27:01 +05:30
Rohit Waghchaure	f5db407461	fix: available qty for consumption	2021-06-19 23:19:45 +05:30
Rohit Waghchaure	5cc3f14506	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	ddb0ec261a	fix: code cleanup and convert public method to private for subcontracting class	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	2fb5291785	fix: toggle consumed qty field based on condition	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	9a2db0b5b1	fix: semgrep error	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	a94b89727c	feat: subcontract code refactor and enhancement	2021-06-19 23:16:22 +05:30
rohitwaghchaure	1c846c5be7	Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix ... fix: time out while submitting the stock transactions with more than 50 Items	2021-06-19 18:51:47 +05:30
Rohit Waghchaure	4d81d45a0e	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 16:15:08 +05:30
rohitwaghchaure	a2bb1b8acd	Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance ... fix: time out while submit / cancel the stock transactions with more than 50 Items	2021-06-19 16:14:14 +05:30
Rohit Waghchaure	8520edc952	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 00:55:35 +05:30
Ankush	4e88dcf956	fix: auto unlink warehouse from item on delete (#26073) (#26101) ... * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table Co-authored-by: Alan <2.alan.tom@gmail.com>	2021-06-18 14:48:30 +05:30
Rohit Waghchaure	7fc50ba460	fix: timeout while cancelling stock reconciliation	2021-06-18 10:45:53 +05:30
rohitwaghchaure	3bb9f4a742	Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco ... fix: timeout while cancelling stock reconciliation	2021-06-18 10:44:59 +05:30
Rohit Waghchaure	ef97269386	fix: timeout while cancelling stock reconciliation	2021-06-18 10:11:53 +05:30
Alan	f9390f596d	fix: auto unlink warehouse from item on delete (#26073) ... * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table	2021-06-17 18:13:23 +05:30
Suraj Shetty	00332d1834	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-06-17 09:47:16 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Suraj Shetty	d1902dfadb	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-06-14 12:25:49 +05:30
Ankush Menat	9891780f5a	perf(minor): remove unnecessary comprehensions (port #25645)	2021-06-11 18:40:22 +05:30
Ankush Menat	a9c84f749a	perf(minor): remove unnecessary comprehensions (#25645)	2021-06-11 16:00:48 +05:30
rohitwaghchaure	387de3f3fa	Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop ... fix: timeout error in the repost item valuation	2021-06-11 12:18:13 +05:30
Rohit Waghchaure	17408c6388	fix: on click of duplicate button system copy the difference account from first row	2021-06-11 10:58:00 +05:30
Rohit Waghchaure	b103b24ae1	fix: timeout error in the repost item valuation	2021-06-11 10:55:05 +05:30
Deepesh Garg	5434dd048b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates	2021-06-10 18:56:39 +05:30
walstanb	8f5ae0470d	fix: syntax error in stock entry	2021-06-10 16:35:27 +05:30
rohitwaghchaure	8975c5241e	Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account ... fix: on click of duplicate button system has not copied the difference account	2021-06-10 14:39:56 +05:30
Anupam Kumar	21b8e2f0d8	fix: hiding Rounding Adjustment field (#25380) ... * fix: hiding Rounding Adjustment field * fix: updating purchase_invoice.json	2021-06-09 12:57:21 +05:30
Rohit Waghchaure	99b583f688	fix: on click of duplicate button system copy the difference account from first row	2021-06-09 00:06:35 +05:30
18alantom	6f79c4c348	fix: add account filter	2021-06-07 13:58:45 +05:30
18alantom	23b907df1a	fix: use stock value diff for calculation	2021-06-07 13:52:26 +05:30
Deepesh Garg	3646c301ed	fix: Linting issues	2021-06-05 13:21:03 +05:30
Deepesh Garg	e8a78bd43d	fix: Add test cases	2021-06-05 13:16:39 +05:30
Deepesh Garg	8a7e283926	feat: Item Taxes based on net rate	2021-06-04 22:53:26 +05:30
18alantom	672c8bb112	feature: report for cost of goods sold by item group	2021-06-04 16:44:30 +05:30
Ankush Menat	215516f819	fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) (#25957) ... * fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing bench update --patch --reset * fix(minor): use .get instead of getattr Co-authored-by: D Tim Cummings <tim@triptera.com.au>	2021-06-04 13:09:14 +05:30
D Tim Cummings	fb3ec7ccb8	fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) ... * fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing bench update --patch --reset * fix(minor): use .get instead of getattr	2021-06-04 11:58:45 +05:30
rohitwaghchaure	25b953ad16	Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation ... fix: timeout error in the repost item valuation	2021-06-03 22:14:22 +05:30
Rohit Waghchaure	10558344b0	fix: timeout error in the repost item valuation	2021-06-03 16:34:31 +05:30
Marica	7437748a1d	Merge pull request #25805 from ankush/refactor_item ... refactor: item doctype	2021-06-03 14:23:18 +05:30
Rohan Bansal	a06ec03efc	test: add test for new QI function	2021-06-02 14:55:31 +05:30
Rohan Bansal	11aff80dea	Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts	2021-06-02 14:22:32 +05:30
Rohit Waghchaure	6432aaa07a	feat: added reports to check incorrect qty and valuation for serialized items	2021-06-01 12:46:43 +05:30
Ganga Manoj	c8b34798fe	fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840)	2021-06-01 10:44:26 +05:30
rohitwaghchaure	970f00922d	Merge pull request #25898 from anupamvs/stock-reconciliation ... fix: featching serialized items	2021-05-31 20:00:35 +05:30
rohitwaghchaure	6463cbd15e	Merge pull request #25897 from anupamvs/stock-reconciliation ... fix: featching serialized items	2021-05-31 20:00:26 +05:30
Anupam	0358b64743	fix: featching serialized items	2021-05-31 15:59:32 +05:30
Nabin Hait	a3d1b6973a	fix: merge conflict	2021-05-31 11:21:33 +05:30
Suraj Shetty	54354a84e1	test: Fix permission error	2021-05-28 09:10:33 +05:30
Suraj Shetty	d1a13ec050	test: Fix valuation rate for raw materials	2021-05-28 09:10:33 +05:30
Suraj Shetty	a891d6eed2	fix: allow_zero_valuation_rate for rejected qty	2021-05-28 09:10:33 +05:30
Suraj Shetty	c26d41acf9	chore: Remove unnecessary print statements	2021-05-28 09:09:36 +05:30
Rohan Bansal	9857d63523	fix: add requested changes	2021-05-26 15:41:36 +05:30
Rohan Bansal	1cdf5a0dba	fix: add requested changes	2021-05-26 14:42:15 +05:30
Marica	be157e7467	Merge branch 'version-13-hotfix' into se-supplier-customer	2021-05-26 11:19:50 +05:30
Suraj Shetty	b14a935c5d	Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing	2021-05-25 11:02:03 +05:30
Suraj Shetty	2f8a742aa8	refactor: Replace render imports	2021-05-25 10:28:32 +05:30
Ankush Menat	15f8a0fb22	test: fix flaky test	2021-05-24 17:55:39 +05:30
Ankush Menat	3aed662f46	chore: translation / semgrep / sider fixes	2021-05-24 17:55:39 +05:30
Ankush Menat	c15fef571f	test: item naming series behaviour	2021-05-24 17:55:39 +05:30
Ankush Menat	42e057d079	test: add test for get_timeline_data in item	2021-05-24 17:55:38 +05:30
Ankush Menat	e971b4592e	test: add test for is_stock_item	2021-05-24 17:55:38 +05:30
Ankush Menat	57266a7343	refactor: check_stock_uom_with_bin	2021-05-24 17:55:38 +05:30
Ankush Menat	fc54cf68ac	test: add tests for checking stock_uom with bin	2021-05-24 17:55:38 +05:30
Ankush Menat	4e360f805f	test: hoist defaults to function signature	2021-05-24 17:55:38 +05:30
Ankush Menat	eb17732876	test: add test for item attribute completion	2021-05-24 17:55:37 +05:30
Ankush Menat	f5a937bc45	test: check index creation on item table	2021-05-24 17:55:37 +05:30
Ankush Menat	b9fa12d572	test: add tests for uom conversion function	2021-05-24 17:55:37 +05:30
Ankush Menat	019be66b7b	fix: consider all UOMs for intermediate conversion ... - Using `get_value` will restrict intermediate UOM to first UOM that is found. - A self join is required to truly capture the required behaviour. - Add explanation and examples.	2021-05-24 17:55:37 +05:30
Ankush Menat	0d7f54c6c2	refactor: simplify UOM conversion logic ... - Remove unnecessary sql query - Remove convoluted matching logic and be explcitiy while querying. - better variable names for understanding matching cases	2021-05-24 17:55:37 +05:30
Ankush Menat	297dc5e345	perf: add basic optimisation for uom conversion	2021-05-24 17:55:37 +05:30
Ankush Menat	958d485ba4	refactor: msgprint(raise_exception)->frappe.throw	2021-05-24 17:55:36 +05:30
Ankush Menat	ccbde0efa0	refactor: use enumerate instead of trackign index ... also removed dead code	2021-05-24 17:55:36 +05:30
Ankush Menat	44c489223b	chore: remove py2 compat code	2021-05-24 17:55:18 +05:30
rohitwaghchaure	6809ff4f64	Merge pull request #25776 from rohitwaghchaure/fixed-warehouse-not-found-issue ... fix: warehouse not found in stock entry	2021-05-24 17:00:06 +05:30
marination	c12264f6bc	chore: Cleanup Customer and Supplier Details section in Stock Entry ... - Changed depends on value to "Send to Subcontractor" for supplier fields - Removed Customer fields as they are not relevant to any Stock Entry purpose - Renamed section to "Supplier Details" visibe on subcontracting transfer	2021-05-24 13:20:22 +05:30
rohitwaghchaure	ce88c945cd	Update stock_entry.js	2021-05-24 11:53:27 +05:30
Ankush Menat	c229ac9322	refactor: add guard clause for readability ... Both functions only execute based on a condition. In such cases condition should immediately exit the function, this is called "guard clause" and helps in readability (less indent, and easy to "exit" when reading the code.	2021-05-23 16:31:29 +05:30
Ankush Menat	4b484d741d	refactor: use is_new() instead of __islocal ... Interface over implementation.	2021-05-23 16:31:29 +05:30
Ankush Menat	931c886f92	fix: not checking all fields ... `break` will break out of the loop without checking remaining fields.	2021-05-23 16:31:29 +05:30
Ankush Menat	83e6e2e68a	refactor: add guard clause for readability	2021-05-23 16:31:29 +05:30
Ankush Menat	0b4858d8e5	refactor: eliminate unnecessary loop, container casts	2021-05-23 16:31:29 +05:30
Ankush Menat	ad58a8164a	refactor: code cleanup ... minor fixes for improving code quality	2021-05-23 16:31:29 +05:30
Ankush Menat	4a2dbd4885	refactor: cleanup get_timeline_data, remove py2	2021-05-23 16:31:28 +05:30
Ankush Menat	330353a5ce	refactor: use frappe.throw instread of recreating ... _msgprint was basically duplicating behvaiour of frappe.throw	2021-05-23 16:31:16 +05:30
Marica	eaf0465c44	Merge pull request #25797 from marination/item-variants-report ... fix: Item Variant Details Report	2021-05-22 19:05:54 +05:30
marination	b0019bcf5b	fix: Item Variant Details Report ... Co-authored-by: gavindsouza <gavin18d@gmail.com> - Handling of variants with special characters - Set data in appropriately named columns - Code cleanup	2021-05-21 21:42:11 +05:30
rohitwaghchaure	ab34f5b485	Merge pull request #25742 from ankush/disable_submit_btn ... fix: duplicate stock entry on multiple click	2021-05-21 18:13:01 +05:30
rohitwaghchaure	579a1b7028	Merge pull request #25779 from ankush/parallel_stock_transactions ... fix: wrong quantity after transaction for parallel stock transactions	2021-05-21 18:11:34 +05:30
Suraj Shetty	81d49e9c71	fix: Use extend_cscript function to properly extend class methods to cscript	2021-05-21 17:03:09 +05:30
Alan	1097dc89c5	fix: show allow zero valuation only when auto checked (#25778)	2021-05-21 14:04:03 +05:30
Ankush Menat	4dcac4ae81	refactor(minor): Use identity instead of equality ... Ignore false positive.	2021-05-21 13:49:58 +05:30
Ankush Menat	9979cf5fcc	fix: wrong quantity after transaction for parallel stock transactions ... When two transactions are inserted parallelly then previous SLE could be incorrect for some of them. Locking SLE table would prevent reading from it till transaction is complete.	2021-05-21 12:31:06 +05:30
Rohit Waghchaure	795909fdcd	fix: warehouse not found in stock entry	2021-05-21 11:31:01 +05:30
rohitwaghchaure	94a52c0e17	Merge pull request #25752 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running ... fix: the status of repost item valuation showing In Progress since long time	2021-05-21 09:50:33 +05:30
rohitwaghchaure	84730aa4a5	Merge pull request #25754 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running-13 ... fix: the status of repost item valuation showing In Progress since long time	2021-05-21 09:50:18 +05:30
Rohit Waghchaure	5456873641	fix: run scheduler for reposting if there is no scheduler is running for the reposting	2021-05-19 12:30:28 +05:30
Marica	814fd19424	Merge pull request #25732 from noahjacob/ux_landed_cost_voucher ... refactor: updated applicable charges form in landed cost voucher	2021-05-18 16:39:31 +05:30
Ankush Menat	ecbb8cbc84	revert: "fix: duplicate stock entry (#25486)" ... Not required anymore, submit button is disabled.	2021-05-18 16:35:55 +05:30
Ankush Menat	042b8524cc	fix: disable submit button to avoid multiple calls	2021-05-18 16:35:49 +05:30
Devin Slauenwhite	bdba064fa6	fix: duplicate stock entry (#25486) ... Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-05-18 16:12:53 +05:30
Suraj Shetty	a83d2aacd9	Merge branch 'develop' into esbuild	2021-05-18 14:48:28 +05:30
noahjacob	41ac8be6f2	refactor: base_amount field moved below amount field and renamed	2021-05-17 13:58:27 +05:30
Rohit Waghchaure	0517abad43	fix: run scheduler for reposting if there is no scheduler is running for the reposting	2021-05-17 13:31:12 +05:30
Nabin Hait	8b2fef11b1	fix: merge conflict	2021-05-17 11:37:14 +05:30
Alan	55c2fec683	feat: add pending qty section to batch/serial selector dialog (#25519) ... * feat: add pending qty section to batch/serial selector dialog * fix: call attach in setup and refresh, fix conditional * refactor: camel to snake casing	2021-05-14 12:36:41 +05:30
rohitwaghchaure	2aa401826e	fix: validation message of quality inspection in purchase receipt (#25666)	2021-05-14 12:34:50 +05:30
rohitwaghchaure	e9f6c8cdb1	fix: validation message of quality inspection in purchase receipt (#25667)	2021-05-14 12:34:13 +05:30
Deepesh Garg	be3cde9313	chore: Code clean up for purchase receipt GL (#25379) ... * chore: Code clean up for purchase receipt GL * fix: add params for debit and credit in account curreny * chore: Asset GL entry code cleanup * fix: Syntax error * fix: Update variable names * fix: function naming * fix: Add undefined variables * fix: Supplier warehouse fetching * fix: Linting issues	2021-05-14 12:20:38 +05:30
rohitwaghchaure	ba940bb9e1	Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting ... fix: change today to now to get data for reposting	2021-05-13 17:44:38 +05:30
rohitwaghchaure	fc44478810	Update repost_item_valuation.py	2021-05-13 17:42:33 +05:30
Rohit Waghchaure	a0a88a710e	fix: change today to now to get data for reposting	2021-05-13 17:42:06 +05:30
Rohit Waghchaure	af1376c1df	chore: change today to now to get data for reposting	2021-05-13 17:39:49 +05:30
Rohit Waghchaure	27f50d5852	fix: timeout error while loading warehouse tree	2021-05-13 15:54:35 +05:30
Rohit Waghchaure	d984be0ccd	fix: don't map set warehouse from delivery note to purchase receipt	2021-05-12 12:32:14 +05:30
Suraj Shetty	404e7d07c5	test: Fix permission error	2021-05-10 18:39:09 +05:30
Suraj Shetty	4d6d5f4d89	test: Fix valuation rate for raw materials	2021-05-10 17:37:44 +05:30
Suraj Shetty	a132de42ca	fix: allow_zero_valuation_rate for rejected qty	2021-05-10 17:25:21 +05:30
Suraj Shetty	ec6b652cd4	refactor: Rename assertEquals to assertEqual to avoid deprecation warnings	2021-05-10 09:18:25 +05:30
Ganga Manoj	aa9e172091	feat: Add Create Expense Claim button in Delivery Trip (#25526) ... * feat(Delivery Trip): Add employee_code field * feat(Expense Claim): Add Delivery Trip Number field * feat(Delivery Trip): Add Create Expense Claim button * feat(Delivery Trip): Make Create Expense Claim button show up after save * fix(Delivery Trip): Fix Sider issues * fix(Delivery Trip): Display button after submit * fix(Delivery Trip & Expense Claim): Rename new fields * fix(Delivery Trip): Add button in refresh * fix(Delivery Trip): Remove redundant line * fix(Expense Claim): Display delivery_trip only if non-empty * fix(Delivery Trip): Add test for Create Expense Claim * fix(Delivery Trip): Fix Sider Issue * fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee * fix(Delivery Trip): Fix test * fix(Delivery Trip): Fix make_expense_claim() * fix: sider Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-08 17:15:33 +05:30
Suraj Shetty	80aa8a3149	Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing	2021-05-08 11:28:27 +05:30
rohitwaghchaure	64bd4f27b8	Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos ... fix: added validation in stock entry to check duplicate serial nos	2021-05-07 23:30:27 +05:30
rohitwaghchaure	42fe07bd19	Merge pull request #25551 from rohitwaghchaure/fixed-total-stock-summary-report ... fix: total stock summary report not working	2021-05-07 23:30:06 +05:30
rohitwaghchaure	1726ce547c	Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no ... fix: allow to receive same serial numbers multiple times	2021-05-07 23:27:50 +05:30
Alan	c6dc9eaf2e	feat!: add pick batch button (#25413) ... * feat!: add pick batch button BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no. * refactor: use setup_serial_or_batch_no instead of setup_serial_no * refactor: use setup_serial_or_batch_no instead of setup_serial_no * refactor: use setup_serial_or_batch_no instead of setup_serial_no * style: add sider review changes * refactor: make consice, extract function * refactor: camel to snake casing	2021-05-07 20:30:04 +05:30
Ankush Menat	90e671905a	chore: replace assertEquals with alias assertEqual (#25613) ... * chore: replace assertEquals with alias assertEqual assertEquals has been deprecated. ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases * chore: sider fixes	2021-05-07 20:28:51 +05:30
Faris Ansari	69eb6d476e	Merge remote-tracking branch 'upstream/develop' into esbuild	2021-05-07 15:21:33 +05:30
Faris Ansari	464d838447	fix: Update bundle paths	2021-05-07 14:53:42 +05:30
Saqib	27cf19a19f	feat(pos): show POS reserved stock in stock projected qty report (#25593) ... * feat(pos): consider POS reserved stock in stock projected qty report * chore: remove unwanted string formats	2021-05-07 13:37:42 +05:30
Ganga Manoj	5618ce3852	fix(Material Request): Add 'Partially Received' to Status drop-down list (#24857) ... Co-authored-by: Ganga Manoj <ganga_manoj@Gangas-MacBook-Air.local> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-05-07 13:35:09 +05:30
Umair Sayed	7f79d463f6	fix: Stock and Accounts Settings form refactor (#25534) ... * stock and accounts settings page * fix: Stock and accounts settings page cleanup Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>	2021-05-07 12:28:57 +05:30
Anuja Pawar	f132ed4335	fix: update item level cost center from POS (#25609)	2021-05-07 12:11:09 +05:30
Nabin Hait	7481f54e0c	Merge branch 'version-13' into develop	2021-05-06 19:18:18 +05:30
Nabin Hait	0e41295c0e	perf: Performance enhancement on setup wizard (#25606) ... * perf: Performance enhancement on setup wizard * fix: create departments without updating nsm	2021-05-06 19:14:06 +05:30
Nabin Hait	134eaa5786	perf: Performance enhancement on setup wizard (#25605) ... * perf: Performance enhancement on setup wizard * fix: create departments without updating nsm	2021-05-06 19:13:54 +05:30
Suraj Shetty	c702408f99	chore: Remove unnecessary print statements	2021-05-06 18:37:45 +05:30
Rohit Waghchaure	695becdd05	fix: added validation in stock entry to check duplicate serial nos	2021-05-06 18:03:32 +05:30
rohitwaghchaure	dc6233b703	Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set ... fix: serial no changed after saving stock reconciliation	2021-05-06 17:44:36 +05:30
Rohit Waghchaure	bb3e5d00f4	fix: allow to receive same serial numbers multiple times	2021-05-06 12:38:35 +05:30
Rohit Waghchaure	c432766a70	fix: stock reconciliation getting time out error during submission	2021-05-05 10:16:21 +05:30
Rohit Waghchaure	ba8dc1ffbd	fix: stock balance and batchwise balance history report showing different closing stock	2021-05-04 15:03:10 +05:30
18alantom	308905b1be	fix: semgrep, refactor default mutable dict	2021-05-04 11:46:13 +05:30
18alantom	e36f303042	fix: use percent string templates for db.sql calls	2021-05-04 11:46:13 +05:30
rohitwaghchaure	1f4df80565	Merge pull request #25531 from noahjacob/fix_mr_filter ... fix: updated item filters for material request	2021-05-03 18:36:25 +05:30
rohitwaghchaure	88734eea14	Merge pull request #25557 from rohitwaghchaure/increased-timeout-of-stoc-reco ... fix: stock reconciliation getting time out error during submission	2021-05-03 18:25:33 +05:30
Rohit Waghchaure	8f34ca4ac6	fix: stock reconciliation getting time out error during submission	2021-05-03 15:32:13 +05:30
rohitwaghchaure	9cc7c294e7	Update stock_reconciliation.py	2021-05-03 10:25:53 +05:30
Rohit Waghchaure	6a5a380c07	fix: total stock summary report not working	2021-05-02 18:02:28 +05:30
Rohit Waghchaure	35d4829383	fix: serial no changed after saving stock reconciliation	2021-05-02 17:57:28 +05:30
rohitwaghchaure	2e38f1514f	fix: stock ledger entry created against draft stock entry (#25539)	2021-05-01 13:53:46 +05:30
rohitwaghchaure	00ea336b52	fix: stock ledger entry created against draft stock entry (#25540)	2021-05-01 13:53:39 +05:30
Nabin Hait	a19c6a9278	fix: Fetch total stock at company in PO (#25533)	2021-04-30 18:38:49 +05:30
Nabin Hait	da0ba15cbf	fix: Fetch total stock at company in PO (#25532)	2021-04-30 18:38:41 +05:30
noahjacob	a90c81626f	fix: updated item filters for material request	2021-04-30 15:49:36 +05:30
Noah Jacob	dc086dd52f	fix: item stock levels displaying inconsistently (#25506) ... * fix: fixed stock levels dashboard not displaying after any interactions * fix: minor translation fix	2021-04-29 11:03:27 +05:30
rohitwaghchaure	b9078a0c86	Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop ... feat: purchase receipt creation from purchase invoice	2021-04-27 09:56:28 +05:30
Ankush Menat	9178d95cca	fix: can not create item variants (#25433) ... * fix: item_code assigned to function returning None * fix: ignore has_variants and attributes in variant * fix: patch to remove has_variants and attributes * chore: fix whitespace in translation	2021-04-26 15:37:17 +05:30
Walstan Baptista	4a805b5622	chore: frappe.whitelist for doc methods (#25465)	2021-04-24 14:23:08 +05:30
Faris Ansari	1fe891b287	refactor: Replace Class.extend with native class	2021-04-23 08:04:00 +05:30
Nabin Hait	840c921229	Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop	2021-04-19 13:30:19 +05:30
Deepesh Garg	cb718fce88	feat: Role to allow over billing, delivery, receipt (#24854) ... * feat: Role to allow over billing, delivery, receipt * fix: Typo	2021-04-19 13:25:15 +05:30
Alan	ac8a467b0a	fix: exclude spurious Stock Entry Types from 'consumed' calculation (#25352) ... * fix: exclude spurious 'Stock Entry Type's from 'consumed' calculation * fix: filter using purpose, make requested changes Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-04-19 12:38:25 +05:30
Marica	e8bc912ffc	perf: Fetching exchange rate on every line item slows down PO (#25345) ... * fix: Dont fetch exchange rates for each line item once fetched at parent ` * perf: Use price list conversion rate from parent - If price list conversion rate exists in args already from earlier call, use that - `get_price_list_currency_and_exchange_rate` wont be called for each child row Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-19 11:05:21 +05:30
Ankush Menat	9229ee1745	fix: update shipment status in database ... Caught by semgrep rule: https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4	2021-04-18 13:22:19 +05:30
Ankush Menat	dedf2c1b61	fix: remove duplicate keys from dictionaries	2021-04-17 16:56:08 +05:30
Nabin Hait	eeece59a17	Merge branch 'develop' into disable_rounded_total	2021-04-16 18:44:17 +05:30
Marica	ede339f80b	fix: Serial No not updated correctly via Inter Company Stock Transfer (#25006) ... * fix: Serial No not updated correctly via Inter Company Stock Transfer * chore: Added More Test Cases for inter company Serial Transfer * fix: Test for serial no duplication - fixed serial no test - made errors more meaningful on serial no validation * fix: Stock Reco Test Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-04-16 18:42:54 +05:30
Anupam	9d9c256e70	feat: added Disable Rounded Total in sales transactions	2021-04-16 00:11:40 +05:30
18alantom	6179cc1311	fix: make pickup_to and pickup_from mandatory fields	2021-04-15 20:36:28 +05:30
18alantom	597bb8be18	fix: remove pickup_to, pickup_from and get_pickup_time ... relies on server-side validation instead js controller	2021-04-15 20:32:45 +05:30
rohitwaghchaure	72929aab38	Merge pull request #24878 from anupamvs/planning ... feat: add total available stock field in PO	2021-04-15 16:28:49 +05:30
rohitwaghchaure	1bdc457777	Merge pull request #25304 from ankush/fix_sl_rounding ... fix(stock_ledger): round off values near to zero	2021-04-15 14:44:09 +05:30
Anupam Kumar	ee0dda6ba5	Merge branch 'develop' into planning	2021-04-15 12:48:25 +05:30
Nabin Hait	2535fe9b1e	fix: Resolved merge conflict	2021-04-14 13:09:50 +05:30
Nabin Hait	1bc65ddbe4	Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop	2021-04-14 11:23:34 +05:30
Nabin Hait	dd02b5abf1	Merge branch 'develop' into fix_sl_rounding	2021-04-14 10:36:40 +05:30
rohitwaghchaure	ce6c3b5b74	fix: incorrect incoming rate for the sales return (#25306)	2021-04-13 20:55:52 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305)	2021-04-13 15:46:01 +05:30
Deepesh Garg	9aad73b9f0	Merge pull request #25195 from ankush/use_isinstance_instead_of_type ... fix: broken type check in stock ageing report	2021-04-13 15:24:53 +05:30
Deepesh Garg	3db8ba2d4a	Merge pull request #25033 from anupamvs/se-add-to-transit ... fix: unable to submit stock entry	2021-04-13 14:59:54 +05:30
Rushabh Mehta	65f25c27b3	fix(minor): fix dynamically changing grid properties	2021-04-13 11:58:16 +05:30
Ankush Menat	6a014d12c1	fix(stock_ledger): round off values near to zero	2021-04-12 20:21:27 +05:30
Rohit Waghchaure	bda4c5cc52	fix: update scheduler check tim	2021-04-12 16:11:52 +05:30
Rohit Waghchaure	2339de7333	fix: update scheduler check tim	2021-04-12 16:09:55 +05:30
Marica	be26e59087	Merge pull request #25196 from noahjacob/UX ... fix: Company field in Warehouse	2021-04-12 11:08:45 +05:30
Deepesh Garg	5f3d7f547c	fix: Item wise tax rate for consolidated POS invoice (#25029) ... * fix: Item wise tax rate for consolidated POS invoice * fix: Do not alter item wise taxes for consolidated invoices * fix: Add test case * fix: Update * fix: Set opening stock for test item * fix: Add valuation rate for opening stock	2021-04-12 10:56:47 +05:30
Marica	99522252c4	Merge branch 'develop' into UX	2021-04-12 10:51:24 +05:30
Ankush Menat	d235fc75ad	fix: remove nonexistent method from pick list (#25279) ... This method is merged in calculate_rate_and_amount() during repost item valuation refactoring. Ref: e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)	2021-04-12 10:23:06 +05:30
Rohit Waghchaure	cb6494876f	feat: purchase receipt creation from purchase invoice	2021-04-10 10:49:30 +05:30
Rohit Waghchaure	1358443cdb	fix: patch	2021-04-10 10:42:08 +05:30
noahjacob	110f28f869	Company field editable and is readonly after saving.	2021-04-09 20:01:47 +05:30
Anupam Kumar	a91d7bd4b5	Merge branch 'develop' into se-add-to-transit	2021-04-09 18:00:03 +05:30
Anupam Kumar	cd2aedd0c6	Merge branch 'develop' into planning	2021-04-09 17:59:47 +05:30
rohitwaghchaure	526f76c27d	Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project ... fix: travis	2021-04-09 17:07:22 +05:30
Rohit Waghchaure	ca5e10892c	fix: travis	2021-04-09 16:23:45 +05:30
Marica	d38618fc34	Merge branch 'develop' into item-dashboard-fixes	2021-04-09 11:57:56 +05:30
Marica	5467d7c3e3	fix: Use system precision instead of SLE precision	2021-04-09 11:56:49 +05:30
Marica	a7ac01153e	fix: Remove redundant import and import cint	2021-04-09 11:55:44 +05:30
Anupam Kumar	dfdf72cbb2	Merge branch 'develop' into planning	2021-04-08 10:58:05 +05:30
Anupam Kumar	8edf9d23c0	Merge branch 'develop' into se-add-to-transit	2021-04-08 10:57:50 +05:30
Marica	4440ff7a0d	Merge branch 'develop' into item-dashboard-fixes	2021-04-05 16:25:57 +05:30
Marica	bc50193702	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-05 16:24:53 +05:30
Walstan Baptista	8789ef16a1	test: uses _Test Item instead of _Test Item Home Desktop 100 (#25198)	2021-04-05 13:18:03 +05:30
Ankush Menat	36ff0748bf	fix: broken type check in stock ageing report	2021-04-05 10:18:44 +05:30
Walstan Baptista	b7481633b1	test: adds role after setting user to Administrator (#25177)	2021-04-03 17:37:59 +05:30
Deepesh Garg	232c127295	Merge pull request #25107 from deepeshgarg007/stock_entry_serial_batch_selector ... fix: Hide serial and batch selector in Stock Entry	2021-04-03 17:15:22 +05:30
rohitwaghchaure	fe72e17a7b	Merge pull request #25109 from ankush/po_to_pr_fixes ... fix: incorrect status creating PR from PO after creating PI	2021-04-03 17:11:14 +05:30
Marica	7f9fedf08a	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-02 13:19:19 +05:30
Anuja Pawar	87dea3923b	fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106) ... * fix: picked qty from Stock Qty to Qty in DN * fix: suggested changes and added test * fix: sider changes * fix: sider changes	2021-04-01 22:05:08 +05:30
Marica	913e7254cb	Merge branch 'develop' into qc-back-update	2021-04-01 17:40:46 +05:30
Walstan Baptista	446a6df662	test: set opening stock to fix NegativeStock errors (#25101) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-04-01 16:54:26 +05:30
Anuja P	7982688508	fix: sider changes	2021-04-01 16:04:28 +05:30
marination	a3da206b64	fix: Don't string format args as they may not be escaped properly ... - Append even conditional args to args list and send to query executer - It will escape all values that are sent to it - String formatting without escaping causes issues with % sign, etc.	2021-04-01 15:45:33 +05:30
Anuja P	45d0b9bce6	test: added tests for Pick List for item with multiple UOM	2021-04-01 15:38:13 +05:30
Rucha Mahabal	6717773c28	fix: Travis (#25078) ... * fix(test): set default accounts in mode of payment * fix(test): import_doc params in shopify settings test * fix: syntax error in salary slip test * fix(test): use Temporary Opening account for Stock Reco opening entry * fix(test): skip GST doc naming validations for tests * fix(test): Salary Structure Assignment date edge case * fix(test): GST doc naming validations * fix: sider * revert: skip GST doc naming validations for tests	2021-04-01 15:30:34 +05:30
Nabin Hait	11eb30d082	fix: merge conflict	2021-04-01 15:03:11 +05:30
marination	561fa6b530	fix: Don't string format args as they may not be escaped properly ... - Append even conditional args to args list and send to query executer - It will escape all values that are sent to it - String formatting without escaping causes issues with % sign, etc.	2021-04-01 12:56:05 +05:30
Ankush Menat	8993ccb7d2	fix: update PR status in database	2021-04-01 11:51:31 +05:30
Ankush Menat	4198cf58e5	test: add tests for PO->PI, PO->PR workflow ... Add failing test cases for PR status and PR percent billed.	2021-04-01 11:51:30 +05:30
rohitwaghchaure	56bd4d71a9	Merge pull request #25112 from rohitwaghchaure/fixed-clear-source-warehouse ... fix: not able to save material request	2021-03-31 23:58:44 +05:30
Rohit Waghchaure	825850a58f	fix: not able to save material request	2021-03-31 23:55:06 +05:30
Marica	bfc2590e3b	Merge branch 'develop' into patch-7	2021-03-31 22:23:23 +05:30
Marica	8617c0ab99	Merge pull request #25070 from marination/update-items-bin ... fix: Update Bin via Update Item on Purchase/Sales Order	2021-03-31 22:21:41 +05:30
Deepesh Garg	9f7bb14ea1	fix: Remove console	2021-03-31 20:01:00 +05:30
Anuja P	a1d0932093	fix: suggested changes	2021-03-31 19:59:28 +05:30
Deepesh Garg	2d86eb3ab1	fix: Hide serial and batch selector in Stock Entry	2021-03-31 19:57:50 +05:30
Anuja P	fb9ce3f37b	fix: Picked Qty conversion from Stock Qty to item Qty in DN	2021-03-31 19:26:42 +05:30
Prssanna Desai	9920d4062c	Merge pull request #25103 from prssanna/redesign-fixes-v13	2021-03-31 19:02:10 +05:30
Anupam Kumar	526497bc43	Merge pull request #25104 from anupamvs/purchase-side-margin-beta ... feat: price margin in buying	2021-03-31 18:38:58 +05:30
Anupam	ad520e08ba	feat: price margin in buying	2021-03-31 18:31:12 +05:30
prssanna	bcd63f04da	style: missing semicolon	2021-03-31 18:26:52 +05:30
prssanna	5cdb1cb7a9	fix: item variant dialog dropdown issue	2021-03-31 18:26:45 +05:30
Jannat Patel	c814aab0b6	fix: delivery note print error (#25081)	2021-03-31 16:24:31 +05:30
Jannat Patel	11e9ae3841	fix: delivery note print error (#25080)	2021-03-31 16:24:08 +05:30
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +05:30
Saqib	4d0939de8d	feat: introduce parameter group in quality inspection (#25094) ... * feat: introduce parameter group in quality inspection * chore: make parameter group optional	2021-03-31 15:51:48 +05:30
rohitwaghchaure	e353c84aa5	Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop ... fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:31:50 +05:30
rohitwaghchaure	968885af26	Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request ... fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:31:30 +05:30
Rohit Waghchaure	1bc53a32bf	fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:30:42 +05:30
Rohit Waghchaure	94c145f3c3	fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:28:26 +05:30
Sagar Vora	e50324aed7	perf: reduce number of queries for checking if future SL entry exists (#25064)	2021-03-31 12:44:03 +05:30
Walstan Baptista	d6360755b9	chore: frappe.whitelist for doc methods (#25068) ... * chore: frappe.whitelist for doc methods * fix: incorrect spelling * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-31 12:30:32 +05:30
Anupam	41229ba705	fix: unable to submit stock entry	2021-03-31 02:32:25 +05:30
marination	a5de6c779b	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 02:03:26 +05:30
marination	0673f558c1	fix: Cleaned up and fixed validation and bin updation on deletion ... - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 01:42:18 +05:30
Anupam Kumar	9be11afbde	feat: price margin in buying (#25058)	2021-03-30 12:09:46 +05:30
Walstan Baptista	ee822a9dcd	test: use different product attribute value; cleanup (#25043) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-27 19:42:25 +05:30
Walstan Baptista	d6c7d8e631	test: reset session user if test errors in test_sle (#25042)	2021-03-27 18:30:07 +05:30
Sagar Vora	868c0bf45b	perf: reduce no of queries for checking if future sl entry exists (#24881)	2021-03-27 16:10:20 +05:30
Anupam	4adaf7ed2e	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release	2021-03-27 00:56:48 +05:30
Anupam	5d994d8aa1	fix: unable to submit stock entry	2021-03-27 00:54:19 +05:30
Anupam	096da429ed	fix: unable to submit stock entry	2021-03-27 00:45:31 +05:30
rohitwaghchaure	d5759bab11	Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule ... feat: recursive pricing rule	2021-03-26 19:10:10 +05:30
Rohit Waghchaure	256b9c7bf9	fix: total weight not set for free items	2021-03-26 19:05:46 +05:30
Sagar Vora	0b569b3e43	fix: allow creating stock entry based on work order for customer provided items (#24885)	2021-03-26 14:40:15 +05:30
Marica	7c6f72fd39	Merge branch 'develop' into hide_alt_field	2021-03-25 12:15:58 +05:30
Rohit Waghchaure	244f3eeedc	fix: incorrect fieldname	2021-03-24 16:42:22 +05:30
Anurag Mishra	4217a4b1ff	Merge branch 'develop' into item-dashboard-fixes	2021-03-24 15:35:33 +05:30
Anupam Kumar	d1bbb4c311	Merge branch 'develop' into planning	2021-03-24 15:12:04 +05:30
rohitwaghchaure	3c490088c4	Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre ... fix: repost not completed backdated transactions	2021-03-24 12:38:42 +05:30
Rohit Waghchaure	9165327cf6	fix: repost not completed backdated transactions	2021-03-24 11:32:26 +05:30
rohitwaghchaure	575f8f226b	fix: repost not completed backdated transactions (#24980)	2021-03-24 11:30:53 +05:30
Ankush Menat	2ba198576c	fix: set valuation rate for customer items to zero ... - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 14:03:09 +05:30
Ankush Menat	2a391298a7	test: customer item in stock reconciliation	2021-03-23 14:03:00 +05:30
Ankush Menat	6a534ea82b	fix: Allow zero valuation in stock reconciliation ... Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 14:02:52 +05:30
Ankush Menat	e76ecb8f74	fix: set valuation rate for customer items to zero ... - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 13:01:21 +05:30
Ankush Menat	714b780868	test: customer item in stock reconciliation	2021-03-23 12:43:02 +05:30
Ankush Menat	762d6e38f7	fix: Allow zero valuation in stock reconciliation ... Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 11:18:04 +05:30
Rohit Waghchaure	bde159a77d	fix: total weight not set for free items	2021-03-22 23:36:48 +05:30
Anupam	661b1e59c1	Merge branch 'develop' of https://github.com/frappe/erpnext into planning	2021-03-22 11:48:11 +05:30
Anupam	4980dd616b	fix: resolving commits	2021-03-22 11:23:47 +05:30
Sagar Vora	a85959f574	fix: remove unwanted parameter in calculate_rate_and_amount (#24883) ... * fix: remove unwanted parameter in calculate_rate_and_amount * fix: translation syntax	2021-03-20 16:37:33 +05:30
rohitwaghchaure	98a40d81d5	Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre ... fix: revert stock balance value calculation	2021-03-19 16:22:51 +05:30
rohitwaghchaure	081499c0c0	Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop ... fix: revert stock balance value calculation	2021-03-19 16:22:13 +05:30
Rohit Waghchaure	67d94ac0cc	fix: revert stock balance value calculation	2021-03-19 16:21:30 +05:30
Rohit Waghchaure	f21a55c8ef	fix: revert stock balance value calculation	2021-03-19 16:19:34 +05:30
Ankush Menat	c0a9c391eb	fix: hide alt tag if item is not shown in website	2021-03-18 14:07:24 +05:30
Anurag Mishra	abf974daee	fix: precision and formated document	2021-03-17 18:55:04 +05:30
prssanna	1cdef8bd97	style: missing semicolon	2021-03-16 15:39:16 +05:30
prssanna	b8b89a02af	fix: item variant dialog dropdown issue	2021-03-16 14:16:22 +05:30
Anurag Mishra	5e475f85b9	Merge branch 'develop' into suplier_portal_fixes	2021-03-15 16:21:55 +05:30
Rohit Waghchaure	00a0e8da10	fix: validation of job card in stock entry	2021-03-15 14:15:10 +05:30
Anupam Kumar	ed42afc5e8	feat: price margin in buying (#24685)	2021-03-15 11:11:28 +05:30
Nabin Hait	fe3529b194	fix: merge conflict	2021-03-11 16:45:41 +05:30
rohitwaghchaure	a0e7787f7b	fix: removed show cancelled entries checkbox from the stock ledger report (#24826)	2021-03-10 13:46:42 +05:30
Raffael Meyer	20cc2bb0d8	fix: autoname for Item Tax Template ... * fix: autoname for Item Tax Template Use title + company abbreviation instead of just title. * fix: test records of Item Tax Template * fix: rename item tax templates in test records * Revert "fix: test records of Item Tax Template" This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1. * fix: rename hardcoded item tax templates in tests * fix: rename hardcoded Item Tax Templates in tests (2) * fix: delete Item Tax Template with company	2021-03-10 10:24:43 +05:30
Anupam Kumar	832098f042	fix: In-Transit Feature enhancements (#24652)	2021-03-09 21:14:25 +05:30
Rohit Waghchaure	535406cb0c	fix: allow to select item code in batch naming	2021-03-09 21:01:12 +05:30
Sagar Vora	78777d6ed4	fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756) ... Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-09 20:35:08 +05:30
Afshan	9f6015a4e9	fix: batch no in POS (#24771) ... * fix: batch no in list * fix: check for batch no to be list	2021-03-09 20:31:14 +05:30
Marica	e1ee9034ef	Merge branch 'develop' into item-attribute-fix	2021-03-09 18:35:44 +05:30
Nabin Hait	d96be3f9f1	Reposting patch and earned leave rounding (#24783) ... * fix: rounding of earned leave is optional (#24782) * fix: reposting patch fixes (#24775)	2021-03-02 17:02:47 +05:30
Nabin Hait	bd10d7c028	fix: reposting patch fixes (#24775)	2021-03-02 13:37:45 +05:30
Deepesh Garg	236a232de0	Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming ... fix: allow to select item code in batch naming	2021-03-01 20:25:14 +05:30
Rohit Waghchaure	eb6b3cfe6d	fix: allow to select item code in batch naming	2021-03-01 11:32:39 +05:30
Rohit Waghchaure	9f13a060f0	fix: reposting patch	2021-02-26 17:44:54 +05:30
Rohit Waghchaure	c603fd638b	fix: reposting patch	2021-02-26 17:42:52 +05:30
Anurag Mishra	02f50a93e5	fix: copy variants property and Attributes whil duplicatinh item Tamplate (#24662)	2021-02-25 18:47:17 +05:30
Anuja Pawar	118a4ffb08	fix: rounding error in finished goods qty (#24653)	2021-02-25 18:44:44 +05:30
Rohit Waghchaure	39b5ad8e69	fix: patch failing because of incorrect gl entries	2021-02-23 18:35:36 +05:30
Rohit Waghchaure	bc8c9de26d	fix: patch failing because of incorrect gl entries	2021-02-23 18:26:48 +05:30
Nabin Hait	d46b23699c	fix: optimize reposting of gle and sle (#24702) ... * fix(india): escape for special characters in JSON (#24695) JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811 * fix: Accounting Dimension creation background job timeout * fix(regional): vehicle no is mandatory for ewaybill generation (#24679) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition * fix: excluding unidentified accounts from gstr-1 * fix: optimize reposting of sle and gle (#24694) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> * fix: Replaced spaces with tabs * fix: merge conflict * fix: test cases Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-23 16:38:52 +05:30
Nabin Hait	19f8fa59d3	fix: optimize reposting of sle and gle (#24694) ... * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-22 22:27:22 +05:30
shariquerik	f5d6bd77e5	fix: item attributes not editable until refresh	2021-02-22 21:27:14 +05:30
Afshan	133ebc1d51	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 14:16:33 +05:30
Marica	4a1ffcf742	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-22 11:34:34 +05:30
Afshan	01b4ee8a3c	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 11:17:45 +05:30
rohitwaghchaure	1aad27a539	Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card ... fix: [minor] validation of job card in stock entry	2021-02-19 21:22:57 +05:30
Saqib Ansari	8c7c682f17	chore: make parameter group optional	2021-02-19 20:35:23 +05:30
Anupam Kumar	b1997da488	feat: capture Rate of stock UOM in purchase (#24315) ... * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-18 21:32:05 +05:30
Nabin Hait	186a045e28	fix: update qty in future sle (#24649) ... * fix: update qty in future sle * fix: validate cancellation due to ongoing reposting * fix: process sle against current timestamp	2021-02-18 21:28:28 +05:30
Nabin Hait	deddcc513d	fix: stock and account balance syncing (#24644) ... * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-18 21:28:16 +05:30
Nabin Hait	f2be0805f7	fix: formatting query args (#24627)	2021-02-18 21:25:59 +05:30
rohitwaghchaure	83792ec009	fix: reposting issue with same posting date and posting time (#24570) ... * fix: reposting issue with same posting date and posting time * Update erpnext/stock/stock_ledger.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 21:24:48 +05:30
Marica	77d72d59ef	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-18 16:55:44 +05:30
Rohit Waghchaure	c697cb8b2d	fix: validation of job card in stock entry	2021-02-18 15:10:12 +05:30
Nabin Hait	d826bee13a	fix: update qty in future sle (#24649) ... * fix: update qty in future sle * fix: validate cancellation due to ongoing reposting * fix: process sle against current timestamp	2021-02-18 14:14:21 +05:30
Anurag Mishra	5ec592d09c	fix: supplier was not able to Submit RFQ due to in sufficient permission	2021-02-18 13:42:04 +05:30
Marica	208d1942c3	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-17 12:56:35 +05:30
Nabin Hait	9b178bcd10	fix: stock and account balance syncing (#24644) ... * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-16 14:57:00 +05:30
Nabin Hait	243661b37b	fix: formatting query args (#24627)	2021-02-15 19:27:49 +05:30
Afshan	e963362dfd	fix: check if customer provided item while setting opening stock	2021-02-15 15:00:37 +05:30
Saqib Ansari	138e98fef2	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-12 11:19:25 +05:30
Anupam Kumar	7e1dcf911d	feat: capture Rate of stock UOM in purchase (#24315) ... * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-11 20:19:30 +05:30
rohitwaghchaure	aa00eb9898	fix: reposting issue with same posting date and posting time (#24570) ... * fix: reposting issue with same posting date and posting time * Update erpnext/stock/stock_ledger.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:23:01 +05:30
Jannat Patel	30c8873f24	fix: validation for disabled warehouse (#24539) ... * fix: validation for disabled warehouse * fix: better function name * fix: validation in stock ledger entry	2021-02-11 11:46:48 +05:30
Nabin Hait	b58b8ec2fb	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-11 11:14:02 +05:30
marination	a97eb6a052	fix: Empty State text font weight in Item Dashboard	2021-02-07 22:27:40 +05:30
Saqib Ansari	8c3da162ba	feat: introduce parameter group in quality inspection	2021-02-04 19:39:41 +05:30
Nabin Hait	7177579051	fix: Dependant sle logic fixes (#24489) ... * fix: Dependant sle logic fixes * fix: negative qty validation * fix: Travis fixes	2021-02-02 22:03:07 +05:30
Nabin Hait	243d59b0c3	Reposting logic fixes (#24520) ... * fix: Dependant sle logic fixes * fix: negative qty validation * fix: Travis fixes * fix: test fix	2021-02-02 16:55:13 +05:30
Suraj Shetty	54a253616a	Merge pull request #24508 from frappe/rebrand-ui	2021-02-02 09:07:35 +05:30
Marica	0ea2587679	fix: Numeric/Non-numeric QI UX (#24516) ... * chore: Show 1 field each of both types of Insoections in grid view * fix: Make QI check Numeric by default and make checkbox "Numeric" - Reducing cognitive load	2021-02-01 20:38:53 +05:30
Marica	003ae90e12	fix: Numeric/Non-numeric QI UX (#24517) ... * chore: Show 1 field each of both types of Insoections in grid view * fix: Make QI check Numeric by default and make checkbox "Numeric" - Reducing cognitive load	2021-02-01 20:38:32 +05:30
Suraj Shetty	055b81da7b	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 15:10:52 +05:30
Rohit Waghchaure	aeba3d311c	fix: extra transferred qty has not consumed against work order	2021-01-29 12:33:09 +05:30
rohitwaghchaure	cf3e0cf271	Merge pull request #24365 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue-develop ... fix: extra transferred qty has not consumed against work order	2021-01-29 12:28:28 +05:30
Suraj Shetty	0a8939e1c1	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-29 08:56:22 +05:30
Saqib	ac9e6ff704	fix(pos): multiple pos fixes and additions (#24227) ... * fix: make custom fields in pos invoice similar to sales invoice * feat: allow/disallow rate & discount change * fix: any pos profile can be selected while creating pos opening * fix: cannot add item to cart * fix: validate phone payment only if payment request exists * fix: replace pos payment method patch * chore: rearrange item & customer group filter * fix: allow/disallow invoice level discount * fix: updating qty of item with uom having space char * fix: move configuration checbox to config section * fix: invalid item rate trigger * fix: cannot remove item from draft invoices * fix: customer currency not set in pos invoice * fix: duplicate item error message * fix: sales uom not fetched in pos invoice * fix: cannot add taxes to pos invoice for uae region * fix: cannot merge pos invoice into credit note * fix: tax calculation while merging pos invoices * feat: delete draft orders from order list * fix: merging of pos invoice with pricing rules	2021-01-28 17:58:55 +05:30
Nabin Hait	a6213ccd61	Merge branch 'develop' into version-13-beta-pre-release	2021-01-28 17:36:08 +05:30
Marica	56c6805d79	Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop	2021-01-28 15:03:15 +05:30
Marica	7aa16bafff	Merge branch 'develop' into lcv_multicurrency	2021-01-28 13:29:36 +05:30
Deepesh Garg	b4be292217	fix: Item valuation for internal stock transfers (#24200) ... * fix: Item valuation for internal stocktransfers * fix: Consider conversion factor for invoices * fix: Add missing set warehouse fields * fix: Add validations and other fixes * fix: Fixes in flow * fix: Internal sales item link in Purchase Invoice * fix: Debugging * fix: Debug travis * fix: Remove commented code * fix: Rate forcing in sales order * fix: Unreallized profit in Sales Register * fix: Item wise gst sales register fix * fix: From warehouse in Purchase Order * fix: Target field in Sales Invoice * fix: remove self * fix: GST Purchasse register and other fixes * fix: Add shipping_address to no field map * fix: Ref doc map * fix: Test Cases * fix: address mapping between sales and purchase document * fix: Import Error * fix: Tax updation for internal invoices * fix: Purchase Order and Invoice linking * fix: Internal Party validation fix * fix: validation * fix(india): GST Taxes for intra state transfer * fix(india): GST Taxes for intra state transfer Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-01-28 13:09:56 +05:30
Marica	ed6368d782	Merge pull request #24481 from marination/stock-entry-indicator ... chore: Set Stock Entry Form Indicators in setup	2021-01-28 13:00:24 +05:30
Marica	9e11521764	Merge pull request #24466 from marination/stock-entry-qi ... fix: Always show QI Template in Item	2021-01-28 12:45:49 +05:30
Jannat Patel	9f8cbe9101	Material request wrong status issue (#24019) ... * fix: material request status fix * fix: changing precision to global defaults for material request status * fix: adding back the removed flt * fix: sider issues fixed Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2021-01-28 12:29:52 +05:30
Marica	cc22814df5	Merge branch 'develop' into lcv_multicurrency	2021-01-28 12:15:09 +05:30
Marica	cdccf4be52	Merge branch 'develop' into stock-entry-qi	2021-01-28 12:12:03 +05:30
Deepesh Garg	16bcd01f6d	feat: Provision to disable serial no and batch selector (#24398) ... * feat: feat: Provision to disbale serial no and batch selector * fix: Sider issues * fix: Linting issues	2021-01-28 12:09:35 +05:30
Deepesh Garg	bd9bdc5797	feat: Batch wise item pricing (#24470) ... * feat: Batch wise item pricing * fix: Rate for items with no batch * fix: Add test case for batch pricing * fix: Sider Issues * fix: Add item filter for batch	2021-01-28 12:05:57 +05:30
marination	27bac2aaec	fix: Missing semi-colon	2021-01-28 12:04:14 +05:30
marination	bc370b3ee5	chore: Set Stock Entry Form Indicators in setup ... - Makes it easier to override via customisations - Style consistency with other forms that set indicator in setup as well	2021-01-28 11:44:26 +05:30
Marica	ea7c2dbfaf	Merge branch 'develop' into stock-entry-qi	2021-01-28 11:31:43 +05:30
Deepesh Garg	a0d61524c1	fix: Add distribute manually option in LCV	2021-01-26 17:05:00 +05:30
Deepesh Garg	224fdf34e4	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2021-01-25 22:16:02 +05:30
marination	b0ef8fb7c5	fix: Always show QI Template in Item	2021-01-25 21:00:24 +05:30
rohitwaghchaure	fa3ec3c346	Merge pull request #23969 from marination/putaway ... feat: Putaway	2021-01-25 16:42:04 +05:30
Suraj Shetty	0c34a711eb	Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release	2021-01-25 16:06:38 +05:30
Marica	62a1caf6c4	Merge branch 'develop' into lcv_multicurrency	2021-01-25 12:39:16 +05:30
Afshan	96edfd93c9	fix: stock ageing should not take cancelled stock entries.	2021-01-21 18:22:35 +05:30
prssanna	9f1a156307	Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-21 13:04:58 +05:30
Deepesh Garg	60a8ba5cbd	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2021-01-20 10:30:52 +05:30
Suraj Shetty	bbc6bfd3c3	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2021-01-19 09:34:06 +05:30
marination	957615bec8	fix: Stricter validations ... - Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation - Every incoming stock transaction must be checked to avoid overcapacity - However application of rule and splitting only on certain doctypes - Validate capacity < stock balance on save in putaway rule, irrespective	2021-01-18 23:47:24 +05:30
Marica	6ac51edc56	Merge branch 'develop' into putaway	2021-01-18 17:47:25 +05:30
Deepesh Garg	cbed6f970a	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2021-01-15 15:43:59 +05:30
Marica	17614c9860	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-14 13:02:45 +05:30
marination	814858061f	fix: test for raising MR-SE mismatch error ... - Make test add mismatched item code instead of warehouse, since warehouse can be different.	2021-01-14 12:13:08 +05:30
Rohit Waghchaure	56c7b554a6	fix: extra transferred qty has not consumed against work order	2021-01-14 11:54:32 +05:30
Anuja Pawar	e62ce4b172	fix: Add button PO, PI, SI, DN and, Quotation Dashboard (#24187)	2021-01-13 21:13:12 +05:30
Marica	b8c5cd7331	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-12 20:16:58 +05:30