brotherton-erpnext

Author	SHA1	Message	Date
Rucha Mahabal	bae2a77d08	Merge branch 'develop' into barredterra-patch-1	2020-08-28 10:43:02 +05:30
Rucha Mahabal	8cdc3b5d91	Merge branch 'develop' into patch-9	2020-08-28 10:41:02 +05:30
rohitwaghchaure	78a32f79df	Merge pull request #23168 from ruchamahabal/fix-appointment-overlap fix: don't overwrite patient appointment duration if already specified	2020-08-28 10:39:25 +05:30
rohitwaghchaure	3018d38940	Merge pull request #23170 from anupamvs/product-contact-us-v13 feat: Added phone field in product Inquiry	2020-08-28 10:38:44 +05:30
rohitwaghchaure	c31ae27227	Merge pull request #23176 from marination/pricing-rule-missing-fix fix: Pricing Rule encoding missing line	2020-08-28 10:37:38 +05:30
rohitwaghchaure	939b95ad3c	Merge pull request #23190 from ruchamahabal/fix-bom-update fix: BOM Update Tool failing due to Too Many Writes error	2020-08-28 10:35:59 +05:30
bhavesh95863	33f984c7af	fix: can't multiply sequence by non-int of type 'float	2020-08-27 21:49:21 +05:30
Rucha Mahabal	c8eea556d1	fix: BOM Update Tool failing due to Too Many Writes error	2020-08-27 18:54:25 +05:30
michellealva	ead2f6abf0	fix: Chage fiedtype of Customer's PO in Sales Invoice	2020-08-27 13:57:15 +05:30
Rucha Mahabal	1bd83e69ee	feat: added Installation Note and Warranty Claim links to Customer dashboard (#23183 )	2020-08-27 13:06:52 +05:30
Marica	e7fabb10e1	Merge branch 'develop' into general-ledger-filters	2020-08-27 11:59:01 +05:30
Afshan	b719620d0c	fix: handleling condition if default company doesn't exist	2020-08-26 20:55:16 +05:30
Afshan	7600960d2b	fix: returned empty list if non US based company	2020-08-26 18:40:11 +05:30
bhavesh95863	bb5d886930	fix: account & cost center filter by company	2020-08-26 18:23:21 +05:30
marination	733fd5f03c	fix: get_applied_pricing_rule in taxes_and_totals	2020-08-26 18:23:12 +05:30
Marica	d741ac6871	Merge branch 'develop' into quoted-item-report-v2	2020-08-26 17:33:13 +05:30
Rucha Mahabal	cf2db41876	Merge branch 'develop' into fix-appointment-overlap	2020-08-26 16:33:27 +05:30
Anupam K	c7830f7107	feat: Added phone field in product Inquiry	2020-08-26 15:28:22 +05:30
Rucha Mahabal	9766adbf4e	fix: don't overwrite appointment duration if already specified	2020-08-26 14:53:23 +05:30
Rushabh Mehta	73f648473f	fix(minor): update_start_end_date_for_old_shift_assignment.py	2020-08-26 14:51:37 +05:30
Rushabh Mehta	a163d8bc84	fix(minor): rename_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	544d18327c	fix(patch): quotation_lost_reason_detail	2020-08-26 14:51:37 +05:30
Rushabh Mehta	38fad58834	fix(patch)	2020-08-26 14:51:37 +05:30
rohitwaghchaure	fe0ecc2ff7	Merge pull request #23144 from anupamvs/product-image fix: Homepage Featured Product image fetch issue	2020-08-26 13:05:50 +05:30
rohitwaghchaure	5f4b5f3f46	Merge pull request #23151 from ruchamahabal/fix-conversion-factor fix: conversion factor for BOM exploded item rate	2020-08-26 13:01:13 +05:30
bhavesh95863	d888a59bd1	fix: set company filter in condition	2020-08-26 12:44:20 +05:30
Abhishek Balam	dc9af639a7	fix: move condition field	2020-08-26 12:26:15 +05:30
Abhishek Balam	7d0bb25aca	fix: dont show message on condition syntax error	2020-08-26 12:22:31 +05:30
Deepesh Garg	f4b939754c	fix: Codacy fixes	2020-08-26 12:10:12 +05:30
Deepesh Garg	29f187f4f3	Merge branch 'develop' into hsn_wise_json	2020-08-26 12:05:59 +05:30
Shivam Mishra	e1e5e3c915	Merge branch 'develop' into iff-invoicing	2020-08-26 11:30:01 +05:30
Michelle Alva	7a927cefbd	fix: Social Media Status hidden in Mobie View (#23158 )	2020-08-26 10:32:26 +05:30
Deepesh Garg	b4a992e6a3	Merge pull request #23156 from ruchamahabal/add-maintenance-visit-link feat: add Maintenance Visit link in Customer and Sales Order dashboards	2020-08-25 21:04:00 +05:30
Anupam Kumar	91461a0016	fix: heading is hidden in the mobile view (#23145 )	2020-08-25 21:01:17 +05:30
Michelle Alva	258b256dc6	fix: Add Delivery Note link in Sales Invoice Dashboard (#23161 )	2020-08-25 20:37:39 +05:30
Rucha Mahabal	12f7aeb147	feat: add Maintenance Visit link in Sales Order dashboard	2020-08-25 19:03:35 +05:30
Rucha Mahabal	5bf0a51ed4	feat: add Maintenance Visit link in Customer dashboard	2020-08-25 18:22:06 +05:30
Rucha Mahabal	d43d1408cf	fix: conversion factor for BOM exploded item rate	2020-08-25 17:13:05 +05:30
Shivam Mishra	de4ac0c905	chore: remove stray tabs	2020-08-25 17:10:05 +05:30
Shivam Mishra	2030b66fc6	feat: add customer link to call log	2020-08-25 17:09:53 +05:30
Anupam K	42092cc377	fix: Homepage Featured Product image fetch issue	2020-08-25 15:29:18 +05:30
Rushabh Mehta	ee921052c0	fix(minor): test dependencies	2020-08-25 14:35:49 +05:30
Rushabh Mehta	b5b8f9e72d	fix(minor): import	2020-08-25 14:14:23 +05:30
Rushabh Mehta	8ad0fa48bf	fix(minor): circular imports?	2020-08-25 12:24:31 +05:30
Rushabh Mehta	ff5d19609f	fix(hot): Pricing Rule encoding fixed	2020-08-25 11:59:57 +05:30
Anupam K	28f4417fc5	fix: added filter show in website for filtering product	2020-08-25 08:59:37 +05:30
Deepesh Garg	07ee7a5bd6	Merge branch 'develop' into dims_in_gl_report	2020-08-24 20:23:19 +05:30
Marica	3e966d6889	Merge branch 'develop' into crm-reports	2020-08-24 19:42:18 +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
marination	8f452b8663	fix: Codacy and indicator message	2020-08-24 18:57:07 +05:30
marination	f49665077c	feat: Quoted Item Comparison Report Enhancements v2	2020-08-24 18:26:48 +05:30
Anupam K	64e84643fb	lost opportunity	2020-08-24 18:01:28 +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
Shivam Mishra	5d6b07558d	Merge branch 'develop' into iff-invoicing	2020-08-24 07:56:01 +00:00
rohitwaghchaure	554e2c2eb7	Merge pull request #23120 from deepeshgarg007/sle_cancel fix: Reverse SLE not created for fraction qty or qty less than 1	2020-08-24 13:25:12 +05:30
rohitwaghchaure	7d8d26bbea	Merge pull request #23106 from ruchamahabal/add-pos-page fix: POS page link not visible on Desk	2020-08-24 12:22:18 +05:30
Mangesh-Khairnar	e292fd6c58	feat: add integrations desk page	2020-08-24 00:45:13 +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
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
Nabin Hait	111183d080	fix: Installation failed due to global variable (#23114 )	2020-08-22 12:31:06 +05:30
Deepesh Garg	1b760cb278	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-21 12:36:21 +05:30
Saurabh	66ff5e5e77	Merge pull request #22990 from saurabh6790/erpnext-before-install-flag-1 fix: check setup complete flag instead setup page	2020-08-21 11:55:38 +05:30
Nabin Hait	1ba62c9732	fix:Validate Job offer against vacancies (#23109 )	2020-08-20 19:39:10 +05:30
Deepesh Garg	cf3e482052	Merge pull request #23105 from deepeshgarg007/rcm_submit_v13 fix: Unable to submit reverse charge invoice	2020-08-20 19:35:25 +05:30
Marica	c23797e350	fix: Create Opportunity without Default Company from Email (#23097 ) * fix: Create Opoortunity without Default Company from Email * fix: Add Prompt to Select Company * Update communication.js Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-20 19:12:12 +05:30
Rucha Mahabal	4061186429	fix: POS page link not visible on Desk	2020-08-20 18:01:20 +05:30
Deepesh Garg	afd2dd3570	fix: Unable to submit reverse charge invoice	2020-08-20 16:52:52 +05:30
rohitwaghchaure	019d4debb2	fix: incorrect stock value in return case (#23102 )	2020-08-20 15:53:58 +05:30
Raffael Meyer	f0b9f660cd	Merge branch 'develop' into datev_refactor	2020-08-20 12:05:50 +02:00
Shivam Mishra	25ba271562	Merge branch 'develop' into fix-margin-for-filter	2020-08-20 08:59:04 +00:00
Shivam Mishra	d5971d3c59	Merge branch 'develop' into iff-invoicing	2020-08-20 08:16:22 +00:00
rohitwaghchaure	5f2463933a	Merge pull request #23061 from DeeMysterio/dev-sort-warehouses-qty feat(queries): sort warehouses based on item quantity in descending manner	2020-08-20 09:36:16 +05:30
Raffael Meyer	585f1f67b7	Merge branch 'develop' into navbar_links	2020-08-19 18:55:44 +02:00
Raffael Meyer	2c26144a6b	Update erpnext/patches/v13_0/add_standard_navbar_items.py	2020-08-19 18:55:06 +02:00
Deepesh Garg	cbedb3de3a	Merge pull request #23089 from deepeshgarg007/rcm_deduction_v13 fix: Do not update total for RCM invoices if net taxes are zero	2020-08-19 20:19:06 +05:30
Deepesh Garg	8aed48fe31	fix: Do not update total for RCM invvoices if net taxes are zero	2020-08-19 18:59:27 +05:30
Rucha Mahabal	eed2a6340c	Merge branch 'develop' into fix-pos-print	2020-08-19 18:57:47 +05:30
marination	22d3729427	fix: Codacy	2020-08-19 15:42:40 +05:30
Deepesh Garg	aaeb3980bc	feat: JSON download for HSN wise outward summary	2020-08-19 15:13:30 +05:30
marination	698d983eef	fix: Item Tax Updation via Update Items in SO/PO	2020-08-19 14:59:46 +05:30
Diksha Jadhav	182ee5e7c1	feat(queries): sort warehouses based on item quantity	2020-08-19 14:04:34 +05:30
Deepesh Garg	1fb1c08872	Merge pull request #23076 from deepeshgarg007/hsn_wise_outward_v13 fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:43:14 +05:30
Deepesh Garg	b240cfe401	fix: Remove print statements	2020-08-19 11:41:43 +05:30
Deepesh Garg	64ebbf0907	fix: Tax amounts in HSN Wise Outward summary	2020-08-19 11:41:33 +05:30
Rucha Mahabal	434bab8003	fix: Print Language for Customer not set for Print Receipt in POS	2020-08-19 01:00:59 +05:30
Deepesh Garg	1c14606c06	fix: Total calculations for multicurrency RCM invoices (#23072 )	2020-08-18 19:32:52 +05:30
Deepesh Garg	9d60e48538	Merge pull request #23067 from rohitwaghchaure/profit-and-loss-report-not-working fix: profit and loss report not working	2020-08-18 17:03:10 +05:30
Rohit Waghchaure	310ade7282	profit and loss report not working	2020-08-18 16:07:24 +05:30
Marica	847343af86	Merge branch 'develop' into general-ledger-filters	2020-08-18 13:40:45 +05:30
Marica	12c68d0450	Merge branch 'develop' into credit-limit-email	2020-08-18 13:39:03 +05:30
Marica	2d767debf1	Merge branch 'develop' into shift_management	2020-08-18 13:27:15 +05:30
Michelle Alva	849b712770	fix: Change spelling of "Successful" (#23063 ) Before: Import Successfull After: Import Successful	2020-08-18 12:06:46 +05:30
Shivam Mishra	115ad3e99a	Merge branch 'develop' into iff-invoicing	2020-08-18 05:51:41 +00:00
Rucha Mahabal	035907a24f	fix: remove Request for Quotation link from Fiscal Year dashboard (#23040 )	2020-08-18 10:57:10 +05:30
Glen Whitney	b2604d1f77	fix(General Ledger): include Accounting Dimension columns in report Prior to this commit, custom Accounting Dimensions are not (by default) shown or even considered in generating a General Ledger report. Moreover, as they are not considered, they are not used to distinguish GL Entry lines in the same voucher with the same Account when the "Group By" value is "Group by Voucher (Consolidated)". This situation leads to lines with different values for the accounting dimension to be ganged together in the General Ledger view of a Journal entry, making the entry difficult for an accountant to read. This commit alleviates the problem by adding a checkbox to control whether Accounting Dimension columns are considered in the General Ledger report. When they are considered, they are displayed and also included in the key that distinguishes lines in the "Group by Voucher (Consolidated)" mode. Resolves #23033.	2020-08-17 20:43:56 +00:00
Deepesh Garg	1067f7ed3e	fix: Price rule filtering in case of no doc	2020-08-17 23:47:58 +05:30
Deepesh Garg	38cabbd4b8	Merge pull request #23007 from prssanna/expense-claim-list-currency fix: add company in list fields to fetch for Expense Claim	2020-08-17 23:07:51 +05:30
Deepesh Garg	aef5c4cb64	Merge pull request #23044 from frappe/sales-analytics fix: Remove dependency of Sales Order in Sales Analytics	2020-08-17 23:00:49 +05:30
Shivam Mishra	eb832f6861	Merge branch 'develop' into iff-invoicing	2020-08-17 12:53:43 +00:00
Marica	4c1ea3e0e3	Merge branch 'develop' into credit-limit-email	2020-08-17 18:10:29 +05:30
Marica	0a926ee20d	Merge branch 'develop' into general-ledger-filters	2020-08-17 18:10:05 +05:30
Marica	11a167f8bb	Merge branch 'develop' into shift_management	2020-08-17 16:39:27 +05:30
marination	205df14a48	fix: Credit Limit Email not working	2020-08-17 16:23:44 +05:30
Anurag Mishra	df7b428331	fix: UI/UX Salary details and salary slip form cleanup (#22536 ) * fix: UI/UX Salary details * feat: salary slip form cleaup * fix(test): set working days zero if salary slip is based on timesheet * fix(revert): set working days zero if salary slip is based on timesheet * fix: salary slip form cleanup Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 14:09:54 +05:30
Marica	39c97bfbe9	Merge branch 'develop' into shift_management	2020-08-17 13:46:51 +05:30
Anurag Mishra	13be09e883	Update update_start_end_date_for_old_shift_assignment.py	2020-08-17 13:43:33 +05:30
Afshan	084de5f0b2	fix: handled condition if staffing isn't created (#22992 ) * fix: handled condition if staffing isn't created * style: reformated code for redability * Update erpnext/hr/doctype/job_offer/job_offer.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-17 13:14:09 +05:30
marination	eb241c6c42	fix: General Ledger filter validation	2020-08-17 12:57:56 +05:30
Anupam K	d7b69e57ae	fix: deleting unused Stock Entry Type	2020-08-17 11:20:56 +05:30
Afshan	5b45961b9d	fix: the JSON object must be str, bytes or bytearray, not "list" (#23047 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-17 10:51:53 +05:30
Deepesh Garg	e1e847a3f7	feat: Enhancement in Loan Topups	2020-08-16 20:57:39 +05:30
Deepesh Garg	a2249e013d	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes	2020-08-15 18:28:04 +05:30
michellealva	e69b2e0da1	fix: Remove dependency of Sales Order in Sales Analytics	2020-08-15 10:16:26 +05:30
Deepesh Garg	d9accededa	fix: filter pricing rules based on condition	2020-08-14 22:36:01 +05:30
Shivam Mishra	fe57ed629e	Merge branch 'develop' into iff-invoicing	2020-08-14 14:31:31 +00:00
Shivam Mishra	736aee886e	Merge branch 'develop' into support-search	2020-08-14 13:36:59 +00:00
Rucha Mahabal	5fb0e7184e	fix: list index out of range error while setting POS payment mode (#23018 )	2020-08-14 17:11:39 +05:30
Suraj Shetty	cab5918244	Merge branch 'develop' into HR-fix	2020-08-14 16:12:28 +05:30
Shivam Mishra	3daa9de998	feat: add email option to field email_id	2020-08-14 13:46:58 +05:30
Shivam Mishra	6b68eaad1e	feat: use email template for membership acknowledgement	2020-08-14 13:46:58 +05:30
Shivam Mishra	b4d3666e69	feat: show send acknowledgement button if enabled in settings	2020-08-14 13:46:58 +05:30
Shivam Mishra	e4c58c37c8	feat: allow member creation via API	2020-08-14 13:46:58 +05:30
Shivam Mishra	98bcedd09c	feat: create member if not already exists	2020-08-14 13:46:58 +05:30
Shivam Mishra	d7139bbd43	fix: type error	2020-08-14 13:46:58 +05:30
Shivam Mishra	87ddec069e	refactor: try block across the function	2020-08-14 13:46:58 +05:30
Shivam Mishra	6fbe9b5404	fix: remove payload	2020-08-14 13:46:58 +05:30
Shivam Mishra	733bde31c9	fix: doctype name in patch	2020-08-14 13:46:58 +05:30
Shivam Mishra	3a67a78ece	feat: add custom buttons for invoice and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	8e0314e7f6	feat: separate invoice generation and email	2020-08-14 13:46:58 +05:30
Shivam Mishra	c8d9e7f77b	feat: add message field	2020-08-14 13:46:58 +05:30
Shivam Mishra	1678eb9b50	feat: drop payload column	2020-08-14 13:46:58 +05:30
Shivam Mishra	62e344188a	feat: update settings and link filters	2020-08-14 13:46:32 +05:30
Shivam Mishra	15340e0c7f	feat: send invoice via email	2020-08-14 13:46:32 +05:30
Shivam Mishra	811ac909f9	feat: add auto invoice creation fields and controllers	2020-08-14 13:46:32 +05:30
Shivam Mishra	96dc67c35e	feat: add copy button and docs link	2020-08-14 13:46:32 +05:30
Shivam Mishra	3a1868dae8	feat: add item field	2020-08-14 13:46:32 +05:30
Shivam Mishra	a16b24d50a	feat: add enable or disable invoicing and print format field	2020-08-14 13:46:32 +05:30
Anurag Mishra	759632c025	fix: requested Changes	2020-08-14 12:26:04 +05:30
Anurag Mishra	6f1579da1f	Merge branch 'develop' into shift_management	2020-08-14 12:11:41 +05:30
Deepesh Garg	8ca57eb5dd	Merge pull request #23022 from marination/loan-amount fix: Validate or Set Loan Amount first	2020-08-13 19:53:09 +05:30
Afshan	d7d92c520e	fix: removed code relating to standard working hours (#23009 )	2020-08-13 19:40:09 +05:30
Deepesh Garg	1151f888ba	fix: Set pledge amount before setting loan amount	2020-08-13 18:52:23 +05:30
bhavesh95863	a647bef682	fix: warehouse mandatory even update stock uncheck (#23023 )	2020-08-13 17:41:55 +05:30
Anupam K	b3bd780d46	fix: codasy dix	2020-08-13 17:07:15 +05:30
Anurag Mishra	f096ba4998	patch: Old Shift Assignment	2020-08-13 14:18:48 +05:30
Anurag Mishra	c2710e05ce	fix: showing on_going shift on calendar	2020-08-13 14:17:47 +05:30
Anurag Mishra	74f0a1ab7c	fix: changes Requested	2020-08-13 14:17:47 +05:30
Anurag Mishra	00a8081aba	Fix: button label	2020-08-13 14:17:47 +05:30
Anurag Mishra	dcf598dc2d	Fix: requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	d5c921e358	Fix: Requested Changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	b48110caf1	Update erpnext/hr/doctype/shift_assignment/shift_assignment.py Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-13 14:17:47 +05:30
Anurag Mishra	3aa1101d5e	fix: requested changes	2020-08-13 14:17:47 +05:30
Anurag Mishra	17e6d0918b	feat: Employee level Shift Request Approver	2020-08-13 14:17:47 +05:30
Anurag Mishra	43ba7dd4c8	feat: don't allow to request for default shift	2020-08-13 14:17:47 +05:30
Anurag Mishra	feef4a6c1e	test: employee checkin	2020-08-13 14:17:47 +05:30
Anurag Mishra	b3e00de0ae	refactor: Shift Request	2020-08-13 14:17:47 +05:30
Anurag Mishra	a6ec7e31d2	test: shift assignment	2020-08-13 14:17:47 +05:30
Anurag Mishra	dd46d19765	feat: map event calendar to show ongoing shift assignment and fixed period assigment	2020-08-13 14:17:47 +05:30
Anurag Mishra	afa98bb39b	feat: Assign shift for period or create ongoing assignment	2020-08-13 14:17:47 +05:30
Abhishek Balam	a25760046f	fix: condition syntax validation readded, fetch item details if condition not met ignoring rule	2020-08-13 13:22:58 +05:30
marination	8264fcd0a5	fix: Only validate repayment if term loan	2020-08-13 12:47:34 +05:30
Abhishek Balam	487aa30aef	fix: eval fail message fix	2020-08-13 12:19:34 +05:30
marination	6988fbb82d	fix: Validate or Set Loan Amount first	2020-08-13 12:17:13 +05:30
Deepesh Garg	ca898c6da3	fix: Condition fix	2020-08-13 11:54:18 +05:30
Deepesh Garg	cbde04d3da	fix: Pass doc instead of args	2020-08-13 11:47:41 +05:30
prssanna	bfb219612e	feat: enable total row in Gross Profit Report	2020-08-13 11:34:05 +05:30
Anupam Kumar	e447c79f9d	fix: Quotation lost reason options fix (#22814 ) * adding patch and lost reason child tables * fix: conflict resolved	2020-08-13 09:20:36 +05:30
Saqib	c7614174d0	fix: cannot change customer fields if credit exhausted (#22838 ) * fix: cannot change customer fields if credit exhausted * fix: order based on company * fix: sort current limits w.r.t company before compare * fix: CustomerCreditLimit Object is not subscriptable	2020-08-13 09:18:59 +05:30
Nabin Hait	e2ee455acc	fix: Calculate taxes if tax is based on item quantity	2020-08-12 20:58:03 +05:30
Abhishek Balam	fdfab03c11	feat: add condition field in pricing rule	2020-08-12 20:33:54 +05:30
Raffael Meyer	94308fc107	Merge branch 'develop' into barredterra-patch-1	2020-08-12 16:14:55 +02:00
Deepesh Garg	21a220e2a5	fix: Update state code and union territory for Daman and Diu (#22988 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-12 19:19:03 +05:30
Rucha Mahabal	cd5821e00a	Merge pull request #23011 from ruchamahabal/fix-asset-maintenance-status fix: don't set asset maintenance log status as Overdue when Completed or Cancelled	2020-08-12 19:17:33 +05:30
Deepesh Garg	617027c6ca	Merge branch 'develop' of https://github.com/frappe/erpnext into navbar_links	2020-08-12 18:39:20 +05:30
Rucha Mahabal	517a6d0054	fix: set draft indicators for Asset Maintenance Log listview	2020-08-12 18:01:45 +05:30
Rucha Mahabal	691ec1bd27	fix: don't set maintenance log status as Overdue when Completed or Cancelled	2020-08-12 18:01:07 +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
Marica	846771cb29	Merge branch 'develop' into item-image-alt	2020-08-12 13:37:19 +05:30
Deepesh Garg	1d5ab618d2	Merge pull request #23001 from nabinhait/inclusive-tax-based-on-item-quantity fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 22:05:02 +05:30
Deepesh Garg	7d0a625b9c	git commit -m "fix: Add missing semicolon"	2020-08-11 22:02:12 +05:30
Nabin Hait	19ea7218d9	fix: Calculate taxes if tax is based on item quantity and inclusive on item price	2020-08-11 20:34:57 +05:30
Shivam Mishra	1679c7af88	Merge branch 'develop' into support-search	2020-08-11 14:54:10 +00:00
Afshan	ba33900712	Merge remote-tracking branch 'upstream/develop' into fix-duplicate-dropdown-PO	2020-08-11 20:17:05 +05:30
Afshan	b5b2586968	fix: referencing frm	2020-08-11 20:15:57 +05:30
Shivam Mishra	2fe5d76fe4	Merge branch 'develop' into item-image-alt	2020-08-11 14:45:55 +00:00
Shivam Mishra	ccdaf3da66	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 14:41:29 +00:00
Deepesh Garg	ca9038feb7	Merge pull request #22998 from abhishekbalam/rename_source_section_opportunity fix(CRM): Change 'Source' section name to 'More Information' in Opportunity	2020-08-11 18:26:09 +05:30
Anurag Mishra	ed6e9550ca	fix: removed payroll from HR. (#22991 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 18:04:42 +05:30
Deepesh Garg	2633e292a5	fix: Is Secured Loan check mapping	2020-08-11 18:03:28 +05:30
Abhishek Balam	d0ae92d4bd	fix: moved company field, renamed to 'More Information'	2020-08-11 17:39:17 +05:30
prssanna	5a7618d8ec	fix: add company in list fields to fetch for Expense Claim	2020-08-11 16:50:31 +05:30
Abhishek Balam	ee5b9c7691	feat(Accounting): Process Statement Of Accounts (#22901 ) * feat: Process Statement Of Accounts initial commit * fix: add jinja supported inputs for subject and body in email settings * feat: utils support in template, tested autoemail, fixed issues	2020-08-11 16:23:47 +05:30
Abhishek Balam	9f6d114265	fix: Change Source section name to 'Company Information'	2020-08-11 16:16:05 +05:30
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
Deepesh Garg	145b80b11c	Merge pull request #22987 from frappe/fix-company-field fix: Consistent capitalization	2020-08-11 16:09:27 +05:30
Deepesh Garg	2621016884	fix: Allocated advance amount for multi-currency payment (#22923 ) * fix: Allocated advance amount for multicurrency payment * fix: Get grand total based on party currency * fix: Remove unwanted code	2020-08-11 16:06:13 +05:30
Abhishek Balam	ef3b82dae2	fix(CRM): Move Source section above Follow Up section In Opportunity (#22974 ) * fix: move source section above follow up * fix: only moving source field to 1st section	2020-08-11 16:05:02 +05:30
Shivam Mishra	3325be1d87	fix: spacing for slideshow (#22996 )	2020-08-11 16:03:46 +05:30
Deepesh Garg	285e059394	Merge pull request #22997 from abhishekbalam/set_opportunity_status_to_converted fix(CRM): Change Opportunity to 'Converted' when Sales Order is created	2020-08-11 16:00:16 +05:30
Abhishek Balam	c992616d35	fix: change opportunity to 'Converted' when items not selected in opportunity itself for making quotation and sales order	2020-08-11 15:22:54 +05:30
Shivam Mishra	c798c6abbd	Merge branch 'develop' into fix-margin-for-filter	2020-08-11 09:11:30 +00:00
Afshan	acc3d42cf0	fix: escape apostrophe in company name if exist (#22956 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-11 14:40:44 +05:30
Shivam Mishra	49dd8782fd	fix: margin overflow cutting the focus state	2020-08-11 14:39:04 +05:30
Rucha Mahabal	19b51762ef	fix: escape fields for Payroll Entry (#22994 )	2020-08-11 13:12:00 +05:30
Rucha Mahabal	f7a7cc08d9	Merge branch 'develop' into escape-company-field	2020-08-11 10:22:32 +05:30
Saurabh	58d05ac0e0	fix: check setup complete flag insted setup page	2020-08-10 19:36:45 +05:30
Jai Chavan	dbbb864ba5	fix: Consistent capitalization	2020-08-10 16:55:03 +05:30
sahil28297	4e4a19d3e6	Merge pull request #22984 from saurabh6790/tax-template-issue fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 16:01:35 +05:30
Deepesh Garg	069a54e5c3	fix: Cancellation of accounting transactions within closed accounting period	2020-08-10 16:01:01 +05:30
sahil28297	e5e0e93229	Merge pull request #22978 from sahil28297/fix_pos_isse_v13 Fix pos isse v13	2020-08-10 16:00:36 +05:30
sahil28297	4ace0829b9	Merge pull request #22983 from saurabh6790/pos Pos	2020-08-10 15:59:39 +05:30
marination	3beeeb589a	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:55:02 +05:30
Deepesh Garg	b1e2cdd4d2	fix: Subscripition link in Customer dashboard (#22960 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 15:53:29 +05:30
Saqib Ansari	cc5b49bff4	fix: [pos] minor bugs	2020-08-10 15:52:32 +05:30
Mangesh-Khairnar	9305e7f1cc	fix: remove mentions of display items in stock (#22963 )	2020-08-10 15:48:33 +05:30
Deepesh Garg	372abaa420	Merge pull request #22976 from marination/sales-taxes-dashboard fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:59 +05:30
marination	0f27500197	fix: Susbcription in Sales Taxes and Charges Dashboard	2020-08-10 15:17:58 +05:30
Saurabh	2547b7479e	Merge pull request #22975 from nextchamp-saqib/pos-fixes-1 fix: [pos] minor bugs	2020-08-10 14:50:53 +05:30
Marica	0fcb05a3aa	fix: Misleading filters on Item tax Template Link field (#22918 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 14:48:13 +05:30
Saqib Ansari	f1091534cd	fix: [pos] minor bugs	2020-08-10 14:45:58 +05:30
Marica	42fbdc09f8	Merge branch 'develop' into opportunity-from-email	2020-08-10 13:48:43 +05:30
Anoop	d3d3db654e	fix: Inpatient Record - Transfer check-in time validation (#22958 ) * fix: inpatient transfer should not allow future checkin time * Update erpnext/healthcare/doctype/inpatient_record/inpatient_record.js Error message corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 13:21:12 +05:30
Deepesh Garg	d626e3bd2e	Merge branch 'develop' into billing_address_fetch	2020-08-10 12:57:12 +05:30
Shivam Mishra	ded9f41cce	refactor: update confusing label	2020-08-10 12:45:07 +05:30
marination	a07973cfa5	fix: Creating opportunity from email	2020-08-10 12:39:42 +05:30
Anurag Mishra	95984fd921	fix: Not able to cancel application,allocation nad encashments	2020-08-10 12:36:00 +05:30
Rucha Mahabal	97ecf52d6f	fix: failing Fees test	2020-08-10 12:13:35 +05:30
Prssanna Desai	5c0439f768	fix: set correct default value from from date in downtime analysis report (#22903 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:12:52 +05:30
Deepesh Garg	bc8a281f83	fix: Subscripition link in Customer dashboard (#22960 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-10 11:00:08 +05:30
Deepesh Garg	41a4999711	Merge pull request #22843 from nextchamp-saqib/asset-adj-dimension-fix fix: cannot submit value adjustment with custom dimension	2020-08-10 10:12:41 +05:30
Deepesh Garg	097d89f550	Merge pull request #22946 from deepeshgarg007/gst_export_wopay fix: GSTR 1 report for exports without payment of Tax	2020-08-10 09:56:12 +05:30
Anupam K	d01caac852	report lead detail	2020-08-10 09:39:58 +05:30
Raffael Meyer	821eeb9852	fix(membership): currency should be a link	2020-08-09 14:07:32 +02:00
Mangesh-Khairnar	a53f15ca35	fix: remove mentions of display items in stock (#22963 )	2020-08-09 13:12:47 +05:30
Deepesh Garg	7882c70244	Merge pull request #22959 from deepeshgarg007/gst_rcm_fixes_v13 fix: Taxable value for RCM	2020-08-08 22:34:36 +05:30
Deepesh Garg	d4ecf426b7	fix: Place of supply fix	2020-08-08 22:33:18 +05:30
Deepesh Garg	5ac2fd94f0	fix: Taxable value for RCM	2020-08-08 22:28:13 +05:30
Deepesh Garg	af1f46f2d9	fix: Add default billing address for purchase documents	2020-08-07 19:44:20 +05:30
Deepesh Garg	72fc188706	Merge pull request #21756 from deepeshgarg007/loan_patch_and_fixes fix: Description for fields and patch for old loans	2020-08-07 17:08:31 +05:30
Deepesh Garg	bad269c354	fix: Parent income account check	2020-08-07 16:21:41 +05:30
Afshan	1f3cc7553c	fix: grand_total assigment before reference	2020-08-07 15:57:31 +05:30
Rucha Mahabal	8118dd9e62	fix: escape company field	2020-08-07 14:52:50 +05:30
Deepesh Garg	ab611d5fd8	fix: GSTR 1 report for exports without payment of Tax	2020-08-07 14:47:40 +05:30
Shivam Mishra	b7a24ad95b	Merge branch 'develop' into item-image-alt	2020-08-07 09:15:00 +00:00
Shivam Mishra	b1f8859121	feat: add alt value in product page	2020-08-07 14:38:40 +05:30
Shivam Mishra	a0954e66a8	feat: add image alt argument for product_image macros	2020-08-07 14:34:54 +05:30
Shivam Mishra	ba4c4f107e	feat: add image alt field in items	2020-08-07 14:34:28 +05:30
Deepesh Garg	b98088bb01	Merge branch 'develop' into loan_patch_and_fixes	2020-08-07 13:27:40 +05:30
Deepesh Garg	a306af8c08	fix: Add help link in navbar settings	2020-08-06 20:52:02 +05:30
Shivam Mishra	124eabaac8	Merge branch 'develop' into barredterra-patch-1	2020-08-06 14:16:48 +00:00
Rucha Mahabal	a78336e77d	fix: remove patch for retaining permissions for Video DocType (#22932 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-08-06 19:01:42 +05:30
Raffael Meyer	d854d39c00	fix: show only company's bank accounts	2020-08-06 15:09:22 +02:00
Shivam Mishra	b110e5842f	fix: unbound error in product configurator	2020-08-06 18:30:55 +05:30
marination	0702fbd206	fix: Show Add to Cart Button anyway - add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion	2020-08-06 18:28:55 +05:30
marination	72fdc1302c	fix: product action instead of info	2020-08-06 18:28:55 +05:30
Shivam Mishra	aa4f8cf4fc	fix: handle product_info null	2020-08-06 18:28:55 +05:30
marination	63513f1b14	fix: Show Add to Cart Button anyway - add to cart wasnt visible if show price is disabled in shopping cart settings (product_info = null), creating confusion	2020-08-06 18:22:28 +05:30
marination	ccf44a1bfd	fix: product action instead of info	2020-08-06 17:34:38 +05:30
Shivam Mishra	01f664a88f	fix: handle product_info null	2020-08-06 17:24:02 +05:30
Shivam Mishra	33a5fdfb78	fix: unbound error in product configurator	2020-08-06 17:23:51 +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
Marica	1afe177a4f	Merge branch 'develop' into education-dashboard	2020-08-06 14:12:00 +05:30
Saurabh	5ad9c2a1a0	bumped to version 13.0.0-beta.4	2020-08-06 13:50:20 +05:50
Deepesh Garg	44d62ad0d7	Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref fix: condition for checking reference details for Payment Entry	2020-08-05 23:16:14 +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
Rucha Mahabal	5da067b689	fix: condition for checking reference detail for Payment Entry	2020-08-05 18:18:57 +05:30
Marica	0c818927a5	fix: get_regional_address_details missing positional arg 'company' (#22915 )	2020-08-05 16:47:41 +05:30
Rucha Mahabal	f9143e9bb0	Merge branch 'develop' into education-dashboard	2020-08-05 16:28:14 +05:30
Rucha Mahabal	8edace1a58	fix: covert Program wise Fee Collection to a Script Report	2020-08-05 16:24:21 +05:30
Rucha Mahabal	d67c2ea0d4	fix: make program field mandatory in Fees	2020-08-05 14:13:14 +05:30
marination	6823e8ed03	fix: Remove Duplicate Banket order method	2020-08-04 14:04:15 +05:30
Nabin Hait	a042d4721e	fix: Bank Clearance of POS purchase invoice (#22882 )	2020-08-03 20:42:15 +05:30
Nabin Hait	a1d3537f2a	fix: Bank Clearance of POS purchase invoice (#22883 )	2020-08-03 20:42:00 +05:30
Rucha Mahabal	b7311c8fc1	fix: SQL query in accounts receivable, payable reports (#22888 )	2020-08-03 20:41:25 +05:30
Marica	e211bb7a53	fix: Reposition description in Warehouse (#22895 )	2020-08-03 20:40:09 +05:30
Nabin Hait	5e548b4387	Dunning cleanup beta (#22899 ) * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:39:15 +05:30
Nabin Hait	48163e31c5	Dunning cleanup (#22898 ) * fix: Dunning cleanup * fix: Added dashboard for Dunning	2020-08-03 20:38:28 +05:30
Rucha Mahabal	cb665dc4d1	fix: Assessment Result child table not visible when accessed via dashboard (#22881 )	2020-08-03 19:43:17 +05:30
Rucha Mahabal	101fe2b769	fix: Assessment Result child table not visible when accessed via dashboard (#22880 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-08-03 19:42:24 +05:30
Anupam Kumar	25ee4328d3	card company issue (#22900 )	2020-08-03 19:39:55 +05:30
Anupam Kumar	1895e9b89a	fix: Shopping cart issue v13 (#22868 ) * refactoring shopping cart settings * adding column_break in shopping cart settings * fix: mandatory depend on fix company * fix: resetting company, price_list, default_customer_group, quotation_series when card is diabled.	2020-08-03 18:50:11 +05:30
Rucha Mahabal	b50b20458e	fix: TypeError while concatenating account number and name in COA (#22885 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-08-03 15:51:57 +05:30
Prssanna Desai	b44ee186cd	fix: check if row['delay'] exists (#22892 )	2020-08-03 15:18:35 +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
Prssanna Desai	1dfd9fd756	fix: check if row['delay'] exists (#22889 )	2020-08-03 14:48:45 +05:30
Deepesh Garg	2f2de2264d	Merge pull request #22887 from deepeshgarg007/subscription_test fix: Test case for subscription	2020-08-03 14:31:21 +05:30
Deepesh Garg	5572f8eb1e	fix: Test case for subscription	2020-08-03 13:40:11 +05:30
Wolfram Schmidt	5e438cc853	Update lead_source.json (#22872 ) Allow Lead Source to be renamed. This is usefull for cleaning up data at a later point and allow correcting spelling errors. Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 12:46:50 +05:30
Nabin Hait	1a64d1a4ab	Reset home page based on product settings (#22876 )	2020-08-03 10:43:56 +05:30
Nabin Hait	9cc2d340ba	Reset home page based on product settings (#22875 )	2020-08-03 10:43:47 +05:30
Nabin Hait	826158c792	fix: Update modified timestamp in accounts settings (#22874 )	2020-08-03 09:34:55 +05:30
Nabin Hait	4cc99286c0	fix: Update modified timestamp in accounts settings (#22873 )	2020-08-03 09:33:31 +05:30
Anurag Mishra	804426023f	fix: minor payroll_dashboard fixes (#22832 ) * fix: minor payroll_dashboard fixes * Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 09:28:04 +05:30
Anurag Mishra	ba52dd8ba6	fix: minor payroll_dashboard fixes (#22832 ) * fix: minor payroll_dashboard fixes * Update erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-08-03 08:57:49 +05:30
Deepesh Garg	4104887abb	fix: fieldname in filter	2020-08-02 18:23:54 +05:30
marination	e3495116dd	chore: Error Logging and exception hnadling on connection failure	2020-08-02 17:13:34 +05:30
Deepesh Garg	d909669a18	fix: Test cases	2020-08-02 17:00:53 +05:30
marination	c16ace6732	fix: Codacy	2020-08-02 16:43:15 +05:30
marination	ccf4ab9f85	chore: Added Interactions Report and behaviour fixes - Youtube Interactions Report with Chart and Summary - Statistics change in doc on refresh and get updated in db as well	2020-08-02 16:26:36 +05:30
marination	ddc2be36ab	Merge branch 'develop' of https://github.com/frappe/erpnext into youtube-analytics	2020-08-02 05:37:30 +05:30
marination	d4817c8685	feat: Track Youtube interactions via Video DocType	2020-08-02 05:35:45 +05:30
Deepesh Garg	b9dc21129c	fix: Loan Seurity shortfall calculation fixes	2020-08-01 22:51:40 +05:30
Deepesh Garg	946e106714	Merge pull request #22863 from deepeshgarg007/taxjar_fix fix: Import pycountry and taxjar only if taxjar is enabled	2020-08-01 13:52:40 +05:30
Deepesh Garg	dcb462f305	fix: Import pycountry and taxjar only if taxjar is enabled	2020-08-01 13:47:09 +05:30
Anurag Mishra	2a4c90302b	fix: minor recritment analytics fixes (#22830 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-31 17:59:30 +05:30
Marica	cf00ee49ec	fix: PO/SO view title (#22858 )	2020-07-31 15:14:50 +05:30
Deepesh Garg	7a004615a7	Merge pull request #22855 from nabinhait/gl-balance-fix-pre--v13 fix: Ignore cancelled gl entries to get account balance	2020-07-30 22:15:46 +05:30
Deepesh Garg	01e0d50eba	Merge pull request #22854 from nabinhait/gl-balance-fix fix: Ignore cancelled gl entries to get account balance	2020-07-30 22:15:23 +05:30
Nabin Hait	38d5c2e04f	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:53:07 +05:30
Nabin Hait	9837285bf1	fix: Ignore cancelled gl entries to get account balance	2020-07-30 20:52:20 +05:30
Rucha Mahabal	b6675f8dd4	feat: Lab Test Report Summary and Chart	2020-07-30 19:33:08 +05:30
Rucha Mahabal	c5ccf38cdf	refactor: Lab Test Report	2020-07-30 18:56:16 +05:30
Saurabh	a14618efe4	fix: validate theme_scss attribute	2020-07-30 17:22:29 +05:30
Rucha Mahabal	ca1b389c99	fix: validate negative quantity for sample collection	2020-07-30 16:58:19 +05:30
Rucha Mahabal	fa2c20ea9e	chore: Sample Collection Form clean-up	2020-07-30 16:56:11 +05:30
Rucha Mahabal	9087689d90	fix: subtitle for onboarding Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 16:10:05 +05:30
Rucha Mahabal	afa001a1d1	fix: code clean-up	2020-07-30 15:25:04 +05:30
Rucha Mahabal	73edb12ab3	fix: msgprint for sample collection doc created on Lab Test creation	2020-07-30 14:50:30 +05:30
Rucha Mahabal	c33703d54c	fix: move result value validations to server side	2020-07-30 14:25:40 +05:30
Rucha Mahabal	b00f870c77	fix: Lab Test Completed status not visible in list view	2020-07-30 13:49:13 +05:30
Rucha Mahabal	621529adfb	fix: unlink item from healthcare service unit type (#22828 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 13:18:41 +05:30
Marica	c0ea2bc804	Merge branch 'develop' into validate-patient-transfer-time	2020-07-30 13:10:19 +05:30
Saqib	031768f49d	chore: asset form reorder (#22833 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-30 12:40:53 +05:30
Rucha Mahabal	ff0b9bffcf	feat: added dashboard for Lab Test Template	2020-07-30 12:16:56 +05:30
Rucha Mahabal	440c752529	chore: Lab Test Template form clean-up	2020-07-30 12:16:18 +05:30
Anupam K	6bab21483c	report lost opportunity	2020-07-30 00:41:06 +05:30
barredterra	517df5fb0e	fix: codacy (again)	2020-07-29 18:16:49 +02:00
barredterra	b719378ee5	fix: codacy	2020-07-29 18:11:04 +02:00
Shivam Mishra	5b056988a6	Merge branch 'develop' of https://github.com/frappe/erpnext into support-search	2020-07-29 21:16:35 +05:30
barredterra	dec2c90866	refactor: move datev-specific stuff to utils	2020-07-29 17:14:23 +02:00
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
Anupam K	61bfb8c817	Merge branch 'develop' of https://github.com/frappe/erpnext into crm-reports	2020-07-29 15:45:55 +05:30
Saqib Ansari	8cfa00920e	fix: cannot submit value adjustment with custom dimension	2020-07-29 15:24:03 +05:30
anoop	5903002039	fix: exclude Cancelled appointments while Get Items in Sales Invoice	2020-07-28 21:15:54 +05:30
Rucha Mahabal	a695971596	fix: show the standard validation message Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-28 20:15:29 +05:30
Rucha Mahabal	7cbc7946af	fix: validate check out and check in time for inpatient occupancy	2020-07-28 14:11:12 +05:30
Marica	c1e46d8131	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-28 12:29:47 +05:30
Rucha Mahabal	81ae6c3240	fix: reload HR Settings to fix failing setup (#22802 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-28 12:27:41 +05:30
Nabin Hait	b7602d29f2	fix: POS patch fix (#22827 )	2020-07-28 09:13:42 +05:30
Nabin Hait	701474cbaa	fix: POS patch fix (#22818 )	2020-07-28 09:11:37 +05:30
Shivam Mishra	48be7d37b8	fix: add order_by explicitly for lead (#22820 )	2020-07-28 09:00:09 +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
Rucha Mahabal	fdcaecb58c	Merge branch 'develop' into education-dashboard	2020-07-27 22:23:08 +05:30
Rucha Mahabal	9a2cc74414	feat: onboarding for Education module	2020-07-27 21:33:00 +05:30
Anupam K	9ceeefbd2b	refactor: CRM Reports	2020-07-27 19:56:07 +05:30
Rucha Mahabal	6c11f26a11	feat: Education dashboard charts and number cards	2020-07-27 18:50:04 +05:30
Rucha Mahabal	49140ccbfd	feat: Program wise Fee Collection Query Report	2020-07-27 18:48:15 +05:30
Shivam Mishra	97a316c09a	feat: add create customer button to member	2020-07-27 15:27:09 +05:30
Shivam Mishra	9e3776e001	feat: improve webhook logging	2020-07-27 14:26:37 +05:30
Shivam Mishra	e43d362d53	feat: verbose logging for verification	2020-07-27 14:19:36 +05:30
Shivam Mishra	4e40b9bdbe	feat: log everything	2020-07-27 14:19:36 +05:30
bhavesh95863	bcb49e59e7	fix: Add missing translation function (#22813 ) * fix: Add missing translation function Add missing translation function * fix: Add missing function for translation * fix: Add missing translation function * fix: Add missing translation function	2020-07-26 14:02:16 +05:30
Anupam K	8718daa11e	Adding formatter in budget variance report	2020-07-25 23:56:11 +05:30
Nabin Hait	abc3227480	chore: Added change log	2020-07-24 21:02:15 +05:30
Deepesh Garg	b2fccc1d05	Merge pull request #22800 from ruchamahabal/fix-assessment-report fix(Education): course wise assessment report labels	2020-07-24 19:12:24 +05:30
Deepesh Garg	c591b77613	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-24 19:04:05 +05:30
Mangesh-Khairnar	762f6297f6	fix(payment-request): do not set guest as administrator (#22804 )	2020-07-24 18:05:13 +05:30
Mangesh-Khairnar	8721530b4b	fix(payment-request): do not set guest as administrator (#22801 )	2020-07-24 17:19:56 +05:30
Rucha Mahabal	860a824a7c	fix: change label for final grade	2020-07-24 14:32:36 +05:30
Rucha Mahabal	27835b7789	fix: add labels to chart datasets in course wise assessment	2020-07-24 14:07:00 +05:30
Nabin Hait	a8efe8eb5f	Merge branch 'develop' into version-13-beta-pre-release	2020-07-24 11:15:13 +05:30
Rucha Mahabal	1010feefe0	feat: Patient Progress Page (#22474 ) * feat: add patient progress page * feat: patient progress sidebar * feat: Patient Progress Charts * feat: set up sidebar links * feat: added heatmap chart for patient interactions * fix: styles * fix: add markers for max score in assessment charts * fix(style): mobile view css * fix: heatmap and percentage chart filters * feat: add time span filters to line charts * fix: make date fields mandatory in healthcare doctypes for better analytics * fix: title and filter styles * fix: handle null state for charts * feat: add Patient Progress Page to desk * feat: add date range filter to all charts * fix: code clean-up * fix: assign roles for Patient Progress Page Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:49:04 +05:30
Afshan	ecb1460440	fix: update the project after task deletion so that the % completed s… (#22591 ) * fix: update the project after task deletion so that the % completed shows correct value * fix: patch to correct % complete of previous projects * fix: for version-13 * fix: removed patch from v13 Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-24 10:48:16 +05:30
Afshan	91fe10666e	fix: buying price for non stock item in gross profit report (#22616 ) * fix: buying price for non stock item in gross profit report * fix: refactor query	2020-07-24 09:49:17 +05:30
Nabin Hait	39969647ca	fix: Added missing project field in Purchase invoice (#22799 )	2020-07-24 09:48:54 +05:30
Nabin Hait	6bbd4d0c14	fix: Other charges on income tax (#22797 )	2020-07-24 09:20:48 +05:30
Anupam K	5d5f026a0d	fix: Target variance report signs	2020-07-24 02:32:45 +05:30
Deepesh Garg	7cb1613173	Merge pull request #22622 from AfshanKhan/add-age-range-in-stock-ageing feat: added range for age in stock ageing	2020-07-23 21:56:45 +05:30
Afshan	73b86d241c	fix: conversion to float	2020-07-23 21:09:27 +05:30
Rucha Mahabal	89f9346185	fix(Education): descriptions not copied while creating fees from fee structure (#22792 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-07-23 20:59:56 +05:30
Deepesh Garg	9843e9f917	fix: Expnese claim outstanding while making payment entry (#22735 )	2020-07-23 20:58:57 +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
Sun Howwrongbum	9bd5f1e4b0	fix: incorrect available_qty being set (#22539 ) * fix: incorrect available_qty being set * style: descriptive variables	2020-07-23 20:06:26 +05:30
Afshan	aa94abf601	fix: asset dashboard report changes (#22759 ) * fix: asset dashboard report changes * fix: moved static filters to dynamic filters Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 19:12:38 +05:30
Abhishek Balam	cb45836cda	feat(CRM): Email Group Option In Email Campaign (#22731 ) * new parent updating logic, made requested changes * feat: adding Email Group option in Email Campaign * fix: inv commas	2020-07-23 19:07:11 +05:30
Deepesh Garg	76028cde6a	Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop	2020-07-23 19:05:17 +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
Deepesh Garg	718870f4a2	Merge pull request #22736 from Thunderbottom/set-homepage fix: reset homepage to home after unchecking products page	2020-07-23 18:53:37 +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
Nabin Hait	8712ac6d39	fix: Job offer is mandatory for employee onboarding (#22791 )	2020-07-23 18:09:35 +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
Afshan	55125fbe4e	fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options (#22744 )	2020-07-23 17:44:38 +05:30
Rucha Mahabal	833682b03d	feat(Education): Student Attendance and Leave Enhancements (#22623 ) * feat: make Student Attendance doctype submittable * feat: add attendance related fields in Student Leave Application * feat: update Attendance records on Leave Application submission * refactor: better error messages and ORM queries * fix: show present only for leave applications with mark_as_present enabled in attendance reports * test: Student Leave Application * fix: filter for attendance records * fix: codacy issues	2020-07-23 16:40:07 +05:30
Anupam Kumar	04a76285e2	fix: Unable to change link from new lead to existing customer (#22787 ) * Unable to change link from new lead to existing customer * Unable to change link from new lead to existing customer Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-07-23 16:30:56 +05:30
Anupam Kumar	7137b0b670	refactor: shopping cart (#22617 ) * refactoring shopping cart settings * adding column_break in shopping cart settings	2020-07-23 15:58:47 +05:30
Rucha Mahabal	5142fc9365	feat(Education): added form dashboards and refactored custom buttons for better linking (#22727 ) * feat: add form dashboards to all forms in Education Module * feat: Add Course to Programs button in Course DocType * refactor: custom buttons in Education module forms * feat: buttons to add topic, article, quiz to their respective parent doctypes * feat: add charts to form dashboards * fix: code cleanup	2020-07-23 15:57:27 +05:30
KanchanChauhan	2826fd3c20	feat: Dunning (#22559 ) * feat: Dunning * fix: Replaces spaces with tab Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 15:45:03 +05:30
Afshan	767ee1cdb8	fix: logic to get other items also other than just 1st one	2020-07-23 15:39:27 +05:30
Anoop	23481cc484	feat: Laboratory Module Enhancements (#22416 ) * feat: option to add organism count in descriptive tests print format to accommodate descriptive test changes fix: refactoring, clean up wip * lab test - result based on secondary uom, result format options lab test print - consider result format options, result legend and worksheet instructions * feat: option to allow results blank in lab test if configured via lab test template * fix: rename child doctypes, rename related links * fix: field display depends on, cleanup - rename fields and variables * fix: get from encounter popup layout, code cleanup and minor fixes * fix: sms send dialog bug * fix: lab test get from encounter html class name typo corrected * fix: lab test organisms depends on condition * fix: reorder fields - depends on fields brought together * fix: PR review feedback, removed : separator, result formatting applied to result UOM * fix: child table js removed * fix: internal field require_result_value hidden, secondary uom result field type set to data * fix: Use ORM methods instead of db.sql, code cleanup, style * fix: create item price for lab test template if billable, code cleanup * fix: patch rename doctypes before fields, deleted renamed child doctypes * fix: secondary uom result calc - warn user if calculation fails * fix: patch to insert entries into renamed child tables * fix: codacy issues * fix: patch duplicate error as items are already migrated in v12 migrate organisms child table field name updated * fix: patch a bit lenghty, added comments * fix: patch * fix: require_result_value flag marked hidden * fix: code cleanup-up * fix: patch - lab_test rename field, lab_test_group_template select option corrected Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-23 15:00:54 +05:30
Anurag Mishra	453325fbc9	fix: job applicant fixes (#22448 ) * fix(validation): not two job offer should be allowed for single job_applicant * fix: don't allow to create employee_onboarding without job offer * fix: server side validation * fix: requested changes	2020-07-23 12:22:42 +05:30
Deepesh Garg	7ac4ad8410	fix: Error due to comma in Pricing rule name (#22741 ) * fix: Error due to commma in Pricing rule name * fix: Remove print statement * fix: Tests Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:12:55 +05:30
Anurag Mishra	9aa0602065	Fix: HR and Payroll Dashboard (#22771 ) * Fix: HR and Payroll Dashboard * fix: requested changes	2020-07-23 12:10:48 +05:30
Chinmay D. Pai	3e503e4404	chore: do not reset homepage through hooks Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-23 12:06:19 +05:30
Anurag Mishra	ce5b490f66	feat : Recruitment analytics (#21732 ) * feat: recruitment_anlytics * fix: filters * feat: added missing column designation Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-23 12:04:58 +05:30
Deepesh Garg	9c49f2d886	feat: Enhancement in subscription (#22263 ) * feat: Add supplier in subscription doctype * fix: Code cleanup * fix: Add dynamic link in subscription invoices * fix: Multiple enhanccement in subscription * feat: Follow calendar months in subscription * fix: Test Cases and patch * fix: Patch * fix: Update patch and add fixes * fix: Update permission for subscription settings * fix: Patch and Test * fix: Add cost center dimension in Subscripiton	2020-07-23 11:11:23 +05:30
Anupam Kumar	a18f2ec23e	fix: setting filter for project in kanban board (#22717 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-07-23 11:09:17 +05:30
Marica	43b4b1cb55	chore: Export Buying Dashboard (#22767 ) * chore: Export Buying Dashboard * fix: Use Timespan instead of Between for static filters	2020-07-23 11:08:49 +05:30
Anupam Kumar	4a5fc23d5c	Export Project dashboard (#22782 )	2020-07-23 11:07:56 +05:30
Marica	f207f48a67	Merge branch 'develop' into change-video-doctype-module	2020-07-22 21:22:39 +05:30
Prssanna Desai	fb89906354	fix: pass date range instead of from date (#22114 ) * fix: pass date range instead of from date * fix: escape inputs Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2020-07-22 20:17:50 +05:30
Marica	3994aa8b06	fix: Same Contact name for different parties at Portal Login (#22715 )	2020-07-22 19:49:54 +05:30
Rucha Mahabal	f4a7adbf2e	refactor: Education Desk Page	2020-07-22 18:59:04 +05:30
Marica	2ee64ceaff	Merge branch 'develop' into club-mr-column	2020-07-22 18:52:10 +05:30
Deepesh Garg	c88a3b4bf9	Merge pull request #22765 from anupamvs/rfq feat: Provision to make RFQ against Opportunity	2020-07-22 18:28:48 +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
Deepesh Garg	7c50f421e1	fix: Move branch code back to bank account (#22725 ) * fix: Move branch code back to bank account * fix: Patch	2020-07-22 18:21:04 +05:30
Anupam Kumar	3e4b5e5496	fix: item-wise sales history report (#22783 )	2020-07-22 18:17:58 +05:30
Anupam Kumar	e519334dfc	feat: Export CRM dashboard (#22778 ) * feat: Exported CRM dashboard * feat: Export CRM Dashboard * fix: adding company in all dashboard and number card	2020-07-22 18:16:57 +05:30
Anupam K	5bd0b93acf	fix: cur_frm -> frm	2020-07-22 18:10:57 +05:30
Anupam Kumar	93afbe143b	feat: Export Selling Dashboard (#22776 ) * feat:Export Stock Dashboard * Export Selling Dashboard * Export Selling Dashboard	2020-07-22 18:07:39 +05:30
Deepesh Garg	c7eadfceb0	fix: Multi currency payment reconciliation (#22738 ) * fix: Multi currency payment reconciliation * fix: Hide currency link fields	2020-07-22 17:59:37 +05:30
Prssanna Desai	f098221550	feat: Exported manufacturing dashboard (#22626 ) * feat: exported Manufacturing Dashboard * fix: update use_report_chart fieldname * fix: add dynamic filter for company in Produced Quantity chart	2020-07-22 16:58:17 +05:30
sahil28297	3d3c922d7f	fix(patch): handle duplicate entry error while inserting account (#22745 )	2020-07-22 16:42:31 +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
Shivam Mishra	f50312b6d2	fix: button sizing (#22777 )	2020-07-22 16:17:11 +05:30
Rucha Mahabal	1fddc6d126	chore: Exported Accounts Module Dashboard (#22769 ) * chore: Exported Accounts Module Dashboards * chore: deleted dashboard fixtures for Accounts module	2020-07-22 16:11:06 +05:30
Afshan	6b9acf4476	updated patch to delete auto email reports and moved patch to v13 from v12	2020-07-22 16:00:18 +05:30
Rucha Mahabal	8d28eacb09	chore: Exported Healthcare Module Dashboard (#22775 )	2020-07-22 15:57:33 +05:30
Deepesh Garg	d6615248a8	Merge pull request #22762 from DeeMysterio/financial-stat fix(report): fix alignment in script report that extends financial_statements.js	2020-07-22 14:45:22 +05:30
Anupam K	de417d2774	feat: Provision to make RFQ against Opportunity	2020-07-22 01:05:32 +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
Rucha Mahabal	ffbd7b4087	fix: move Video DocType from Core to Utilities module	2020-07-21 19:40:18 +05:30
Diksha Jadhav	09b8caf866	fix(report): fix alignment in script report that extends financial_statements.js	2020-07-21 17:35:10 +05:30
Deepesh Garg	9e5aa282ec	Merge pull request #22753 from nabinhait/trial-balance-opening-cancelled-entry-fix fix: Ignore cancelled entries in trial balance opening	2020-07-21 16:42:02 +05:30
Abhishek Balam	a5b83e85c3	feat: dashboard for timesheet (#22750 )	2020-07-21 12:54:59 +05:30
Nabin Hait	493b581862	fix: Ignore cancelled entries in trial balance opening	2020-07-21 12:47:16 +05:30
Marica	8ec4198af2	Merge branch 'develop' into club-mr-column	2020-07-20 16:07:10 +05:30
Afshan	2b21b7bafa	fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options	2020-07-20 16:05:52 +05:30
michellealva	8c7d8ba917	fix: remove tab in code	2020-07-20 13:12:17 +05:30
michellealva	37cd1b8021	fix: Heatmap in Vehicle	2020-07-20 13:04:46 +05:30
Deepesh Garg	04e8af7dca	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_and_fixes	2020-07-20 09:53:26 +05:30
Chinmay D. Pai	33bf0574a3	chore: fix get single value call Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-19 15:54:11 +05:30
Chinmay D. Pai	5bda28eae6	fix: reset homepage to home after unchecking products page resets homepage back to home when "home page is products" is unchecked Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>	2020-07-19 00:15:40 +05:30
Deepesh Garg	d81372a39c	Merge pull request #22734 from deepeshgarg007/custom_cash_flow fix: Period list api changes for custom cash flow report	2020-07-18 20:35:28 +05:30
Deepesh Garg	07f8e749be	fix: Period list api changes for custom cash flow report	2020-07-18 19:47:33 +05:30
Deepesh Garg	f6c70bca0a	Merge pull request #22615 from aerele/fix_mandatory_error fix: log type mandatory error while exposing api call to employee checkin.	2020-07-17 17:38:21 +05:30
Deepesh Garg	2fd4aa3051	Merge pull request #22661 from frappe/lead-owner-efficiency fix: making owner fieldtype to link	2020-07-17 17:36:59 +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
rohitwaghchaure	b4ef13c686	Merge pull request #22726 from rohitwaghchaure/fixed-actual-qty-showing-as-zero-develop fix: Stock Reconciliation Invalid Quantity for Batched Item	2020-07-17 16:55:59 +05:30
Rucha Mahabal	3e6fe38d02	Merge branch 'develop' into fix-maintenance-visit	2020-07-17 16:34:59 +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
rohitwaghchaure	7e56e80057	Merge pull request #22721 from deepeshgarg007/gstr_test fix: Multiple fixes in GST	2020-07-17 14:34:43 +05:30
Mangesh-Khairnar	9be6787b80	fix(maintenance-visit): change fieldtype of status to select	2020-07-17 12:51:49 +05:30
Rucha Mahabal	7e64a1f170	Merge branch 'develop' into issue-list-action	2020-07-17 11:48:23 +05:30
Deepesh Garg	188273564c	fix: Multiple fixes in GST	2020-07-17 11:31:15 +05:30
michellealva	d02465a68f	fix: Update modified timestamp for Delivery Note Item	2020-07-17 10:35:16 +05:30
marination	6319073d81	fix: Move Issue List actions under 'Actions' dropdown	2020-07-16 15:38:51 +05:30
Karthikeyan S	ff6ba25386	fix: remove FE validation for log_type field	2020-07-16 13:33:38 +05:30
Anurag Mishra	ac23ac6a02	fix: validation for additional salary (#22645 ) * fix: validation for additional salary * fix:changes requested Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2020-07-16 13:10:43 +05:30
Rucha Mahabal	6b3110ed13	Merge branch 'develop' into expense-claim-payment-fix	2020-07-16 12:23:26 +05:30
Anurag Mishra	50902cf30c	Fix: Changes Requested	2020-07-16 12:21:46 +05:30
Suraj Shetty	11b0554ae9	Merge branch 'develop' into fix-financial-statement-print-format	2020-07-16 09:45:26 +05:30
Deepesh Garg	52c319cfa7	fix: Update RCM only for indian countries	2020-07-16 00:23:58 +05:30
Deepesh Garg	2af43b3df6	fix: linting	2020-07-15 21:54:28 +05:30
Deepesh Garg	49821df0ae	Merge pull request #22697 from rohitwaghchaure/fixed-not-able-to-submit-si fix: not able to submit sales invoice	2020-07-15 21:51:16 +05:30
Deepesh Garg	177bbd8e20	Merge pull request #22701 from deepeshgarg007/gstr3b_cess fix: Cess amount in GSTR 3B report	2020-07-15 18:20:42 +05:30
Deepesh Garg	0fa4143bac	fix: Cess amount in GSTR 3B report	2020-07-15 18:17:38 +05:30
rohitwaghchaure	8ff821970a	Merge pull request #22700 from rohitwaghchaure/fixed-incorrect-balance-qty-in-stock-ledger-develop fix: incorrect balance qty in stock ledger report	2020-07-15 17:25:11 +05:30
Rohit Waghchaure	132376750c	fix: incorrect balance qty in stock ledger report	2020-07-15 17:23:17 +05:30
Rohit Waghchaure	e0de0ac617	fix: not able to submit sales invoice	2020-07-15 17:13:43 +05:30
Rohit Waghchaure	07cc918d70	fix: patch update_actual_start_and_end_date_in_wo	2020-07-15 16:41:32 +05:30
Suraj Shetty	34617744e1	fix: Show total row in print format of financial statement	2020-07-15 16:37:21 +05:30
rohitwaghchaure	f16bd00463	Merge pull request #22608 from ruchamahabal/fix-sla-ui fix: allow creating SLA documents even if SLA tracking is not enabled	2020-07-15 15:47:37 +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
rohitwaghchaure	7c08ff7572	Merge pull request #22596 from marination/exploded-item-rate fix: Exploded Item Rate in BOM	2020-07-15 14:30:27 +05:30
Rohit Waghchaure	e1b3f16abd	fix: project field added two time in purchase receipt	2020-07-15 12:28:19 +05:30
Deepesh Garg	5beac7a0cc	fix: Period list fixes in financial statements (#22677 )	2020-07-15 12:17:43 +05:30
Anurag Mishra	c1636f8fab	fix: conversion rate as 1 if no conversion rate	2020-07-14 18:58:02 +05:30
marination	392f323d2d	fix: Dont overwrite default warehouse in Material Request	2020-07-14 17:03:17 +05:30
rohitwaghchaure	eb2a42d9e1	Merge pull request #22589 from deepeshgarg007/rcm_fix fix: Do not add GST tax amount in grand total for reverse charge invoices	2020-07-14 13:42:48 +05:30
Rucha Mahabal	c4a1b34811	Merge branch 'develop' into fix-sla-error	2020-07-14 13:24:57 +05:30
Marica	82a606d04b	fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666 )	2020-07-14 13:16:28 +05:30
Anupam Kumar	c5f14da99c	Merge branch 'develop' into lead-owner-efficiency	2020-07-14 12:59:42 +05:30
Rucha Mahabal	88931f0677	fix(Support): TypeError while saving Service Level Agreement	2020-07-14 11:46:11 +05:30
John Veness	72320afb07	Correct help link for Address (#22673 )	2020-07-14 10:44:15 +05:30
bhavesh95863	eb69859d3e	fix: Quotation list view blank if quotation_to field not set as a standard filter	2020-07-13 23:15:31 +05:30
rohitwaghchaure	165d57aa0b	Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop fix: '>' not supported between instances of 'str' and 'int'	2020-07-13 18:11:50 +05:30
rohitwaghchaure	165eb5a1c3	Merge pull request #22665 from marination/maintenance-schedule fix: Block Invalid Serial No updates in Maintenance Schedule	2020-07-13 18:11:06 +05:30
rohitwaghchaure	62fe2cac19	Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts fix: Project link not set in accounts other than profit and loss accounts	2020-07-13 18:09:41 +05:30
Marica	3f8840cd7a	Merge branch 'develop' into maintenance-schedule	2020-07-13 15:24:37 +05:30
Rucha Mahabal	68cc3e4220	Merge branch 'develop' into fix-sla-ui	2020-07-13 14:40:01 +05:30
Anurag Mishra	b9d8ff91a5	Merge branch 'develop' into lead-owner-efficiency	2020-07-13 14:22:34 +05:30
Anurag Mishra	d38c22d85d	Merge branch 'develop' into fixed-error-report-related-to-task-develop	2020-07-13 14:21:58 +05:30
rohitwaghchaure	a8fea8df98	Merge pull request #22614 from deepeshgarg007/payment_reco_cost_center_fix fix: Add default cost center in payment reconciliation JV	2020-07-13 13:44:49 +05:30
marination	1791bc187b	fix: Block Invalid Serial No updates in Maintenance Schedule	2020-07-13 12:32:09 +05:30
Rohit Waghchaure	2e8d8b9aeb	fix: '>' not supported between instances of 'str' and 'int'	2020-07-13 12:09:10 +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
Afshan	e40605d711	Merge remote-tracking branch 'upstream/develop' into club-mr-column Merge remote-tracking branch 'upstream/develop' into club-mr-column	2020-07-13 11:43:19 +05:30
Deepesh Garg	f5a457c397	Merge branch 'develop' into lead-owner-efficiency	2020-07-13 11:32:09 +05:30
Anupam K	cd445786fe	making owner fieldtype to link	2020-07-12 20:03:15 +05:30
Afshan	d058840094	fix: removed fiscal year field from "Request for Quotation" doctype (#22446 ) * fix: removed fiscal year field from "Request for Quotation" doctype	2020-07-12 19:19:59 +05:30
Raffael Meyer	193e12f02a	fix: download button (#22652 )	2020-07-12 17:26:27 +05:30
Afshan	83cd1dcc44	fix: Add project filter in parent task field (#22655 ) * fix: Add project filter in parent task field	2020-07-11 21:54:54 +05:30
Deepesh Garg	1ab228b52e	Merge pull request #22657 from deepeshgarg007/eway_bill_json_gen fix: ewaybill json had json dump of json dump, and other related fixes	2020-07-11 21:42:01 +05:30
Sagar Vora	c9b4ba6de8	fix: ewaybill json had json dump of json dump, and other related fixes	2020-07-11 21:29:17 +05:30
Deepesh Garg	62d047bf9b	Merge branch 'develop' into payment_reco_cost_center_fix	2020-07-11 21:05:32 +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	a9820cdcf6	fix: Remove every bit of randomness from this test	2020-07-11 19:38:51 +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
Deepesh Garg	87eb2827ef	fix: Update tests	2020-07-10 22:45:45 +05:30
marination	a6c10b1bc0	fix: Pricing Rule breaks if no item_code	2020-07-10 20:09:58 +05:30
Karthikeyan S	183ebb237e	Merge branch 'develop' into fix_mandatory_error	2020-07-10 18:05:18 +05:30
gavin	ecf2bae041	Merge branch 'develop' into erpnext-install-check	2020-07-10 17:42:39 +05:30
Afshan	e9affe3705	merge branch develop	2020-07-10 16:31:40 +05:30
Faris Ansari	70aa3c0b1f	fix: Remove explicit exception Co-authored-by: gavin <gavin18d@gmail.com>	2020-07-10 16:13:21 +05:30
Afshan	0863beec92	created new report named "requested_items_to_order_and_receive" removed report "requested_items_to_order" also wrote a patch for deleting old report from table "tabReport"	2020-07-10 15:14:01 +05:30
Afshan	dca8a1d69d	renamed "pending qty" to "qty to recieved"	2020-07-10 14:26:21 +05:30
rohitwaghchaure	bca8483dc8	Merge pull request #22634 from Anurag810/retention-bonus-fixes fix: default overwrite property and 'company' is not defined	2020-07-10 13:41:40 +05:30
Deepesh Garg	e99091fd4f	Merge pull request #22644 from deepeshgarg007/dcc_query fix: Distributed cost center query	2020-07-10 13:35:34 +05:30
Deepesh Garg	7cb195b304	fix: Distributed cost center query	2020-07-10 13:33:50 +05:30
Marica	eee12fbcb4	fix: Remove redundant variable declaration (#22641 )	2020-07-10 12:34:59 +05:30
Afshan	fd28f1071e	style: arrangements of filters for reports (#22636 )	2020-07-10 11:25:39 +05:30
rohitwaghchaure	3a3787f9e7	fix: Due to decimal issue make purchase receipt button not showing from PO (#22629 )	2020-07-09 20:07:40 +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
Deepesh Garg	b74077faf5	fix(travis): Item Tax tempate template test	2020-07-09 19:50:41 +05:30
Anurag Mishra	d7563f0327	fix: default overwroite property n 'company' is not defined	2020-07-09 19:40:18 +05:30
Rohan	cdf55cef80	fix: fetch project-related info in Timesheet (#22423 ) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-09 11:36:01 +05:30
Rucha Mahabal	6c6c36e780	fix: attribute error while cancelling patient encounter	2020-07-09 11:23:41 +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
Rucha Mahabal	45b01d2c02	feat: add medical coding fields to Healthcare DocTypes (#22501 ) * feat: add medical coding fields to templates * feat: fetch medical codes from templates in forms * fix: codacy issues Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 15:39:45 +05:30
Afshan	e0ff0cfcb9	fix: fetch "Employee Leave Policy" from "Employee Grade" if available (#22570 ) * fix:fetch "Employee Leave Policy" from "Employee Grade" if available * fix: checked "Fetch IF Empty" checkbox Co-authored-by: Marica <maricadsouza221197@gmail.com>	2020-07-08 14:40:22 +05:30
Marica	b78dc75456	Merge pull request #22573 from deepeshgarg007/employee_tree feat: Added all companies option in employee tree to view employee ac…	2020-07-08 14:34:33 +05:30
rohitwaghchaure	0cd39e3a38	Merge pull request #22611 from frappe/hrms-dashboard-fix fix: HR dashboard number card filter	2020-07-08 14:33:45 +05:30
Marica	9e73fdd866	Merge branch 'develop' into employee_tree	2020-07-08 14:33:10 +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
Marica	3f05a2692e	Merge branch 'develop' into employee_tree	2020-07-08 14:04:49 +05:30
rohitwaghchaure	41c9708f99	Merge branch 'develop' into project-link-for-all-accounts	2020-07-08 13:11:37 +05:30
Marica	0afdafdbce	Merge branch 'develop' into error-message	2020-07-08 13:07:01 +05:30
rohitwaghchaure	37d828eda6	Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation fix: Do not ignore validate methods on GL entry submit	2020-07-08 13:06:47 +05:30
rohitwaghchaure	be9f8dc5db	Merge pull request #22522 from Anurag810/leave_application_fixes fix: set half day date None if half day is unchecked	2020-07-08 12:40:30 +05:30
rohitwaghchaure	1fce8b7475	Update leave_application.js	2020-07-08 12:40:01 +05:30
rohitwaghchaure	c7b63bfcaf	Merge pull request #22415 from Anurag810/payroll_entry_ux_fix_2.0 fix: Create salary slip button disappears	2020-07-08 12:35:24 +05:30
rohitwaghchaure	e862b3f9ce	Update payroll_entry.js	2020-07-08 12:34:15 +05:30
rohitwaghchaure	3431d42d12	Merge pull request #22610 from frappe/lead-creation-from-email fix: Creating Lead from email	2020-07-08 12:27:18 +05:30
rohitwaghchaure	50f48f5176	Merge pull request #22592 from frappe/number-card-filter-fix fix: crm dashboard Number card filter fix	2020-07-08 12:25:12 +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
Faris Ansari	0a06580e2c	fix: Update message Co-authored-by: gavin <gavin18d@gmail.com>	2020-07-08 12:06:28 +05:30
Deepesh Garg	9071a7de82	fix: Add default cost center in payment reconciliation JV	2020-07-08 11:27:25 +05:30
Kaviya Periyasamy	923ed8a741	fix: log type mandatory error while exposing api call to employee checkin	2020-07-08 11:15:04 +05:30
Faris Ansari	f3a6e30e6a	fix: Check if homepage is not setup-wizard The new desk changes sets the default homepage to 'workspace'. To avoid problem in the future, check if the value is not setup-wizard. Also throw an exception if the check passes, so it exits with error.	2020-07-08 10:45:55 +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
Anupam K	6669f7457a	hr dashboard number card filter fix	2020-07-08 01:24:53 +05:30
Anupam K	8bc92b90f5	updating lead.py	2020-07-08 00:56:21 +05:30
Rucha Mahabal	3d14011d23	fix: allow creating SLA documents even if SLA tracking is not enabled	2020-07-07 18:30:54 +05:30
Afshan	e3269039d3	feat: added columns to get complete analysis for material request	2020-07-07 18:01:37 +05:30
Marica	4d5d706a4b	Merge branch 'develop' into error-message	2020-07-07 16:41:39 +05:30
Mitali Deshpande	f642be9727	fix: Changed error message in the Product Bundle	2020-07-07 16:14:01 +05:30
Marica	f4d0a3e7b0	Merge branch 'develop' into whitelist-query	2020-07-07 15:42:42 +05:30
rohitwaghchaure	546cfdaac2	Merge pull request #22601 from deepeshgarg007/payment_reco_company fix: Payment reco error in multi-company setup	2020-07-07 15:32:36 +05:30
Deepesh Garg	ca351e3549	fix: Pass company	2020-07-07 14:37:17 +05:30
Marica	8dbdf0902f	Merge branch 'develop' into whitelist-query	2020-07-07 14:29:24 +05:30
marination	32f3d24dac	fix: Employee benefit application & quality inspection whitelist	2020-07-07 14:31:49 +05:30
Deepesh Garg	e2fdff5777	fix: Payment reco error in multicompany setup	2020-07-07 14:14:07 +05:30
Marica	7860d9e699	Merge branch 'develop' into whitelist-query	2020-07-07 11:53:19 +05:30
Afshan	70b3edd502	fix: format according to cordacy	2020-07-07 00:03:45 +05:30
Afshan	3819c0bf28	fix: cost center should only show option of selectedcompany	2020-07-06 23:52:11 +05:30
Marica	d187a6ac48	Merge branch 'develop' into exploded-item-rate	2020-07-06 23:35:37 +05:30
marination	4355d3cf0f	fix: Exploded Item Rate	2020-07-06 23:15:08 +05:30
Marica	5f299a08bd	fix: General Message in previous doc validation for buying and selling (#22546 )	2020-07-06 18:26:56 +05:30
Marica	e3e5fd7e74	fix: Skip Progress and Completed by fields on Task Duplication (#22565 )	2020-07-06 18:26:19 +05:30
rohitwaghchaure	39933a4db1	Merge pull request #22441 from nextchamp-saqib/asset-delete-fix fix: cannot cancel asset and asset movement	2020-07-06 16:13:55 +05:30
Anupam K	8b26ea720b	Merge branch 'develop' of https://github.com/frappe/erpnext into number-card-filter-fix	2020-07-06 15:21:53 +05:30
rohitwaghchaure	71e1d2cc79	Merge pull request #22563 from AndyOverLord/patch-6 fix: fetch item price in sales invoice	2020-07-06 14:18:03 +05:30
Deepesh Garg	05738bd29a	fix: Remove print statements	2020-07-06 13:40:48 +05:30
rohitwaghchaure	661bc46b81	Merge pull request #22571 from marination/quality-feedback fix: Quality Feedback and Template (minor)	2020-07-06 13:17:10 +05:30
rohitwaghchaure	1cc1fd4f86	Merge pull request #22576 from marination/party-details fix: Check for Company before trying to fetch party details	2020-07-06 12:42:16 +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
rohitwaghchaure	e5d9ebe32e	Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix fix: Consider company fiscal year for getting balance	2020-07-06 12:34:56 +05:30
Anupam K	e88f2bb053	number card filter	2020-07-06 12:34:05 +05:30
Marica	7e198527b9	Merge branch 'develop' into party-details	2020-07-06 11:09:20 +05:30
Saqib	819879dd12	Merge branch 'develop' into asset-delete-fix	2020-07-05 18:38:51 +05:30
Deepesh Garg	be05c4e14a	fix: Codacy and minor fixes	2020-07-05 18:16:16 +05:30
Deepesh Garg	4993ab5191	Merge branch 'develop' into develop	2020-07-04 18:28:06 +05:30
rohitwaghchaure	3292e63dee	Merge pull request #22569 from rohitwaghchaure/fixed-travis-failing-due-to-loan-issue fix: travis	2020-07-04 14:14:52 +05:30
Rohit Waghchaure	f0f4f70a76	fix: test case for salary slip	2020-07-04 13:30:22 +05:30
Deepesh Garg	96d40ec9da	fix: Consider company fiscal for getting balalnce	2020-07-03 22:59:00 +05:30
marination	e27b996e38	fix: Check for Company before trying to fetch party details	2020-07-03 22:12:00 +05:30
Deepesh Garg	62181707ee	Merge pull request #22574 from deepeshgarg007/uae_item_tax_fix fix: Update item tax only if item code available	2020-07-03 21:25:28 +05:30
Deepesh Garg	04661a4e15	fix: Update item tax only if item code available	2020-07-03 21:23:23 +05:30
Rohit Waghchaure	2cbf598b4b	fix: travis	2020-07-03 20:15:18 +05:30
Deepesh Garg	d7adacd3e2	feat: Added all companies option in employee tree to view employee accress all companies	2020-07-03 18:39:51 +05:30
marination	8e62035991	fix: Quality Feedback and Template (minor)	2020-07-03 16:19:55 +05:30

... 10 11 12 13 14 ...

24236 Commits