brotherton-erpnext

Author	SHA1	Message	Date
jsukrut	c3a23ddbe3	fix: restricted duplicate courses on Program Enrollment doctype (#20611 )	2020-02-15 16:39:51 +05:30
Yugandhara	ce1f6a73e2	fix: Changes done to get valid sales order list on production plan form(#20609 )	2020-02-15 16:31:53 +05:30
jsukrut	3a6ca13b44	fix:Mandatory field property failed to work based on the selection of field 'Group Based on' on 'Student Group' Page #20605	2020-02-15 16:18:17 +05:30
Yugandhara	e997168a23	fix: unused variable cdn removed	2020-02-15 16:14:46 +05:30
Yugandhara	af2b39891e	fix: Changes done to get valid sales order list on sales order child table of production plan	2020-02-15 16:01:41 +05:30
anil pise	7c474130ea	fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed.	2020-02-15 15:58:57 +05:30
Khushal Trivedi	dc39b4ba13	fix: validation on max group strength student group form	2020-02-15 15:38:16 +05:30
anil pise	21b1a00f61	Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599	2020-02-15 15:23:15 +05:30
pratik.m	c224cf761f	fix: restricted duplicate topics on Course doctype (#20594 )	2020-02-15 13:22:17 +05:30
Anuradha Kalaskar	21d662f96d	fix: to date cannot be less than from date validation on student leave application	2020-02-15 13:17:57 +05:30
Yugandhara	ad645afeb2	fix: Changes done to get valid customer and employee list on payment entry form	2020-02-15 10:56:41 +05:30
Raffael Meyer	772394b95a	fix header	2020-02-13 20:58:59 +01:00
Raffael Meyer	54717fa993	update cloumn names	2020-02-13 20:58:44 +01:00
Raffael Meyer	3bacdf1f4b	quote format name	2020-02-13 20:40:15 +01:00
Raffael Meyer	96b66dfae6	update TRANSACTION_COLUMNS according to "DATEV Format v7.0"	2020-02-13 20:37:37 +01:00
Raffael Meyer	b555ed0cba	update header accoding to "DATEV Format v7.0"	2020-02-13 20:05:27 +01:00
Raffael Meyer	8818850174	consutant number and client number are mandatory	2020-02-13 17:13:15 +01:00
Raffael Meyer	46cf20825b	generated on is datetime, not date	2020-02-13 17:09:22 +01:00
Raffael Meyer	0070805bbb	add format version (data type)	2020-02-13 17:06:06 +01:00
Raffael Meyer	7d2777870e	bump version number	2020-02-13 17:05:37 +01:00
Raffael Meyer	4fb897728b	EXTF must be in quotes	2020-02-13 17:02:01 +01:00
rohitwaghchaure	c2c12dc82f	Merge pull request #20572 from abhijitkumbharInd/develop Production Plan \| Get items from Sales Order not fetching grand total value	2020-02-13 10:09:24 +05:30
Raffael Meyer	0fac1f9429	Add groups for account types "Bank" and "Cash"	2020-02-12 13:59:48 +01:00
Raffael Meyer	cad404c355	Merge branch 'develop' into skr03_gnucash	2020-02-12 13:58:53 +01:00
Himanshu Mishra	b76d2d4d98	Fix: Syntax error in `get_child_warehouses`	2020-02-12 13:22:05 +05:30
rohitwaghchaure	490b843ecf	Merge branch 'develop' into fixed_purchase_receipt_time_out_error_develop	2020-02-11 19:56:11 +05:30
rohitwaghchaure	3d98c59585	Merge pull request #20555 from ashish-greycube/fix_actual_qty_for_backflush fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-11 19:50:36 +05:30
abhijitkumbharIND	a67ae3ad31	fix: Production Plan \| Get items from Sales Order not fetching grand total value. #20568	2020-02-11 16:45:59 +05:30
Rucha Mahabal	ba740ff558	feat: show linked Sales Invoice in Patient Appointment after booking	2020-02-11 16:27:22 +05:30
Er-Naren719	94e14257fb	feat: column width increased for view attachments field (#314 )	2020-02-11 15:21:48 +05:30
Deepesh Garg	65a53ba86c	Merge pull request #20565 from vishdha/filter_serial_based_on_batch_v13 fix: filter serial no based on batch no	2020-02-11 13:45:21 +05:30
Deepesh Garg	93b98774e7	Merge pull request #20519 from ahmad18189/patch-3 automatic booking of asset depreciation fix	2020-02-11 13:44:29 +05:30
Rucha Mahabal	4dd6f0ae9b	fix: non-empty service unit set as empty after booking appointment	2020-02-11 13:39:18 +05:30
vishal	998de83d48	fix: filter serial no based on batch no	2020-02-11 12:24:44 +05:30
Deepesh Garg	97669e975d	fix: Update condition	2020-02-11 10:18:39 +05:30
Deepesh Garg	c688f9f584	Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop fix: added indexing on columns to fix performace issue	2020-02-11 10:12:49 +05:30
Deepesh Garg	9462ba6559	feat: Group by item wise sales register (#20251 ) * fix: Group by sales register report * fix: Remove group-by item * fix: Grand total query fix * fix: Remove debug param * fix: Code cleanup and commonification * fix: Add group by functionality to purchase register * fix: Changes in total row display * fix: Minor fixes * fix: Add total row * fix: Do not calculate total for rate	2020-02-10 17:59:17 +05:30
Rohit Waghchaure	50886f02c3	fix: added indexing on columns to fix performace issue	2020-02-10 15:56:56 +05:30
Rohit Waghchaure	e55a927eee	fix: test cases	2020-02-10 14:39:26 +05:30
Deepesh Garg	930e61d6e3	Merge pull request #20549 from nextchamp-saqib/so-update-items-warehouse-fix fix: mandatory warehouse wrror while updating items after submission	2020-02-10 12:09:11 +05:30
ashish-greycube	121636f9bf	fix: backflush raw material based on - Material Transferred for Manufacture	2020-02-10 10:49:50 +05:30
Rucha Mahabal	cf3c8174f6	Merge branch 'develop' into fix_regional_data	2020-02-10 00:40:21 +05:30
Rucha Mahabal	8334a3a1fd	fix: patch for creating irs_1099 custom field (United States)	2020-02-10 00:34:09 +05:30
rohitwaghchaure	7d2c8cffb0	fix: pricing rule not working on item groups (#20547 ) Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-02-09 21:23:53 +05:30
thefalconx33	9225159d8c	fix: mandatory warehouse wrror while updating items after submission	2020-02-09 12:19:03 +05:30
Rohit Waghchaure	f0d27528e3	fix: time out error while submitting the purchase receipt which has more than 100 serial nos	2020-02-07 14:42:33 +05:30
Deepesh Garg	ed5c05b0f7	Merge pull request #20533 from rohitwaghchaure/procurement_tracker_not_working_for_special_char_company_name fix: Procurement Tracker report not working	2020-02-07 10:43:11 +05:30
Rohan Bansal	d64f92cf99	fix: show WFH in monthly attendance sheet report	2020-02-06 17:30:57 +05:30
Rohit Waghchaure	07f3312804	fix: Procurement Tracker report not working	2020-02-06 14:34:11 +05:30
Deepesh Garg	eeb4c3629c	Merge pull request #20529 from nextchamp-saqib/mv-fix-develop fix: typo; serial no doesn't have amc start date	2020-02-06 13:56:10 +05:30
Deepesh Garg	cf8e2732c9	Merge pull request #20428 from 0Pranav/territory-sales-pipeline feat: add territory wise sales report	2020-02-06 13:11:07 +05:30
thefalconx33	fcae88a514	fix: typo; serial no doesn't have amc start date	2020-02-06 13:00:47 +05:30
Deepesh Garg	da406d74ef	fix: Remove debug param	2020-02-06 12:55:21 +05:30
Deepesh Garg	a4928f6f5b	fix: Add report link in module view and fix date filter	2020-02-06 12:50:25 +05:30
Parth J. Kharwar	830b316543	fix: full day leaves not tagged as half day in attendance (#20487 ) * fix: full day leaves not tagged as half day in attendance * chore: code cleanup for half day date value set	2020-02-05 15:01:13 +05:30
0Pranav	9d9a3d85d8	fix: filters after rename	2020-02-05 14:17:21 +05:30
Anurag Mishra	eacc1bc2dc	fix: requested changes	2020-02-05 12:45:43 +05:30
Deepesh Garg	30e766b228	fix: SQL query in financial statements	2020-02-05 12:12:47 +05:30
Ahmad M Abdelrahman	41e7163476	automatic booking of asset depreciation fix Stop Automatic deprecation is not working	2020-02-05 08:33:53 +02:00
Rucha Mahabal	50b67792ca	fix: remove check availability button from form	2020-02-03 23:45:14 +05:30
Rucha Mahabal	513b443861	fix: make check availability as the primary action button	2020-02-03 23:42:21 +05:30
Rucha Mahabal	4d9d51d91c	fix: get prescribed procedures button not working	2020-02-03 22:29:32 +05:30
Rucha Mahabal	217e1b41fb	refactor: Appointment Type, add dashboard	2020-02-03 21:55:52 +05:30
Rucha Mahabal	6ffdbcbcd7	feat: show Patient Appointment status in List View	2020-02-03 21:23:02 +05:30
Deepesh Garg	d8e57d3d5a	fix: Unable to submit landed cost voucher (#20493 ) * fix: Unable to submit landed cost voucher * fix: Test case for multiple landed cost voucher against a Purchase receipt * fix: Test Case	2020-02-03 18:53:34 +05:30
Anurag Mishra	1f6cc2b6ec	feat: appointment Letter (#20104 ) * feat: appointment Letter * fix: requested changes Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-02-03 17:52:42 +05:30
Pranav Nachnekar	6c14a08631	fix: disallow quick entry for doctypes with tree view (#20452 )	2020-02-03 17:05:26 +05:30
rohitwaghchaure	716a85d81a	Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order feat: added source warehouse field in the work order	2020-02-03 16:32:19 +05:30
Himanshu	10b3b79c0f	fix(Report): query report for Quality Action (#20424 ) * fix: query report for QA * fix: add QM permission * fix: add QM permission	2020-02-03 16:16:49 +05:30
Deepesh Garg	9e1fbaf59e	fix: Label and UX fixes while creating payment entry against customer (#20465 ) * fix: Label and UX fixes while creating payment entry against customer * fix: filter	2020-02-03 15:58:50 +05:30
Saqib	4fca6cae34	feat: add tax category in pos profile (#20413 ) * feat: add tax category in pos profile * fix: review fixes	2020-02-03 15:53:27 +05:30
Deepesh Garg	589f2cd16c	fix: Get only specified company accounts in financial statements (#20486 )	2020-02-03 15:49:24 +05:30
Saqib	5e6ce88c78	fix: gst permission for gst settings & hsn code (#20500 ) * fix: gst permission for gst settings & hsn code * Fix: typo Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-02-03 15:40:35 +05:30
Frappe PR Bot	ba0712a429	feat: Updated translation (#20490 )	2020-02-03 14:58:03 +05:30
Frappe PR Bot	1478282920	feat: Updated translation (#20499 )	2020-02-03 14:57:43 +05:30
0Pranav	9c4399e1f2	fix: better syntax for checking empty arrays	2020-02-03 14:57:42 +05:30
Deepesh Garg	943de261bb	Merge pull request #20505 from deepeshgarg007/button_shift fix: Move E-Way bill button under create	2020-02-03 14:50:54 +05:30
Rucha Mahabal	b010988033	feat: add dashboards to Healthcare Masters	2020-02-02 23:22:02 +05:30
Rucha Mahabal	0a35b2207e	refactor: Healthcare masters	2020-02-02 23:21:18 +05:30
Deepesh Garg	cce3ac9f79	fix: Move E-Way bill button under create	2020-02-02 21:25:58 +05:30
Deepesh Garg	c3f28db5b7	Merge pull request #20475 from ParthKharwar/dev-work-from-home-application feat: request for work from home marked in attendance	2020-02-01 19:06:40 +05:30
Parth Kharwar	823964f3a6	fix: test added to check work from home application	2020-01-31 14:30:38 +05:30
rohitwaghchaure	ffa74ad5c1	Merge pull request #20478 from deepeshgarg007/finance-book-filter-new fix: Do not show any finance book record if no finance book filter is applied	2020-01-31 13:19:16 +05:30
Rohit Waghchaure	adbe291498	feat: added source warehouse field in the work order	2020-01-31 13:09:06 +05:30
Rucha Mahabal	d089029bb4	fix: disabled practitioner schedule shown as enabled in list view	2020-01-31 12:32:42 +05:30
Deepesh Garg	34c33baa82	fix: Cash flow filter fix	2020-01-31 11:16:30 +05:30
0Pranav	b1473c3de0	fix: return empty array	2020-01-31 10:43:00 +05:30
0Pranav	75adb808e5	various fixes from review - Rename the report to title case - Added company filter - fixed checks in filter and += operator for total	2020-01-31 10:35:47 +05:30
Deepesh Garg	ba44f28202	fix: Filtering fixes in financial statement	2020-01-31 09:08:29 +05:30
Deepesh Garg	ce04526db8	fix: Do not show any finance book record if no finance book filter is applied	2020-01-30 15:33:51 +05:30
Suraj Shetty	0860865763	Merge branch 'develop' into fix-incorrect-translations	2020-01-30 15:12:33 +05:30
Parth Kharwar	5342c846d2	feat: request for work from home marked in attendance	2020-01-30 13:12:56 +05:30
Faris Ansari	8e131c7cad	fix: Remove translated strings from test	2020-01-30 13:03:05 +05:30
Parth Kharwar	2bccd7f717	fix: rename breadcrumb for Brand DocType from Selling to Stock	2020-01-30 12:12:42 +05:30
Suraj Shetty	082020184a	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-30 10:46:11 +05:30
Raffael Meyer	e21cd5e7f1	fix: account number for "Kasse"	2020-01-29 23:39:55 +01:00
Raffael Meyer	3716434218	fix: add missing account types	2020-01-29 22:21:19 +01:00
Rucha Mahabal	be29a24de5	refactor: Patient master	2020-01-29 22:22:39 +05:30
Deepesh Garg	d89fbc56d9	Merge pull request #20464 from Alchez/dev-wfh feat(hr): add work from home option in status	2020-01-29 20:12:40 +05:30
Diksha	480d52c6f3	feat(attendance): add work from home option in status	2020-01-29 17:46:27 +05:30
Suraj Shetty	da2c69e836	fix(translations): Incorrect syntax	2020-01-29 15:34:06 +05:30
Suraj Shetty	2f67647f7b	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations	2020-01-29 15:06:50 +05:30
Suraj Shetty	48e9bc3fc9	fix: Incorrect translation syntax	2020-01-29 15:06:18 +05:30
Pranav Nachnekar	d64135b2d2	fix: linking party in calendar event of appointment (#20458 )	2020-01-29 13:01:25 +05:30
Rucha Mahabal	a4202d1660	fix: disabled patient shown as enabled	2020-01-29 11:33:29 +05:30
Deepesh Garg	47ba65edc0	Merge pull request #20459 from 0Pranav/fix-supplier-quotation-button fix: missing plus button in request for quotaion for supplier quotation	2020-01-29 10:46:21 +05:30
Deepesh Garg	565a810bf7	Merge pull request #20454 from marination/stock-ledger-qty-column fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-29 09:49:55 +05:30
Deepesh Garg	b61b8d7ced	fix: Remove comma	2020-01-29 09:49:26 +05:30
0Pranav	d4c0184f3f	fix: missing plus button in request for quotaion for supplier quotation	2020-01-29 09:32:40 +05:30
Deepesh Garg	217517a61f	Merge pull request #20455 from toxnico/develop fix: french translation correction	2020-01-29 08:39:38 +05:30
Rucha Mahabal	c7417c08ed	refactor: Healthcare Settings	2020-01-28 18:06:23 +05:30
Pranav Nachnekar	c1312700e8	feat: create appoitnemnt against customer (#20457 )	2020-01-28 17:50:47 +05:30
Nicolas Simonnet	10ffaf4e89	french translation correction	2020-01-28 11:45:57 +01:00
marination	372c5e51d5	fix: 'In Qty' and 'Out Qty' columns in Report Stock Ledger	2020-01-28 16:04:49 +05:30
rohitwaghchaure	da9a3936e1	fix: incorrect work order qty for sub assembly items (#20449 )	2020-01-28 14:34:27 +05:30
Nabin Hait	2bb3a62b1a	fix: cannot complete task if dependent task are not completed / cancelled (#20437 )	2020-01-28 14:08:53 +05:30
Anurag Mishra	3496104ebe	fix: odometer value was not syncing properly	2020-01-28 13:11:49 +05:30
Deepesh Garg	cd8d667861	fix: Parent company defaulting on creation of new company (#20422 ) * fix: Parent company defaulting on creation of new company * fix: Test Cases * fix: Test Cases * fix: Test Cases for staffing plan	2020-01-28 12:54:45 +05:30
Pranav Nachnekar	3fb48ebf61	fix: discounting not applied on sales invoice created by subscriptions (#20431 )	2020-01-28 12:52:13 +05:30
Marica	4e7625bd8f	fix: Column 'project' in where clause is ambiguous (#20438 ) * fix: Column 'project' in where clause is ambiguous * fix: Fixed alias in query	2020-01-28 12:43:38 +05:30
Deepesh Garg	0c31d62edd	Merge pull request #20447 from Alchez/dev-driver-address-fetch fix: only fetch driver address if not set (develop)	2020-01-28 09:20:26 +05:30
Don-Leopardo	f6d5073832	Merge branch 'develop' into fix_sqlinjection_develop	2020-01-27 13:56:01 -03:00
rohitwaghchaure	7fda3a12cc	Merge pull request #20445 from rohitwaghchaure/copy_to_warehouse_to_target_warehouse_in_delivery_note_item fix: to warehouse not set in the customer warehouse	2020-01-27 19:29:19 +05:30
Rohan Bansal	ce17a546b9	fix: only fetch driver address if not set	2020-01-27 18:08:11 +05:30
Rohit Waghchaure	2dff28498f	fix: to warehouse not set in the customer warehouse	2020-01-27 17:56:25 +05:30
NahuelOperto	be1895fd08	Fix sql injection	2020-01-27 09:02:02 -03:00
Saqib	e009187e02	refac: filters and columns of fixed asset register report (#20332 )	2020-01-27 16:05:55 +05:30
Parth J. Kharwar	011c13b3cc	fix: employee checkin doctype time permissions (#20403 )	2020-01-27 16:03:24 +05:30
Shivam Mishra	149b4e5985	chore: warn bom naming conflict (#20244 ) Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-01-27 15:20:30 +05:30
Deepesh Garg	ef41a0eda5	fix: Finance book filtering in financial statements (#20410 ) * fix: Finance book filtering in financial statements * fix: Use IS NULL instead of ifnull	2020-01-27 15:18:51 +05:30
Saqib	9cb02bf2e1	fix: incorrect status for fraction of outstanding amount (#20369 )	2020-01-27 14:22:43 +05:30
Himanshu Warekar	e169d2964c	fix: change fieldtype to Text	2020-01-24 17:40:29 +05:30
Saqib	9291df4d4c	fix: wrong outstanding invoices fetched against employee (#20373 )	2020-01-24 16:22:49 +05:30
Anurag Mishra	ce00f6cf70	fix: Duplicate Attendance Due Wrong Date format (#20390 )	2020-01-24 16:14:50 +05:30
Rucha Mahabal	0a27c98a99	fix(Healthcare): disabled Lab Test Template shown as Enabled in List View (#20378 ) * fix (Healthcare): disabled Lab Test Template shown as enabled in List View * fix: remove custom disabled button and unhide disabled field	2020-01-24 16:12:08 +05:30
Marica	40dffab79e	fix: Product Page non-stock item status (#20383 )	2020-01-24 15:52:27 +05:30
Rucha Mahabal	72c3dd1d11	fix: healthcare settings registration fee NoneType error (#20395 )	2020-01-24 15:50:44 +05:30
Frappe PR Bot	84afdfdb4c	feat: Updated translation (#20404 )	2020-01-24 14:21:53 +05:30
rohitwaghchaure	573de02f60	Merge pull request #20398 from rohitwaghchaure/fixed_serial_no_button_not_working_develop fix: add serial no button not working	2020-01-24 13:49:41 +05:30
Deepesh Garg	60e8d52f32	Merge pull request #20401 from deepeshgarg007/general_ledger_sort fix: Order GL entries by creation time in General ledger	2020-01-24 13:19:39 +05:30
Deepesh Garg	1e77a1374d	Merge pull request #20393 from rohitwaghchaure/unlink_reference_name_from_batch_on_cancel_of_stock_transactions_develop fix: unlink references from batch on cancellation of stock transactions	2020-01-23 22:40:26 +05:30
Rohit Waghchaure	8996b7d8a4	delete the auto created batch	2020-01-23 17:44:19 +05:30
deepeshgarg007	fdba26d476	fix: Order GL entries by creation time in General ledger	2020-01-23 17:42:57 +05:30
Rohit Waghchaure	067e8ad50d	fix: add serial no button not working	2020-01-23 15:49:39 +05:30
Deepesh Garg	f2d3bd71c9	Merge pull request #20356 from abhijitkumbharInd/develop fix: Gives a 404 error when clicked on the Download Required Material…	2020-01-23 15:45:42 +05:30
Deepesh Garg	1d279c30bb	Merge pull request #20386 from rohitwaghchaure/fixed_lead_date_comparision_issue_develop fix: lead date comparison issue	2020-01-23 15:22:53 +05:30
Deepesh Garg	b83f5cee6c	Merge pull request #20388 from rohitwaghchaure/lead_showing_two_times_in_the_report_develop fix: lead details duplicate entries	2020-01-23 15:20:47 +05:30
Deepesh Garg	32be74e40d	Merge pull request #20381 from nextchamp-saqib/small-fix-asset fix: tuple index out of range error	2020-01-23 15:03:00 +05:30
Rohit Waghchaure	4f4dbf1996	fix: unlink references from batch on cacnellation of stock transactions	2020-01-23 12:45:45 +05:30
Rohit Waghchaure	0251e33f31	fix: lead details duplicate entries	2020-01-22 16:59:36 +05:30
Rohit Waghchaure	7b8e1e0891	fix: lead date comparison issue	2020-01-22 16:36:14 +05:30
thefalconx33	e7154f155b	fix: tuple index out of range error	2020-01-22 12:22:55 +05:30
Rohit Waghchaure	0cc4cf2cf5	fix: Zero division error while making finished good entry against the work order	2020-01-21 19:28:08 +05:30
abhijitkumbharIND	0eb6f06685	fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355 )	2020-01-21 19:16:32 +05:30
abhijitkumbharIND	b2f08a7a42	fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved (#20355 )	2020-01-21 19:16:32 +05:30
byugandhara	239f0d529e	Fix: Spelling correction in throw message of stock entry(#20337 ) (#20353 )	2020-01-21 15:47:27 +05:30
rohitwaghchaure	5056c8bcb4	fix: not able to import chart of account if parent account is missing (#20368 )	2020-01-21 15:32:26 +05:30
Saqib	eea0ffcb38	fix: account not added to child company (#20361 )	2020-01-21 15:25:51 +05:30
Nabin Hait	50cb49cb00	fix: Don't fetch price list rate on change of qty (#20363 )	2020-01-21 13:04:21 +05:30
KanchanChauhan	a7d1985b5f	fix: Set Quotation expired if not Ordered or Lost (#20354 ) Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2020-01-21 12:35:11 +05:30
Anurag Mishra	85e5ba9698	Merge branch 'develop' into fix-remaining-leave-balance-calculation	2020-01-20 19:41:33 +05:30
Mangesh-Khairnar	2892a3b067	fix: nonetype issue in the total leaves calculation	2020-01-20 18:02:23 +05:30
rohitwaghchaure	6ae61a1693	fix: incorrect number of gl entries issue (#20352 )	2020-01-20 17:53:19 +05:30
Marica	7653a8b9fa	fix: 'get_additonal_costs' is not defined (#20344 ) * fix: 'get_additonal_costs' is not defined * fix: Re-added get_items on Work order change.	2020-01-20 15:46:36 +05:30
Nabin Hait	03b116dd01	fix: deprecated fetching item price based on min_qty (#20347 )	2020-01-20 15:45:04 +05:30
Himanshu Warekar	7be9120730	fix: remove email_append_to from hooks	2020-01-19 15:05:26 +05:30
Himanshu Warekar	303f085499	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-01-19 11:45:24 +05:30
Mangesh-Khairnar	2ac8473abf	fix: calculate remaining leave balance	2020-01-17 22:46:26 +05:30
Nabin Hait	444156184c	fix: Plaid TypeError in add_bank_accounts (#20335 )	2020-01-17 15:57:48 +05:30
Jigar Tarpara	f5374c182e	Bug Fix (#20330 ) * Bug Fix auto_close_after_days field is in Selling Settings * fix: close_opportunity_after_days field is in selling settings Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-01-17 11:54:25 +05:30
Parth Kharwar	0a581c096b	chore: changed employee contact field name	2020-01-17 11:50:35 +05:30
Rohan	ef734ee850	fix: handle default value for batch size in BOM operation (#20328 )	2020-01-17 11:45:54 +05:30
Vishal Dhayagude	2ae87876b6	fix: salary structure assignment filter employee based on company (#20318 ) * fix: pick company from employee salary structure * fix: Salary structure assignment fetch company from enmployee * Revert "fix: Salary structure assignment fetch company from enmployee" This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f. * fix: Salary structure assignment fetch company from enmployee * fix: filter on company for salary structure assignment * fix: minor changes * fix: minor changes * fix: added company to salary strucutre assignment	2020-01-17 11:44:11 +05:30
Himanshu	e3afe8a73c	fix: don't hide primary_address_and_contact_detail (#20322 )	2020-01-16 13:39:29 +05:30
Saqib	bcb6130bbe	fix: hide total amount field from journal entry PF (#20324 )	2020-01-16 13:38:43 +05:30
Nabin Hait	e321fbb0d5	fix: Multiple fixes based on testing on pre-release branch (#20301 ) * fix: Multiple fixes based on testing on pre-release branch * fix: reload hr settings	2020-01-16 13:37:25 +05:30
rohitwaghchaure	3cbb4cbad9	Merge pull request #20315 from PawanMeh/fix_20314 fix: Italian invoicing supplier name issues	2020-01-16 11:43:14 +05:30
rohitwaghchaure	d821c58a5e	fix: capacity planning validation (#20317 )	2020-01-16 11:29:08 +05:30
Pawan Mehta	687cbc7c0c	fix: #20314	2020-01-15 23:44:36 +05:30
Vishal Dhayagude	654d785776	fix: Delivery note not able to create sales return (#20264 )	2020-01-15 19:28:58 +05:30
Marica	9f6c95549a	fix: Applied query on PO Supplier popup field in Material Request. (#20231 )	2020-01-15 19:24:28 +05:30
Marica	4e6b3ada0f	fix: Missing argument in status updater (#20281 )	2020-01-15 19:22:35 +05:30
Saqib	b0b179f1b7	fix: make jv depreciations only if calculate depr is checked (#20282 )	2020-01-15 19:05:35 +05:30
Wolfram Schmidt	a346469e0c	Update de.csv (#20292 ) Missing translation	2020-01-15 19:04:39 +05:30
sahil28297	32d643ed3c	fix(patch): reload tax category (#20308 )	2020-01-15 18:57:54 +05:30
sahil28297	596a072d5f	fix(patch): do not append taxes to template if account name is not set (#20312 )	2020-01-15 18:56:36 +05:30
Saqib	617a24191f	fix: get existing payment req amount only from unpaid req (#20289 )	2020-01-15 16:36:13 +05:30
rohitwaghchaure	61ad6292d6	fix: incorrect number of GL Entries error in stock entry (#20299 )	2020-01-15 16:35:31 +05:30
Suraj Shetty	71ed1d42e2	Merge branch 'develop' into cancel_frappe_1	2020-01-15 11:22:44 +05:30
Shivam Mishra	a59c2ce17a	fix: profit and loss indicator bug	2020-01-14 17:55:49 +05:30
Shivam Mishra	748c3d9e8b	feat: update profit and loss for new report summary API	2020-01-14 17:31:19 +05:30
0Pranav	6280609c25	enhancement: add territory wise sales report	2020-01-14 15:53:35 +05:30
Suraj Shetty	080d136fd7	fix: Improper escaping (#20248 ) * fix: Improper escaping issue was introduced in https://github.com/frappe/erpnext/pull/20202 * fix: missing closing parentheses * style: trim unwanted spaces Co-authored-by: Pranav Nachnekar <prnvnachnekar@gmail.com>	2020-01-14 12:55:03 +05:30
rohitwaghchaure	7894caf397	Merge pull request #20276 from rohitwaghchaure/fixed_report_stock_and_account_value_comparison fix: filter issue for the stock and account value comparison report	2020-01-14 12:18:39 +05:30
Rohit Waghchaure	9650c25429	fix: filter issue for the stock and account value comparision report	2020-01-14 12:12:54 +05:30
Saqib	1218160c70	fix: payment entry can be created against on hold PI (#20270 )	2020-01-14 12:07:24 +05:30
Deepesh Garg	7420fccbee	Merge pull request #20269 from rohitwaghchaure/fixed_delivery_date_not_able_to_change_after_submit fix: allow on submit for the delivery date field	2020-01-14 10:00:10 +05:30
Saqib	b8bcad5850	fix: gl not generated on manual asset creation (#20265 )	2020-01-13 18:17:05 +05:30
Himanshu Warekar	c9f497d7c0	feat: move subject and sender fields to json	2020-01-13 16:26:40 +05:30
Himanshu Warekar	e5692e035a	Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to	2020-01-13 15:17:32 +05:30
Deepesh Garg	2d151a7b85	fix: Remove patch to set automatic tax fetching from item tax template (#20234 )	2020-01-13 15:09:27 +05:30
Suraj Shetty	06ed72a859	Merge branch 'develop' into cancel_frappe_1	2020-01-13 15:08:23 +05:30
Deepesh Garg	70a58d333b	Merge pull request #20245 from nextchamp-saqib/asset-cancel-fix fix: auto cancel if movement exists	2020-01-13 14:44:45 +05:30
Deepesh Garg	16b8673554	Merge pull request #20257 from nextchamp-saqib/revery-jv-fix fix: remove default customer as party type	2020-01-13 13:48:55 +05:30
vishal	dcef798be7	fix: minor changes	2020-01-13 12:59:52 +05:30
vishal	1dd289450f	fix: docstring for auto cancel	2020-01-13 12:59:18 +05:30
vishal	eef05758b6	feat: Added docinfo for auto cancel exempt doctypes	2020-01-13 12:59:18 +05:30
vishal	70148a6748	feat: docstring added for auto cancel exempt doctypes	2020-01-13 12:59:12 +05:30
thefalconx33	f04d054faa	fix: remove default customer as party type	2020-01-13 12:43:49 +05:30
Rohit Waghchaure	ecdfc1a15c	fix: allow on submit for the delivery date field	2020-01-13 12:43:26 +05:30
thefalconx33	1e7a127dfa	fix: auto cancel if movement exists	2020-01-11 14:19:02 +05:30
deepeshgarg007	00746306a3	fix: Item tax template fetching from HSN Code	2020-01-10 15:01:50 +05:30
gavin	12568e4f07	Merge pull request #19514 from gavindsouza/rename-doc-fix fix: frappe.rename_doc update	2020-01-09 15:07:05 +05:30
rohitwaghchaure	d4d7d211ea	feat: report to show difference between stock and account value (#20186 )	2020-01-09 15:05:05 +05:30
Suraj Shetty	000ac0068b	Merge branch 'develop' into rename-doc-fix	2020-01-09 13:46:08 +05:30
Marica	287f491f7b	fix: Employee name in Report trial balance for party (#20223 ) * fix: Employee name in Report trial balance for party * fix: Add account filter in trial balance for party report Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2020-01-09 13:35:06 +05:30
Pranav Nachnekar	1612432f45	fix: parent item should not appear in raw material request dialog (#20216 )	2020-01-09 13:32:15 +05:30
Don-Leopardo	ccdf19314d	fix: min_qty and valid_from for the price selection (#20217 )	2020-01-09 12:24:43 +05:30
Pranav Nachnekar	229e5398b5	fix: escape % in customer name (#20202 )	2020-01-09 12:21:26 +05:30
Marica	c72de6edaa	fix: Added description and title to supplier selection popup in Material Request. (#20179 )	2020-01-07 13:06:08 +05:30
Vishal Dhayagude	7ae11005c4	fix: UX improvement. move trigger on fieldname restrict_backdated_leave_application (#20211 )	2020-01-07 13:02:13 +05:30
Vishal Dhayagude	6b316cd7cb	feat: Backdated leave application (#20201 ) * fix: only HR Managers can make backdated leave applications * fix (leave application): error message changed and user check modified * fix: Move hardcoded logic to HR Settings * fix: added role as mandetory field on check restict field * fix: minor changes	2020-01-07 11:48:38 +05:30
Wolfram Schmidt	aab96b7fbf	Update de.csv (#20205 ) changed translation of "leave/-s" to "Urlaub/Urlaubstage" instead of "Blätter" (Blätter is leaves as in tree or sheet as in paper)	2020-01-07 11:37:08 +05:30
sahil28297	88737e38f2	fix(item_tax_template): fetch parent account if not set (#20198 )	2020-01-07 11:30:22 +05:30
Pranav Nachnekar	971458043d	fix: add new delivery note button in Sales Order (#20199 ) * fix: add new delivery note button in Sales Order * fix: removed debugger Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2020-01-07 11:29:35 +05:30
Rohan	7c8aaba449	fix: integer UOM check in transactions (#20176 )	2020-01-07 11:23:53 +05:30
Deepesh Garg	ef0d26c161	feat: Validity for Item taxes (#20135 ) * feat: Validity for Item taxes * fix: Trigger for gst hsn code * fix: Sort taxes based on validity * fix: Validation for item tax template and filters based on validity * fix: Add missing semicolon * fix: Validate tax template only if item code available * fix: Do not validate or filter item tax template if no item taxes applied * fix: Consider item group for validating taxes * fix: Test cases for item tax validation * fix: Item tax template filtering fixes * fix: Add missing semicolon * fix: Remove unnecessary query	2020-01-06 15:34:15 +05:30
rohitwaghchaure	b5f91bea90	Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request fix: incorrect party type in payment request	2020-01-06 15:16:42 +05:30
Rohit Waghchaure	8641f9ce77	fix: party type in payment request	2020-01-06 15:07:06 +05:30
rohitwaghchaure	055012a7fb	Merge pull request #20170 from nabinhait/inter-company-serial-no-outgoing-rate fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-06 12:07:53 +05:30
rohitwaghchaure	fe2afc643e	fix: incorrect valuation rate for finished good entry (#20165 )	2020-01-06 11:51:43 +05:30
Deepesh Garg	92f3149a64	Merge pull request #20185 from mujeerhashmi/fee-write-off feat: Allow write-off for Fees doctype in journal entry.	2020-01-06 08:09:16 +05:30
Himanshu	9496b8453f	fix(plaid): change json structure (#20189 )	2020-01-06 00:17:16 +05:30
Syed Mujeer Hashmi	03bf1a875f	feat: Allow write-off for Fees doctype Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2020-01-04 13:26:42 +05:30
Marica	159799c238	Merge branch 'develop' into item-min-qty	2020-01-03 12:13:00 +05:30
rohitwaghchaure	52c5fb33d7	Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop fix: ignore pricing rule for other item group	2020-01-02 19:24:37 +05:30
thefalconx33	7a01367ef1	ux: add description for minimum purchase qty	2020-01-02 19:14:55 +05:30
Nabin Hait	328c4f9b92	fix: Get outgoing rate of serial no from SLE if serial no already transferred to another company	2020-01-02 19:00:47 +05:30
Rohit Waghchaure	660a78b877	fix: ignore pricing rule for other item group	2020-01-02 17:31:09 +05:30
deepeshgarg007	473b478883	fix: Show closing row in general ledger print	2020-01-02 12:22:04 +05:30
Raffael Meyer	5d6fada431	feat: add accounts and account types	2020-01-01 22:55:54 +01:00
Rucha Mahabal	2d293c585e	fix(Subscription): pass start_date while computing next_schedu… (#20159 )	2019-12-31 19:15:37 +05:30
Anurag Mishra	8554304616	fix: set currency to company default currency (#20157 )	2019-12-31 17:23:31 +05:30
Rohan	938ba3efc4	feat: show item name in Item Price list view (#20156 )	2019-12-31 17:21:07 +05:30
Saqib	440a3b75be	fix: don't show transfer button if already items are supplied (#20154 )	2019-12-31 17:20:04 +05:30
Nabin Hait	5748cde54b	fix: minor field arrangements	2019-12-31 17:18:15 +05:30
Anurag Mishra	d2eae9fbcf	fix: Atendance Request, Employee Skill Map, Leave Encashment form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	b57ec65812	fix: Additional salary, Department, driver, loan, salary slip, shift,Travel request form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	52d280067b	fix: Leave Type form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	cfdbbcff70	fix: Employee incentive form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	39ecd6ee1e	fix: Expense calim form UI	2019-12-31 17:18:15 +05:30
Anurag Mishra	ec9000b6b9	fix: Employee form UI	2019-12-31 17:18:14 +05:30
Anurag Mishra	bd6e8b9cec	feat: Mark Unmarked Attendance (#20062 ) * feat: Mark Unmarked Attendance * Update shift_type.py * Update attendance_list.js * Update attendance.py * Update attendance.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-31 17:09:56 +05:30
Rohan	b73b347697	feat: add job applicant's email in job offer (#20153 )	2019-12-31 17:09:02 +05:30
Javier Wong	5cc7648e9c	[Fix] Allow Print Before Pay in POS (#20151 ) Print Button does not show even when Print Before Pay is enabled in the POS Profile.	2019-12-31 17:07:37 +05:30
Saqib	71649fe141	fix: customer credit limit label (#20152 )	2019-12-31 17:05:34 +05:30
Deepesh Garg	2bc7e2881a	Merge pull request #20149 from nextchamp-saqib/rounded-total-ss feat: added provision to disable rounded total for salary slips	2019-12-31 17:02:14 +05:30
thefalconx33	88de158378	feat: added provision to disable rounded total for salary slips	2019-12-31 15:27:30 +05:30
Saqib	cb7043fd9d	fix: party account currency not fetched from account for SO (#20146 )	2019-12-31 13:55:13 +05:30
Marica	5483f1a27e	fix: Field 'other_charges_calculation' column type changed. (#20141 )	2019-12-30 22:20:02 +05:30
Rucha Mahabal	3ac39ba28d	fix: format currency field in bank and cash payment voucher print format (#20137 )	2019-12-30 15:18:07 +05:30
rohitwaghchaure	9af557f9d7	fix: incorrect batch fetched for the serialized items (#20119 ) * fix: incorrect batch fetched for the serialized items * Update stock_controller.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-30 13:26:47 +05:30
Ishan Loya	fe0adc8b25	fix: read WIP warehouse from work order (#20131 ) * fix: read wip_warehouse from work order in stock entry even if skip transfer is checked * fix: remove skip_transfer in stock entry Related to #10753	2019-12-30 12:19:08 +05:30
rohitwaghchaure	59a835602a	fix: service item's cost showing incorrect amount in stock entry (#20106 )	2019-12-30 11:42:06 +05:30
Deepesh Garg	e90126f7ab	Merge pull request #20123 from nextchamp-saqib/so-update-items fix: don't allow deletion of items which has work order assigned to it	2019-12-28 21:01:17 +05:30
Deepesh Garg	b914cf0a9d	Merge pull request #19815 from Mangesh-Khairnar/publish-item feat(marketplace): allow user to un-publish item	2019-12-28 17:52:49 +05:30
Deepesh Garg	4f1fcdd4a7	Merge pull request #20125 from marination/stock-module-desk chore: Added Reports to Stock Module Desk	2019-12-28 17:45:06 +05:30
marination	126a63af26	chore: Added Reports to Stock Module Desk	2019-12-27 17:18:27 +05:30
Rohan	901fe4785c	fix: employee preferred email patch (#20116 )	2019-12-27 17:07:35 +05:30
Ishan Loya	b2a1ae77ce	Remove default BOM filter in Work Order (#20117 ) Not all companies use default BOM (e.g. construction companies, etc.)	2019-12-27 17:06:34 +05:30
Marica	f4fbdf98d1	fix: Removed unneccesary Duplicate Entry Error. (#20120 )	2019-12-27 16:53:05 +05:30
thefalconx33	2073eeb8fa	fix: don't allow deletion of items which has work order assigned to it	2019-12-27 16:26:03 +05:30
Marica	47ab9850e6	fix: Show both warehouse columns in Stock Entry Grid view. (#20113 )	2019-12-27 15:31:07 +05:30
Mangesh-Khairnar	c7ce597b7f	fix: return when Hub Tracked Item is empty	2019-12-27 14:48:14 +05:30
Saqib	7e57ede35b	fix: unpaid invoices are created even if current invoice is paid (#20081 )	2019-12-27 13:02:13 +05:30
Deepesh Garg	467dba1954	fix: Patch incorrect GST category in invoices (#20084 ) * fix: Patch to set GST category for unregistered invoice * fix: Move patch up in line	2019-12-27 12:58:19 +05:30
Mangesh-Khairnar	cca6fb2794	Merge branch 'develop' into publish-item	2019-12-27 12:55:28 +05:30
rohitwaghchaure	4d806033af	Merge pull request #19335 from PawanMeh/feat_19334 feat(regional): Italian Localization and Passive invoicing cycle	2019-12-27 12:48:46 +05:30
rohitwaghchaure	616431d7c3	fix: incorrect reorder level in stock balance report (#20111 )	2019-12-27 12:35:58 +05:30
Rohan	e944f7ac05	fix: Add Serial No button prompt (#20099 )	2019-12-27 12:34:36 +05:30
rohitwaghchaure	a99f926a4b	fix: incorrect validation for scrap items (#20109 )	2019-12-27 12:21:15 +05:30
Nabin Hait	8f3fea63b1	Merge branch 'develop' into publish-item	2019-12-27 12:19:02 +05:30
Saqib	8774c869d7	fix: first name not fetched from job offer applicant name (#20093 )	2019-12-27 12:15:20 +05:30
Mangesh-Khairnar	8768d5d396	fix: fetch opening accumulated depreciation (#20095 )	2019-12-27 12:14:46 +05:30
rohitwaghchaure	5b889ef864	Merge pull request #20079 from nabinhait/rounding-adjustment-dev fix: rounding adjustment while both inclusive tax and discount amount present	2019-12-27 11:51:50 +05:30
Deepesh Garg	1a2e4fa36d	Merge pull request #20087 from nextchamp-saqib/pay-reco-fix fix: undefined dr_or_cr_notes in case of party type Employee	2019-12-27 08:13:09 +05:30
thefalconx33	61bd6ccc2b	fix: travis failing for leave application test	2019-12-26 18:27:58 +05:30
deepeshgarg007	bd1da65098	fix: Update modified date	2019-12-26 18:26:13 +05:30
deepeshgarg007	0b9a98ad43	fix: Add against blanket order field in sales order	2019-12-26 18:15:13 +05:30
deepeshgarg007	8857d87c5b	fix: Travis	2019-12-26 17:34:02 +05:30
Deepesh Garg	4ee6e37fc3	Merge pull request #20091 from nextchamp-saqib/account-period fix: only show doctypes which impact accounting in accounting period	2019-12-26 17:18:08 +05:30
Deepesh Garg	3f7a1a736c	Merge pull request #20090 from geniusupgrader/develop fix: fix to issue #20089	2019-12-26 16:06:10 +05:30
thefalconx33	81d0861506	fix: undefined dr_or_cr_notes in case of party type Employee	2019-12-26 14:42:11 +05:30
thefalconx33	6291ca8e40	fix: only show doctypes which impact accounting in accounting period	2019-12-26 13:55:35 +05:30
Saqib	7519436260	Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos feat: provision to select the custom fields in the online POS	2019-12-26 13:40:43 +05:30
Robin Rosenstock	e6387f9dca	fix to issue #20089	2019-12-26 08:09:47 +00:00
Rohit Waghchaure	2469fb9e35	fix: rounded total issue	2019-12-26 13:26:39 +05:30
Pawan Mehta	6e1ba43c3c	code fixes	2019-12-26 12:14:33 +05:30
Rohit Waghchaure	2c13a0533b	code cleanup	2019-12-26 12:14:32 +05:30
Pawan Mehta	bc40161d08	add ignore mandatory flag	2019-12-26 12:13:27 +05:30
Pawan Mehta	c3bb04ccb8	code improvements	2019-12-26 12:13:27 +05:30
hello@openetech.com	39b54cb889	validation change	2019-12-26 12:13:27 +05:30
hello@openetech.com	e9377e2513	review changes	2019-12-26 12:13:27 +05:30
hello@openetech.com	eb87566fa6	log encoding exception	2019-12-26 12:13:27 +05:30
hello@openetech.com	9e0762e8c2	code review changes	2019-12-26 12:13:27 +05:30
hello@openetech.com	5b33765a8c	discount handling	2019-12-26 12:13:27 +05:30
hello@openetech.com	90f170c376	code improvement	2019-12-26 12:13:27 +05:30
hello@openetech.com	c8e64235c0	codacy fixes	2019-12-26 12:13:27 +05:30
hello@openetech.com	309913bbdf	fix codacy issues	2019-12-26 12:13:27 +05:30
hello@openetech.com	5fadd355df	add naming series option	2019-12-26 12:13:27 +05:30
hello@openetech.com	fa8159efa3	mop options fix	2019-12-26 12:13:27 +05:30
hello@openetech.com	9964ad7870	python 2.7 fixes	2019-12-26 12:13:27 +05:30
hello@openetech.com	7021402a45	[feat] #19334	2019-12-26 12:13:27 +05:30
Rohit Waghchaure	682273a00b	feat: provision to select the custom fields in the online POS	2019-12-26 11:59:19 +05:30
Mangesh-Khairnar	d19bd8f0dd	Merge branch 'develop' into publish-item	2019-12-25 22:10:33 +05:30
Nabin Hait	a68ebdd008	Merge branch 'develop' into rounding-adjustment-dev	2019-12-25 15:18:12 +05:30
Himanshu	e2ea11c437	fix: remove quote (#20076 )	2019-12-25 15:15:35 +05:30
Parth J. Kharwar	8c4cf12c93	Setting preferred driver email in delivery trip (#19832 ) * fix: add driver's preferred contact email in delivery trip * fix: modify driver's preferred email patch and blank field checks * fix: patch file fix * fix: patch changes to improve speed * fix: removal of conflicts Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-25 15:14:52 +05:30
Nabin Hait	f32fc230f7	fix: rounding adjustment while both inclusive tax and discount amount present	2019-12-25 14:01:38 +05:30
rohitwaghchaure	6e8a9286c2	fix: multiple stock entry issues for the work order (#18686 ) * fix: multiple stock entry issues for the work order * Update work_order.py * Update work_order.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-24 18:53:32 +05:30
Rohan	7372672044	fix: pull serial numbers linked to batches + pull warehouse correctly (develop) (#19022 ) * fix: pull serial numbers according to set warehouses * fix: handle purchase returns	2019-12-24 18:19:58 +05:30
DeeMysterio	df3b4e48fe	fix(adress): get the address title at the top and mandatory in display (#20074 )	2019-12-24 18:10:18 +05:30
Khushal Trivedi	dd42dbc6a3	fix: date validation on student form, instructor duplicate fix on student grp, instructor with same employee id fix (#20072 ) * fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix: joining and relieving Date can be on same date as valid use case * fix-education: date of birth validation * fix:Sibling child table filtering for duplacacy on student form * fix:Sibling child table filtering for duplacacy on student form * fix:Sibling child table filtering for duplacacy on student form * fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix * fix: date validation on student form, instructor duplicacy fix on student grp, instructor with same employee id fix * fix: Exclude current record while validating duplicate employee Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2019-12-24 18:07:09 +05:30
Mitchy25	fee8340f98	fix: Bank Reconciliation Allows to Over Reconcile (#19461 ) * Update bank_reconciliation.py * fix: improve error message while over reconciling * fix: only check over-reconciliation when against payment entry Co-authored-by: Saqib <thefalconx33@gmail.com>	2019-12-24 18:02:18 +05:30
Mangesh-Khairnar	0143f7c59d	patch: set published in hub track item	2019-12-24 17:45:57 +05:30
Mangesh-Khairnar	7a5b9a7bbe	fix: translations and route fixes	2019-12-24 17:39:15 +05:30
Don-Leopardo	ec258a43d9	perf: Asset Depreciations and Balances report (#18022 )	2019-12-24 17:35:53 +05:30
Pranav Nachnekar	b972f763f3	fix: added validation for cost center (#19932 ) * fix: add validation for cost centers in sales invoice * use `get_cached_value` for getting compnay, formatting of error message	2019-12-24 16:46:46 +05:30
Deepesh Garg	e0b4d33039	Merge pull request #18715 from Alchez/v12-lead-address-contact feat: create address and contact after lead creation (develop)	2019-12-24 16:46:05 +05:30
deepeshgarg007	d7427919a4	fix: Address section rearrange and minor bug fixes	2019-12-24 16:45:09 +05:30
Saqib	0ad7449ae3	feat: allow adding & deleting of items in submitted SO & PO (#19911 ) * feat: allow adding of items after quotation submission * feat: allow deletion of items from submitted SO & PO * fix: case when items are added and deleted at once * fix: add test cases * For deletion of items while Updating Items after submitting PO & SO	2019-12-24 16:42:30 +05:30
Don-Leopardo	5557b16260	fix: order_type validation restriction (#18096 )	2019-12-24 16:39:34 +05:30
rohitwaghchaure	5c0ea2d7c9	Merge pull request #19708 from Alchez/dev-batch-to-stock-ledger feat: drill down on batch transactions (develop)	2019-12-24 15:25:05 +05:30
Deepesh Garg	e633567787	Merge branch 'develop' into v12-lead-address-contact	2019-12-24 14:43:41 +05:30
Deepesh Garg	a02bb5170b	Merge pull request #19913 from nextchamp-saqib/cart-address-fix fix: enable adding of address without enabling checkout feature	2019-12-24 14:08:19 +05:30
rohitwaghchaure	08433c2919	fix: supplier email id field not showing in the notification for purchase cycle doctypes (#20071 )	2019-12-24 13:03:47 +05:30
Deepesh Garg	58408217f6	Merge pull request #19822 from Mangesh-Khairnar/edit-item-details feat(marketplace): edit item details	2019-12-24 13:02:20 +05:30
Saqib	977489697d	Merge pull request #19973 from deepeshgarg007/budget_variance_dimension feat: Dynamic filters for dimensions in budget variance report	2019-12-24 12:57:50 +05:30
Deepesh Garg	55bc26e300	fix: Allow creation of multiple landed cost voucher against a Purchase Document (#20058 )	2019-12-24 12:55:01 +05:30
Himanshu	5af4c57ef7	fix: ambihious error (#20068 )	2019-12-24 12:31:38 +05:30
Sun Howwrongbum	088be37e64	feat: consider expiry_date during Batch queries (#20065 )	2019-12-24 12:29:25 +05:30
RJPvT	818c49279c	Update supplier_scorecard.py (#20061 )	2019-12-24 12:24:58 +05:30
Deepesh Garg	f5bd920e8f	Merge pull request #19955 from deepeshgarg007/employee_advance_return feat: Capture return amount against Employee Advance via Journal Entry	2019-12-24 11:52:20 +05:30
Deepesh Garg	cc62aad503	fix: Label for return amount	2019-12-24 11:51:39 +05:30
Rohan	ff98a52834	Merge branch 'develop' into v12-lead-address-contact	2019-12-24 11:21:08 +05:30
DeeMysterio	152c6be209	fix(employee onboarding): stop showing irrelevant job offer links for a job applicant (#20053 )	2019-12-23 19:02:29 +05:30
Wolfram Schmidt	964cbc03ba	Update employee.json (#20057 ) unnecessary description. Should be added by customer manually if needed individually.	2019-12-23 18:50:40 +05:30
Parth J. Kharwar	da5d5c4941	fix(hr): update leave application status on cancel (#19883 )	2019-12-23 18:41:17 +05:30
Khushal Trivedi	d8c10bcedb	fix:Sibling child table filtering for duplicate entry on student form (#19908 ) * fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix: joining and relieving Date can be on same date as valid use case * fix-education: date of birth validation * fix:Sibling child table filtering for duplacacy on student form * fix:Sibling child table filtering for duplacacy on student form * fix:Sibling child table filtering for duplacacy on student form	2019-12-23 18:38:11 +05:30
Prssanna Desai	4f72c0b8b5	fix: wrong items in table being deleted (#19994 )	2019-12-23 18:27:12 +05:30
Marica	93cb64ee30	enhancement`: Added Set Reserve Warehouse field in Purchase Order. (#19991 )	2019-12-23 18:24:56 +05:30
Pranav Nachnekar	8bada8759a	fix: wrap `scheduled_time` with `getdate()` (#20044 ) * fix: wrap `scheduled_time` with `getdate()` Handles inconsistent data returned from the ORM. * fix: use `getdate()` instead of `date()`	2019-12-23 18:19:29 +05:30
Anurag Mishra	bd5f5dabbd	fix: Salary Structure Fixes (#19923 )	2019-12-23 18:01:40 +05:30
Deepesh Garg	2b3482d5dd	fix: Do not validate accounting dimensions if from repost (#20042 ) * fix: Do not check for accounting dimensions in case of repost * fix: Do not validate accounting dimensions if from repost	2019-12-23 17:58:50 +05:30
Saqib	c1b6b4ed35	fix: breadcrumb for company list (#20051 )	2019-12-23 17:28:00 +05:30
Saqib	9078607600	fix: paid amount gets overwritten by get_outstanding_invoices (#20050 )	2019-12-23 16:25:16 +05:30
Saqib	06f9538e51	fix: bad condition while checking last asset movement entry (#20047 )	2019-12-23 16:08:21 +05:30
Saqib	4f18d2548d	fix: none type object updates AR report row (#19958 )	2019-12-23 16:01:38 +05:30
Saqib	1263515a92	fix: exchange rate not fetching correctly (#20010 )	2019-12-23 15:51:31 +05:30
Anurag Mishra	e6b3da0f59	feat: fixed party and party type in Accrual journal entry (#20021 )	2019-12-23 15:50:29 +05:30
Mangesh-Khairnar	6edd3580d1	fix(expense-claim): update status (#20030 ) * fix(expense-claim): update status * fix(expense-claim): compare using grandtotal precision	2019-12-23 15:48:34 +05:30
Deepesh Garg	06e7cf3caa	Merge pull request #20009 from nextchamp-saqib/pi-payable-filter fix: bad credit to filter in purchase invoice	2019-12-23 14:50:56 +05:30
thefalconx33	ee10f2f50d	fix: bad query for debit_to field in sales invoice	2019-12-23 13:07:00 +05:30
Rucha Mahabal	0e83a5754b	fix: remove illustrations from onboarding slides (#19872 ) * fix: remove illustrations from onboarding slides * fix: change Welcome slide's description * fix: justify text in slide	2019-12-23 08:24:46 +05:30
Deepesh Garg	704235565e	Merge pull request #20012 from nextchamp-saqib/share-transfer-perm fix: no role has cancelling permission for share transfer doctype	2019-12-21 17:23:15 +05:30
Rohit Waghchaure	0dba4345f3	fix: patch	2019-12-20 17:04:39 +05:30
rohitwaghchaure	7e7cad8296	Merge pull request #20005 from 0Pranav/appointment-schedulling fix: multiple issues with appointment schedulling	2019-12-20 15:16:59 +05:30
thefalconx33	7e68f050d9	fix: account manager doesn't have cancel submit perm for share transfer	2019-12-20 14:50:25 +05:30
rohitwaghchaure	0dd7e77615	Merge pull request #19928 from 0Pranav/delete-company-txn-query fix: replace sql with orm query for deleting company communications	2019-12-20 13:47:34 +05:30
rohitwaghchaure	977511e814	Merge pull request #20028 from rohitwaghchaure/subcontracting_issue_for_partial_purchase_receipt_develop fix: incorrect consumed qty for partial purchase receipt in subcontracting	2019-12-20 13:36:23 +05:30
rohitwaghchaure	9c1d3f2f54	Merge pull request #20024 from deepeshgarg007/gstr_2_report_fix fix: Tax amount not visible for some invoices	2019-12-20 13:34:53 +05:30
Rohit Waghchaure	c2a5f99a38	fix: incorrect consumed qty for partial purchase receipt in subcontracting	2019-12-20 13:01:02 +05:30
Deepesh Garg	7043bbd19e	Merge pull request #19869 from nextchamp-saqib/website-fix fix: website showing disabled items in list of products	2019-12-20 12:14:12 +05:30
Deepesh Garg	ccea0759cc	Merge pull request #20014 from marination/valuation_rate_company fix: Company None not found in get_valuation_rate	2019-12-20 11:55:57 +05:30
deepeshgarg007	ad9eb9b72c	fix: Tax amount not visible for some invoices	2019-12-19 20:57:40 +05:30
Mangesh-Khairnar	c1a1e7d503	style: formatting changes	2019-12-19 20:11:37 +05:30
Gavin D'souza	1e4ea466d3	style: update/standardize rename_doc usage	2019-12-19 19:07:29 +05:30
Deepesh Garg	c408628ef2	Merge pull request #19979 from deepeshgarg007/sales_register_upgrade fix: Update sales register report	2019-12-19 13:53:15 +05:30
marination	457ca0fe6c	fix: Company None not found in get_valuation_rate	2019-12-19 13:34:29 +05:30
thefalconx33	e9cb561d8d	fix: no role has cancelling permission for share transfer doctype	2019-12-19 13:18:46 +05:30
thefalconx33	9d9a78442e	fix: bad filter query	2019-12-19 13:10:57 +05:30
Deepesh Garg	57f9b758b7	Merge pull request #19983 from 0Pranav/mapped-doc-for-customer-quotation fix: use open_mapped_doc instead of create_new_doc	2019-12-19 11:59:50 +05:30
deepeshgarg007	aba58ba50e	fix: Spacing after commas	2019-12-19 11:02:37 +05:30
Rohit Waghchaure	2ae79b8ac2	fix: Pricing Rule Discount for Product	2019-12-18 17:53:21 +05:30
0Pranav	e786eea7db	remove comments	2019-12-18 16:25:26 +05:30
0Pranav	5f5c725ef9	add book appointment to the sidebar	2019-12-18 16:21:50 +05:30
0Pranav	0db86204cf	fix : only set price list if it exists for customer	2019-12-18 16:03:40 +05:30
0Pranav	84ae2cc543	fix: defualt timezone not getting selected	2019-12-18 15:47:10 +05:30
0Pranav	5150c69ee6	use open_mapped_doc instead of create_new_doc	2019-12-18 12:16:49 +05:30
Anurag Mishra	1202e64403	fix: Training Event Email Tenplate (#19652 )	2019-12-18 11:43:16 +05:30
0Pranav	e7aa20ebef	fix: replace sql query by orm in delete_communications and added tests	2019-12-18 11:16:54 +05:30
Ben Knowles	f597ba82ea	fix: task validation error when adding tasks to projects (#19919 ) * fix: task validation error when adding tasks to projects When adding a task to a project, if the project didn't have an Expected End Date the validation would fail. This is because passing a None value to getdate() returns today's date, rather than being optional as expected. * update task.py	2019-12-18 00:37:02 +05:30
deepeshgarg007	be8c406808	fix: Update sales register report	2019-12-17 22:27:23 +05:30
Rohit Waghchaure	4203eb4ee1	fix: not able to make work order from BOM	2019-12-17 18:19:26 +05:30
deepeshgarg007	b695fd31d6	fix: Remove trailing whitespace and add semicolon	2019-12-17 18:14:33 +05:30
deepeshgarg007	e65ada2807	feat: Dynamic filters for dimensions in budget variance report	2019-12-17 17:54:34 +05:30
rohitwaghchaure	5d0c42e2a1	Merge pull request #19943 from nextchamp-saqib/gl-precision-fix fix: gl entries doesn't filter based on debit precision	2019-12-17 17:23:34 +05:30
rohitwaghchaure	3772b2e03e	Merge pull request #19962 from rohitwaghchaure/allow_overproduction_against_work_order fix: now allow to over production against work order	2019-12-17 17:16:24 +05:30
rohitwaghchaure	86babbe3ac	Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13 fix: incorrect outstanding amount showing in the AP/AR report	2019-12-17 17:15:45 +05:30
Rohit Waghchaure	0f583b8c5a	fix: incorrect outstanding amount shwoing in the AP/AR report	2019-12-17 12:48:02 +05:30
deepeshgarg007	83ecaefd4c	feat: Custom button to create return entry from Employee Advance	2019-12-17 11:03:22 +05:30
rohitwaghchaure	741f64a51d	Merge pull request #19960 from rohitwaghchaure/fixed_incorrect_child_bom_fecthed_develop fix: incorrect child boms fetched	2019-12-16 17:00:35 +05:30
Rohit Waghchaure	b5bf22a821	fix: now allow to over production against work order	2019-12-16 16:53:00 +05:30
Rohit Waghchaure	197a99ee35	fix: incorrect children boms fetched	2019-12-16 16:20:47 +05:30
rohitwaghchaure	bb75179577	Merge pull request #19957 from nextchamp-saqib/pos-serial-no-fix fix: display serial no selection on adding items to cart	2019-12-16 15:11:51 +05:30
thefalconx33	f195ccd85f	fix: review changes	2019-12-16 15:04:17 +05:30
thefalconx33	e9c9cbd2fe	fix: display serial no selection on adding items to cart	2019-12-16 14:55:16 +05:30
rohitwaghchaure	b500f2ce4c	Merge pull request #19940 from marination/item_manufacturer_table_dev fix: Removed 'manufacturers' table from Item Master	2019-12-16 14:44:49 +05:30
rohitwaghchaure	86b2956ac0	Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount fix: pricing rule not working for product discount	2019-12-16 14:44:22 +05:30
Rohit Waghchaure	8bd84b28ca	fix: schedule date	2019-12-16 12:29:07 +05:30
marination	5ab823beab	fix: Removed validation from non existent manufacturers table	2019-12-16 12:19:47 +05:30
Rohit Waghchaure	21fe97e723	fix: pricing rule not working for production discount	2019-12-16 11:15:53 +05:30
deepeshgarg007	c05bd1964f	feat: Capture return amount against Employee advance via Journal Entry	2019-12-15 21:22:28 +05:30
deepeshgarg007	b223dd95e2	fix: Dashboard for employee advance doctype	2019-12-15 21:21:31 +05:30
deepeshgarg007	40b7ac4987	fix: Minor filter fix in expense claim type	2019-12-15 21:20:55 +05:30
Deepesh Garg	b0ab31f69b	Merge pull request #19927 from surajshetty3416/fix-profit-and-loss-statement fix: Profit and Lost (financial statement) report	2019-12-15 20:22:31 +05:30
rohitwaghchaure	5ed8465788	Merge pull request #19945 from nextchamp-saqib/existing-asset-fix fix: remove mandatory purchase reference for existing asset	2019-12-15 16:29:30 +05:30
Suraj Shetty	ba3c9b7651	Merge branch 'develop' into fix-profit-and-loss-statement	2019-12-14 23:36:11 +05:30
Suraj Shetty	586390db81	Merge branch 'develop' into fix-profit-and-loss-statement	2019-12-14 22:49:53 +05:30
deepeshgarg007	94ff8058ac	fix: Add missing import	2019-12-14 21:25:30 +05:30
rohitwaghchaure	b2f65366cf	Merge pull request #19941 from deepeshgarg007/pricing_rule_fix fix: Price rule filtering fix	2019-12-13 16:01:16 +05:30
thefalconx33	5da7e729a5	fix: remove mandatory purchase reference for existing asset	2019-12-13 15:44:39 +05:30
thefalconx33	bfc43d3b15	fix: gl entries doesn't filter based on debit precision	2019-12-13 15:41:19 +05:30
Mangesh-Khairnar	4bea44b9c9	fix: update already existing items	2019-12-13 15:05:43 +05:30
deepeshgarg007	8c9c6ec919	fix: Price rule filtering fix	2019-12-13 13:47:15 +05:30
marination	81990aee9f	fix: Removed 'manufacturers' table from Item Master	2019-12-13 13:18:59 +05:30
Deepesh Garg	57e6bcaf43	Merge pull request #19733 from marination/zero-division-basic-amount fix: Division by zero error in Stock Entry	2019-12-13 09:23:44 +05:30
Himanshu Warekar	c7feea830f	feat: Email Append To	2019-12-12 21:12:17 +05:30
marination	0e33f792d3	fix: Distribute charges based on quantity if Total Basic Amount is Zero.	2019-12-12 16:34:41 +05:30
Deepesh Garg	c9870c88b6	Merge pull request #19930 from deepeshgarg007/regional_address_fix fix: Get regional address details	2019-12-12 16:25:31 +05:30
Deepesh Garg	859b464a57	Merge pull request #19904 from prssanna/file-upload-fix fix: Bank statement not getting attached in Bank Reconciliation	2019-12-12 15:19:54 +05:30
deepeshgarg007	c58dc873d5	fix: Get regional address details fix	2019-12-12 14:55:57 +05:30
Suraj Shetty	f95267041d	fix: Financial statement report - Hidden column should note be considered in the report - Remove hardcoded currency formatting - Remove duplicate letterhead in the report (print_template already adds one) - Remove extra quotes from Total Amount text	2019-12-12 13:06:17 +05:30
Rohit Waghchaure	9b0d7b93dd	fix: not able to submit the landed cost voucher	2019-12-12 12:10:25 +05:30
Deepesh Garg	60592e9d43	Merge pull request #19897 from hrwX/qms-int-issue fix: rename labels	2019-12-12 08:45:51 +05:30
Deepesh Garg	d10cefa37e	Merge pull request #19893 from marination/rounded_total fix: Disable Rounded Total always showing field default value	2019-12-11 18:40:56 +05:30
Deepesh Garg	0e10340471	Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher fix: not able to cancel the landed cost voucher	2019-12-11 18:38:23 +05:30
thefalconx33	107989316c	fix: additional notes from Quotations not saved in SO	2019-12-11 18:15:54 +05:30
thefalconx33	894c210027	fix: enable address without checkout feature * fix add address form country link field	2019-12-11 17:43:04 +05:30
Mangesh-Khairnar	c6599fd1e2	fix: add publihed in hub track item	2019-12-11 17:29:04 +05:30
thefalconx33	5b622eace1	fix: handle scenario with no condition	2019-12-11 16:08:31 +05:30
0Pranav	d3605d2354	fix: issue in javascript timezones	2019-12-11 15:02:23 +05:30
prssanna	2ef26fbb07	fix: empty fname and fcontent of uploaded file	2019-12-11 14:21:04 +05:30
Rohit Waghchaure	37cf096102	fix: not able to cancel the landed cost voucher	2019-12-11 13:50:29 +05:30
Himanshu Warekar	45e4b73e08	fix: rename fields	2019-12-11 13:07:41 +05:30
rohitwaghchaure	797481f9d5	Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement fix: Manufacturing UX, added calendar view for job card	2019-12-11 13:01:16 +05:30
marination	ca6dbad7cb	fix: Disable Rounded Total always showing field default value	2019-12-11 12:10:05 +05:30
Raffael Meyer	9e32f587f5	fix: remove contact info, use international format (#19828 ) - for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15 - it is not customary, to use contact information such as phone number in the address	2019-12-10 21:41:05 +05:30
Khushal Trivedi	5380a4c3db	fix-education: date of birth validation on student form (#19875 ) * fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix: joining and relieving Date can be on same date as valid use case * fix-education: date of birth validation	2019-12-10 21:38:42 +05:30
Anurag Mishra	9046c13858	fix: added extra condition (#19884 )	2019-12-10 21:37:27 +05:30
Pranav Nachnekar	6aa763221b	fix: rename appointment booking route (#19886 ) * rename appoinment booking route * fix: replace all references to book-appointment route	2019-12-10 21:35:28 +05:30
rohitwaghchaure	c58495dcee	fix: Item-wise Sales History report not working (#19889 )	2019-12-10 21:34:03 +05:30
Saqib	664d0d89b5	fix: incorrect account mapping for child companies (#19887 ) * fix: incorrect account mapping for child companies on adding account to parent company * Update account.py	2019-12-10 21:32:17 +05:30
Mangesh-Khairnar	dd079d7e02	Merge pull request #19885 from Anurag810/leave_application_dashboard_fix fix: removed only custom dashboard	2019-12-10 16:24:51 +05:30
Deepesh Garg	6e2c13f4c8	feat(regional): Auto state wise taxation for GST India (#19469 ) * feat(regional): Auto state wise taxation for GST India * fix: Update gst category on addition of GSTIN * fix: Codacy and travis fixes * fix: Travis * fix(test): Update GST category only if GSTIN field available * fix: Test Cases * fix: Do not skip accounts if place of supply is not present * fix: Auto GST taxation for SEZ Party types * fix: Automatic taxation for multi state * fix: Codacy and travis fixes * fix: Auto GST template selection in Sales Order * fix: Move inter state check and source state to tax category * fix: Remove unique check from tax template * fix: Remove unique check from tax template * fix: Address fetching logic in Sales * fix: fecth tax template on company address change * fix: fetch company gstin on address change * fix: company_gstin set value fix * fix: Mutiple fixes and code refactor * fix: Add missing semicolon * fix: Company address fetching in sales invoice * fix: Remove print statement * fix: Import functools * fix: Naming fixes and code cleanup * fix: Iteritems compatibility for python 3	2019-12-10 15:55:05 +05:30
Anurag Mishra	9cc5c18f36	fix: removed only custom dashboard	2019-12-10 15:20:47 +05:30
Deepesh Garg	ce42f48bfb	fix: Append expense account only if expense account exists (#19880 )	2019-12-10 12:15:33 +05:30
Nabin Hait	6f68f2d020	feat: Cost center for each expenses in expense claim and allowed deferred expense (#19807 ) * refactor: Expense Claim Cost Center * refactor: Expense Claim Cost Center * refactor: Expense Claim Cost Center * fix: copy cost center from other row * patch: set cost center in children based on parent * fix: test cases for expense claim	2019-12-10 08:40:10 +05:30
marination	214acc9a42	fix: Changed check condition and added test	2019-12-09 21:38:19 +05:30
Mangesh-Khairnar	0cb2783f80	fix: create unpublish log on the hub	2019-12-09 19:24:29 +05:30
Saqib	5998034b02	fix: error message displays asset category as None (#19873 ) * fix: error message displays asset category as None * fix: asset gl_entries doesn't considers asset category's cwip account	2019-12-09 19:07:05 +05:30
Pranav Nachnekar	ae02b4119d	add init.py for appointment modules (#19823 )	2019-12-09 19:03:35 +05:30
Nabin Hait	da4847e46d	patch: Set against_blanket_order value in existing SO/PO (#19810 ) * patch: Set against_blanket_order value in existing SO/PO * Update set_against_blanket_order_in_sales_and_purchase_order.py	2019-12-09 18:27:50 +05:30
Shivam Mishra	9e0b3b29fa	feat: better message for serial number creation (#19863 )	2019-12-09 18:21:23 +05:30
Deepesh Garg	88c4514024	Merge pull request #19864 from nextchamp-saqib/report-col-fix fix: column data not visible after manual selection of columns	2019-12-09 17:57:12 +05:30
Saqib	7e958da6d6	fix: sales order reqd only checks for stock items (#19865 )	2019-12-09 17:23:19 +05:30
thefalconx33	2944301c87	fix: website showing disabled items in list of products	2019-12-09 16:35:54 +05:30
Mangesh-Khairnar	ba48546678	fix: display new item value	2019-12-09 16:31:14 +05:30
Mangesh-Khairnar	d249d4c947	style: change formatting	2019-12-09 15:44:31 +05:30
Mangesh-Khairnar	4350846f1e	fix(compensatory leave request): Create leave ledger entry on submit/cancel (#19476 ) * fix: allow creation of leave ledger entry * feat(compensatory-leave-request): create leave ledger entry on submit * style: add descriptive comments * test: allow creation of leave period based on company * fix(leave-allocation): check name of leave allocation for determining overlap * fix: validate new leaves allocated before updating leave allocation * test: compensatory leave request creation * fix: skip leave entries for non expired leave allocation * test: creation of leave ledger entry on creation of compensatory leave request * fix: minor changes * fix: fetch leave approver defined in employee in leave application * fix: attendance creation and leave balance calculation * test: create leave period for the compensatory off * style: add descriptive method name * test: updation of leave allocation on submit * fix: remove db_set from compensatory off	2019-12-09 14:27:38 +05:30
Faris Ansari	317bf5a321	feat(marketplace): Add category wise search (#19760 ) feat(marketplace): change route for category wise search	2019-12-09 13:59:30 +05:30
Saqib	39e4f75a76	fix: get outstanding invoices btn working on submitted payment entry (#19858 )	2019-12-09 13:16:35 +05:30
Deepesh Garg	babc2d1ea4	fix: Consistency in button positions in Sales Order and Purchase Order (#19833 )	2019-12-09 13:04:44 +05:30
Deepesh Garg	b63101250c	fix: Rounding Adjustment GL entry fix (#19838 ) * fix: Rounding Adjustment GL entry fix * fix: Spacing in tab * fix: Comment fix	2019-12-09 13:03:24 +05:30
rohitwaghchaure	d2f64214cc	Merge pull request #19853 from rohitwaghchaure/fixed_production_plan_items_required_to_pull_mr fix: 'NoneType' object is not iterable	2019-12-09 12:31:06 +05:30
Deepesh Garg	da638cd476	fix: NoneType' object has no attribute '__getitem_'_ (#19859 )	2019-12-09 11:28:31 +05:30
Deepesh Garg	3139fa2866	Merge branch 'develop' into new_invoice_fix	2019-12-07 19:54:21 +05:30
Deepesh Garg	ddc6e42b08	Merge pull request #19836 from deepeshgarg007/gst_1_validation_msg fix: Validation msg fix in GSTR-1 report	2019-12-07 19:52:43 +05:30
Raffael Meyer	af9c5fda9e	rename CoA	2019-12-07 14:22:51 +01:00
Raffael Meyer	05d708b51c	add some missing accounts Aktive Rechnungsabgrenzung Passive Rechnungsabgrenzung Kasse Verblk. aus Lohn und Gehalt Erlöse	2019-12-07 14:21:22 +01:00
Raffael Meyer	d86cefe1a5	first draft	2019-12-07 13:10:44 +01:00
Rohit Waghchaure	502189913a	fix: 'NoneType' object is not iterable	2019-12-07 14:10:11 +05:30
Rohit Waghchaure	6301874795	fix: timsheet overlap error	2019-12-07 13:20:37 +05:30
Rucha Mahabal	690068142b	feat: Continue Slide and New Illustrations for Onboarding Wizard (#19813 ) * feat: added illustrations for onboarding * refactor: change help label for supplier * refactor (breaking): rename Setup Wizard slide to Onboarding Slide * chore: code cleanup for the old doctype Setup Wizard Slide * fix: added a 'Continue' type slide * fix: change text in continue slide * fix: change text for continue slide	2019-12-06 20:58:26 +05:30
deepeshgarg007	99309229bc	fix: Add missing semicolon	2019-12-06 19:59:54 +05:30
deepeshgarg007	ad53649f41	fix: Validation msg fix in GSTR-1 report	2019-12-06 19:34:49 +05:30
Rohit Waghchaure	8ab8376975	fix: Manufacturing UX, added calendar view for job card	2019-12-06 17:40:09 +05:30
Rohan	05222270e1	Merge branch 'develop' into v12-lead-address-contact	2019-12-06 14:25:30 +05:30
Rohan	5161ba787c	Merge branch 'develop' into dev-batch-to-stock-ledger	2019-12-06 14:25:00 +05:30
Rohit Waghchaure	d98ed8047a	fix: travis failing	2019-12-06 13:17:56 +05:30
Mangesh-Khairnar	015038236c	fix: update hub item document	2019-12-05 02:10:57 +05:30
Mangesh-Khairnar	6d4f4bef7e	fix(marketplace): autocomplete hub category	2019-12-05 01:01:01 +05:30
Himanshu Warekar	175d604f5f	chore: commonize function	2019-12-04 23:08:51 +05:30
rohitwaghchaure	cfbf895876	Merge pull request #19498 from marination/stock_entry_bom_fetch feat: Provision to fetch items from multiple BOMs in Stock Entry	2019-12-04 21:44:47 +05:30
Himanshu Warekar	5e90ad6063	Merge branch 'develop' of https://github.com/frappe/erpnext into new_invoice_fix	2019-12-04 19:01:33 +05:30
Mangesh-Khairnar	e4274cbfa6	fix: change formatting	2019-12-04 17:51:08 +05:30
ronelvcabrera	370cdc0170	feat(Sales/Purchase Order): optional to reference a Blanket Order (#19612 )	2019-12-04 16:07:11 +05:30
Mangesh-Khairnar	fa170e3c84	fix(marketplace): add watcher for route change to fetch new items	2019-12-04 15:59:17 +05:30
Pranav Nachnekar	114e0db419	fix: query for finding lost quotation (#19800 ) * fix: query for finding lost quotation * Update opportunity.py	2019-12-04 15:31:43 +05:30
Nabin Hait	d285e9b7bd	optimize: Optimization of Receivable report filtered based on sales person (#19796 )	2019-12-04 15:30:58 +05:30
Nabin Hait	acdd5081da	fix: Service start and end date validation for deferred accounting (#19805 )	2019-12-04 15:30:01 +05:30
Mangesh-Khairnar	a830f89a59	feat: add date filter in the fixed asset register (#19799 ) * feat: add date filter in the fixed asset register * fix: remove function from keyword argument	2019-12-04 13:32:31 +05:30
sahil28297	eb9c3e1c5b	fix(patch): set proper tax_type and proper account (#19794 )	2019-12-04 12:01:31 +05:30
Khushal Trivedi	51f2131a41	fix: joining and relieving Date can be on same date as valid use case on emoloyee form (#19798 ) * fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix: joining and relieving Date can be on same date as valid use case * Update employee.py	2019-12-04 11:56:44 +05:30
Deepesh Garg	dfd82d22c8	Merge pull request #19792 from nabinhait/ar-summary-based-on-terms feat: Receivable / payable summary based on payment terms	2019-12-04 11:25:28 +05:30
thefalconx33	a639f16dc9	fix: column data not visible after manual selection of columns	2019-12-04 09:46:42 +05:30
marination	be88d0f8a3	fix: Custom button conditionally visible in draft condition as well	2019-12-03 18:34:38 +05:30
Shivam Mishra	5128f3bd0f	feat: allow searching from meta fields (#19711 ) * feat: allow searching from meta fields * feat: remove description in query based on number of items	2019-12-03 17:27:22 +05:30
Saqib	d635bda29b	fix selling setting label for sales order reqd (#19775 )	2019-12-03 17:05:06 +05:30
Khushal Trivedi	73129e6ac8	fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' (#19774 ) * fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770 * fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770	2019-12-03 17:03:45 +05:30
Nabin Hait	e176c3c1d1	feat: Receivable / payable summary based on payment terms	2019-12-03 16:56:48 +05:30
Deepesh Garg	8d31171ff8	fix: Party name field in trial balacne for party report (#19789 )	2019-12-03 16:31:07 +05:30
rohitwaghchaure	36b60dbbef	Merge pull request #19441 from rohitwaghchaure/capacity_planning_for_workstataion_feature fix: capacity planning back	2019-12-03 15:23:06 +05:30
Deepesh Garg	03d1394540	fix: Unable to see parties with negative balance in AR/AP Summary (#19776 )	2019-12-03 15:12:44 +05:30
Marica	c68a940aac	fix: Item qty cannot be zero in Purchase Receipt (#19779 )	2019-12-03 12:59:22 +05:30
gavin	728f8d09c8	fix: AttributeError on new Student creation (#19786 )	2019-12-03 12:54:46 +05:30
Nabin Hait	a0f9db4b83	Update employee.py	2019-12-03 12:51:27 +05:30
Deepesh Garg	b4b90eaaf7	Merge pull request #19762 from Mangesh-Khairnar/fix-pr-creation fix(sales-order): allow payment request creation for so that are not billed	2019-12-03 10:42:01 +05:30
Anurag Mishra	de5237fbd5	refactor: Report BOM Sock Calculated (#19431 )	2019-12-02 17:08:12 +05:30
Rucha Mahabal	2fa204d8be	fix: render_template for subject in Email Campaign (#19772 )	2019-12-02 16:26:10 +05:30
Anurag Mishra	957a6f5bd5	fix: UX/UI (#19753 )	2019-12-02 14:44:17 +05:30
rohitwaghchaure	ce32f9a361	Merge branch 'develop' into capacity_planning_for_workstataion_feature	2019-12-02 11:29:06 +05:30
Mangesh-Khairnar	c131bd1b25	feat(marketplace): edit item dialog	2019-12-02 01:09:59 +05:30
deepeshgarg007	f89b172202	fix: Available stock for packing item report	2019-12-01 21:53:32 +05:30
Wolfram Schmidt	5249a6348f	Update de.csv (#19755 ) Changed all translations from "Aufgabe" to "Vorgang" in singular and plural where the word "Task" is project related. Left all agricultural and others how they are (as Aufgabe).	2019-12-01 10:47:21 +05:30
Deepesh Garg	98a54355ae	fix: Post GL entry fix for asset (#19751 )	2019-12-01 10:06:16 +05:30
Himanshu Warekar	4405a2a5f8	fix: add project in child for items	2019-11-30 16:58:31 +05:30
Mangesh-Khairnar	ad66677029	fix: add conditional message in template string	2019-11-29 23:59:02 +05:30
Gavin D'souza	5e217c698f	Merge branch 'set-request-util' of github.com:gavindsouza/erpnext into set-request-util	2019-11-29 20:30:03 +05:30
Gavin D'souza	23b1dae6a7	chore: dropped dead setup_wizard test fix: fixed imports for teste utils	2019-11-29 20:22:06 +05:30
Nabin Hait	d1b1156b8c	Merge branch 'develop' into set-request-util	2019-11-29 18:49:34 +05:30
Rohit Waghchaure	8c6bc34bc4	added test cases	2019-11-29 18:42:20 +05:30
Victor Munene	b3af2adc4a	use program.courses instead of get_all_children to get course list (#19695 )	2019-11-29 18:12:13 +05:30
Anurag Mishra	935517d914	fix: added bank reconciliation page in the accounting module (#19719 ) * fix: added bank reconcilation page inaccounting module * Update accounts.py	2019-11-29 18:08:42 +05:30
Sammish Thundiyil	54694dd816	modified: erpnext/hr/doctype/repayment_schedule/repayment_schedule.json (#19470 )	2019-11-29 18:00:30 +05:30
Gavin D'souza	611d2ccd04	chore: updated path for set_request in v13-develop	2019-11-29 17:42:32 +05:30
Anurag Mishra	10017c14f3	feat: HSN Code wise Item Tax (#19478 ) * feat: HSN Code wise Item Tax * feat: enqueued task of updating all items	2019-11-29 17:33:10 +05:30
Raffael Meyer	0de066c3b1	feat(regional): Add master data to DATEV Export (#18755 ) * Add master data to export * add SQL statements to get customers and suppliers * make data category a string * fix SQL error * fix SQL errors * unique column names * add encoding of constants * get customer primary address and contact * fix typo * fix typo * binary response * add filename * add filecontent * rename account columns * exclude account groups * use compression, close file before transfer * fix StringIO * add basic tests * fix assertion, merge test methods * fix indentation * relative import of constants * fix path * import os * Add default currency to test company * root accounts with parent = null * move account-related things to setup() * add: test headers * company and filters become class properties * add: test csv creation * (fix): add missing account * (fix): remove wrong space * add items to sales invoice * refactor: create test data * fix: create cost center * fix: doctype Accoutn * fix: make sure account belongs to company * fix: remove customer group and territory, save on a new line * create default warehouses * fix: make Item myself * fix: item defaults are a list * fix: use my own warehouse * fix: use my own expense account * fix: let you take care of the Sales Invoice Item * fix: import zipfile * add TODOs * fix: workaround for pandas bug * SQL: utf-8 everywhere to make conversion in tests unnecessary * tests: zipfile must be encoded string * fix(tests): invalid start byte * fix(test): give is_zipfile() the file-like object it expects * fix(test): fix encoding of colums * fix(get_transactions): as_dict is 1 by default * fix(tests): allow empty data * refactor: rename columns in get_account_names * fix(pandas): keep sorting columns * fix: "lineterminator" must be a string * fix(test): check if cost center exists * fix: credit limit became a child table * fix: save company after creation * insert instead of save * tests: setup_fiscal_year * fix(test): import cstr * fix(tests): fiscal year * fix: can't concat str to bytes * fix: make csv-encoding work for py2 and py3 * fix(test): use frappe.as_unicode instead of unicode * fix: use BytesIO instead of StringIO for py3 compatibility * fix(tests): use BytesIO instead of StringIO for py3 compatibility	2019-11-29 17:32:17 +05:30
Prasad Ramesh	750b3a5946	fix: Button label case (#19706 ) Json -> JSON	2019-11-29 17:30:46 +05:30
Khushal Trivedi	e3c05290c8	fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req (#19691 )	2019-11-29 17:00:09 +05:30
Deepesh Garg	06a6fa4cfc	feat: Accounts Payable report based on payment terms (#19672 )	2019-11-29 16:56:27 +05:30
Saqib	20c31dd579	fix: tax templates from all companies fetching in receipt (#19682 ) * fix: tax templates from all companies fetching in receipt * Update purchase_receipt.js	2019-11-29 16:55:10 +05:30
rohitwaghchaure	d76529e6ca	Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix fix: Serial no validation against sales invoice	2019-11-29 16:34:58 +05:30
rohitwaghchaure	c9afe2f707	Merge pull request #19602 from Anurag810/bom-explorer-report-fix fix: Raw material qty depending on the quantity of the parent BOM	2019-11-29 16:18:30 +05:30
deepeshgarg007	c51dd2989e	fix: Validation msg	2019-11-29 15:56:16 +05:30
deepeshgarg007	45f57f273c	fix: Serial no validation against sales invoice	2019-11-29 15:56:08 +05:30
Mangesh-Khairnar	8287c3d05a	feat(marketplace): unpublish item from hub	2019-11-29 15:52:29 +05:30
rohitwaghchaure	b59a25b02b	Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module fix: please specify customer error in sales invoice if patient is blank	2019-11-29 14:29:31 +05:30
Mangesh-Khairnar	92b9d7383d	fix: show create payment request for so that are not billed	2019-11-29 14:22:52 +05:30
Rohit Waghchaure	bf8fe06f86	fix: please specify customer error in sales invoice if patient is blank	2019-11-29 14:14:11 +05:30
Rohit Waghchaure	8b599f2bc9	fix: capacity planning back	2019-11-29 14:09:30 +05:30
Suraj Shetty	9d6d95c4a2	fix: valuation of "finished good" item in purchase receipt (#19268 ) * fix: Remove redundant purchase orders and unwanted condition * fix: [WIP] Purchase receipt value * fix: Add raw material cost based on transfered raw material * fix: get_qty_to_be_received * fix: Remove debugger statement * fix: Reset rm_supp_cost before setting subcontracted raw_materials * test: Fix and modify tests for backflush_based_on_stock_entry * fix: Add non stock items to Purchase Receipt from Purchase Order * fix: Ignore valuation rate check for non stock raw material * fix: Rename check all rows * fix: Remove amount from test * test: Fix item rate error * fix: handling of serial nos in backflush * fix: Add serial no. of raw materials * fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material * fix: Raw material batch number selection in purchase receipt * Update test_purchase_order.py	2019-11-29 13:26:52 +05:30
Marica	8f48896261	fix: Permission issue in Stock Entry (#19738 )	2019-11-28 19:39:49 +05:30
Mangesh-Khairnar	2597817cde	fix: add new routes to handle category wise search	2019-11-28 18:57:42 +05:30
Anurag Mishra	f3b393f5e0	fix: UOM was not fetching in purchase invoice (#19732 ) * fix: UOM was not fetching in purchase invoice * fix: Changes requested Co-authored-by: Marica <maricadsouza221197@gmail.com>	2019-11-28 18:52:16 +05:30
Deepesh Garg	7cdde93645	fix: Validation for parent cost center (#19664 ) * fix: Validation for parent cost center * fix: Minor modification in condition * fix: Update test cases for invalid cost center creation	2019-11-28 18:37:51 +05:30
Joseph Marie Alba	5c2ba0ef9c	Fix: Logic bug (#19692 ) account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)] - if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group. - should be if accounts[d]['is_group'] not in ('', 0) However, the correction provided here: account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1] is more consistent with the prior statement that extracts ledger (and not group) accounts. account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]	2019-11-28 18:33:20 +05:30
Deepesh Garg	9f3276046f	fix: Account type in Handling Difference in Inventory account (#19674 ) * fix: Account type in Handling Difference in Inventory account * fix: Add Stock Adjustment account * fix: Rename account to stock adjustment	2019-11-28 18:29:33 +05:30
Saqib	707b83940a	fix: due date before posting date for items added to cart yesterday (#19681 )	2019-11-28 18:27:17 +05:30
Marica	bcd02069ea	fix: Validation for Suppliers in SO to PO (#19686 ) - Check if there is a Supplier against atleast one item in Sales Order - Validation message earlier was vague	2019-11-28 18:23:45 +05:30
Marica	aff678e376	fix: Changed type of column 'serial_no' in Stock Ledger Entry (#19702 )	2019-11-28 18:20:48 +05:30
Shivam Mishra	2512962f55	fix: handle None case for get_shipping_amount_from_rules (#19723 )	2019-11-28 16:46:58 +05:30
Marica	f51ccbf5d4	chore: Added Quick Stock Balance to Stock Module (#19726 ) - Also 'Stock Balance Report' button no longer primary button	2019-11-28 16:44:46 +05:30
rohitwaghchaure	1511154aa8	fix: removed stock value and account balance out of sync validation (#19729 ) * fix: revert value out of sync feature * fix: removed stock value and account balance out of sync validation	2019-11-28 16:43:39 +05:30
marination	236140d94c	fix: Division by zero error in Stock Entry	2019-11-28 16:36:24 +05:30
Shivam Mishra	30245a0673	Merge pull request #19677 from ruchamahabal/setup_wizard feat: Slides for Onboading Wizard in ERPNext	2019-11-28 14:35:10 +05:30
Rohan Bansal	c59ac36378	fix: use new Contact schema	2019-11-28 12:25:38 +05:30
Rohan Bansal	fd46fef857	fix: add designation to Lead	2019-11-28 12:23:33 +05:30
Rohan Bansal	69e3868a9d	patch: set title for old leads	2019-11-28 12:23:19 +05:30
Rohan Bansal	75da5af900	fix: set missing values	2019-11-28 12:23:05 +05:30
Rohan Bansal	f9e2bfcc29	fix: conditionally set lead title as organization or person	2019-11-28 12:23:05 +05:30
Rohan Bansal	312210c2b0	feat: create address and contact after lead creation	2019-11-28 12:22:47 +05:30
deepeshgarg007	2fe0c98772	fix: Path for quotation expiry method in hooks	2019-11-28 08:09:47 +05:30
Rohan Bansal	c7cfc726d7	feat: navigate to stock ledger from batch report	2019-11-27 18:23:31 +05:30
Anurag Mishra	707bb2052c	fix: Employee dashboard disappear after switching from leave application form (#19690 )	2019-11-27 16:27:50 +05:30
Marica	f0e87f7fdd	fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' (#19693 )	2019-11-27 15:49:41 +05:30
Rucha Mahabal	58928e8eae	Merge branch 'develop' into setup_wizard	2019-11-27 11:55:53 +05:30
Rucha Mahabal	e2bb82872c	fix: moved slide json files to respective modules	2019-11-26 18:46:17 +05:30
Rucha Mahabal	3f8c460584	feat: moved slide action functions from onboarding utils to doctypes	2019-11-26 15:22:45 +05:30
Rucha Mahabal	195893db0e	fix: conditionally run old patch for Setup Progress	2019-11-26 15:22:05 +05:30
Shivam Mishra	a791170f29	Merge pull request #19475 from 0Pranav/scheduling-ui-rewrite feat: Appointment Schedulling	2019-11-26 13:43:14 +05:30
rohitwaghchaure	b5991e9264	Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12 fix: BOM UX	2019-11-26 13:15:40 +05:30
0Pranav	fb1e87710b	Tweaks to success redirect - 5 seconds wait before redirect - Edited description for URL in settings	2019-11-26 12:14:41 +05:30
0Pranav	8d2b0d800c	Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite	2019-11-26 10:55:53 +05:30
0Pranav	2515022377	add condition for zero appointment slots	2019-11-26 10:55:28 +05:30
Deepesh Garg	5558ee8597	Merge pull request #19591 from 0Pranav/FR-ISS-152101 fix: add status "expired" to doctype quotation	2019-11-26 09:08:30 +05:30
Deepesh Garg	31a4fa5dd3	Merge pull request #19606 from deepeshgarg007/shareholder_refactor refactor: Share Transfer code cleanup and refactor	2019-11-26 07:54:57 +05:30
deepeshgarg007	53a66ee386	fix: Method name in hooks, test case code clean up	2019-11-25 21:58:15 +05:30
rohitwaghchaure	0881557c7d	Merge pull request #19636 from rohitwaghchaure/not_able_to_submit_sales_invoice_e_invoice_issue fix: e-invoice issue	2019-11-25 19:24:23 +05:30
Rohit Waghchaure	9326fb78f2	fix: BOM UX	2019-11-25 18:56:18 +05:30
Nabin Hait	ecc6b1917b	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-11-25 18:13:58 +05:30
Nabin Hait	a7d168c05f	fix: merge conflict	2019-11-25 18:12:56 +05:30
Pranav Nachnekar	fc5d8fcd9f	Merge branch 'develop' into scheduling-ui-rewrite	2019-11-25 12:24:32 +00:00
0Pranav	b84e56ebb5	fix:travis tests	2019-11-25 17:32:02 +05:30
0Pranav	565d3efcdf	fetch updated document in test_quotation	2019-11-25 17:11:12 +05:30
Pranav Nachnekar	d63ad3bb5f	fix: add email group and newsletter links to CRM module view (#19679 ) * fix: add email group and newsletter links to CRM module view * chore: move email group to bottom	2019-11-25 16:50:47 +05:30
0Pranav	f9dec5201f	fix:tests	2019-11-25 16:42:07 +05:30
0Pranav	cf3a2f6579	set transaction date to yesterday	2019-11-25 16:26:04 +05:30
0Pranav	032baeac5b	don't submit quotation	2019-11-25 15:15:00 +05:30
Nabin Hait	4d12f8acab	bumped to version 12.2.0	2019-11-25 15:31:23 +05:50
Nabin Hait	c856cb85d9	log: Change log for v12.2.0	2019-11-25 15:08:47 +05:30
0Pranav	754c43f6c3	fix set_expired_status method	2019-11-25 14:27:43 +05:30
0Pranav	e0c9f3c282	fix valid date	2019-11-25 14:14:51 +05:30
0Pranav	3ec5eabaf6	formatting	2019-11-25 14:11:31 +05:30
0Pranav	f2752bf38c	fix: tests for python2	2019-11-25 14:09:49 +05:30
Nabin Hait	35e8d1e1d7	Stock acc bal sync msg (#19676 ) * fix: Prefilled JV via Account Balance and Stock Value mismatch error message - Make JV button will route to Journal Entry and add rows in child table * fix: make journal entry to sync stock and account balance * fix: translated action label	2019-11-25 14:02:51 +05:30
Mangesh-Khairnar	647331bbd7	feat: add search in category	2019-11-25 13:56:00 +05:30
Rucha Mahabal	7728ae6988	fix: added company letter head slide	2019-11-25 13:23:53 +05:30
0Pranav	a9ff7df2e6	add sql query to set valid_till	2019-11-25 12:55:27 +05:30
Nabin Hait	2fd6814cbf	Merge branch 'marination-account_stock_sync_error' into develop	2019-11-25 12:46:45 +05:30
Nabin Hait	1ed1c4e6a4	fix: make journal entry to sync stock and account balance	2019-11-25 12:33:40 +05:30
Saqib	cd3976f7d2	Asset cancellation fix (#19671 ) * fix: remove asset movement mandatory fields * fix: label for reference doctype	2019-11-25 12:24:34 +05:30
Pranav Nachnekar	04e3a506e4	fix: Primary address not being fetched for customer (#19667 ) * fix: priamry address not being fetched * add doctype to filter for customer_primary_address * remove get_customer_primary_address_method	2019-11-25 12:04:00 +05:30
0Pranav	a077795581	fix tests	2019-11-25 12:01:00 +05:30
Rucha Mahabal	00677f334e	fix: user progress code cleanup	2019-11-25 11:58:14 +05:30
0Pranav	eefc492ff4	call commit after sql query for schedular job	2019-11-25 10:51:27 +05:30
marination	737d8a1e26	fix: Added comments	2019-11-25 09:42:08 +05:30
Saqib	c9203a1bee	fix: asset movement ux fixes (#19637 )	2019-11-22 16:35:15 +05:30
Saqib	f37a46edea	Fixed Asset Refactor Review fixes (#19665 ) * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:50 +05:30
Saqib	1919af2ff1	Fixed Asset Refactor Review fixes (#19666 ) * fix: fixed asset item creation ux fixes * fix: auto creation of asset ux fixes * fix: [LCV] incorrect condition when checking assets linked with PR * fix: bulk update assets * refac: remove company level cwip enabling * cwip can be enabled only on category level * fix: #19649	2019-11-22 16:32:34 +05:30
Nabin Hait	aff4a67954	Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error	2019-11-22 15:14:32 +05:30
Marica	b5c296da9e	fix: Validation Error message on Prepared Report. (#19639 ) Give the user the reason why he has to use filters.	2019-11-22 14:38:58 +05:30
Marica	7ca472780b	fix: Get Current Stock button not working in Purchase Receipt (#19645 ) - Field visible in grid view as well for better feedback	2019-11-22 14:37:38 +05:30
Anurag Mishra	763660b2e4	fix: set allocated amount in employee advance as per total amount (#19626 )	2019-11-22 13:32:25 +05:30
0Pranav	6c368e2dfb	submit quotation in test	2019-11-22 13:22:12 +05:30
0Pranav	b3354198f1	Fix sql query in set_expired_status	2019-11-22 12:38:43 +05:30
Mangesh-Khairnar	b10526dd86	fix: consider taxes in the grand total (#19631 )	2019-11-22 12:28:33 +05:30
thefalconx33	fa42999314	fix: last purchase rate greater than selling price	2019-11-22 12:15:41 +05:30
Saqib	290253fdd0	fix: last purchase rate greater than selling price (#19617 )	2019-11-22 12:12:29 +05:30
Deepesh Garg	24cde55e28	fix: Patch for updating price or product discount field (#19642 ) * fix: Patch for updating price or product discount field * fix: Update pactch * Update update_price_or_product_discount.py	2019-11-22 11:57:42 +05:30
Ben Knowles	49cd19d917	fix: update syntax error in company.js (#19661 )	2019-11-22 11:36:02 +05:30
Nabin Hait	7af153da50	fix: Multiple fixes related to landed cost accounting (#19656 )	2019-11-22 11:35:14 +05:30
Nabin Hait	046137caa2	fix: Multiple fixes related to landed cost accounting (#19657 )	2019-11-22 11:34:50 +05:30
Saqib	150c44b350	fix: asset movement ux fixes (#19641 )	2019-11-22 11:08:35 +05:30
Rucha Mahabal	3cf2c2b3d5	feat: slides for onboarding wizard in ERPNext	2019-11-21 20:47:08 +05:30
Mangesh-Khairnar	1a92eb14ed	fix: Mark attendance from employee attendance tool (#19627 )	2019-11-21 17:58:18 +05:30
0Pranav	f5112905dc	import make_item method in tests	2019-11-21 13:19:44 +05:30
Rohit Waghchaure	c4e6c42950	fix: e-invoice issue	2019-11-21 11:20:49 +05:30
Rohit Waghchaure	a831848074	fix: code cleanup	2019-11-20 19:42:27 +05:30
Rohit Waghchaure	eed30c6d8c	fix: not able to select item in sales order	2019-11-20 19:42:11 +05:30
0Pranav	4a28144941	add tests	2019-11-20 15:53:19 +05:30
0Pranav	5717a265b7	remove: unused imports	2019-11-20 15:31:13 +05:30
0Pranav	ae90ea9547	fix:travis errors	2019-11-20 15:24:33 +05:30
marination	e537cda062	fix: Added conditional check for conversion factor	2019-11-20 12:38:58 +05:30
0Pranav	682956543e	fix travis	2019-11-20 11:45:14 +05:30
Rucha Mahabal	45e9dd9c51	fix(Journal Entry): default Cash Entry account not getting fetched	2019-11-20 11:40:38 +05:30
0Pranav	fe2147a496	fix travis	2019-11-20 11:37:49 +05:30
0Pranav	dbde140e46	fix: save method of Appointment Booking Setting	2019-11-20 10:30:41 +05:30
0Pranav	c8e66a0f71	Infer number_of_agents from agent_list in apppointment booking settings	2019-11-20 10:27:59 +05:30
rohitwaghchaure	26c46282e8	Merge pull request #19618 from nextchamp-saqib/pos_fix fix: stock qty not displayed in pos	2019-11-19 19:41:25 +05:30

... 11 12 13 14 15 ...

21855 Commits