5234 Commits

Author	SHA1	Message	Date
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
Marica	30cc040d50	Merge branch 'develop' into batch-selector	2021-01-12 20:14:35 +05:30
Anupam	c53ad88503	fix: resolved commit	2021-01-12 10:51:29 +05:30
Rushabh Mehta	7619d3d6d6	fix(merge): develop	2021-01-12 09:16:21 +05:30
Marica	aef71a8abe	Merge branch 'develop' into batch-selector	2021-01-11 14:22:11 +05:30
marination	7646d7b741	fix: Batch/Serial Selector for Batched Item	2021-01-11 12:51:15 +05:30
Marica	b9d5ae9285	Merge branch 'develop' into qi-ux	2021-01-08 20:28:28 +05:30
marination	b7637f49cd	fix: Remove QI link on cancel wherever same QI name exists	2021-01-08 18:35:49 +05:30
marination	c4963bfdb2	fix: Back Update from QC based on Batch No	2021-01-08 09:56:04 +05:30
marination	ff6ee9d4e7	fix: Formula field description and Rearrange grid view ... - Missing closing quote in Formula field description - In grid view of child table in QI, show only input fields	2021-01-08 09:14:43 +05:30
Marica	d91c7e2b38	Merge branch 'develop' into mr-se-warehouse-validation	2021-01-07 15:41:21 +05:30
Marica	eab1867235	Merge branch 'develop' into qi-ux	2021-01-05 14:23:05 +05:30
Saqib	60460a6d23	fix(e-invoicing): minor calculation fixes (#24282)	2021-01-05 13:54:04 +05:30
Saqib	1f591ab02e	fix(e-invoicing): minor calculation fixes (#24285)	2021-01-05 13:53:51 +05:30
marination	b8aeb9ea88	fix: Indentation and missing semi-colon ... - Fix incorrect indentation after merge conflict - Sider	2021-01-05 12:16:25 +05:30
Marica	41ea77ce31	Merge branch 'develop' into putaway	2021-01-05 11:24:05 +05:30
Marica	099162814c	Merge branch 'develop' into qi-ux	2021-01-05 09:27:40 +05:30
marination	0c883853b3	fix: Dont validate warehouse values between MR to Stock Entry ... - Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from	2021-01-04 18:48:50 +05:30
Anupam	27fd9e4d7d	fix: added empty value in Quality Inspection Reading status	2021-01-04 18:18:00 +05:30
marination	7877d5a7c2	fix: Create QI Parameters (links) in test cases	2021-01-04 11:10:04 +05:30
Rohit Waghchaure	16bce49f18	fix: incorrect valuation rate for finished good	2020-12-31 17:39:52 +05:30
Deepesh Garg	23ab5c5cc0	fix: Multiplle sider issues	2020-12-31 11:29:06 +05:30
Deepesh Garg	133ce286f9	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-31 11:24:14 +05:30
rohitwaghchaure	b09ddc4672	Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue ... fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'	2020-12-29 17:52:43 +05:30
Rohit Waghchaure	81285204dc	fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'	2020-12-29 16:25:45 +05:30
Deepesh Garg	4a8c2c4cb5	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-12-29 15:10:36 +05:30
marination	a69e81a151	chore: Made 'Parameter' a link field in QI and QI Template ... - Added doctype Quality Inspection Parameter - Made 'Parameter' a link field in QI and QI Template - Added patch to create Quality Inspection Parameter records for every parameter in the system	2020-12-28 18:07:22 +05:30
marination	29a03bd5a1	feat: Add 'Manual Inspection' checkbox ... - fix merge conflict in js file - Dont auto set status if manual inspection is checked - Added 'Manual Inspection' checkbox in QI readings table	2020-12-28 16:59:13 +05:30
Marica	62f9cc6c5a	Merge branch 'develop' into qi-ux	2020-12-28 15:09:15 +05:30
Rohit Waghchaure	40d2c6a0cc	fix: finished good produced qty validation	2020-12-28 14:08:45 +05:30
Deepesh Garg	d3814b2676	Merge branch develop into batch-wise-pricing	2020-12-28 10:48:29 +05:30
Deepesh Garg	d4fc451c2a	Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset ... fix: accounting entries of asset when submitting purchase receipt	2020-12-26 19:14:32 +05:30
Deepesh Garg	4f8da4c313	fix: Test Cases	2020-12-26 11:37:51 +05:30
Deepesh Garg	5269f02919	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-25 18:35:26 +05:30
Deepesh Garg	bfc17e487c	fix: Commonify code for Stock Entry	2020-12-25 18:34:39 +05:30
rohitwaghchaure	49d7499990	fix: added shipment link in delivery note dashboard (#24210) ... * fix: added shipment link in delivery note dashboard * Update shipment.py	2020-12-25 18:15:35 +05:30
Nabin Hait	b99c77b753	Reposting fixes (#24202) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:12:35 +05:30
Nabin Hait	327f03566a	Reposting fixes pre release (#24203) ... * fix: finished item validation and rate * fix: Check if stock and account balance in sync after reposting * fix: validate stock accounts in journal entry * fix: validate expense against budget	2020-12-25 18:11:54 +05:30
rohitwaghchaure	de10d7dcf2	Update shipment.py	2020-12-25 15:15:55 +05:30
Rohit Waghchaure	5bcc6c6b15	fix: added shipment link in delivery note dashboard	2020-12-25 15:02:53 +05:30
rohitwaghchaure	630258f493	Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop ... fix: do not manufacture same serial no multiple times	2020-12-24 17:46:26 +05:30
Rohit Waghchaure	ed20819432	fix: travis	2020-12-24 16:24:10 +05:30
Shivam Mishra	bba2726333	fix: minor styling fixes	2020-12-24 14:14:17 +05:30
prssanna	79c3d6f71d	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into shopping-cart	2020-12-24 11:36:59 +05:30
Rucha Mahabal	9fe7f235d0	fix: Do not cancel reference document on Quality Inspection cancellation (#24198)	2020-12-24 11:03:48 +05:30
Rucha Mahabal	d2f91e8c11	fix: Do not cancel reference document on Quality Inspection cancellation (#24197)	2020-12-24 11:03:36 +05:30
Rushabh Mehta	ab1c2b7631	fix(minor): routing	2020-12-23 23:26:58 +05:30
Nabin Hait	0411a43c6e	fix: set finished good item rate based on qty	2020-12-23 12:14:41 +05:30
Saqib Ansari	09c6842199	fix: accounting entries of asset when submitting purchase receipt	2020-12-23 11:29:26 +05:30
Deepesh Garg	e5e2ad646a	fix: Test Cases	2020-12-22 19:53:07 +05:30
Deepesh Garg	e1320c7e47	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-22 13:32:59 +05:30
Nabin Hait	bd4bdca6ad	feat: Repost item costing (#24183) ... * Repost item valuation (#24031) * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis * fix: removed duplicate field from pos profile	2020-12-21 20:03:59 +05:30
Nabin Hait	a77b8c9fcc	Repost item valuation (#24031) ... * feat: Reposting logic for future finished/transferred item * feat: added fields to identify needs to recalculate rate while reposting * refactor: Set rate for outgoing and finished items * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item * refactor: Get outgoing rate for purchase return * refactor: Get incoming rate for sales return * test: Added tests for reposting valuation of transferred/finished/returned items * feat: added incoming rate field in DN, SI and Packed Item table * feat: get incoming rate for returned item * fix: no error while getting valuation rate in stock entry * fix: update stock ledger for DN and SI * feat: update item valuation rate in PR and PI based on supplied items cost * feat: SLE reposting logic for sales return and subcontracted item with test cases * feat: update qty in future sle * feat: repost future sle and gle via Repost Item Valuation * fix: Skip unwanted function calling while reposting * fix: repost sle for specific item and warehouse * test: Modified tests for backdated stock reco * fix: ignore cancelled sle in few methods * feat: role allowed to do backdated entry * feat: Show reposting status on stock valuation related reports * fix: minor fixes * fix: fixed sider issues * fix: serial no fix related to immutable ledger * fix: Test cases fixes related to perpetual inventory * fix: Test cases fixed * fix: Fixed reposting on cancel and test cases * feat: Restart reposting item valuation * refactor: Code cleanup using small functions and test case fixes * fix: minor fixes * fix: Raise on error while reposting item valuation * fix: minor fix * fix: Tests fixed * fix: skip some validation ig gle made from reposting * fix: test fixes * fix: debugging stock and account validation * fix: debugging stock and account validation * fix: debugging travis for stock and account sync validation * fix: debugging travis * fix: debugging travis * fix: debugging travis	2020-12-21 14:45:50 +05:30
marination	eae31f02cc	fix: Sider (missing semi-colons)	2020-12-21 13:58:44 +05:30
marination	68f91c9640	chore: Added tests for new ux ... - Test for value based inspection - tweaks in test for formula based inspection - tweaks in create_quality_inspection as status in child row is auto set now	2020-12-21 12:24:45 +05:30
marination	0c4f97368d	chore: UX improvement ... - Removed 'single reading' checkbox, unnecessary - Removed 'Mean' field and added computed mean to formula data - Changed 'Value Based' to 'Non-Numeric' - Re-arranged fields	2020-12-21 11:44:48 +05:30
marination	d6277cdc7f	feat: Value Based and Numeric Quality Inspection ... - Acceptance Formula is optional - Choose between Value based and Numeric QI - If numeric, select single or multiple readings - Added Min, Max and Mean Values for numeric inspection to avoid formula usage - Deprecated code cleanup in js file	2020-12-18 21:37:19 +05:30
Rushabh Mehta	2cd41bca06	fix(routes): desk to app	2020-12-18 13:17:58 +05:30
Anurag Mishra	5e8e0037d6	Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop	2020-12-17 16:01:42 +05:30
Deepesh Garg	51892efd60	fix: Translation issues	2020-12-17 12:35:22 +05:30
Deepesh Garg	f48296ddf0	Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency	2020-12-17 12:20:16 +05:30
Deepesh Garg	6f99c0850c	fix: Linting Issues	2020-12-17 12:19:58 +05:30
Deepesh Garg	5a2030c2f2	fix: Add server side methods and other fixes	2020-12-17 09:21:11 +05:30
Rohit Waghchaure	c9f63accdd	fix: do not manufacture same serial no multiple times	2020-12-17 00:18:17 +05:30
Shivam Mishra	fd044b032f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements	2020-12-16 13:21:10 +05:30
Nabin Hait	13dc63499a	Merge branch 'develop' into version-13-beta-pre-release	2020-12-15 09:06:27 +05:30
Deepesh Garg	46f3c65b00	feat: Multi currency in landed cost voucher	2020-12-14 23:09:19 +05:30
Marica	406af27b9e	Merge branch 'develop' into putaway	2020-12-14 13:07:50 +05:30
marination	c47d38dc18	chore: Stock Entry Tests and fixes ... - Maintain item-warehouse wise rules for Stock Entry Material Transfer - Test cases for Stock Entry with more use cases - Sider fixes	2020-12-14 12:12:49 +05:30
Suraj Shetty	f2511c84b5	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-12-14 09:05:48 +05:30
rohitwaghchaure	8b8ef8d364	Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop ... fix: incorrect stock quantity if 'Allow Multiple Material Consumption…	2020-12-13 13:31:25 +05:30
Nabin Hait	3423d94145	fix: Fixed merge conflict	2020-12-12 21:12:56 +05:30
Rohit Waghchaure	edb99d4e53	fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled	2020-12-12 16:03:07 +05:30
Rohit Waghchaure	5bfd6831c4	fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry	2020-12-12 16:00:28 +05:30
Deepesh Garg	249595a2d8	fix: Sider Issues	2020-12-09 18:13:23 +05:30
marination	a5d8d32775	chore: Test and fixes ... - Tests as per new design flow - Fixed duplicate data bug in Warehouse Capacity Summary - Set Amount currently on applying rule in client side - Apply rules on server side before validate	2020-12-09 16:27:18 +05:30
Deepesh Garg	c41fb7556b	fix: Add test case for batch pricing	2020-12-09 15:55:39 +05:30
Deepesh Garg	bc0a2859e4	fix: Rate for items with no batch	2020-12-09 12:40:09 +05:30
Deepesh Garg	91e1136d2c	feat: Batch wise item pricing	2020-12-08 22:53:03 +05:30
marination	0f3cfc502b	feat: Trigger rule application from client side ... - Table is reset and overwritten with applied rules on checkbox trigger - Sider fixes	2020-12-08 19:44:29 +05:30
Rushabh Mehta	fec8dba16c	fix(merge): merge develop	2020-12-08 16:23:09 +05:30
Marica	0b68243979	Merge branch 'develop' into putaway	2020-12-08 11:44:00 +05:30
marination	fac4035f23	feat: Apply Putaway Rules within transaction itself ... - Added checkbox 'Apply Putaway Rule' in PR and SE - Added link to rule in child tables - Rule is applied on Save - Validation for over receipt - Apply Rule on Stock Entry as well for Material Transfer and Receipt	2020-12-07 21:35:49 +05:30
rohitwaghchaure	0a672b69e6	Merge pull request #22859 from marination/pr-dn-return ... feat: Return tracking in PR/DN	2020-12-06 22:43:34 +05:30
Michelle Alva	c9067e40cb	fix: Change validation message ... grammatical fix	2020-12-06 10:48:32 +05:30
Shivam Mishra	2fa3cac814	feat: update workspace folders	2020-12-03 15:48:57 +05:30
Shivam Mishra	2895645f86	feat: rename desk page to workspace	2020-12-03 15:39:53 +05:30
Rohit Waghchaure	8474476316	fix: incorrect balance value in stock balance report	2020-12-03 13:43:11 +05:30
jbienesdev	8e68f128c1	fix: travis build error ... - Removed shipment notification and subscription files - Minor changes on shipment field configuration - Add shipment to desk	2020-12-02 08:56:49 +00:00
jbienesdev	b4b542d1c3	chore: linter issues and sider checks	2020-12-02 07:15:16 +00:00
jbienesdev	99361b4a9e	chore: remove notification details section	2020-12-02 07:15:14 +00:00
jbienesdev	28055f483d	fix(shipment): change shipment test and refactor shipment.js	2020-12-02 07:15:13 +00:00
jbienesdev	ac3c1f1493	chore: remove packlink, letmeship, and sendcloud files	2020-12-02 07:15:11 +00:00
jbienesdev	000494f548	fix(shipment): apply code review	2020-12-02 07:15:05 +00:00
jbienesdev	1c9410e5e8	feat(shipment): Shipment Doctype with Integrations	2020-12-02 07:14:58 +00:00
Shivam Mishra	9aaca25edb	feat: update desk page json	2020-12-01 13:39:54 +05:30
Shivam Mishra	de68f74b4c	chore: update all desk pages	2020-12-01 12:51:38 +05:30
Shivam Mishra	27e7c264f2	fix: link type	2020-11-30 14:58:16 +05:30
Shivam Mishra	61388d412b	feat: update desk pages	2020-11-30 14:58:00 +05:30
rohitwaghchaure	9707b4789e	fix: stock ageing report not working (#23923)	2020-11-30 14:58:00 +05:30
rohitwaghchaure	10c168e257	fix: default cost center in item master not set in stock entry (#23877) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-30 14:58:00 +05:30
marination	724e16bca1	chore: Use JSON style response and use ORM ... - Use JSON style response for report columns - Use ORM instead of frappe.db.sql - Remove returned % from list view	2020-11-30 12:55:30 +05:30
marination	1087d97c03	feat: Warehouse Capacity Summary ... - Added Page Warehouse Capacity Summary - Added Page to Desk and Putaway List View - Reused Item Dashboard/Stock Balance page render code - Added naming series to Putaway Rule	2020-11-26 10:45:44 +05:30
Deepesh Garg	1a4390de44	Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters	2020-11-25 14:51:11 +05:30
Deepesh Garg	6b9dda5f3e	fix: Move filter setup to doctype controllers	2020-11-25 14:49:10 +05:30
Marica	df17b4ff83	Merge branch 'develop' into pr-dn-return	2020-11-25 10:43:55 +05:30
Rucha Mahabal	6b57cf3285	feat: Quality Inspection on Job Card (#23964) ... * feat: Quality Inspection on Job Card * fix(Job Card): quality inspection filter query * fix: sider issues	2020-11-25 09:17:16 +05:30
marination	2ed80656aa	chore: Code Cleanup ... - Validate capacity < stock level only on new rule - Mention stock uom while validating capacity in new rule - Separate function to format and display unassigned items - Format ORM args	2020-11-24 21:07:56 +05:30
marination	2fbaa5dc58	Merge branch 'putaway' of https://github.com/marination/erpnext into putaway	2020-11-24 17:39:19 +05:30
marination	68a49efc80	chore: Added Putaway Rule to Desk Page and added Priority to List View	2020-11-24 17:38:34 +05:30
Marica	e762bc67eb	Merge branch 'develop' into putaway	2020-11-24 17:28:34 +05:30
Anurag Mishra	927106f552	fix: maintain stock can't be changed it there is product bundle	2020-11-24 15:02:52 +05:30
marination	ccbd432b56	chore: Added Tests ... - Fixed Sider Issues - Added perms to Putaway Rule - Added Unit Tests to check warehouse assignment	2020-11-24 12:47:13 +05:30
marination	0cec1477f2	chore: Format unassigned Items dialog and add freeze message	2020-11-23 19:19:35 +05:30
marination	90598ea19c	chore: Multi UOM support for Putaway ... - Added UOM & conversion factor field in Putaway Rule - Items are split and assigned as per UOM - Handled Whole UOMs too	2020-11-23 17:35:13 +05:30
Rucha Mahabal	9a73a67dcd	Merge pull request #23982 from pateljannat/track-changes-in-stock-settings ... fix: enabling track changes for stock settings	2020-11-23 15:57:48 +05:30
pateljannat	34f381df17	fix: enabling track changes for stock settings	2020-11-23 15:31:08 +05:30
marination	9596276b95	fix: Linter and Sider	2020-11-23 10:32:17 +05:30
Jannat Patel	34d07b6306	fix: purchase receipt to purchase invoice bill date mapping (#23967) ... Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>	2020-11-20 19:22:35 +05:30
marination	c7991f8561	feat: Putaway Rule	2020-11-20 11:53:20 +05:30
marination	86e03325c3	Merge branch 'develop' of https://github.com/frappe/erpnext into putaway	2020-11-19 14:07:48 +05:30
Marica	9b897c4073	Merge branch 'develop' into pr-dn-return	2020-11-19 12:21:38 +05:30
Rucha Mahabal	14514f776b	fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field (#23776) ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-11-19 08:17:16 +05:30
Marica	6dafe1eabf	feat: Formula based Quality Inspection (#23916) ... * feat: Formula based Quality Inspection * chore: Added Test for Formula Based QI reading	2020-11-19 08:12:58 +05:30
Shivam Mishra	3bec3cfef1	fix: don't use primary action for create	2020-11-18 17:10:02 +05:30
rohitwaghchaure	67ba0462e9	Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking ... fix: Item price duplicate checking	2020-11-18 16:41:48 +05:30
Rushabh Mehta	542bc01718	fix(minor): update routes	2020-11-18 15:00:34 +05:30
Shivam Mishra	e0b2e31f86	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-17 12:28:14 +05:30
rohitwaghchaure	7aa60d1dea	fix: stock ageing report not working (#23923)	2020-11-17 12:10:27 +05:30
rohitwaghchaure	1c8c1d78e9	fix: default cost center in item master not set in stock entry (#23877) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-11-15 09:40:44 +05:30
Shivam Mishra	bed717b442	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-11-12 11:32:59 +05:30
Jannat Patel	0ea0a7495c	fix: making company address read-only in delivery note (#23890)	2020-11-12 11:10:59 +05:30
marination	c1b0e65f9f	feat: Putaway	2020-11-12 09:54:44 +05:30
Marica	2b44f22cf4	Merge branch 'develop' into fix-po-no-fetching	2020-11-11 11:10:34 +05:30
Marica	63d1a0436c	Merge branch 'develop' into fix-po-no-fetching	2020-11-09 12:59:10 +05:30
Marica	7e1511f527	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-06 12:28:55 +05:30
Afshan	4d3e83682e	fix: showing error for wrong filters.	2020-11-06 12:25:46 +05:30
Marica	d845e8a53a	Merge branch 'develop' into pr-dn-return	2020-11-06 12:25:11 +05:30
Marica	6d2bcd2404	Merge branch 'develop' into purchase-invoice-payment-terms	2020-11-05 12:25:38 +05:30
Marica	fd2b7d3c1d	Merge branch 'develop' into dialog-cleanup	2020-11-05 12:22:50 +05:30
rohitwaghchaure	64059db69f	Merge pull request #23814 from Anurag810/stock_ledger_report ... fix: list index out of range on including UOM	2020-11-05 11:49:46 +05:30
Afshan	cdc17bb9f3	fix: added code for testing	2020-11-04 19:28:55 +05:30
Anurag Mishra	09b8ca0ddb	fix: list index out of range on incilding uom	2020-11-04 15:04:50 +05:30
marination	7837161a3f	fix: Sider	2020-11-03 22:09:42 +05:30
Marica	7b42e8e27c	Merge branch 'develop' into dialog-cleanup	2020-11-03 16:26:06 +05:30
marination	f21e3fbf04	chore: Tests ... - Added test for mapping secnd return doc - Added test for billing % of partially returned doc - Handled PR with 0 billing amount	2020-11-03 12:01:56 +05:30
Kevin Chan	a2ba8ea74a	style: Clean up code formatting	2020-11-03 10:57:52 +08:00
Kevin Chan	312561fd77	Merge branch 'develop' into fix/item-price-duplicate-checking	2020-11-03 10:56:23 +08:00
marination	3991b84b2b	chore: Avoid multiline string in Translation & remove print statement	2020-11-02 15:23:41 +05:30
marination	28dd90f3dc	Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return	2020-11-02 15:16:31 +05:30
marination	d6596a169c	fix: Billing % Logic and Map Pending Qty only in PR and DN ... - Billing % should consider unreturned amount as total - While mapping to return doc, map unreturned amount - Added field Received Qty in Stock UOM, to tally against Returned Qty in PR - PR billing percentage updation custom function - In patch set received qty in stock uom first, then update returned qty and billing	2020-11-02 15:07:48 +05:30
marination	542ae6ab97	chore: Linter and Sider fixes ... - Translatable strings cannot be multi line or be formatted by '+' - Reduce no of tabs in stock_entry.js	2020-11-02 08:50:48 +05:30
marination	66b2b544f8	chore: Purchase Receipt, added required by date in PO popup	2020-10-30 17:45:28 +05:30
marination	e14fdf4a3c	chore: RFQ cleanup and Title case for 'Get Items From' ... - Cleanup up RFQ Get Items From Dialogs - Title cased 'Get items from' to 'Get Items From'	2020-10-30 17:06:00 +05:30
Rohit Waghchaure	71913c36a7	fix: po_detail field has no value for subcontracted stock entry	2020-10-30 14:35:16 +05:30
marination	6bf507a54b	chore: (MR)Added delivery date in SO dialog	2020-10-30 13:59:47 +05:30
Deepesh Garg	9c67629e28	fix: Ignore cancelled entries instock balance report (#23757) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-29 19:51:57 +05:30
prssanna	71e5b60df1	refactor: refactor contextual print setting implementation	2020-10-29 14:19:34 +05:30
Marica	7496ac0fe2	Merge branch 'develop' into pr-dn-return	2020-10-28 11:54:01 +05:30
Rushabh Mehta	1dd54e457d	Merge pull request #23734 from rmehta/quality-form-cleanup ... fix(cleanup): Quality Module, cleanup of forms, dashboards etc.	2020-10-28 11:36:00 +05:30
Marica	cf8698fb0b	Merge branch 'develop' into pr-dn-return	2020-10-27 15:34:51 +05:30
marination	67f2c82d90	chore: Test case for Payment Terms in PI from PR	2020-10-27 14:49:43 +05:30
marination	fa085d7f4b	fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt	2020-10-27 13:18:30 +05:30
Afshan	bd987e56bc	fix: showing error for wrong filters. (#23726) ... * fix: showing error for wrong filters. * style: formatting translation	2020-10-26 19:37:33 +05:30
Rushabh Mehta	ea49e30bfd	fix(cleanup): cleaned up forms	2020-10-26 15:30:52 +05:30
Saqib	34873bf26b	fix: multiple pos issues (#23725) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis	2020-10-26 13:24:47 +05:30
Rohit Waghchaure	103ecec9d4	fixed translation syntax	2020-10-26 12:20:11 +05:30
Rohit Waghchaure	9caac6976c	fix: incorrect supplied qty error	2020-10-26 12:19:00 +05:30
rohitwaghchaure	4c688b71f3	fix: consumed qty logic for subcontracted raw materials (#23314) ... * fix: consumed qty logic for subcontracted raw materials * added test case * fix: sales order workflow test case	2020-10-26 12:19:00 +05:30
rohitwaghchaure	1cfa61628d	fix: incorrect calculation for consumed qty for subcontract item (#23257) ... * fix: incorrect calculation for consumed qty for subcontract item * added test case	2020-10-26 12:19:00 +05:30
Saqib	60212ff9b9	fix: multiple pos issues (#23347) ... * fix: point of sale search * fix: pos fetches expired serial nos * fix: pos doesn't refresh on route change * fix: opening balances not set in opening entry * fix: remove debug statement * fix: invalid query if no serial no is reserved by pos invoice * chore: make new order btn primary * chore: filter warehouse by company * chore: add shortcuts for new order and email * fix: cannot fetch serial no if no batch control * chore: add shortcuts for menu items * feat: standard keyboard shortcuts for pos page * feat: display only items that are in stock * fix: empty point of sale page if opening entry dialog is closed * feat: conversion factor in pos item details * fix: show all invalid mode of payments * chore: show all items if allow negative stock is checked * fix: -ve amount set when changing mode of payment * fix: pos closing validations * fix: test * fix: non expired serial no fetching query * fix: cannot dismiss pos opening creation dialog * fix: transalation strings * fix: msgprint to throw * chore: use as_list in frappe.throw * chore: clean up pos invoice.js & .py * fix: codacy * fix: transalation syntax * fix: codacy * fix: set_missing_values called twice from pos page * fix: mode selector with double spaces * fix: do not allow tables in pos additional fields * fix: pos is not defined * feat: set mode of payments for returns * fix: remove naming series from pos profile * fix: error message * fix: minor bugs * chore: re-arrange pos closing entry detail fields * fix: sider & frappe linter * fix: more translation strings * fix: travis * fix: more translation strings * fix: sider * fix: travis * fix: unexpected end of string * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-26 11:17:04 +05:30
Nabin Hait	da301b0b7a	fix: merge conflict	2020-10-25 13:07:59 +05:30
rohitwaghchaure	8be296b343	Merge pull request #23675 from rohitwaghchaure/feat-added-balance-serial-no-column-develop ... feat: balance serial nos in stock ledger report	2020-10-24 19:04:31 +05:30
Michelle Alva	b39c17dd55	fix: Typo/Grammatical fixes in Settings (#23612) ... * fix(Stock Settings): Type/Grammatical fixes in Settings * fix: grammatical fixes in manufacturing settings * fix: typo fix in accounting settings * fix: typo fixes in HR settings * fix: typo fixes in buying settings * fix: typo fixes in Selling Settings * Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Apply suggestions from code review Co-authored-by: Sagar Vora <sagar@resilient.tech> * Update accounts_settings.json Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rushabh Mehta <rmehta@gmail.com> Co-authored-by: Sagar Vora <sagar@resilient.tech>	2020-10-23 18:22:26 +05:30
rohitwaghchaure	4eb87ea8e2	Merge pull request #23695 from rohitwaghchaure/fix-stock-entry-consumption-issue ... fix: incorrect backflush qty in manufacture entry	2020-10-23 15:43:43 +05:30
Rohit Waghchaure	558879fad7	fix: Translation Syntax	2020-10-23 13:42:51 +05:30
Nabin Hait	9ff4a2ebd8	Merge branch 'develop' into feat-added-balance-serial-no-column-develop	2020-10-22 21:40:29 +05:30
Marica	3b1be2b1de	fix: Add Taxes if missing via Update Items (#23702) ... * fix: Add Taxes if missing via Update Items * chore: PO Test for adding tax row via Update Items * chore: SO Test for adding tax row via Update Items	2020-10-22 17:04:31 +05:30
rohitwaghchaure	cc5171a324	Merge branch 'develop' into stock_entry_conversion_factor	2020-10-22 15:20:32 +05:30
Rohit Waghchaure	fa842e8774	fix: incorrect backflush qty in manufacture entry	2020-10-22 13:35:27 +05:30
Shivam Mishra	5e00ed926c	feat: update icons	2020-10-21 12:30:22 +05:30
Shivam Mishra	9d468a8daf	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-21 11:38:31 +05:30
Rohit Waghchaure	09572f10f8	fix: overproduction, not allowed to transfer extra materials	2020-10-20 11:01:36 +05:30
Deepesh Garg	8859b71956	fix: Check for backdated validation only for transaction company (#23639) ... * fix: Check SLE only for transaction company * fix: Add tests * fix: Move backdated entry validation from transaction base to stock ledger entry * chore: Add tests Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 16:56:45 +05:30
rohitwaghchaure	3a17147a32	refactor: book loss amount in the COGS instead of stock received but not billed (#23671)	2020-10-19 16:54:11 +05:30
rohitwaghchaure	2fbeb7c1dd	refactor: added new filters in the Batch-wise balance history report (#23676) ... * refactor: added new filters in the Batch-wise balance history report * fix: added semicolon Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-10-19 11:37:54 +05:30
rohitwaghchaure	5d6686bd8c	Fixed stock ageing report data develop (#23673) ... * fix: stock ageing report * Update stock_ageing.py	2020-10-19 10:39:20 +05:30
Rohit Waghchaure	e6a29cc33a	fix: performance issue while adding template item in the cart	2020-10-16 17:59:54 +05:30
Rohit Waghchaure	76fafe8842	feat: balance serial nos in stock leder report	2020-10-16 17:58:54 +05:30
Deepesh Garg	775e689ba9	fix: Add tests	2020-10-15 22:09:05 +05:30
Deepesh Garg	01a7297f69	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-15 17:13:29 +05:30
Rohit Waghchaure	5f465394a7	fix: serial no field is blank in stock reconciliation	2020-10-15 15:56:50 +05:30
Shivam Mishra	cb8457b9ae	feat: add description to Accounts onboarding	2020-10-15 13:53:12 +05:30
Shivam Mishra	55f52e8135	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-10-13 20:09:22 +05:30
Marica	50b708f615	Merge branch 'develop' into pr-dn-return	2020-10-13 16:57:11 +05:30
Marica	c5e139a542	fix: Travis (#23606) ... * fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places * fix: Item Barcode and Test * fix: Over Receipt on subcontracting test * fix: POS Invoice and Loyalty Program Tests * fix: POS serialized item test and subcontracting exploded items in PO * fix: Subcontracting test considering sourced_by_supplier items * fix: Make only one Additonal Salary List with overwrite set	2020-10-13 16:53:10 +05:30
Saqib	ebb0a6266a	fix: last purchase rate in item prices report (#23506) ... * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * fix: last purchase rate in item prices report * chore: fetch last purchase rate from update stock purchase invoices	2020-10-12 17:09:09 +05:30
Marica	e9f0268d32	Merge branch 'develop' into item-attribute-validation-on-non-template-item	2020-10-12 15:26:34 +05:30
Marica	aeba75cd08	Merge branch 'develop' into mr-ux	2020-10-12 15:17:32 +05:30
rohitwaghchaure	4e59abf0bf	Merge pull request #23583 from anupamvs/item-price ... fix: can't save item price after adding child table	2020-10-12 15:15:50 +05:30
Kevin Chan	f6bcd5c2b2	test: Add test case for duplicate checking	2020-10-12 16:57:33 +08:00
Kevin Chan	58389ebd40	style: Collapse whitespace	2020-10-12 15:20:11 +08:00
marination	03975a692e	fix: Perform Item Attribute Value Validation on Variants Only	2020-10-12 12:03:07 +05:30
Kevin Chan	39bed3a65e	fix: Add null or empty checking to validation ... This commit adds null or empty checking in the **Item Price** DocType's `check_duplicates()`. This was done to fix a bug where some prices are shown to be duplciates even though they aren't because they don't have values in some fields.	2020-10-12 11:42:05 +08:00
Kevin Chan	a322f0d0b3	chore: Fix error message grammar	2020-10-12 11:38:55 +08:00
Anupam	2be23309bb	fix: can't add child table in item price	2020-10-11 14:14:50 +05:30
marination	bd6d5eb5ac	fix: Remove Production Order reference from Item Validation	2020-10-09 20:57:17 +05:30
Deepesh Garg	8242da6310	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor	2020-10-08 16:23:34 +05:30
michellealva	3525ddabc5	fix: Add links in Stock desk page	2020-10-07 19:02:19 +05:30
marination	c213cd96c5	fix: Handle Blank from/to range in Numeric Item Attribute	2020-10-02 12:22:28 +05:30
marination	0bc61b31f7	chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM	2020-10-02 11:54:54 +05:30
Sagar Vora	382676d875	Merge branch 'develop' into mr-stock-uom-v13	2020-09-27 20:09:00 +05:30
prssanna	fec4ea5643	fix: set stock uom in tem while creating material request from stock entry	2020-09-25 18:01:12 +05:30
Shivam Mishra	9a4d603403	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-09-25 11:44:37 +05:30
Michelle Alva	879a8ef26b	fix: Change button label in Item (#23410)	2020-09-23 15:36:07 +05:30
Deepesh Garg	2bf4245334	fix: Conversion factor fixes in Stock Entry	2020-09-23 12:50:06 +05:30
Marica	ef2b5e8284	Merge branch 'develop' into pr-dn-return	2020-09-22 15:39:25 +05:30
rohitwaghchaure	7230b0f9a0	Merge pull request #23360 from anupamvs/batch-wise ... fix: Batch-Wise Balance History filter validation	2020-09-22 10:32:51 +05:30
Saqib	f2ea3877c8	fix: depreciation start date ux fixes (#23339)	2020-09-20 19:31:18 +05:30
Deepesh Garg	e3ee63f677	Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter ... fix: warehouse address filtered based on warehouse	2020-09-19 18:17:08 +05:30
marination	b782d2a99d	fix: Added back accidentally deleted field	2020-09-19 01:04:28 +05:30
marination	90d9d80ef9	fix: More MR UX fixes	2020-09-19 00:43:53 +05:30
Abhishek Balam	4e6733293f	fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) ... * fix: reset owner values in doctype to Administrator * fix: updated modified value * fix: also fixed modified by * fix: change modified_by to Administrator	2020-09-18 18:27:24 +05:30
Anupam	bf166736b0	fix: Batch-Wise Balance History filter validation	2020-09-18 17:15:49 +05:30
Afshan	d5710b4d6f	style: removed extra spaces	2020-09-17 13:01:47 +05:30
Afshan	e813684433	fix: warehouse address filtered based on warehouse	2020-09-17 12:57:26 +05:30
Marica	c4a8c9eb26	Merge branch 'develop' into pr-dn-get-items	2020-09-14 11:09:32 +05:30
marination	9205101ecf	fix: Make Reference fields mandatory in Quality Inspection	2020-09-12 16:17:13 +05:30
marination	0a688005be	fix: Make sure Supplier/Customer is selected before fetching Items.	2020-09-12 15:39:27 +05:30
Suraj Shetty	67095d239f	fix: Custom dashboard sections	2020-09-10 17:15:52 +05:30
marination	83a03689a1	fix: Use independent item for DN Test	2020-09-09 20:51:01 +05:30
marination	efb211af6d	chore: Fix Received/Delivered Items to Billed Logic	2020-09-09 16:24:11 +05:30
Marica	52e87d1a4f	Merge branch 'develop' into pr-dn-return	2020-09-09 11:56:26 +05:30
marination	8484d1cd95	fix: Patch and test codacy	2020-09-08 20:58:33 +05:30
marination	315bf3051c	chore: Tests for Delivery Note	2020-09-08 19:27:36 +05:30
marination	e35fd5e305	chore: Tests for Purchase Receipt	2020-09-08 16:24:10 +05:30
Afshan	9691422fb7	feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) ... * feat: added report for mismatch in serial nos and stock quantity in warehouse * style: removed print statement * fix: rename of reports and refactor of code * fix: handled null condition for actual qty and added report link in stock desk page * style: breaking code in multiple lines	2020-09-08 11:57:15 +05:30
Marica	0411026ad6	Merge branch 'develop' into pr-dn-return	2020-09-08 10:48:44 +05:30
rohitwaghchaure	515d8b9e50	Merge pull request #23259 from anupamvs/se-quntity ... fix: SE quantity data type issue	2020-09-04 16:07:13 +05:30
Anupam K	faebef21b7	fix: SE quantity data type issue	2020-09-04 15:09:16 +05:30
Rohit Waghchaure	68b0108301	fix: incorrect qty after transaction in stock ledger entry	2020-09-03 15:10:07 +05:30
marination	731bae170e	fix: Test for Over Receipt via PRs on a PO	2020-08-28 14:09:02 +05:30
Suraj Shetty	f39bb116cc	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-27 19:27:49 +05:30
prssanna	a324e9bd12	fix: remove text-muted and small class fromtree items	2020-08-27 19:26:14 +05:30
Suraj Shetty	b6ebcd7559	refactor: Replace darkgray indicator with gray indicator	2020-08-27 18:57:18 +05:30
prssanna	744169833c	fix: replace indicator color darkgrey with darkgray	2020-08-27 17:06:10 +05:30
Shivam Mishra	7556517a4f	feat: validate if removed item attributes exist in variants (#22911) ... * feat: validate if removed item attributes exist in variants * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * Update erpnext/stock/doctype/item/item.py Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: smaller loop Co-authored-by: marination <maricadsouza221197@gmail.com> * feat: don't run validation for new entries Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: use tuple as is Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: error description Co-authored-by: Marica <maricadsouza221197@gmail.com> * refactor: remove unused variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-24 19:37:09 +05:30
rohitwaghchaure	cf4268e21a	Merge pull request #23116 from nabinhait/subcontracted-pr-gle ... fix: GLE for subcontracted PR is fg item rate is zero	2020-08-24 16:07:32 +05:30
Deepesh Garg	8331a38ace	fix: Test Case for qty less than 1	2020-08-23 21:23:26 +05:30
Deepesh Garg	cb0bc2dcaf	fix: Negative SLE not created for fraction qty or qty less than 1	2020-08-23 20:43:50 +05:30
Suraj Shetty	a43e760703	fix: Item dashboard style	2020-08-23 16:36:28 +05:30
Suraj Shetty	6f9f40992c	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-08-23 16:33:50 +05:30
Nabin Hait	337ee0a4bf	test: Test case for GLE in subcontracted PR if FG item rate is zero	2020-08-22 20:02:27 +05:30
Nabin Hait	df175cc8fc	fix: GLE for subcontracted PR is fg item rate is zero	2020-08-22 19:17:18 +05:30
Anupam Kumar	674d1b0803	feat: Material Request and Stock Entry Enhancement (#22671) ... * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes	2020-08-12 17:55:02 +05:30
Rucha Mahabal	e0cc421e50	fix: TypeError while setting transfer_qty in Stock Entry (#22929) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-12 14:33:30 +05:30
Shivam Mishra	2fe5d76fe4	Merge branch 'develop' into item-image-alt	2020-08-11 14:45:55 +00:00
Anupam Kumar	79d731dcd8	feat: Naming series for Sales/Purchase Return (#22942) ... * feat: adding return naming series * Update purchase_invoice.json Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-11 16:11:20 +05:30
Shivam Mishra	ded9f41cce	refactor: update confusing label	2020-08-10 12:45:07 +05:30
Shivam Mishra	b1f8859121	feat: add alt value in product page	2020-08-07 14:38:40 +05:30
Shivam Mishra	ba4c4f107e	feat: add image alt field in items	2020-08-07 14:34:28 +05:30
Afshan	085061fa21	fix: show or hide section or attributes depending on other attributes… (#22861) ... * fix: show or hide section or attributes depending on other attributes for better UI * Update erpnext/stock/doctype/item/item.js Co-authored-by: Marica <maricadsouza221197@gmail.com> * fix: made has_variants checkbox to read_only if stock_exists Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 14:36:34 +05:30
Suraj Shetty	8d05514260	refactor: Format and sanitise user inputs to search queries. (#22922) ... * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 20:07:30 +05:30
Suraj Shetty	1923ef052c	refactor: Format and sanitise user inputs to search queries. (#22913) ... * refactor: Sanitize whitelisted method inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Format and sanitize tax_account_query inputs Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * refactor: Validate and sanitize search inputs via decorator Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> * style: Minor formatting fix * refactor: Validate and sanitize search inputs using decorator * fix: Typo * fix: Remove unwanted import statement * refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Prssanna Desai <prssud@gmail.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-05 19:42:25 +05:30
Marica	e211bb7a53	fix: Reposition description in Warehouse (#22895)	2020-08-03 20:40:09 +05:30
Marica	4e0989d0cb	fix: Misleading description in Warehouse (#22878)	2020-08-03 14:56:20 +05:30
Marica	dd97524db5	fix: Misleading description in Warehouse (#22877) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 14:55:40 +05:30
marination	d36df92750	fix: Codacy and repositioned Returned Qty in DN Item	2020-07-31 20:22:55 +05:30
marination	ba37fe796c	chore: Delivery Note Return status	2020-07-31 20:01:06 +05:30
marination	66069df020	feat: Return tracking in PR/DN	2020-07-31 15:54:05 +05:30
Shivam Mishra	11111cd9a9	Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui	2020-07-30 21:29:02 +05:30
prssanna	60cdef7d57	fix: add range filters to oldest items chart	2020-07-29 18:06:54 +05:30
Prssanna Desai	9e81bb9a11	fix: add range filters to oldest items chart (#22842)	2020-07-29 17:28:30 +05:30
Deepesh Garg	9119b4c538	fix: Unable to submit backdated stock transactions for different items (#22648) ... * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test	2020-07-28 08:49:44 +05:30
Deepesh Garg	fa28e600b5	fix: Unable to submit backdated stock transactions for different items (#22822) ... * fix: Unable to submit backdated stock transactions for different items * fix: Test cases * fix: Test Cases * fix: Test Cases * fix: Test for stock account JV * fix: Journal Entry Test * fix: Delete unwanted code	2020-07-28 08:49:21 +05:30
Nabin Hait	a8efe8eb5f	Merge branch 'develop' into version-13-beta-pre-release	2020-07-24 11:15:13 +05:30
Afshan	73b86d241c	fix: conversion to float	2020-07-23 21:09:27 +05:30
Afshan	13d2a34548	Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing ... Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing	2020-07-23 20:35:21 +05:30
Afshan	7965f655a2	Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing ... Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing	2020-07-23 20:33:43 +05:30
Afshan	775fbe74c5	fix: fixed the logic	2020-07-23 20:33:07 +05:30
Abhishek Balam	d05a98517d	Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732) ... * new parent updating logic, made requested changes * fix: Increase Length of In Words fields Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 19:01:31 +05:30
Nabin Hait	9389b3625a	Merge branch 'develop' into add-age-range-in-stock-ageing	2020-07-23 18:53:00 +05:30
Saqib	a6f98d48bc	refactor: POS workflow (#20789) ... * refactor: add pos invoice doctype replacing sales invoice in POS * refactor: move pos.py to pos invoice * feat: add pos invoice merge log doctype * feat: ability to merge pos invoices into a sales invoice * feat: [wip] new ui for point of sale * fix: pos.py moved to pos_invoice * feat: loyalty points for POS Invoice * fix: loyalty points on merging * feat: return against pos invoices * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: status fix and set warehouse from pos profile * fix: naming series * feat: merge pos returns into credit notes * feat: add pos list action for merging into sales invoices * feat[UX]: add shortcuts & focus on search after customer selection * feat: stock validation from previous pos transactions * Merge 'fork/serial-no-selector' into refactor-pos-invoice * chore: fix df not found for base_amount precision * feat: serial no validation from previous pos transactions * chore: move pos.py into pos page * feat: pos opening voucher * feat: link pos closing voucher with opening voucher * chore: use map_doc instead of get_mapped_doc for better perf * feat: enforce opening voucher on pos page * feat: [ui] [wip] point of sale beta ui refactor * fix: auto fetching serial nos with batch no * feat: [ui] item details section for new pos ui * feat: remove item from cart * refactor: [ui] [wip] split point_of_sale into components * new payment component * new numberpad * fix pos opening status * move from flex to grids * fix: search from item selector * feat: loyalty points as payment method * feat: pos invoice status * fix a bug with invalid JSON * fix: loyalty program ui fixes * feat: past order list and past order summary * feat: (minor) setting discount from item details * fix: adding item before customer selection * feat: post order submission summary * save and open draft orders * fix: item group filter * fix: item_det not defined while submitting sle * fix: minor bugs * fix: minor ux fixes * feat: show opening time in pos ui * feat: item and customer images * feat: emailing and printing an invoice * fix: item details field edit shows empty alert * fix: (minor) ux fixes * chore: rename pos opening voucher to pos opening entry * chore: (minor) rename pos closing voucher and sub doctypes * chore: add patch for renaming pos closing doctypes * fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation * fix: invoices not getting fetched on pos closing * fix: indentation * feat: view / edit customer info * fix: minor bugs * fix: minor bug * fix: patch * fix: minor ux issues * fix: remove uppercase status * refactor: pos closing payment reconciliation * fix: move pos invoice print formats to pos invoice doctype * fix: ui issues * feat: new child doctype to store pos payment mode details * fix: add to patches.txt * feat: search by serial no * chore: [wip] code cleanup * fix: item not selectable from cart * chore: [wip] code cleanup * fix: minor issues * loyalty points transactions * default payment mode * fix: minor fixes * set correct mop amount with loaylty points * editing draft invoices from UI * chore: pos invoice merge log tests * fix: batch / serial validation in pos ui and on submission * feat: use onscan js for barcode scan events * fix: cart header with amount column * fix: validate batch no and qty in pos transactions * chore: do not fetch closing balances as opening balance * feat: show available qty in item selector * feat: shortcuts * fix: onscan.js not found * fix: onscan.js not found * fix: cannot return partial items * fix: neagtive stock indicator * feat: invoice discount * fix: change available stock on warehouse change * chore: cleanup code * fix: pos profile payment method table * feat: adding same item with different uom * fix: loyalty points deleted after consolidation * fix: enter loyalty amount instead of loyalty points * chore: return print format * feat: custom fields in pos view * chore: pos invoice test * chore: remove offline pos * fix: cyclic dependency * fix: cyclic dependency * patch: remove pos page and order fixes * chore: little fixes * fix: patch perf and plural naming * chore: tidy up pos invoice validation * chore: move pos closing to accounts * fix: move pos doctypes to accounts * fix: move pos doctypes to accounts * fix: item description in cart * fix: item description in cart * chore: loyalty tests * minor fixes * chore: rename point of sale beta to point of sale * chore: reset past order summary on filter change * chore: add point of sale to accounting desk * fix: payment reconciliation table in pos closing * fix: travis * Update accounting.json * fix: test cases * fix: tests * patch loyalty point entries * fix: remove test * default mode of payment is mandatory for pos transaction * chore: remove unused checks from pos profile * fix: loyalty point entry patch * fix: numpad reset and patches * fix: minor bugs * fix: travis * fix: travis * fix: travis * fix: travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 18:51:26 +05:30
Marica	3c8c346227	fix: Pick List empty table and Serial-Batch items handling (#22426) ... * chore: Pick List empty table and serial-batch items handling * fix: Remove console statement * chore: Added tests for batched and batched-serialised item	2020-07-23 17:52:06 +05:30
Shivam Mishra	1358efe896	feat: update icons	2020-07-23 17:02:32 +05:30
Afshan	767ee1cdb8	fix: logic to get other items also other than just 1st one	2020-07-23 15:39:27 +05:30
rohitwaghchaure	d45ff31ff0	fix: incorrect stock after merging the items (#22526) ... * fix: incorrect stock after merging items * fix: Readability fix Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-22 18:24:01 +05:30
Marica	514366654e	fix: Serial No Rename does not affect Stock Ledger Entry (#22746) ... * Revert "fix: Remove rename related code from Serial No (#22627)" This reverts commit 1ec2d962db. * fix: Rename fails on Stock Ledger Entry * fix: Allow Rename in Serial No	2020-07-22 16:40:24 +05:30
Marica	53646cb360	chore: Export Stock Dashboard (#22768)	2020-07-22 16:17:40 +05:30
Afshan	871889220b	style: moved parent warehouse to top section also added a section bre… (#22708) ... * style: moved parent warehouse to top section also added a section break for better look * style: changes display depends on for HTML field Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 20:39:00 +05:30
Afshan	66d4b42df0	fix: update set query for warehouse after changing the company (#22632) ... * fix: update set query for warehouse after changing the company * fix: changed set_query to get_query * fix: variable filter doesn't get updated once set on load hence removed Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-21 19:59:30 +05:30
rohitwaghchaure	f4db8c1c11	Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop ... fix: currency symbol not showing as per company currency in stock balance report	2020-07-17 16:56:22 +05:30
Rohit Waghchaure	2347e69cb9	fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date	2020-07-17 14:50:49 +05:30
Rohit Waghchaure	848568d023	fix: currency symbol not showing as per company currency in stock balance	2020-07-17 14:49:12 +05:30
michellealva	d02465a68f	fix: Update modified timestamp for Delivery Note Item	2020-07-17 10:35:16 +05:30
Rohit Waghchaure	132376750c	fix: incorrect balance qty in stock ledger report	2020-07-15 17:23:17 +05:30
rohitwaghchaure	30030230bf	Merge pull request #22675 from marination/material-request-warehouse ... fix: Dont overwrite default warehouse in Material Request	2020-07-15 15:35:38 +05:30
Rohit Waghchaure	e1b3f16abd	fix: project field added two time in purchase receipt	2020-07-15 12:28:19 +05:30
marination	392f323d2d	fix: Dont overwrite default warehouse in Material Request	2020-07-14 17:03:17 +05:30
Marica	82a606d04b	fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666)	2020-07-14 13:16:28 +05:30
rohitwaghchaure	ac984eb37c	Merge branch 'develop' into project-link-for-all-accounts	2020-07-13 11:50:11 +05:30
Afshan	ccf6b5f640	Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing ... Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing	2020-07-13 11:45:33 +05:30
Deepesh Garg	8cdf33f618	Merge pull request #22635 from deepeshgarg007/item_tax_test ... fix(travis): Item Tax template test	2020-07-11 21:04:31 +05:30
Deepesh Garg	46bcb46422	fix: Do not use random customers	2020-07-11 18:36:32 +05:30
Deepesh Garg	f15ff5fbfa	fix: Test	2020-07-11 13:58:53 +05:30
rohitwaghchaure	d14666e419	fix: incorrect delivered qty in Supplier-Wise Sales Analytics (#22631)	2020-07-09 20:07:10 +05:30
Marica	1ec2d962db	fix: Remove rename related code from Serial No (#22627)	2020-07-09 20:02:18 +05:30
Afshan	a629c9e1bc	style: remove import comment	2020-07-08 19:28:28 +05:30
Afshan	d16d0efde5	feat: added range for age in stock ageing	2020-07-08 19:23:13 +05:30
Michelle Alva	5d514fe4df	fix: grammatical fixes in module onboarding (#22580) ... * fix: grammatical fixes in module onboarding * fix: more grammatical changes for consistency * fix: Reorder Stock Onboarding * fix: update success message * fix: change order of stock onboarding steps Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:25:51 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
rohitwaghchaure	fae570e0a2	Merge pull request #22612 from netchampfaris/fix-item-price-labels ... fix: Remove trailing spaces from labels	2020-07-08 12:14:21 +05:30
Deepesh Garg	addd1e842b	Merge pull request #22568 from ahmadpak/develop ... fix: Item Tax Template permissions as per company	2020-07-08 10:08:53 +05:30
Faris Ansari	8c5c74ca06	fix: Remove trailing spaces from labels	2020-07-08 09:20:13 +05:30
marination	32f3d24dac	fix: Employee benefit application & quality inspection whitelist	2020-07-07 14:31:49 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
Deepesh Garg	92a03aa5db	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-07-06 12:37:28 +05:30
mohammadahmad1990	261ecba3d6	Company field removed from Item Taxes Table	2020-07-03 15:04:28 +05:00
mohammadahmad1990	ad3d44d622	fix: Item Tax Template check on company field	2020-07-03 15:02:39 +05:00
mohammadahmad1990	e39649bc9e	fix: Item Tax Template with no validity	2020-07-03 15:02:03 +05:00
mohammadahmad1990	41c0c9f46b	fix: Item Tax Template	2020-07-03 15:01:49 +05:00
Andy Zhu	b60abb0158	fix: fetch item price in sales invoice ... When create standalone sales invoice, the item price will not be created fetch. By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.	2020-07-03 14:13:15 +12:00
Afshan	bfffd9b01b	made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-02 15:11:45 +05:30
Chinmay D. Pai	ed0bb20e6f	chore: add query functions to whitelist ... Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-02 12:35:41 +05:30
mergify[bot]	47a3524a7d	fix: Stock Onboarding typo and reorder (#22499) (#22503) ... (cherry picked from commit 8732b8caf6) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-29 18:24:25 +05:30
Marica	8732b8caf6	fix: Stock Onboarding typo and reorder (#22499)	2020-06-29 17:38:42 +05:30
rohitwaghchaure	4cc2e70348	Merge pull request #22454 from wojosc/patch-10 ... refactor: update customs_tariff_number.json	2020-06-28 15:07:19 +05:30
Wolfram Schmidt	a97715e464	Update customs_tariff_number.json	2020-06-26 10:24:48 +02:00
Wolfram Schmidt	7f2a3e8c7d	Update customs_tariff_number.json ... Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.	2020-06-25 13:56:32 +02:00
marination	f311f52f6e	fix: Disable Renaming in Serial No	2020-06-25 16:02:18 +05:30
John Clarke	6fd1068af3	Update stock_ageing.py	2020-06-24 07:31:21 -06:00
Deepesh Garg	51ce1e1d4e	fix: Test Cases ... (cherry picked from commit ded3ab1cd7)	2020-06-24 05:38:33 +00:00
Deepesh Garg	12f1f8e111	fix: Move check from Stock Settings to Company Master ... (cherry picked from commit 53d5d16abb)	2020-06-24 05:38:33 +00:00
Deepesh Garg	6e2ca779c5	feat: Accounting entries for service item in Purchase receipt ... (cherry picked from commit c258ac82c5)	2020-06-24 05:38:32 +00:00
rohitwaghchaure	d63c59ced4	Merge branch 'develop' into grn_posting	2020-06-24 10:23:23 +05:30
mergify[bot]	ca8894b0fc	fix: alternative item not working for subcontract (#22386) ... (cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281) Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-06-23 10:42:32 +05:30
Marica	bd5c8573de	fix: Unable to create batched Item (#22393)	2020-06-23 10:32:51 +05:30
Deepesh Garg	edd4aa6faa	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-22 09:59:39 +05:30
Deepesh Garg	ded3ab1cd7	fix: Test Cases	2020-06-22 09:40:15 +05:30
Deepesh Garg	c70eb30e7e	Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting	2020-06-20 11:56:25 +05:30
Deepesh Garg	53d5d16abb	fix: Move check from Stock Settings to Company Master	2020-06-20 11:55:56 +05:30
Marica	383807f72e	feat: Selling Desk, Dashboard and Onboarding (#22055) ... * feat: Selling Desk, Dashboard and Onboarding * chore: Selling Onboarding and fixes in Other onboardings * chore: Dashboard and Number card Fixtures * fix: Escape filters and Reposition Accounts Dashboard shortcut. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-06-19 15:33:21 +05:30
Deepesh Garg	3c63f5b76b	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-06-19 11:41:21 +05:30
rohitwaghchaure	d8683d381b	Merge pull request #22205 from deepeshgarg007/fiscal_year_travis ... fix: Travis(develop)	2020-06-15 16:12:10 +05:30
rohitwaghchaure	25f49d59c5	Merge pull request #22233 from deepeshgarg007/pi_billing_address ... fix: Billing address in for Purchase documents	2020-06-14 15:10:43 +05:30
Deepesh Garg	6760077674	fix: Billing address in for Purchase documents	2020-06-13 22:40:23 +05:30
John Clarke	15e4ea0472	Merge branch 'develop' into clarkejj-patch-1	2020-06-12 07:55:49 -06:00
John Clarke	85f237257a	Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case	2020-06-12 07:22:14 -06:00
Deepesh Garg	c258ac82c5	feat: Accounting entries for service item in Purchase receipt	2020-06-12 18:33:42 +05:30
John Clarke	677978dd00	Update stock_ageing.py ... As reviewer Deepesh Garg advised thanks! batch[0] can be int of float - see line 49 - so change proposed cint to flt	2020-06-12 05:53:24 -06:00
Alirio Castro	faf33072c8	fix: key was mispelled	2020-06-11 23:32:53 -04:00
John Clarke	6b55f66f02	Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ ... Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605	2020-06-11 10:24:48 -06:00
Deepesh Garg	9df4532d14	fix: Travis(develop)	2020-06-11 21:33:43 +05:30
Rohan	d60d2e1826	fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) ... * fix: only auto-set serial nos and batches if allowed in Stock Settings * fix: bug with setting disabled batch no in Pick List * fix: remove auto-set batch variable Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-06-10 19:10:56 +05:30
rohitwaghchaure	3a9c1b23db	Merge pull request #22096 from marination/valuation-rate ... fix: '>=' not supported between instances of 'str' and 'int'	2020-06-10 14:12:13 +05:30
marination	f5b9deea5b	fix: Finished Product Valuation at Repack	2020-06-08 13:02:00 +05:30
Deepesh Garg	407c7bc113	Merge pull request #22067 from marination/item-attribute ... fix: Misleading Error message for Item Attribute.	2020-06-05 11:21:08 +05:30
P-Froggy	6f87f97efe	fix: Wrong Ordered-Status Indicator for Material Request Items (#22118) ... The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status. The qty field used in the code is not in stock uom while the ordered_qty field is. Now, the stock_qty field is used for correct comparison with ordered_qty.	2020-06-05 10:57:07 +05:30
marination	6f7e9d2904	fix: '>=' not supported between instances of 'str' and 'int'	2020-06-03 17:13:58 +05:30
Myuddin khatri	9276d16420	fix(stock): able to create purchase invoice from purchase receipt dashboard ... able to create purchase invoice from purchase receipt dashboard	2020-06-03 11:22:49 +05:30
marination	0df7f0fe9d	fix: Misleading Error message for Item Attribute.	2020-06-01 11:56:33 +05:30
Deepesh Garg	c96bf870e4	fix: Test Cases	2020-05-30 11:46:39 +05:30
Deepesh Garg	36f7710356	Revert "fix: tests depending on global default company" ... This reverts commit 1f20c99ecf.	2020-05-30 11:38:04 +05:30
Deepesh Garg	c897e800ed	Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts	2020-05-29 11:04:20 +05:30
Marica	c2aabb0fbf	fix: Buying Module fixes (#21965) ... * fix: Buying Module fixes * fix: Delete Report files as well * fix: Add Purchase Order Analysis to Stock & Accounting	2020-05-27 20:56:39 +05:30
Marica	a49f045d14	fix: Grammar fixes (#21970)	2020-05-27 20:28:37 +05:30
Rohan	d28854b3c2	fix: throw error if no serial numbers are found in Pick List (#21915) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-26 18:13:25 +05:30
Marica	74a910ae92	fix: title for onboarding step (#21933) ... Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com> Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>	2020-05-26 17:49:34 +05:30
Marica	07f305a1d6	refactor: open link in new tab (#21910)	2020-05-25 16:30:59 +05:30
Rohan	e5395c3ae8	fix: filter batches based on item and warehouse in Pick List (#21780) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-25 15:25:21 +05:30
Marica	dd3e52184c	fix: Added Inactive serial no status (#21848)	2020-05-22 10:48:35 +05:30
rohitwaghchaure	7978907cc8	feat: BOM template (#21262) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-21 18:10:13 +05:30
marination	7afee887a8	fix: Fetch customer into Delivery Note from Pick List	2020-05-21 13:11:48 +05:30
Nabin Hait	939441117a	Merge branch 'marination-purchase-dashboard' into develop	2020-05-19 20:22:48 +05:30
Nabin Hait	e005078c0d	feat: buying module dashboard and onboarding	2020-05-19 20:22:25 +05:30
rohitwaghchaure	aa85e511da	feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-19 19:51:45 +05:30
Nabin Hait	ddec05ee07	Merge branch 'marination-stock-dashboard' into develop	2020-05-19 19:08:58 +05:30
Nabin Hait	8b686a5721	feat: stock module dashboard and onboarding	2020-05-19 19:08:30 +05:30
rohitwaghchaure	f128b1c0c5	refactor: changed the fieldtype from data to small text (#21782)	2020-05-19 19:05:42 +05:30
Marica	e50ca69bb9	Merge branch 'develop' into stock-dashboard	2020-05-19 14:39:31 +05:30
marination	658f29915a	fix: PR and DN trend report charts, group by fixes	2020-05-19 13:58:13 +05:30
marination	64b36dba4f	fix: Changed Form Tour order and grammar fixes.	2020-05-19 13:27:10 +05:30
marination	a5fcaf66f9	fix: Added filters in number Cards	2020-05-19 13:05:22 +05:30
Rohit Waghchaure	34f4a2398b	feat: manufacturing dashboards	2020-05-18 11:57:25 +05:30
rohitwaghchaure	8e3fc5ee6e	fix: incorrect stock valuation for repack entry (#21736)	2020-05-17 20:28:39 +05:30
rohitwaghchaure	5cfbdf4bcb	fix: user not able to view product (#21740)	2020-05-15 19:36:23 +05:30
marination	be5c45a9ae	chore: Fixtures and empty state handling in chart widgets	2020-05-15 13:21:58 +05:30
Saqib	41b47a68b3	fix: item price not fetching when customer is unset in item price (#21488) ... * fix: item price not fetching when customer is unset in item price * fix: item price of selling type has hidden supplier value * fix: remove test variable * fix: test * patch: invalid customer/supplier based on item price type * fix: invalid query * fix: patch Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-05-15 04:24:36 +05:30
marination	3f7678416f	chore: Stock Onboarding	2020-05-15 04:13:02 +05:30
marination	bb95cd5fd8	chore: Added Dynamic Charts to DN and PR Trends Reports	2020-05-15 01:33:43 +05:30
marination	10bd2417ff	feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source	2020-05-14 15:35:18 +05:30
marination	021acd0a01	chore: Stock Ageing and Item Shortage Reports with Charts	2020-05-14 13:20:43 +05:30
Marica	97715f2877	fix: Message for missing valuation rate (#21686)	2020-05-11 20:45:37 +05:30
Deepesh Garg	ece1b4bc5a	Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry ... fix: '<' not supported between instances of 'str' and 'int'	2020-05-11 12:27:20 +05:30
Rohit Waghchaure	3a914a7cd7	fix: '<' not supported between instances of 'str' and 'int'	2020-05-11 11:44:45 +05:30
marination	65123d2adc	fix: Item Barcode stays the same after updation.	2020-05-08 16:30:46 +05:30
rohitwaghchaure	8b9574d434	Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report ... fix: local variable 'lft' referenced before assignment	2020-05-08 15:39:24 +05:30
Rohit Waghchaure	074ea2f882	fix: local variable 'lft' referenced before assignment	2020-05-08 15:33:35 +05:30
rohitwaghchaure	9de26f6648	fix: list index out of range (#21613)	2020-05-07 12:06:47 +05:30
Marica	5e3d8050aa	fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724) ... * fix: Handle rows with same item code from Purchase Receipt to Invoice. * fix: Added patch, fixed tests, fixed delivery note behaviour * chore: Added comments amd fixed typo * fix: Added patch to patches.txt * fix: Patch fix and simplification, json timestamp updation. Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-05-05 14:37:39 +05:30
Deepesh Garg	6df581f78b	Merge pull request #21375 from marination/commonify-warehouse-autofill ... chore: Commonify auto-filling warehouses in child tables	2020-05-03 20:33:45 +05:30
rohitwaghchaure	268df35d80	Merge pull request #21516 from marination/stock-balance-cleanup ... chore: Added company filter and minor cleanup in Stock Balance Report	2020-05-03 16:31:34 +05:30
Nabin Hait	da17f9cb05	feat: Run MRP at parent level in the production plan (#21545) ... * enhance: provision to make material request from other location * fix: source warehouse for material transfer from production plan Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2020-05-01 18:16:25 +05:30
Deepesh Garg	998364d636	fix: Update timestamp	2020-05-01 12:04:13 +05:30
Deepesh Garg	6cce75a230	Revert "fix: Update in field type"	2020-05-01 12:03:18 +05:30
Deepesh Garg	e2de2923e2	Merge pull request #21420 from wojosc/patch-8 ... fix: Update in field type	2020-05-01 11:38:23 +05:30
rohitwaghchaure	be16e5cccc	fix: 'NoneType' object is not iterable (#21537)	2020-05-01 10:50:17 +05:30
marination	3568dc75be	fix: Make Company the first filter	2020-05-01 00:01:37 +05:30
marination	89c41d8384	chore: Added company filter and minor cleanup in Stock Balance Report	2020-04-30 13:56:49 +05:30
Deepesh Garg	758f0f0780	Merge branch 'develop' into patch-8	2020-04-30 11:37:27 +05:30
Deepesh Garg	2a9c5badc6	feat: Immutable ledger (#18740) ... * fix: Reverse GL entry on cancellation of document * fix: Removed set posting time field for multiple docs * fix: Stop future reposting and reverse entry for purchase receipt and delivery note * fix: Change is_cancelled field from select to check * Revert "fix: Removed set posting time field for multiple docs" This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8. * fix: Multiple fixes in GL Entry * fix: Remove future reporting from doctypes * fix: Canceled entry filters in Stock Ledger and General Ledger Report * fix: Remove print statement * fix: Validation for back dated entries * fix: Codacy fixes * fix: Add ignore links to multiple doctypes * fix: Codacy Fixes * fix: Ignore GL Entry and Stock Ledger entry while cancel * fix: Test case fixes * fix: Patch * fix: Codacy * fix: Budget Test Cases * fix: Patch * fix: Patch * fix: Multiple test cases * fix: changes in make_reverse_entry function * fix: Update patch * fix: Test Cases * fix: Test Case fixes * fix: Move patch upward in patches.txt * fix: Budget Test Cases * fix: Test Case and codacy * fix: Patch * fix: Minor label and UX fixes * fix: Move freezing date check * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Test Case * fix: Remove update_gl_entries_after function * fix: Remove update_gl_entries_after function * fix: Test Cases * fix: Fiscal Year wise backdated entry * fix: Update entries only for current SLE * fix: Remove is_cancelled * fix: Test Cases * fix: Test cases * fix: Test Cases * fix: Uncomment account and stock balance sync logic * fix: Stock balance and Account balance out of sync fixes * fix: Test Cases * fix: Test cases for POS, Stock Reco and Purchase Receipt * fix: Stock Reco tests * fix: Test stock reco precision * fix: Test stock reco for fifo precision * fix: Test stock reco for fifo precision * fix: Stock Entry test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-04-30 10:38:58 +05:30
rohitwaghchaure	20fa73ff9c	Merge pull request #21388 from marination/stock-entry-form-cleanup ... chore: Stock Entry Form Cleanup	2020-04-29 03:13:12 +05:30
marination	6c871d6bcf	fix: Removed Finished Product and Finished Qty columns from Stock Ledger Report	2020-04-28 21:28:53 +05:30
Deepesh Garg	57bfd38944	Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message ... fix: E-Way bill error message	2020-04-27 15:04:32 +05:30
Wolfram Schmidt	acfe8f020f	added time stamp to commit ... added time stamp to commit	2020-04-27 08:48:34 +02:00
Rucha Mahabal	f40a431d8c	fix: delivery trip form	2020-04-27 11:29:56 +05:30
Deepesh Garg	4eecc65cff	fix: E-way bill fix in Delivery Note	2020-04-27 10:50:59 +05:30
Himanshu	c9a1aa8eaa	fix: add dashboard to quality inspection template (#21423)	2020-04-26 23:28:33 +05:30
rohitwaghchaure	733b47c5e6	Merge pull request #21389 from marination/stock-entry-qty ... fix: Issues on qty trigger in Stock Entry Detail	2020-04-26 17:59:45 +05:30
marination	de33029393	fix: Remove callback outside if condition	2020-04-26 17:16:21 +05:30
Wolfram Schmidt	64c7eeed24	Update in field type ... Warrenty Period (in Days) changed from "Data" to "Int".	2020-04-26 10:56:08 +02:00
rohitwaghchaure	8b1c71ea44	fix: work order creation message against material request (#21413)	2020-04-26 09:38:18 +05:30
marination	e1e98fe116	fix: Issues on qty trigger in Stock Entry Detail	2020-04-23 20:18:52 +05:30
marination	f7aa6a8357	chore: Stock Entry Form Cleanup	2020-04-23 19:27:50 +05:30
rohitwaghchaure	28deddeb6f	fix: incorrect out value in stock balance due to precision issue (#21379)	2020-04-23 09:44:58 +05:30
marination	8a30cb2565	chore: Commonify autofilling warehouses in child tables	2020-04-23 00:18:21 +05:30
Nabin Hait	a529a5078f	Update purchase_receipt.json	2020-04-21 13:50:26 +05:30