3258 Commits

Author	SHA1	Message	Date
rahib-hassan	52fd804aed	Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account	2022-04-18 14:13:46 +05:30
Deepesh Garg	5cdd0d6719	fix: Move tax withholding category field	2022-04-16 20:34:56 +05:30
Deepesh Garg	0a67b0239e	fix: Consistent customer and supplier forms	2022-04-16 19:43:59 +05:30
ruthra kumar	13487e2408	test: Sales order analysis report	2022-04-16 12:02:32 +05:30
ruthra kumar	e28e6726f1	fix: SO analysis rpt will fetch SO's without Delivery note as well	2022-04-14 18:37:46 +05:30
rahib-hassan	4130493b58	fix: Label typo	2022-04-14 16:03:08 +05:30
Saqib Ansari	0373347a97	Merge branch 'develop' into separate-discount-account	2022-04-11 14:55:42 +05:30
Ankush Menat	c3e1f0e369	refactor: ignore mandatory fields during setup	2022-04-11 13:19:17 +05:30
Deepesh Garg	02c6b898a6	Merge branch 'develop' into mergify/bp/develop/pr-30385	2022-04-09 19:57:59 +05:30
mergify[bot]	51d77cd85e	fix(pos): cannot change paid amount in pos payments (#30660)	2022-04-09 16:28:10 +05:30
rahib-hassan	1babc5f367	feat: separated discount accounting settings for sales and purchase	2022-04-08 08:05:10 +05:30
Ankush Menat	8d57c853f3	feat: barcode scanning in quotation (#30637)	2022-04-07 21:40:03 +05:30
Sagar Vora	fa4f57f470	fix: dont reassign mutable (list) to a different field	2022-04-07 16:51:27 +05:30
Deepesh Garg	f3e6a26d34	Merge pull request #30499 from ruthra-kumar/payment_terms_status_filter ... feat: 'customer' column and more filter to Payment terms status report	2022-04-07 13:01:16 +05:30
Ankush Menat	ba42c87687	refactor: don't use pandas for basic reports (#30597)	2022-04-06 15:40:41 +05:30
Deepesh Garg	ec6f7040f4	Merge branch 'develop' into mergify/bp/develop/pr-30385	2022-04-06 10:00:51 +05:30
ruthra kumar	16bfb930f8	test: added test cases for group filters	2022-04-05 11:08:09 +05:30
ruthra kumar	b2ed9fd3fe	refactor: use group fields from Sales Order and Sales Order Items	2022-04-04 17:00:47 +05:30
Saqib Ansari	fed66038b5	fix(pos): do not reset search input on item selection (#30537)	2022-04-04 15:59:16 +05:30
ruthra kumar	e324d668d3	refactor: item filters are linked with group filters	2022-04-04 14:52:19 +05:30
Ankush Menat	a896895a9e	fix: bulk fix (~330) missing translations	2022-04-04 13:59:51 +05:30
Deepesh Garg	c58fde2fb2	fix: Add competitor field back	2022-04-02 20:03:46 +05:30
Deepesh Garg	485f5cfdfe	fix: Resolve conflicts	2022-04-02 17:25:29 +05:30
Deepesh Garg	0f6d52c625	Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30385	2022-04-02 17:24:19 +05:30
Ankush Menat	47f27a5171	refactor: move scan api to stock utils; add item_info	2022-04-01 21:11:03 +05:30
Ankush Menat	767b827b59	feat: return batch code while scanning serial no	2022-04-01 21:11:03 +05:30
ruthra kumar	7558f1b078	refactor: adding new filters and column to test cases	2022-03-30 18:50:18 +05:30
ruthra kumar	eaeadbc422	feat: additional filters in payment terms status report	2022-03-30 18:50:13 +05:30
Ankush Menat	76dce2eddc	fix: use name for links not item_code (#30462)	2022-03-29 11:21:03 +05:30
Deepesh Garg	03952f8819	fix(India): Auto tax fetching based on GSTIN ... (cherry picked from commit 7cae669e814a958310ca1b8ee408450569c32d10) # Conflicts: # erpnext/patches.txt # erpnext/regional/india/setup.py # erpnext/selling/doctype/quotation/quotation.json	2022-03-29 04:56:49 +00:00
Ankush Menat	494bd9ef78	style: format code with black	2022-03-28 18:52:46 +05:30
Saqib Ansari	4aabe97565	Merge branch 'develop' into fix-pos-issues-again	2022-03-24 11:18:13 +05:30
Deepesh Garg	405dcb1d3c	fix: Add ignore pricelist for missing flows	2022-03-23 09:04:03 +05:30
Deepesh Garg	66ca085e39	fix: Changing item prices on converting orders/receipts to invoices	2022-03-22 23:03:41 +05:30
Saqib Ansari	aff7408775	fix(pos): allow validating stock on save	2022-03-21 14:08:56 +05:30
Saqib Ansari	4afb47e869	fix(pos): specific case when serialized item not removed	2022-03-21 13:24:11 +05:30
Saqib Ansari	2f82e237ef	fix(pos): customer group filter in customer selector	2022-03-21 12:47:35 +05:30
Saqib Ansari	d5fd8e0ba6	fix: prevent multiple save on applying coupon code	2022-03-21 11:36:30 +05:30
barredterra	36df21067c	refactor: sales analytics	2022-03-20 03:58:24 +01:00
rohitwaghchaure	da16ee159a	Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN ... feat: Create single PL/DN from several SO.	2022-03-17 15:39:45 +05:30
Deepesh Garg	2958f60b46	Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2 ... fix: Do not update ignore pricing rule check implicitly	2022-03-16 12:32:25 +05:30
Deepesh Garg	1f79b47a17	fix: Do not update ignore prcing rule check implicitly	2022-03-16 11:55:43 +05:30
Krithi Ramani	9f7fee7a4f	Added new field in SO - % Picked	2022-03-15 21:40:51 +05:30
Krithi Ramani	a68213d82e	added new field - Picked Qty, in Sales Order Item	2022-03-15 20:18:23 +05:30
Deepesh Garg	2b6e7963f6	Merge branch 'develop' into implicit_pricing_rule_enable	2022-03-14 15:49:21 +05:30
Saqib Ansari	f5f6650779	Merge pull request #30217 from nextchamp-saqib/fix-so-to-po ... fix: cannot create purchase order from sales order	2022-03-14 12:35:32 +05:30
Saqib Ansari	58804b8436	fix: cannot create purchase order from sales order	2022-03-14 12:31:13 +05:30
Deepesh Garg	96b5cedcf8	fix: Do not update ignore prcing rule check implicitly	2022-03-13 17:48:37 +05:30
Deepesh Garg	d596e0e4df	fix: Shipping rule application fixes	2022-03-10 20:56:36 +05:30
Saqib Ansari	baee5d109e	Merge pull request #30110 from nextchamp-saqib/fix-customer-credit-limit-update ... fix: customer credit limit validation on update	2022-03-09 11:42:14 +05:30
Deepesh Garg	9be3bc1dbf	Merge pull request #30080 from deepeshgarg007/item_wise_sales_history ... fix: Item-wise sales history report	2022-03-09 10:18:14 +05:30
Saqib Ansari	1061256358	Merge branch 'develop' into fix-customer-credit-limit-update	2022-03-08 16:01:17 +05:30
Saqib Ansari	a0dc79332d	fix: customer credit limit validation on update	2022-03-08 15:21:27 +05:30
Deepesh Garg	83dd3bd7fc	Merge pull request #29940 from deepeshgarg007/item_discounts_quotation ... fix: Item discounts for quotation and other docs	2022-03-08 09:08:51 +05:30
Deepesh Garg	e2c144e9e3	fix: Item-wise sales history report	2022-03-06 19:05:02 +05:30
Sagar Vora	3d45f3a6a8	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-03-03 10:20:50 +05:30
Saqib Ansari	89f87cee87	Merge branch 'develop' into ordered-qty-for-packed-items	2022-03-02 12:13:56 +05:30
Ankush Menat	afb69b0b7f	Merge branch 'develop' into item_discounts_quotation	2022-03-01 11:49:25 +05:30
Ankush Menat	b0d1e6db54	test(refactor): use FrappeTestCase	2022-02-28 17:23:32 +05:30
Deepesh Garg	1b186682ea	Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check	2022-02-28 12:42:21 +05:30
Saqib Ansari	cde711151e	Merge branch 'develop' into ordered-qty-for-packed-items	2022-02-28 11:35:42 +05:30
Saqib Ansari	81514516f3	fix(pos): coupon code is applied even if ignore pricing rule is check	2022-02-25 15:18:06 +05:30
Sagar Vora	5159e2e6c5	refactor: remove India specific code	2022-02-25 11:36:18 +05:30
Deepesh Garg	0373914704	fix: Commission not applied while making Sales Order from Quotation	2022-02-24 14:42:56 +05:30
Deepesh Garg	3a547cb0d9	fix: Item discounts for quotation	2022-02-22 16:25:32 +05:30
Saqib Ansari	8e3f1e306d	test: po updates packed item's ordered_qty	2022-02-22 15:34:26 +05:30
Saqib Ansari	8005fee656	feat: update ordered qty for packed items	2022-02-22 15:06:19 +05:30
Marica	e952cce17d	chore: Show 'Produced Qty' field in Sales Order Item (#29903)	2022-02-21 14:22:14 +05:30
Saqib Ansari	fa38c291bd	fix(pos): removal of coupon code	2022-02-21 11:38:16 +05:30
Saqib Ansari	2743999785	fix: coupon code is applied even if ignore_pricing_rule is enabled	2022-02-17 16:03:43 +05:30
Deepesh Garg	d251bec380	Merge pull request #29137 from ruthra-kumar/payment_terms_report ... feat: Payment Terms Status report	2022-02-16 14:15:24 +05:30
Deepesh Garg	2f5bfcc055	Merge branch 'develop' into payment_terms_report	2022-02-16 10:06:12 +05:30
Marica	e6fa33012f	Merge branch 'develop' into so-mr-wo-back-update	2022-02-15 17:51:54 +05:30
ruthra kumar	48f37c7659	test: added test for alternate currency ... - Sales Order and Invoice will be submitted in USD with exchange rate of 70 with the default company currency - Report will display in defauly company currency	2022-02-15 17:21:08 +05:30
ruthra kumar	49fdc6c52e	test: refactor and fix failing test case	2022-02-15 17:20:29 +05:30
Ankush Menat	f89a64db48	fix: dont attempt to set batch number if item doesn't have batch no (#29812) ... This causes other triggers and unnecessary changes (e.g. price list)	2022-02-15 16:10:35 +05:30
marination	0ca58d7627	chore: Patch to update SO work_order_qty and Linter fix	2022-02-15 14:28:00 +05:30
marination	f9d52e7346	test: SO > MR > WO flow	2022-02-15 13:38:15 +05:30
ruthra kumar	a4b8d67323	refactor: create invoices list without if else	2022-02-15 12:20:41 +05:30
ruthra kumar	85ed0fb8d6	fix: default to company currency in report output	2022-02-15 12:20:06 +05:30
ruthra kumar	bc244d0740	refactor: currency field and code cleanup	2022-02-14 17:48:16 +05:30
Mohammed Yusuf Shaikh	a3e69cf75d	feat: Bulk Transaction Processing (#28580) ... * feat: Bulk Transaction Processing * fix: add flags to ignore validations and exception handling correction * fix: remove duplicate code, added logger functionality and improved notifications * fix: linting and sider issues * test: added tests * fix: linter issues * fix: failing test case * fix: sider issues and test cases * refactor: mapping function calls to create order/invoice * fix: added more test cases to increase coverage * fix: test cases * fix: sider issue * fix: rename doctype, improve formatting and minor refactor * fix: update doctype name in hooks and sider issues * fix: entry log test case * fix: typos, translations and company name in tests * fix: linter issues and translations * fix: linter issue * fix: split into separate function for marking failed transaction * fix: typos, retry failed transaction logic and make log read only * fix: hide retry button when no failed transactions and remove test cases not rrelevant * fix: sider issues and indentation to tabs Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-02-08 01:00:37 +05:30
Deepesh Garg	4284017e9d	fix: Copyright info	2022-02-07 12:26:01 +05:30
Umair Sayed	104a55aff1	feat: Tab views in Stocks and Accounts Settings (#29638) ... * tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings. * chore: undo changes to creation timestamp happened because of a bug in fw Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>	2022-02-07 10:42:55 +05:30
Deepesh Garg	c5726fd3da	fix: Add test case	2022-02-06 11:35:40 +05:30
Marica	384e6b559b	Merge branch 'develop' into e-commerce-refactor-develop	2022-02-02 21:10:04 +05:30
Saqib Ansari	e082e3f702	fix(pos): pricing rule on transactions doesn't work	2022-02-02 19:33:48 +05:30
Marica	780e29b42e	Merge branch 'develop' into e-commerce-refactor-develop	2022-02-02 10:45:14 +05:30
Saqib Ansari	4557b6a150	Merge branch 'develop' into pos-service-items	2022-02-01 12:25:25 +05:30
Ankush Menat	6cd7c47409	Merge branch 'develop' into e-commerce-refactor-develop	2022-01-31 17:14:36 +05:30
Anupam Kumar	896adc3759	fix: not able to declare opportunity lost without competitors (#29531)	2022-01-31 12:09:54 +05:30
Saqib Ansari	6b377703b3	Merge pull request #29454 from nextchamp-saqib/fix-dn-mapping ... fix(sales order): incorrect no. of items fetched while creating dn	2022-01-31 11:38:57 +05:30
Anupam Kumar	925eca0e4a	fix: multiple CRM fixes (#29507) ... * fix: multiple CRM fixes	2022-01-29 22:32:03 +05:30
Saqib Ansari	4c8408a572	Merge branch 'develop' into fix-dn-mapping	2022-01-29 12:42:19 +05:30
Suraj Shetty	29c7947db0	fix: Further sort sales_order_analysis to get consistent response ... Since the data was sorted by `transaction_date`, report sorting order used to be inconsistent everytime if there were lots of records with same transaction date. This used to create problems while exporting report as "Excel" with filters.	2022-01-27 11:11:37 +05:30
Saqib Ansari	0b9a850a17	chore: add comment	2022-01-25 17:28:28 +05:30
Saqib Ansari	a73ad6759d	fix(sales order): incorrect no. of items fetched while creating dn	2022-01-25 17:12:41 +05:30
rohitwaghchaure	a3ec78991f	Merge pull request #29353 from anupamvs/crm-contact-duplication-develop ... fix: contact duplication on converting lead to customer	2022-01-24 10:16:49 +05:30
Saqib Ansari	53addfda15	fix: sider issue	2022-01-21 12:23:52 +05:30
Saqib Ansari	50c276f64f	fix: bypass_credit_limit_check in credit balance report	2022-01-20 10:56:49 +05:30
Anupam	6ebee9b4c4	fix: changed function name	2022-01-19 13:05:48 +05:30
Anupam	e44c4e007a	fix: contact duplication on converting lead to customer	2022-01-19 12:54:00 +05:30
Subin Tom	845c02a989	fix: remove qty indicator from non stock items	2022-01-17 20:49:11 +05:30
Subin Tom	27b35d72e2	fix: sider fix	2022-01-17 19:53:39 +05:30
Subin Tom	ac9a9fb229	fix: removing get_value call by returning is_stock_item in get_stock_availability method	2022-01-17 19:38:05 +05:30
Shariq Ansari	469bddcadf	fix: minor fix	2022-01-13 19:50:26 +05:30
Shariq Ansari	bc187c121a	fix: updated standard workspace json files	2022-01-13 19:24:11 +05:30
Saqib Ansari	aef432ee2f	fix: description not fetched in sales order analytics report (#29230)	2022-01-12 13:11:21 +05:30
Marica	b5abf68b0d	Merge branch 'develop' into e-commerce-refactor-develop	2022-01-12 02:52:03 +05:30
ruthra	4535a7a301	test: qty and rate changed to remove need for fractional Nos	2022-01-05 10:46:32 +05:30
ruthra	edd980acdc	refactor: remove unused imports	2022-01-05 10:43:20 +05:30
ruthra	9f1e68801d	test: fix failing test case payment terms status	2022-01-05 10:11:19 +05:30
Subin Tom	19bb01c973	fix: POS items added to cart despite low qty (#29126)	2022-01-04 19:14:40 +05:30
Saqib Ansari	f4db474be0	fix: minor issues (#29130)	2022-01-04 19:12:19 +05:30
ruthra	1bac793083	feat: Payment Terms Status report ... - calculate status at runtime for payment terms based on invoices - invoices are used in FIFO method	2022-01-04 15:53:41 +05:30
Subin Tom	9e20fa85c1	fix: Removed validate_non_stock_items, filter_service_items methods	2022-01-03 14:46:53 +05:30
Subin Tom	6b973d658c	fix: sider issues	2022-01-03 10:47:13 +05:30
Saqib Ansari	689e08aca3	Merge branch 'develop' into pos-service-items	2021-12-29 14:55:20 +05:30
Anupam Kumar	1c0fa3c231	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-12-28 10:34:16 +05:30
Anupam Kumar	cfb6b26e47	fix: contact duplication on converting lead to customer (#29001) ... * fix: contact duplication on converting lead to customer * fix: added test case	2021-12-24 19:13:28 +05:30
Subin Tom	ec37930404	fix: Allowing non stock items in POS	2021-12-22 19:14:47 +05:30
Anupam Kumar	27448b9009	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-12-21 15:47:33 +05:30
Anupam Kumar	c847130ae9	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-12-21 12:52:09 +05:30
Saqib	da67403bbd	Merge branch 'develop' into so-days-taken-to-deliver	2021-12-21 12:41:48 +05:30
Subin Tom	98d417602f	fix: Added filter for dispatch address (#28937)	2021-12-21 12:35:44 +05:30
Anupam Kumar	a8637cc7b8	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-12-21 11:27:47 +05:30
Ankush Menat	f5d5281119	chore: drop deprecated qunit tests	2021-12-20 17:03:10 +05:30
Anupam Kumar	603b367568	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-12-17 19:22:27 +05:30
Anupam	31ac1011b8	feat: made carry-forward comments/communication configurable and added test cases	2021-12-17 19:21:08 +05:30
Saqib	56bc8a52f4	Merge branch 'develop' into home-onboarding	2021-12-15 10:40:40 +05:30
Saqib	8aa9481a11	Merge branch 'develop' into so-days-taken-to-deliver	2021-12-15 10:36:47 +05:30
ruthra	9232f75998	refactor: change field to duration and fetch elapsed seconds	2021-12-14 19:45:09 +05:30
Ankush Menat	96ef88d935	test: remove commits from tests (#27939) ... * test: remove commits from tests in selling module * test: remove commits from manufacturing module * test: remove commits from accounts module tests * test: remove commits from controller tests * test: keep commits in accounting dimension test * Revert "test: remove commits from controller tests" This reverts commit f5cfbee5da844f8b2bffeee907ac602754f16ff4. * Revert "test: remove commits from accounts module tests" This reverts commit df4c27efddf355e2731a18e8871e54d18590f219.	2021-12-14 17:36:35 +05:30
Anupam Kumar	ea5e155823	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-12-14 16:42:59 +05:30
Jannat Patel	74d086ffd1	Merge branch 'develop' into home-onboarding	2021-12-13 17:51:38 +05:30
ruthra	2813e5ee29	feat: new column 'Time taken to Deliver' in sales order analysis	2021-12-13 12:26:23 +05:30
Sagar Sharma	6485ac4e59	fix: misleading "Set Default X" fields after saving (#28798) ... * fix: misleading "Set Default X" fields after saving * refactor: remove unncessary code and minor formatting * fix: extend to more doctypes and correct fieldnames Co-authored-by: Ankush Menat <ankush@frappe.io>	2021-12-09 17:04:00 +05:30
Ankush Menat	6efbbb1058	fix: ignore mandatory fields while creating WO from SO (#28772) ... If fields are made mandatory from customizations the WO creation simply fails.	2021-12-07 16:26:14 +05:30
Anupam Kumar	3928a402d4	feat: CRM Settings (#27788) ... * feat: crm settings * feat: CRM Settings * feat: lead and opprtunity section * feat: added CRM Settings in ERPNext Settings workspace * fix: review chnages * added patch * fix: linter issues * fix: linter issues * fix: linter issues * fix: removed crm settings from selling module * fix: raw query to frappe.qb * fix: removed hardcoded value * fix: linter issue * fix: simplify CRM Settings migration patch Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-12-06 13:52:00 +05:30
Ankush Menat	105b6d498c	fix: remove bad defaults from selling settings ... "All cusotmer groups" and "All territories" are pointless defaults, not sure why these are made default. They don't help you track anything. "All" might as well be `Null`. Even the filters for customer_group suggest it shouldn't be group then having the root as default makes no sense.	2021-12-06 11:07:24 +05:30
Ganga Manoj	dc3449c304	Merge branch 'develop' into product-bundle-fixes	2021-12-01 23:27:40 +05:30
Raffael Meyer	e10ab1626c	feat: Grant commission on certain items only (#27467) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-11-30 17:54:18 +05:30
Ankush Menat	aeb62af544	fix(ux): remove attachment limits	2021-11-30 12:46:53 +05:30
Anupam Kumar	83e3e58fe9	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-11-30 10:11:23 +05:30
Subin Tom	2f6a6afaa8	feat(pos): Total item qty field to POS screen (#28331)	2021-11-29 20:35:49 +05:30
Anupam Kumar	d4f57d3a4f	Merge branch 'develop' into crm-carry-forward-communication-comments	2021-11-29 12:15:03 +05:30
Jannat Patel	8cc1dc8079	Merge branch 'develop' into home-onboarding	2021-11-29 10:24:06 +05:30
Shariq Ansari	2a5f663a1e	fix: Customer, Supplier heatmap data not rendering (#28553) ... * fix: adding get_timeline_data import on supplier.py, customer.py	2021-11-26 12:58:43 +05:30
GangaManoj	c9743185c6	fix: Remove unnecessary comma	2021-11-24 21:58:42 +05:30
GangaManoj	adfd519139	fix: Test Product Bundle price calculation when there are multiple Product Bundles	2021-11-24 21:58:05 +05:30
GangaManoj	325923afc7	fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table	2021-11-24 21:47:06 +05:30
Jannat Patel	5b2ba24563	fix: company tour	2021-11-24 19:19:45 +05:30
Saqib	136dd4f801	Merge branch 'develop' into product-bundle-fixes	2021-11-24 11:27:12 +05:30
Subin Tom	1909bb569e	fix: POS Item cart only taxes with amount displayed (#28501)	2021-11-23 10:35:43 +05:30
GangaManoj	406278b5c1	fix: Add bundle items to PO only if the Product Bundle was selected from the SO	2021-11-23 04:51:53 +05:30
Subin Tom	fce4f34325	fix: POS string translation (#28381)	2021-11-22 13:34:26 +05:30
Saqib	78851ecb70	feat: create party link from customer/supplier (#28387) ... * feat: create party link from customer/supplier * test: create_party_link method	2021-11-22 12:23:23 +05:30
Anupam	6210f10207	fix: linter issues	2021-11-19 10:32:04 +05:30
Anupam	6dda1548bc	fix: linter issues	2021-11-19 10:22:50 +05:30
Anupam	6eb779392e	feat: carry forward communication and comments throughout the sales cycle	2021-11-19 10:13:05 +05:30
Rohit Waghchaure	7472760ea3	fix: performance to submit the JV	2021-11-17 11:16:52 +05:30
marination	929a24ea5c	feat: Cart minor UI/UX Refresh ... - Added Setting to show or hide price if checkout is disabled - Show Web Item name in cart instead of Desk Item name - Cart minor UI Refresh: added images in cart - Cart minor UI Refresh: repositioned remove button and redesigned - Cart minor UI Refresh: Payment Summary section - Cart minor UI Refresh: Disable input on free item - Cart minor UI Refresh: Add address button in cards - New file for cart payment summary UI with coupon code (old)	2021-11-16 17:03:17 +05:30
marination	f9929ed8a6	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-11-16 16:06:07 +05:30
Deepesh Garg	ce06aaa0ae	Merge pull request #27735 from GangaManoj/fix-so-cancellation-message ... fix: Sales Order cancellation message	2021-11-15 18:51:30 +05:30
Sagar Sharma	2eccb7a1ca	fix: Work order creation from sales order (#28388) ... * fix: Work order creation from sales order * chore: formatting Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2021-11-15 16:08:15 +05:30
rohitwaghchaure	0157da57b5	Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person ... fix: commission rate not fetch from sales person	2021-11-11 19:11:31 +05:30
Rohit Waghchaure	4d4bfa2333	fix: commision rate not fetch from sales person	2021-11-10 00:00:38 +05:30
Anupam Kumar	6954dd6329	feat: Competitor Tagging in Opportunity and Quotation (#28050) ... * feat: Competitor Tagging in Opportunity and Quotation * fix: review changes * fix: linter issue * fix: section label Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-11-09 19:36:27 +05:30
Ankush Menat	8fe5feb6a4	chore: remove all six compat code	2021-11-05 11:16:29 +05:30
Ankush Menat	6098e92ba9	chore: remove utf-8 compat code	2021-11-05 11:16:29 +05:30
marination	734b57deec	fix: Serial Nos not set in the row after scanning in popup ... - Avoid whitspaces while calculating length of serial nos	2021-11-02 18:34:55 +05:30
Deepesh Garg	051aaa708d	fix: Ignore PO on So cancel	2021-10-29 11:35:34 +05:30
GangaManoj	1a9d2684e2	fix: Remove debugger	2021-10-28 19:27:45 +05:30
Deepesh Garg	8e2b4ef456	Merge branch 'develop' into unlink-po-on-cancelling-so	2021-10-28 14:44:34 +05:30
Faris Ansari	c8d0d9ece9	Merge pull request #28048 from netchampfaris/print-format-builder-templates ... feat: Taxes template for selling/buying doctypes	2021-10-28 12:33:21 +05:30
Saqib	cc07c71bbd	Merge branch 'develop' into fix-so-cancellation-message	2021-10-27 15:19:18 +05:30
GangaManoj	4789c3423d	fix: Linters	2021-10-27 05:25:32 +05:30
GangaManoj	07b25c4275	fix: Import statements	2021-10-27 05:20:31 +05:30
GangaManoj	54a0f5d04f	fix: Make import statements fit conventions	2021-10-27 05:15:44 +05:30
GangaManoj	6dbc47f225	fix: Rename variables	2021-10-27 05:09:44 +05:30
GangaManoj	7454167725	fix: Remove redundant code	2021-10-27 05:08:11 +05:30
GangaManoj	69e011bf6a	fix: Add test to check if SO can be cancelled after linked Work Order has been submitted	2021-10-27 05:07:16 +05:30
GangaManoj	9ec24d4915	fix: Add test to check if SO can be cancelled after linked Maintenance Visit has been submitted	2021-10-27 04:46:59 +05:30
GangaManoj	80ce3e6de7	fix: Add test to check if SO can be cancelled after linked Maintenance Schedule has been submitted	2021-10-27 04:17:21 +05:30
GangaManoj	60119f5ce5	fix: Remove redundant validations	2021-10-26 21:42:58 +05:30
GangaManoj	aac574579a	fix: Add test to check if SO can be cancelled when linked DN has been submitted	2021-10-26 21:42:58 +05:30
GangaManoj	21798d8836	fix: Add test to check if SO can be cancelled when linked SI has been submitted	2021-10-26 21:42:58 +05:30
Deepesh Garg	cd4b20313e	fix: Test case fixes and linting issues	2021-10-25 11:21:55 +05:30
Deepesh Garg	e3ae8d5a1e	fix: Move PAN field from standard doctype to fixtures for India	2021-10-24 17:24:25 +05:30
Faris Ansari	8b547e39a8	feat: Taxes template for selling/buying doctypes ... Depends on the new Print Format Builder frappe/frappe#14134	2021-10-21 12:06:02 +05:30
Shariq Ansari	790c1cda6f	fix: Removing unused fields from workspace JSON files #27612 ... fix: Removing unused fields from workspace JSON files	2021-10-13 16:18:20 +05:30
marination	fd6f3c6b88	Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop	2021-10-12 18:24:21 +05:30
Ankush Menat	8d69ec72a6	fix: remove transaction commit from tests	2021-10-12 16:17:15 +05:30
marination	025574d9b5	chore: Removing Item's Website section & references ... - Removed old onboarding slide json and `create_onboarding_docs` methods - Removed website sections from Item master - Removed references to item website fields - Shifted Item doctype website methods to Website Item - Removed WebsiteGenerator from Item doctype - Website Items in Homepage Products section - Removed redundant code from item_group.py - Fix: Item field filters won’t appear in website	2021-10-12 16:03:19 +05:30
marination	eef9cf152f	chore: Drive E-commerce via Website Item ... - Removed Shopping Cart Settings - Portal fully driven via E Commerce Settings - All Item listing querying will happen via ProductQuery engine only - Product Listing via Website Items - removed redundant code - Moved all website logic from Item to Website Item	2021-10-12 15:48:06 +05:30
mergify[bot]	e85c6e3fc5	fix: SO delivery Date not getting set via data import (#27862) (#27864) ... * fix: SO delivery Date not getting set via data import * fix: logic to add delivery dates * fix: linting issue Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Afshan <afshan13k@gmail.com> (cherry picked from commit d9a219850a02539f82929b5d5490554835fcde8b) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-10-08 13:19:56 +05:30
Afshan	4c16bd5c73	Merge branch 'develop' into fix-so-cancellation-message	2021-10-05 11:52:48 +05:30
Komal-Saraf0609	b483f173a6	fix: Merge "Accounting Ledger" and "Accounts Receivable" in "View" button (#27769) ... * fix: Added a new button "View" and merged "Accounting Ledger" and "Accounts Receivable" into it * fix: sider issues * chore: dead code	2021-10-04 15:42:43 +05:30
GangaManoj	6e5a3c0ea4	fix: Display draft invoices only once in error message	2021-10-02 02:15:17 +05:30
GangaManoj	99edc9c83a	fix: Display message to delete linked invoices in the draft state	2021-10-02 02:03:29 +05:30
Deepesh Garg	b39f8a6215	fix: Ignore user permission for Represents Company field in Sales and Purchase docs (#27684) ... * fix: Ignore user permission for Represents Company field in Sales and Purchase docs * fix: Ignore user permission for fiscal year company	2021-09-29 15:54:35 +05:30
Abdullah A. Zaqout	6d8e869a92	fix(pos): check if item exists before fetching available qty (#27581)	2021-09-20 21:35:37 +05:30
GangaManoj	8396f24e70	fix: Unlink PO on cancelling SO	2021-09-20 19:01:46 +05:30
Deepesh Garg	759f2b7920	fix: Autoname for customer and supplier (#27398)	2021-09-15 10:24:26 +05:30
DeeMysterio	aa82624f31	Merge pull request #27281 from DeeMysterio/party-specific-items ... feat: link items to supplier / customer	2021-09-14 13:58:18 +05:30
Deepesh Garg	c7ceb37b63	Merge pull request #27465 from nextchamp-saqib/so-analytics-report-fix ... fix: cancelled sales invoices are considered in billed qty calculation	2021-09-14 10:05:36 +05:30
Saqib Ansari	44139fbac5	fix: cancelled sales invoices are considered in billed quantity calculation	2021-09-13 16:50:11 +05:30
Saqib	a5baf909b7	fix: editable price list rate field in sales transactions (#27455)	2021-09-13 15:50:20 +05:30
Subin Tom	8b4c57ee09	fix: pos payment mode selection issue (#27409)	2021-09-09 19:33:34 +05:30
Saqib	98696c0ec9	Merge pull request #27306 from GangaManoj/fix-selling-settings ... fix: Move related fields together in Selling Settings	2021-09-03 12:30:02 +05:30
GangaManoj	ebdc568e85	fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle'	2021-09-02 19:32:51 +05:30
Chillar Anand	915b34391c	chore: Clean up imports (#27302) ... * chore: Added isort to pre-commit config * chore: Sort imports with isort * chore: Clean up imports with pycln * chore: Sort imports with isort * chore: Fix import issues * chore: Clean up sider issues * chore: Remove import errors from flake8 ignore list * chore: Clean up lint issues	2021-09-02 16:44:59 +05:30
Saqib	366012817f	Merge branch 'develop' into fix-selling-settings	2021-09-02 11:13:52 +05:30
Saqib	a158b825fc	Merge pull request #27124 from GangaManoj/gross-profit-product-bundle ... feat: Improve Product Bundle handling	2021-09-02 11:12:56 +05:30
GangaManoj	799d67d785	fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked	2021-09-01 22:55:10 +05:30
GangaManoj	f2a7fbd126	fix: Remove redundant description	2021-09-01 22:49:05 +05:30
GangaManoj	06484321d1	fix: Move related fields to the same section	2021-09-01 22:48:09 +05:30
Ankush Menat	b147b85e6a	chore: whitespace / eof fixes	2021-09-01 16:57:21 +05:30
GangaManoj	bbb9fa4bf8	fix: Remove Rate from field_no_map	2021-09-01 16:00:59 +05:30
GangaManoj	471fd9718c	fix: Set Product Bundle's Delivery Dates in SO as Bundle Items' Delivery Dates in PO	2021-09-01 15:36:07 +05:30
Ankush Menat	7d9819f352	fix: remove duplicate imports	2021-09-01 15:33:35 +05:30
GangaManoj	4d8f833cc9	fix: Remove Add Row and Delete Row options for Packed Items table	2021-09-01 15:20:40 +05:30
GangaManoj	17a6a9b036	fix: Uncheck read-only for Packed Items table	2021-09-01 15:13:29 +05:30
GangaManoj	0e457265b7	fix: Test Product Bundle price calculation	2021-09-01 02:50:29 +05:30
GangaManoj	0c3d3bb357	fix: Test if Product Bundles are mapped properly on creating a Sales Order	2021-09-01 02:33:53 +05:30
GangaManoj	912bfb234f	fix: Test if Product Bundles in SOs are replaced with their child items on creating POs	2021-09-01 02:09:46 +05:30
Ganga Manoj	82118975e2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-31 22:08:10 +05:30
GangaManoj	65796853f3	fix: Map Packed Items to Items table of PO	2021-08-31 20:31:22 +05:30
Afshan	763450dcf8	Revert "fix: add child item groups into the filters (#26997)" (#27266) ... This reverts commit c60d5523bc.	2021-08-31 19:07:20 +05:30
GangaManoj	eb24e87637	fix: Replace Product Bundles in the Items table with their child items	2021-08-31 18:44:29 +05:30
Frappe PR Bot	6281c33dd4	fix: pos payment methods not setting rounded_total (#27260)	2021-08-31 18:39:51 +05:30
Marica	fbcf82f788	Merge branch 'develop' into supplier-primary-address	2021-08-30 12:51:37 +05:30
marination	7b78473da3	fix: Indentation and removed f-strings ... - Sider: fixed indentation in js - Dont use f-strings in queries	2021-08-30 12:50:24 +05:30
GangaManoj	e44567754d	fix: Display Packed/Bundle Items table only if it exists	2021-08-27 20:16:13 +05:30
GangaManoj	a2b394b195	fix: Enable Print Hide for Bundle Items	2021-08-27 20:06:22 +05:30
marination	2a3ef03388	fix: Popup stale build and data consistency ... - Include `supplier_quick_entry.js` in erpnext.bundle.js - Create primary supplier address on update - Set newly created address (quick entry) in Supplier and Customer - Clear address set in supplier and customer on delete (dependency)	2021-08-27 18:06:51 +05:30
Anupam Kumar	212921aace	Merge branch 'develop' into prospect	2021-08-27 15:57:10 +05:30
Kamal Johnson	a285b5b78b	feat: Accounts, Selling & Assets Onboarding cleanup (#27112) ... * refactor: company form fields arrangement * refactor: accounts onboarding steps * refactor: re-arrange fields & modify labels in company form * feat: onbording steps for accounts module * fix: updated onboarding steps for selling module * fix: remove unwanted steps from accounts * feat: add more onboarding steps * feat: Refactor onboarding-module for accounting workspace * feat: Add basic asset onboarding steps * feat: Add basic asset item form tour * feat: Add basic selling onboarding-steps * feat: Add basic form tour for purchase recipt * feat: Add basic form tour for existing asset * feat: Adding asset category form tour * feat: Add form tour for asset category * feat: Refactor sales taxes and charges template form tour with new method * refactor: Remove old form tour for accounts settings * refactor: Change asset category form tour with new tour method * refactor: Change asset item form tour with new tour method * refactor: Change purchase receipt form tour with new tour method * refactor: Change asset form tour with new tour method * refactor: Remove old form tour for selling settings * refactor: general fix/typo in onboarding steps * Apply suggestions from code review Co-authored-by: Nabin Hait <nabinhait@gmail.com> * refactor: Remove old form tour method for sales order. * fix: removed duplicate section break * fix: Removed duplicate fields Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Anuja <anuja.pawar20@gmail.com> Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-08-27 15:47:11 +05:30
Saqib	8008598eb2	Merge branch 'develop' into gross-profit-product-bundle	2021-08-27 14:48:54 +05:30
GangaManoj	535dd2d36d	fix: Move Packed Items table right below the Items table	2021-08-27 02:47:11 +05:30
GangaManoj	4353c5e339	fix: Disable Add Row and Delete Row for Bundle Items	2021-08-27 02:32:34 +05:30
GangaManoj	bdbd4f83ab	fix: Create separate section for Bundle Items	2021-08-27 02:29:47 +05:30
GangaManoj	6c03af815e	fix: Display Bundle Items right below the Items table	2021-08-27 01:14:23 +05:30
Pawan Mehta	db69d1dc00	fix: fetch from more than one sales order in Maintenance Visit (#26924) ... * [fix] #26336 * fix(ux): make customer field reqd for fetching SO Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-08-26 22:54:24 +05:30
Ankush Menat	ae55eab599	chore: remove deprecated and empty QUnit tests (#27179) ... * chore: remove deprecated and empty QUnit tests * ci: fix UI test config Testing library was added on Frappe, in order to reuse command testing library has to be installed during setup process.	2021-08-26 20:43:06 +05:30
marination	45edfd9d50	fix: Remove duplicate create_internal_customer util ... - Introduced via https://github.com/frappe/erpnext/pull/27086	2021-08-26 15:53:52 +05:30
Marica	f4dc9ee2aa	fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) ... * fix: Dont create inward SLE against SI unless is internal customer enabled - Check if is internal customer enabled apart from target warehouse - Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal * test: Use internal customer for delivery of bundle items to target warehouse - created `create_internal_customer` util - reused it in delivery note and sales invoice tests - use internal customer for target warehouse test in delivery note	2021-08-26 13:12:51 +05:30
Anupam Kumar	c8f22e5524	fix: removing toggle_display for address and contact HTML (#27152)	2021-08-26 10:46:55 +05:30
Anupam	efdeee4d1f	fix: conflicts	2021-08-26 00:15:35 +05:30
Anupam Kumar	4d98be2126	feat: provision to create customer from opportunity (#27141) ... * feat: provision to create customer from opportunity * fead: linking of address and contact * revert: create_opportunity_address_contact * enabming print hide and no copy	2021-08-25 19:18:17 +05:30
Ganga Manoj	3e5bbc9aa6	Merge branch 'develop' into gross-profit-product-bundle	2021-08-25 00:55:47 +05:30
GangaManoj	1d82c3effe	fix: Make Rate editable if editable_bundle_item_rates is checked	2021-08-24 22:25:59 +05:30
GangaManoj	a575d05a3e	fix: Make fieldname more concise	2021-08-24 22:09:36 +05:30
GangaManoj	2293ba302a	fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates	2021-08-24 22:04:03 +05:30
GangaManoj	8af5802e42	fix: Populate Bundle Items table	2021-08-24 17:58:23 +05:30
GangaManoj	91af0d6ffb	fix: Add Bundle Items table	2021-08-24 17:57:55 +05:30
Anupam	4a529f8039	feat: Prospect	2021-08-24 09:35:59 +05:30
rohitwaghchaure	129a0fc8b2	Merge branch 'develop' into fixed-donot-overrride-batch-no	2021-08-23 18:07:22 +05:30
Rohit Waghchaure	e1f070437a	fix: selected batch no changed on updation of qty	2021-08-23 14:27:55 +05:30
Saqib	153fe1cdb4	refactor: scan barcode field scanning (#26990)	2021-08-20 11:09:51 +05:30
Afshan	c60d5523bc	fix: add child item groups into the filters (#26997) ... * fix: add child item groups into the filters * fix: appending values to proper variable * fix: refactor the loop	2021-08-19 16:23:18 +05:30
Ankush Menat	4551d7d602	chore: mass trailing whitespace and EOF fixes	2021-08-19 13:43:28 +05:30
Shariq Ansari	b32c2fa561	fix: updated erpnext wspace json files (#26380) ... * fix: updated erpnext wspace json files * fix: updated wspace json files * fix: updated wspace json files * fix: removed padding code from wspace json files * fix: Updated restrict_to_domain in wspace json Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-08-13 12:19:16 +05:30
Deepesh Garg	a7054560da	Merge branch 'develop' into po-payment-terms	2021-08-11 19:31:30 +05:30
Ankush	c1c9c4b68e	Merge branch 'develop' into fix_dn_test	2021-08-11 11:40:15 +05:30
Saqib	b37c6992df	Merge branch 'develop' into po-payment-terms	2021-08-10 13:37:31 +05:30
Anurag Mishra	94beda65ca	fix: updating lead status while customer creation (#26606) ... * fix: updating lead status while customer creation * fix: changes requested	2021-08-10 13:16:46 +05:30
Afshan	f5b5be9644	Merge branch 'develop' into po-payment-terms	2021-08-10 09:32:08 +05:30
Deepesh Garg	802c6b3738	test: Improve test case for not coping payment terms	2021-08-09 18:53:15 +05:30
GangaManoj	55cb82c74d	fix: Compare Payment Schedules	2021-08-09 18:53:14 +05:30
GangaManoj	1200872c7e	fix: Disable automcatically_fetch_payment_terms after running its associated tests	2021-08-09 18:53:13 +05:30
Anupam Kumar	2f06c3e40d	Merge branch 'develop' into lead-cleanup	2021-08-09 16:07:04 +05:30
Anupam Kumar	ef8539fd60	refactor: Selling Settings form cleanup (#26841)	2021-08-09 12:38:14 +05:30
Saqib	668f442139	Merge branch 'develop' into po-payment-terms	2021-08-06 13:42:10 +05:30
Anupam	01a0585ba0	fix: removing organization_lead traceback	2021-08-06 12:21:02 +05:30
Subin Tom	035ce304fe	fix: POS payment modes displayed wrong total (#26708)	2021-08-04 13:57:55 +05:30
Subin Tom	3b7615750a	fix: POS Item Cart non-stop scroll issue (#26692)	2021-08-02 11:37:38 +05:30
Saqib	bbb96899a5	Merge branch 'develop' into po-payment-terms	2021-07-29 17:23:09 +05:30
Anupam	ee1089ca4f	Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module	2021-07-27 16:49:24 +05:30
Anupam Kumar	34353df48c	fix: sales pipeline graph issue (#26626)	2021-07-27 09:47:44 +05:30
Ankush Menat	03a6c38f06	test: fix test due to rename change	2021-07-26 22:24:25 +05:30
GangaManoj	add2030553	fix: Sider issues	2021-07-23 03:58:27 +05:30
GangaManoj	aed39a23dc	fix: Rename tests	2021-07-23 03:45:59 +05:30
GangaManoj	caa106b3bd	fix: Add test to check if payment terms are fetched when creating a Sales Invoice	2021-07-22 22:58:45 +05:30
GangaManoj	4323f4bcac	fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()	2021-07-22 05:57:42 +05:30
Deepesh Garg	3e109840f9	Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales ... feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill	2021-07-21 10:52:10 +05:30
GangaManoj	cde0cc0678	fix: Fetch Payment Terms from Sales/Purchase Orders	2021-07-17 22:53:21 +05:30
Afshan	c66277e06b	fix: improving ux for additional discount field (#26495)	2021-07-15 18:10:17 +05:30
Subin Tom	5265ba39f0	feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill	2021-07-13 14:58:17 +05:30
Saqib	7c5711ddf4	fix: pos item cart dom updates (#26459)	2021-07-13 14:09:06 +05:30
Marica	73c9a21987	Merge branch 'develop' into supplier_defaults_fix	2021-07-13 10:31:10 +05:30
Noah Jacob	0be6583083	refactor: suggested changes	2021-07-12 09:18:19 +05:30
Noah Jacob	34a5cb9106	fix: Sider	2021-07-12 08:48:04 +05:30
Afshan	f4d45d60f4	Revert "fix: updated onboarding steps for selling module" (#26414) ... This reverts commit 446171acc4.	2021-07-09 20:45:43 +05:30
Anuja	446171acc4	fix: updated onboarding steps for selling module	2021-07-09 19:31:44 +05:30
Saqib	2098684bc0	fix(pos): taxes amount in pos item cart (#26410)	2021-07-09 18:09:26 +05:30
Subin Tom	95a15ed85d	fix: value fetching for custom field in POS (#26366)	2021-07-09 14:34:51 +05:30
Noah Jacob	8db974b1b9	test: updated test cases	2021-07-02 22:00:33 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Anupam	03f7609a8b	fix: moving campaign from selling to CRM	2021-06-30 18:18:03 +05:30
Nabin Hait	a57976660a	fix: merge conflict	2021-06-24 19:14:33 +05:30
Saqib	81d164134d	Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13 ... refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:37:51 +05:30
Afshan	9dc625c1c9	fix: validate product bundle for existing transactions before deletion (#25978)	2021-06-24 17:36:39 +05:30
Saqib Ansari	3b12601461	fix: sider issues	2021-06-24 15:03:04 +05:30
Saqib Ansari	e39c3f2e69	fix: add missing semicolons	2021-06-24 15:02:59 +05:30
Saqib Ansari	ea70f6f933	fix: hide images from cart & details	2021-06-24 15:02:53 +05:30
Saqib Ansari	54cc1dedf2	refactor(pos): use pos invoice item name as unique identifier	2021-06-24 15:02:43 +05:30
Saqib Ansari	4d3e748c00	fix: sider issues	2021-06-24 15:01:33 +05:30
Saqib	73aaa1c275	Merge branch 'develop' into pos-fixes-9	2021-06-24 14:31:19 +05:30
Saqib Ansari	8aa0e31bb4	fix: add missing semicolons	2021-06-24 14:29:22 +05:30
Deepesh Garg	4cf0b02ddc	Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty ... fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:57 +05:30
Deepesh Garg	70823b6d9a	fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:17 +05:30
Saqib	08c269510e	Merge branch 'develop' into pos-fixes-9	2021-06-23 10:15:07 +05:30
Saqib Ansari	75ce023170	fix: hide images from cart & details	2021-06-22 21:18:44 +05:30
Saqib Ansari	3b225b13e8	refactor(pos): use pos invoice item name as unique identifier	2021-06-22 21:18:20 +05:30
Subin Tom	219a87d530	fix: disable sales order cancellation if linked to draft invoice (#26125)	2021-06-22 16:28:58 +05:30
Subin Tom	e3a697c582	fix: disable sales order cancellation if linked to draft invoice (#26104)	2021-06-22 16:27:53 +05:30
Noah Jacob	38f105eaee	test: test cases for fetching customer group details	2021-06-21 15:40:13 +05:30
Noah Jacob	89215e44a4	feat: details fetched from customer group in customer	2021-06-21 15:37:17 +05:30
Deepesh Garg	59e2e4989b	fix: Incorrect billed qty in Sales Order analytics	2021-06-17 19:58:16 +05:30
Afshan	8c73f6f19e	fix(pos): pos loyalty card alignment (#26051)	2021-06-16 14:28:26 +05:30
Afshan	d5c172590f	fix(pos): pos loyalty card alignment (#26050)	2021-06-16 14:28:03 +05:30
Saqib	1fd80992d7	fix(pos): 'NoneType' object is not iterable (#26066)	2021-06-16 13:27:34 +05:30
Nabin Hait	0950481253	fix: merge conflict	2021-06-15 20:18:06 +05:30
Nabin Hait	1e2df2c109	fix(pos): 'NoneType' object is not iterable	2021-06-15 19:53:57 +05:30
Ankush Menat	9891780f5a	perf(minor): remove unnecessary comprehensions (port #25645)	2021-06-11 18:40:22 +05:30
Ankush Menat	a9c84f749a	perf(minor): remove unnecessary comprehensions (#25645)	2021-06-11 16:00:48 +05:30
walstanb	646f0c3b53	fix: variable declaration	2021-06-08 17:54:34 +05:30
Saqib Ansari	3f32969bee	fix(pos): broken image in item details section	2021-06-06 11:18:20 +05:30
Saqib Ansari	bc46a9772d	fix(pos): cash shortcuts not working	2021-06-06 11:11:07 +05:30
Saqib Ansari	a85c2c16b4	fix(pos): item rate precision in item selector	2021-06-06 11:07:20 +05:30
Saqib Ansari	311b378328	fix(pos): searching items with barcode or serial no	2021-06-03 12:58:53 +05:30
Nabin Hait	a3d1b6973a	fix: merge conflict	2021-05-31 11:21:33 +05:30
Deepesh Garg	c3d8115ca1	Merge pull request #25849 from nextchamp-saqib/pos-rate-as-identifier ... fix(pos): cannot add same item with different rates	2021-05-29 17:33:11 +05:30
Saqib Ansari	b72b4c0bf9	fix(pos): rendering of broken image on pos	2021-05-28 17:38:01 +05:30
Ganga Manoj	17736afab5	fix(POS): Fix stock availability calculation if negative_stock_allowed is checked (#25859)	2021-05-28 10:03:41 +05:30
Ganga Manoj	8a776a63cd	fix(POS): Add Product Bundles to POS item search (#25860)	2021-05-28 09:56:30 +05:30
Saqib Ansari	3382655b5e	fix: sider issues	2021-05-27 14:27:38 +05:30
Saqib Ansari	45a89a7c67	fix(pos): cannot add same item with different rates	2021-05-27 13:49:45 +05:30
Rakshith N	507a211c81	fix: fetch email id from dialog box in pos past order summary' (#25808)	2021-05-25 19:03:29 +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
Faris Ansari	1483a60b90	fix: super call syntax error	2021-05-19 12:30:11 +05:30
Suraj Shetty	a83d2aacd9	Merge branch 'develop' into esbuild	2021-05-18 14:48:28 +05:30
Afshan	dc205e805f	fix: Dialog variable assignment after definition in POS (#25681)	2021-05-12 17:42:06 +05:30
Afshan	6578c045ca	fix: Dialog variable assignment after definition in POS (#25680)	2021-05-12 17:41:50 +05:30
Saqib	55d47a2baa	fix(pos): UI fixes related to overflowing payment section (#25652) ... * fix: additional fields overflowing in payment section * fix: pos profile filter in pos opening dialog * fix: item quantity pill	2021-05-10 15:59:37 +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
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
Sagar Vora	f43a86d90f	perf: significant reduction in time taken to save a delivery note (#25475)	2021-05-06 16:40:06 +05:30
Afshan	eebc6e9277	refactor: Show item's full name on hover over item in POS (#25554) ... Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-05-04 17:05:12 +05:30
Afshan	df06e49e0c	feat: enable custom field search on POS (#25421) ... * feat: multi lingual item search in POS * fix: limit the options for selection and broken down funtion for geting condition	2021-04-26 22:48:13 +05:30
Saqib	34ce4edf29	fix: cannot scan spacebar character in pos (#25479)	2021-04-26 16:38:57 +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
Saqib	19b73968d7	fix(pos): validations & minor ui issues (#25351) ... * fix: pos print format * fix: stock validation on pos invoice creation	2021-04-22 13:38:20 +05:30
Rakshith N	ceba5774be	fix(pos): special character scanning in point of sale (#25353) ... Co-authored-by: rakshith.n <rakshith.n@promantia.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-04-19 13:21:49 +05:30
Anupam	9d9c256e70	feat: added Disable Rounded Total in sales transactions	2021-04-16 00:11:40 +05:30
rohitwaghchaure	640b5e00ce	Merge pull request #25152 from ankush/customer_duplicates ... fix: disable auto naming of customer during import	2021-04-15 14:46:11 +05:30
Saqib	8798f30808	fix: pos print receipt (#25328)	2021-04-14 15:05:33 +05:30
Nabin Hait	5931931c93	Merge branch 'develop' into customer_duplicates	2021-04-14 11:23:12 +05:30
Deepesh Garg	b717420842	fix: Role to override maintain same rate check in transactions (#25193) ... * feat: configurable action if the same purchase/selling rate is not maintained * fix: Role to override maintain same rate check in transactions Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-14 10:43:45 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305)	2021-04-13 15:46:01 +05:30
Ankush Menat	53ce877ad9	Merge branch 'develop' into escape_sql_credit_report	2021-04-12 14:37:31 +05:30
Saqib	b8a270074e	fix(pos): cannot set qty to less than zero (#25258)	2021-04-12 10:28:05 +05:30
Anupam Kumar	986452107b	fix: Lead Source's module (#24583) ... * fix: Lead Source's module * fix: patch fix	2021-04-09 18:15:51 +05:30
Ankush Menat	87b2a51322	fix: escape sql filters in credit report ... closes #24965	2021-04-03 12:34:34 +05:30
Ankush Menat	e41d48c7de	fix: disable auto naming of customer during import	2021-04-02 14:22:04 +05:30
Sagar Vora	d3ee8c7731	fix: customer creation from shopping cart (#25136)	2021-04-01 18:18:19 +05:30
Marica	bfc2590e3b	Merge branch 'develop' into patch-7	2021-03-31 22:23:23 +05:30
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +05:30
Marica	5a601ce851	Merge branch 'develop' into drop-shipping	2021-03-31 13:12:13 +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
marination	120da991d0	fix: Test ... - Preserve order of supplier list while removing duplicates - Dont use list of set, but list of dict with unique keys	2021-03-31 12:27:57 +05:30
Marica	8451da7924	Merge branch 'develop' into drop-shipping	2021-03-31 11:44:07 +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
Prssanna Desai	8a87ffc8f6	fix: POS print receipt (#24924) ... * fix: POS print receipt * fix: print recepit dialog	2021-03-24 19:52:39 +05:30
Saqib	dd39a6b47c	fix(pos): mode of payments disappear on loading draft pos invoice (#24917)	2021-03-24 17:56:24 +05:30
Walstan Baptista	22054044a3	test: created a new user to test warehouse user perms (#24954) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-20 16:35:14 +05:30
Walstan Baptista	6df61d217f	test: created a new user to test child perms (#24943) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-18 19:23:59 +05:30
Marica	3575314260	Merge branch 'develop' into drop-shipping	2021-03-15 12:53:45 +05:30
Marica	4ceea333a7	fix: POS Opening Entry with empty balance detail rows (#24876)	2021-03-15 12:49:14 +05:30
Anupam Kumar	ed42afc5e8	feat: price margin in buying (#24685)	2021-03-15 11:11:28 +05:30
marination	e685c787d2	fix: Sider (unused variables)	2021-03-12 14:24:09 +05:30
marination	86725a6580	fix: PO not created against all selected suppliers (drop shipping) ... - Return list of created POs instead of first doc - test case added	2021-03-12 14:12:46 +05:30
Rucha Mahabal	c7fff34cf5	fix(travis): Customer Testcase Failing (#24833)	2021-03-10 15:51:44 +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
Ankush Menat	7d892438f0	fix: track setting changes	2021-03-02 17:50:58 +05:30
Saqib	2a1b1537f9	fix(pos): rounded total and search fixes (#24738)	2021-02-26 16:49:28 +05:30
Deepesh Garg	27da2bb63a	fix: Remove unique check from represents company field	2021-02-25 22:39:47 +05:30
Saqib Ansari	85c91ca2db	Merge branch 'develop' into tcs_calculation	2021-02-23 15:56:29 +05:30
Saqib	e07eb86498	Merge branch 'develop' into tcs_calculation	2021-02-11 12:13:47 +05:30
Ankush Menat	df6e20887d	fix: update total in words after updating items (#24602) ... * fix: Update total in words after Updating items Update total in words after Updating items in sales/purchase orders. Port of #24592 Closes ISS-20-21-09425 * test: Add test for total & words after update item Add test for total & words after updating items in sales order.	2021-02-11 11:04:39 +05:30
Saqib	0f2dc0eb73	Merge branch 'develop' into tcs_calculation	2021-02-04 18:38:26 +05:30
prssanna	6f1664223d	style: missing semicolon	2021-02-01 20:43:30 +05:30
prssanna	44a055b52f	Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui	2021-02-01 20:39:20 +05:30
prssanna	73d60aa498	style: fix formatting	2021-02-01 20:38:17 +05:30