18427 Commits

Author	SHA1	Message	Date
scmmishra	ab8fc8c2bf	feat: Quizzes fixed	2019-02-28 16:42:37 +05:30
scmmishra	3726f8a7f6	feat: Added check for no content in topic meta	2019-02-28 16:33:53 +05:30
scmmishra	b793cc8e1e	fix: Minor changes	2019-02-28 16:33:38 +05:30
Rohit Waghchaure	c21cda2790	Removed validation for group by voucher in general ledger	2019-02-28 16:20:45 +05:30
Frappe Bot	1fcae10258	Merge branch 'master' into develop	2019-02-28 10:20:48 +00:00
scmmishra	5e61b17cf8	fix: Routing after finishing a course topic	2019-02-28 15:43:33 +05:30
scmmishra	de5f71ae9e	fix: Showing Topic Progress	2019-02-28 15:40:49 +05:30
Frappe Bot	58135976dd	bumped to version 11.1.12	2019-02-28 10:08:08 +00:00
scmmishra	b17d289bda	fix: Course card progress	2019-02-28 15:21:43 +05:30
Rohit Waghchaure	ab4ff984c4	fix: scan barcode not adding the barcode value in the items table	2019-02-28 13:31:02 +05:30
Rushabh Mehta	57128e413c	fix: task.js	2019-02-28 12:43:58 +05:30
Himanshu Warekar	3315a9fafb	fix routes	2019-02-28 11:51:36 +05:30
Himanshu Warekar	1cb695b7e9	fix route for Task and Tree of Procedure	2019-02-28 11:42:36 +05:30
rohitwaghchaure	1d41c1c2de	Merge pull request #16787 from rohitwaghchaure/italian_more_fixes ... fix: e-invoicing patch, patch to set country code in the address	2019-02-28 11:28:04 +05:30
Rohit Waghchaure	b48effebce	fix: test case	2019-02-27 19:33:22 +05:30
Rohit Waghchaure	cd34c70670	fix: bom cost update is not working	2019-02-27 18:01:30 +05:30
scmmishra	56ad5da090	fix: Minor Changes	2019-02-27 15:32:36 +05:30
Rohit Waghchaure	74cfe57716	fix: e-invoicing patch, patch to set country code in the address	2019-02-27 14:38:36 +05:30
Anurag Mishra	a9a1552e32	refactor	2019-02-27 14:10:24 +05:30
scmmishra	e6735e418f	fix: Content navigation	2019-02-27 12:46:23 +05:30
scmmishra	8747900aa1	Fix: Content title fields	2019-02-27 12:34:53 +05:30
scmmishra	47ccad9661	fix: Reloading bug on Content page	2019-02-27 12:24:17 +05:30
scmmishra	23880ae567	fix: Content fetching for articles and videos	2019-02-27 12:09:57 +05:30
scmmishra	628659e02a	fix: Routing for course	2019-02-27 12:09:28 +05:30
Rushabh Mehta	fcd0556119	Merge pull request #16709 from rmehta/project-template ... feat: Project Template	2019-02-27 09:22:12 +05:30
Rushabh Mehta	76f36f68d3	Merge pull request #16790 from crossxcell99/master ... fix: call base class onload method	2019-02-27 08:31:14 +05:30
crossxcell99	f95171e808	fix: call base clase onload method	2019-02-26 18:01:37 +01:00
scmmishra	90b503621b	fix: Content Routing	2019-02-26 17:20:38 +05:30
scmmishra	7e1678e287	fix: TopicMeta fixes	2019-02-26 17:11:01 +05:30
Sagar Vora	e0eafb1c2c	Merge branch 'master' into develop	2019-02-26 17:08:59 +05:30
Sagar Vora	5a14e46a1b	bumped to version 11.1.11	2019-02-26 17:28:58 +05:50
scmmishra	03c4c635e0	fix: list title on CoursePage	2019-02-26 16:54:32 +05:30
scmmishra	95bb3c0ee9	Minor fixes	2019-02-26 16:49:58 +05:30
scmmishra	c011b08699	fix: Fixed UI and API for course page	2019-02-26 16:49:38 +05:30
scmmishra	fed9adbc77	fix: Fixed API and UI for topic card	2019-02-26 16:49:15 +05:30
scmmishra	5ae51dc849	fix: Minor UI fixes	2019-02-26 16:48:49 +05:30
scmmishra	b5ba518bdb	style: Minor code formatting	2019-02-26 16:48:12 +05:30
scmmishra	a8ef773978	fix: Course Card shows topic list	2019-02-26 16:47:54 +05:30
scmmishra	a2ca8dd92f	fix: Route for course page	2019-02-26 16:47:10 +05:30
scmmishra	3866dee3e1	feat: Corse doctype	2019-02-26 16:37:31 +05:30
Rushabh Mehta	45c252a240	fix(test): test_task.py	2019-02-26 16:18:46 +05:30
Nabin Hait	39c489bfdc	Merge pull request #16781 from deepeshgarg007/summary ... fix: Make company filter mandatory in sales person wise transaction summary	2019-02-26 16:00:51 +05:30
Nabin Hait	be5124fe10	Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing ... fix: multiple e-invoicing issues for italy region	2019-02-26 15:52:56 +05:30
Rohit Waghchaure	0f98cb8b83	fix: multiple e-invoicing issues for italy region	2019-02-26 15:09:27 +05:30
Rushabh Mehta	b94c8b1c77	fix(tests): add test for bulk complete / cancellation of project	2019-02-26 14:30:38 +05:30
Rushabh Mehta	02a9ec33ed	BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk	2019-02-26 14:30:38 +05:30
Rushabh Mehta	2d2d176e5c	fix: linting	2019-02-26 14:30:38 +05:30
Rushabh Mehta	e9984672ce	feat: Project Template	2019-02-26 14:30:38 +05:30
Saurabh	acf83791ab	fix: file api	2019-02-26 13:58:18 +05:30
deepeshgarg007	d2d84e3c9d	fix: Company filter fix	2019-02-26 11:52:22 +05:30
Suraj Shetty	5636f924a9	fix: get mode of payment while selecting payment term in payment term template (#16765)	2019-02-25 12:43:34 +05:30
Nabin Hait	9990306399	fix: Consider only active BOMs while updating cost via BOM Update Tool (#16753)	2019-02-25 11:59:05 +05:30
Rushabh Mehta	e2de8e0fa5	fix: expense claim type (#16760)	2019-02-25 11:56:30 +05:30
Suraj Shetty	2dadc1ef98	chore: Remove trailing whitespaces	2019-02-21 20:51:35 +05:30
deepeshgarg007	bf6b36a39b	fix: Removed white spaces	2019-02-21 19:30:27 +05:30
deepeshgarg007	56b52d43e6	Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item	2019-02-21 18:30:02 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Saurabh	76cd402ca5	bumped to version 11.1.10	2019-02-21 18:55:28 +06:00
Saurabh	e5ff28a92c	Merge pull request #16754 from deepeshgarg007/state_code ... fix: State code issue fix	2019-02-21 18:21:24 +05:30
Nabin Hait	367d7c104e	Merge pull request #16724 from rohitwaghchaure/user_progress_issue ... fix: user progress issue	2019-02-21 18:13:52 +05:30
Saurabh	47738f9792	Merge pull request #16750 from nabinhait/cc-against-bs ... fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings	2019-02-21 18:12:06 +05:30
Nabin Hait	e08cb3a49b	Merge pull request #16745 from nabinhait/manage-returned-qty ... fix: Consider returned qty while making invoice from DN / PR	2019-02-21 18:11:37 +05:30
Nabin Hait	31f46b313c	Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue ... fix: not able to cancel maintenance visit	2019-02-21 18:10:46 +05:30
Nabin Hait	e328869b10	Merge pull request #16738 from deepeshgarg007/unique_tree_options ... fix: Filter out unique values for tree options	2019-02-21 18:09:42 +05:30
Nabin Hait	e3b1b11bc5	Merge pull request #16740 from nabinhait/leave-calendar ... fix: Calendar events for leaves considering user permissions	2019-02-21 18:08:19 +05:30
Saurabh	a05ccb76f4	Merge pull request #16748 from nabinhait/multi-company-serial-invoicing ... fix: Validate serial no usage in invoice considering multi company transaction	2019-02-21 18:07:40 +05:30
Nabin Hait	e797ec7463	Merge pull request #16746 from deepeshgarg007/gross_profit ... fix: Decimal point issue in gross profit print	2019-02-21 18:07:14 +05:30
deepeshgarg007	1915e15a9e	fix: State code issue fix in regional module(Italy)	2019-02-21 17:55:57 +05:30
rohitwaghchaure	a49f59fcec	Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero ... (Profit and Loss Statement, fix): for parent account value was showing as zero	2019-02-21 17:50:51 +05:30
Rohit Waghchaure	90691dc0d8	(Profit and Loss Statement, fix): for parent account value was showing as zero	2019-02-21 17:18:28 +05:30
Nabin Hait	b24caad789	fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings	2019-02-21 17:11:35 +05:30
Rohan Bansal	143973166f	fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests	2019-02-21 15:57:06 +05:30
Suraj Shetty	463a3cf8cf	Merge pull request #16725 from deepeshgarg007/item_dashboard ... fix: Item name display issue fix in item dashboard	2019-02-21 14:42:38 +05:30
Nabin Hait	26972c954d	fix: Validate serial no usage in invoice considering multi company transaction	2019-02-21 14:32:41 +05:30
deepeshgarg007	14ff6bfc32	fix: Decimal point issue in gross profit print	2019-02-21 12:08:32 +05:30
Nabin Hait	816a4655a0	fix: Consider returned qty while making invoice from DN / PR	2019-02-21 12:02:36 +05:30
Nabin Hait	40c15d2e74	fix: Calendar events for leaves considering user permissions	2019-02-20 18:55:38 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
Saurabh	ada93e5d77	bumped to version 11.1.9	2019-02-20 18:44:17 +06:00
deepeshgarg007	0d64d622e5	fix: filter only unique values for tree options	2019-02-20 17:55:14 +05:30
rohitwaghchaure	485bd93dae	Merge pull request #16737 from saurabh6790/indentation_fixes ... fix: reload report doc and indentation fixes	2019-02-20 17:40:50 +05:30
rohitwaghchaure	c18e925d61	fix: Moved regional methods from controller to hooks (#16736)	2019-02-20 17:13:15 +05:30
Saurabh	9fcfc63f77	fix: reload report doc and indentation fixes	2019-02-20 17:04:18 +05:30
rohitwaghchaure	ef3f864123	fix: not able to submit purchase order (#16735)	2019-02-20 15:47:06 +05:30
rohitwaghchaure	e141865c43	Merge pull request #16722 from rohitwaghchaure/stop_button_not_working ... fix: stop button not working in material request	2019-02-20 12:30:26 +05:30
Sagar Vora	eba76c99a3	Merge branch 'master' into develop	2019-02-20 12:11:25 +05:30
Sagar Vora	d48393541d	bumped to version 11.1.8	2019-02-20 12:31:25 +05:50
Gaurav Naik	3bf0acbac6	fix(regional,italy): renamed validate hook for address (#16732)	2019-02-20 12:08:53 +05:30
Rohit Waghchaure	7e02e1c3cd	fix: not able to cancel maintenance visit	2019-02-19 22:53:31 +05:30
deepeshgarg007	1b04534095	fix: Removed duplicate fields from BOM Item	2019-02-19 21:36:12 +05:30
deepeshgarg007	942c894f93	fix: fetch item name in item dashboard	2019-02-19 19:51:23 +05:30
Rohit Waghchaure	f4049f9dfd	fix: user progress issue	2019-02-19 19:46:14 +05:30
Rohit Waghchaure	389cd6ad63	fix: stop button not working in material request	2019-02-19 19:18:07 +05:30
scmmishra	62968b318f	wip	2019-02-19 18:25:07 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Sagar Vora	f5c511c193	bumped to version 11.1.7	2019-02-19 18:14:14 +05:50
Nabin Hait	2c23f98b65	Merge pull request #16721 from nabinhait/ar-ap-fix ... fix: AR/AP report based on account type	2019-02-19 17:45:30 +05:30
Gaurav	3f046136d4	fix(regional,italy): added state code on address, updated patch ... moved state codes to init, rewired patch added logic to autoset state code on address validate handled multiple names for Italy refactored validate_address_italy to validate_address	2019-02-19 17:28:36 +05:30
Nabin Hait	e4f73929c4	fix: AR/AP report based on account type	2019-02-19 17:11:50 +05:30
scmmishra	cb8ef96f6b	chore (css): Switched to frappe navbar	2019-02-19 17:03:16 +05:30
scmmishra	1682aa8a36	fix (css): Removed container class	2019-02-19 17:01:31 +05:30
Nabin Hait	8e9d947527	Merge branch 'hotfix' into fix-item-variant-settings-barcodes	2019-02-19 15:07:46 +05:30
Nabin Hait	21706894af	Merge pull request #16705 from deepeshgarg007/pos-precision ... fix: Fetch precision form system settings in Sales invoice payment(POS)	2019-02-19 15:06:56 +05:30
Nabin Hait	818ead4041	Merge branch 'hotfix' into purchase-qty-fix	2019-02-19 15:06:10 +05:30
Nabin Hait	157526c978	Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule ... fix: multi-uom not working for the pricing rule rate	2019-02-19 15:05:07 +05:30
Nabin Hait	6bd3098824	Merge pull request #16716 from deepeshgarg007/precision-fix ... fix: Removed precision from multiple doctypes	2019-02-19 15:03:00 +05:30
Gaurav	2670ad7eb2	mod(regional,italy): adjusted calculation logic for charges ... validation for missing code on mode of payment UOM from settings Replace str with cstr	2019-02-19 13:15:25 +05:30
scmmishra	765529241e	[Major][Breaking] More changes	2019-02-19 13:06:33 +05:30
scmmishra	da39da627c	[Major][Breaking] Server side changes to handle Topic Layer ... - Moved `get_course_progress` to CourseEnrollment class. - Added Topic context to progress functions in lms.py - Create user on creation of a student	2019-02-19 13:06:33 +05:30
scmmishra	cc7290b7af	[Major][Breaking] Student Class	2019-02-19 13:06:33 +05:30
scmmishra	766f68a20a	[Major][Breaking] Modified lms.py and utils	2019-02-19 13:06:33 +05:30
scmmishra	e7d52c594b	[Major][Breaking] Program Enrollment Creates Course enrollment	2019-02-19 13:06:33 +05:30
scmmishra	1253061055	[Major][Breaking] Modified Course Doctype, added Topic based functions	2019-02-19 13:06:33 +05:30
scmmishra	42f50fd82c	[Major][Breaking] Added Topic Layer in Course	2019-02-19 13:06:33 +05:30
scmmishra	699f7c6fee	Minor changes	2019-02-19 13:06:33 +05:30
scmmishra	42f3c51ff7	Removed Content Doctype	2019-02-19 13:06:33 +05:30
scmmishra	6663ca1d7f	Adding Test Utils	2019-02-19 13:06:33 +05:30
scmmishra	c51f738b03	Refactored student creation	2019-02-19 13:06:33 +05:30
scmmishra	689500d081	Minor UI Fixes	2019-02-19 13:06:33 +05:30
scmmishra	d02fd13bf0	UI Improvements: Added Custom Navbar	2019-02-19 13:06:33 +05:30
scmmishra	87df23b52d	Added quiz card on profile page	2019-02-19 13:06:33 +05:30
scmmishra	4d10229cef	Quiz Progress and Minor fixes	2019-02-19 13:06:33 +05:30
scmmishra	c84a318591	Student and User link for LMS added	2019-02-19 13:06:33 +05:30
scmmishra	b3154efa84	UI Fixes	2019-02-19 13:06:33 +05:30
scmmishra	798f13be0d	More Improvements	2019-02-19 13:06:33 +05:30
scmmishra	02420bd4ba	Client side improvements	2019-02-19 13:06:33 +05:30
scmmishra	edc54cd5f6	Minor improvements for CardList.vue	2019-02-19 13:06:33 +05:30
scmmishra	2955851867	Built Student Profile Page	2019-02-19 13:06:33 +05:30
scmmishra	308f235859	Added Profile page	2019-02-19 13:06:33 +05:30
scmmishra	201fec3101	Minor Improvements	2019-02-19 13:06:33 +05:30
scmmishra	97c994f394	create course enrollment if not already enrolled for a program	2019-02-19 13:06:33 +05:30
scmmishra	affbfe7d0c	Added get_program_meta	2019-02-19 13:06:33 +05:30
scmmishra	cbb7c7ff23	ui fixes	2019-02-19 13:06:33 +05:30
scmmishra	cc755f6204	Doctype Changes for Beta Release	2019-02-19 13:06:33 +05:30
scmmishra	788ffbd5b6	Minor improvements	2019-02-19 13:06:33 +05:30
scmmishra	9229f4fc92	UI fixes	2019-02-19 13:06:33 +05:30
scmmishra	082e3c94ef	Minor Fixes: Student Enrollment	2019-02-19 13:06:32 +05:30
scmmishra	fdbabde80a	UI fixes for course card	2019-02-19 13:06:32 +05:30
scmmishra	be7fadc521	Renamed CoursePage to ContentPage	2019-02-19 13:06:32 +05:30
scmmishra	d93cec374d	Minor UI changes	2019-02-19 13:06:32 +05:30
scmmishra	a592f70d4a	Refactored Course Progression Logic	2019-02-19 13:06:32 +05:30
scmmishra	1192529698	Refactored lms.py, modified utils	2019-02-19 13:06:32 +05:30
scmmishra	8951c165f0	Fixed major bugs	2019-02-19 13:06:32 +05:30
scmmishra	53c2d5db63	Refactored lms store	2019-02-19 13:06:32 +05:30
scmmishra	0a5c7a6b46	Removed unnecessary prints	2019-02-19 13:06:32 +05:30
scmmishra	babb68d36c	Refactored server side code	2019-02-19 13:06:32 +05:30
scmmishra	19e12ac3d6	Minor changes to quiz doctype	2019-02-19 13:06:32 +05:30
scmmishra	80ecc56cbe	Using lms.call across the Vue app	2019-02-19 13:06:32 +05:30
scmmishra	0a4902f8b5	UI Changes	2019-02-19 13:06:32 +05:30
scmmishra	c5a1226e93	Refactored State management store	2019-02-19 13:06:32 +05:30
scmmishra	85c2feec0d	Added ListPage and other UI improvements	2019-02-19 13:06:32 +05:30
scmmishra	efb01c3f75	Renamed components	2019-02-19 13:06:32 +05:30
scmmishra	2596ea0816	Renamed Vue Files	2019-02-19 13:06:32 +05:30
scmmishra	0225642459	Renamed Pages	2019-02-19 13:06:32 +05:30
scmmishra	8ff1028665	Renamed AcademyRoot to lmsRoot	2019-02-19 13:06:32 +05:30
scmmishra	1fbe2d4b2b	Renamed academy to lms (Client Side)	2019-02-19 13:06:32 +05:30
scmmishra	35bf561a6f	Renamed academy to lms on server side	2019-02-19 13:06:32 +05:30
scmmishra	44921a3ee9	Renamed default element for Vue to mount on	2019-02-19 13:06:32 +05:30
scmmishra	91bbe776c1	Modified academy.call to point to erpnext.www.lms	2019-02-19 13:06:32 +05:30
scmmishra	af30b771f0	Renamed academy to lms on server side	2019-02-19 13:06:32 +05:30
scmmishra	f9f7318d3f	Deleted Old LMS Content	2019-02-19 13:06:32 +05:30
scmmishra	d7c993f028	Minor UI changes	2019-02-19 13:06:32 +05:30
scmmishra	f9b2fb6717	Fixed course and content page	2019-02-19 13:06:32 +05:30
scmmishra	db9c8b795a	Functions now have a login context	2019-02-19 13:06:32 +05:30
scmmishra	708756ed40	Added academy namespace	2019-02-19 13:06:32 +05:30
scmmishra	892b0c23fc	Added class functions	2019-02-19 13:06:31 +05:30
scmmishra	cc166c01eb	Improved Client implementation	2019-02-19 13:06:31 +05:30
scmmishra	c1b1a5ec37	Permission Changes	2019-02-19 13:06:31 +05:30
scmmishra	8fa9adec37	More Bug fixes UI and Permissions	2019-02-19 13:06:31 +05:30
scmmishra	05e07b44b1	Removed unused utils functions	2019-02-19 13:06:31 +05:30
scmmishra	734a746687	Minor DocType changes	2019-02-19 13:06:31 +05:30
scmmishra	b409f7a388	Minor UI Changes and Fixes	2019-02-19 13:06:31 +05:30
scmmishra	850dfd0358	Set appropriate permissions	2019-02-19 13:06:31 +05:30
scmmishra	9f316a3b30	Permission changes	2019-02-19 13:06:31 +05:30
scmmishra	86897b3cc8	UI: Kinda fixed "Completed" button render issue	2019-02-19 13:06:31 +05:30
scmmishra	5611bf4e29	Minor change	2019-02-19 13:06:31 +05:30
scmmishra	25e42baeaf	Course completion logic complete	2019-02-19 13:06:31 +05:30
scmmishra	a920bca044	Minor UI fixes	2019-02-19 13:06:31 +05:30
scmmishra	0187b18c06	Added methods to saving Quiz attempts	2019-02-19 13:06:31 +05:30
scmmishra	76222f7acc	Modified add-activity, no duplicates will be saved now	2019-02-19 13:06:31 +05:30
scmmishra	a3afe2a998	Sending session data explicitly	2019-02-19 13:06:31 +05:30
scmmishra	cfce153ed4	Minor UI changes	2019-02-19 13:06:31 +05:30
scmmishra	1f4835b3b4	Added Video UI	2019-02-19 13:06:31 +05:30
scmmishra	6de9cbb52d	Solved minor issue (Last activity not being saved)	2019-02-19 13:06:31 +05:30
scmmishra	1a04f774d7	LMS: Saving Course Activity	2019-02-19 13:06:31 +05:30
scmmishra	7d5e218155	Modified Quiz Evaluation	2019-02-19 13:06:31 +05:30
scmmishra	ed5892c7a5	UI: Components rendered based on student progress	2019-02-19 13:06:31 +05:30
scmmishra	a054655442	Updated state functions for session management	2019-02-19 13:06:31 +05:30
scmmishra	90722e3a9b	Fixed Permissions for LMS User	2019-02-19 13:06:31 +05:30
scmmishra	73a31ec7bb	Added functions to query Student enrollments	2019-02-19 13:06:31 +05:30
scmmishra	91aa0e07c8	Added class function for student enrollment	2019-02-19 13:06:31 +05:30
scmmishra	734d3e084c	Set home page for LMS User	2019-02-19 13:06:31 +05:30
scmmishra	8b8db54ef4	Added enroll function	2019-02-19 13:06:30 +05:30
scmmishra	15012c08a4	UI Fixes	2019-02-19 13:06:30 +05:30
scmmishra	72fd3bc0ea	Removed unnecessary watcher	2019-02-19 13:06:30 +05:30
scmmishra	3c412f56c9	UI: Changes to AcademyTopSection	2019-02-19 13:06:30 +05:30
scmmishra	bcafe84bb6	Adding session management to client	2019-02-19 13:06:30 +05:30
scmmishra	7a19b63837	Minor changes	2019-02-19 13:06:30 +05:30
scmmishra	e30f2eb297	Re-factored CourseCard UI	2019-02-19 13:06:30 +05:30
scmmishra	6678f5b88e	Added custom store for state management	2019-02-19 13:06:30 +05:30
scmmishra	ef9a75e50d	Removed unnecessary print statements	2019-02-19 13:06:30 +05:30
scmmishra	cd0cab78a5	Quiz UI Working	2019-02-19 13:06:30 +05:30
scmmishra	f9e8e4e2d3	Modified question.py	2019-02-19 13:06:30 +05:30
scmmishra	f7029f084c	Quiz is now submittable	2019-02-19 13:06:30 +05:30
scmmishra	cfc35f4424	Quiz: Save responses as an object	2019-02-19 13:06:30 +05:30
scmmishra	d2e040b6f1	Added separate ContentTitle component	2019-02-19 13:06:30 +05:30
scmmishra	160d8b0914	Added separate ContentTitle component	2019-02-19 13:06:30 +05:30
scmmishra	d87ca178d8	UI for Quiz	2019-02-19 13:06:30 +05:30
scmmishra	374184414b	Added quiz functions	2019-02-19 13:06:30 +05:30
scmmishra	7a59f9501e	UI for Content	2019-02-19 13:06:30 +05:30
scmmishra	bcafbea481	UI for Course page	2019-02-19 13:06:30 +05:30
scmmishra	b43ab3317c	UI for home page and program page	2019-02-19 13:06:30 +05:30
scmmishra	9c642ace52	Helper Functions for VueJS	2019-02-19 13:06:30 +05:30
scmmishra	84297fa349	Starting with VueJS	2019-02-19 13:06:30 +05:30
scmmishra	1778b59efa	Started with Vue	2019-02-19 13:06:30 +05:30
scmmishra	9456c82536	Getting started with Vue	2019-02-19 13:06:29 +05:30
scmmishra	5e758aea00	Minor Changes	2019-02-19 13:06:29 +05:30
scmmishra	75ad128912	Added LMS Settings	2019-02-19 13:06:29 +05:30
scmmishra	9e80f32e2a	Minor Changes	2019-02-19 13:06:29 +05:30
scmmishra	1e1f1ad186	LMS: Course Completion Status Working	2019-02-19 13:06:29 +05:30
scmmishra	a8703d4036	LMS: Changes to Course Activity Doctype, Course Activity Tracking Works ... Co-authored-by: Sahil <sahilkhan28297@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	57c77e452b	LMS: Course Activity ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	7409fe6438	LMS: Quiz Eval and Max Attempts Check ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
Chinmay Pai	3574ac3f5e	quiz_activity: add quiz activity ... Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	3bf71a2df6	Quiz Logic	2019-02-19 13:06:29 +05:30
scmmishra	d133e8229b	Quiz Evaluation Logic	2019-02-19 13:06:29 +05:30
scmmishra	4f439ec4dd	Quiz eval utils	2019-02-19 13:06:29 +05:30
scmmishra	0d4135ec2b	LMS: Fixed view for Quiz ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	91bbe10495	LMS: More changes to the web view	2019-02-19 13:06:29 +05:30
scmmishra	5569cbf82c	Revert "LMS: Fixed views for article and video" ... This reverts commit 9b7585405f7e25dcdcba4e131066d6b57a1d8899.	2019-02-19 13:06:29 +05:30
scmmishra	1e10fc43f4	LMS: Fixed views for article and video	2019-02-19 13:06:29 +05:30
scmmishra	590227b107	LMS: Fixed views for article and video	2019-02-19 13:06:29 +05:30
scmmishra	18baff5fec	Minor changes to question doctype ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	541a522b26	LMS:Added class methods for course, program and student doctypes ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
Chinmay Pai	1869419bdc	lms: refactor entire course model ... each course item now has its own doctype. Co-authored-by: Shivam Mishra <scm.mymail@gmail.com> Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	685584bf56	Quiz: Quiz now displays correctly on the portal ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	3757a4eab8	Modified program and index view ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	fa2db3c41b	LMS: Added functions to get LMS contents ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	82df4378de	Changes to get_quiz function	2019-02-19 13:06:28 +05:30
scmmishra	3cbb9795a4	Minor changes to doctypes	2019-02-19 13:06:28 +05:30
scmmishra	f9cef33e41	Dashboard changes for student and program	2019-02-19 13:06:28 +05:30
scmmishra	5311e3898c	General Changes	2019-02-19 13:06:28 +05:30
scmmishra	31cbe3c0dc	Added function to retrieve quiz data as JSON	2019-02-19 13:05:23 +05:30
scmmishra	d1650b9f63	Modified Question doctype for a better design	2019-02-19 13:05:23 +05:30
scmmishra	1fc45c547b	Added Course Enrollment doctype	2019-02-19 13:05:23 +05:30
scmmishra	06d175a2bd	Added Quiz Activity doctype	2019-02-19 13:05:23 +05:30
scmmishra	e7308125b4	Replaced Student Course Activity with Course Activity	2019-02-19 13:05:23 +05:30
scmmishra	17294e703e	Course Activity linked to Student ID	2019-02-19 13:05:23 +05:30
scmmishra	38c1baf719	Templates: modified routing logic, added data attributes in template ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	9335593b56	LMS: JS Script to send quiz and activity data	2019-02-19 13:05:23 +05:30
scmmishra	4ae11f4d74	LMS: added python functions to evaulate quiz and save student activity ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	eab0b833a1	Modified Student Course Activity Doctype ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	6660a675f1	templates: add templates for LMS content ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	de36e13db7	modified doctypes for lms ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	836a4b5e54	lms: add activity child table and create frontend ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	b3b003f518	course_activity: create doctype for tracking student course activity ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	55e7c1a866	api: create user account for student ... Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	43da645be0	Added Web Academy Applicant doctype	2019-02-19 13:05:23 +05:30
scmmishra	4e208e99bc	Added Student Course Acitivity doctype	2019-02-19 13:05:23 +05:30
scmmishra	8c41abc2df	Modified education menu items	2019-02-19 13:03:59 +05:30
scmmishra	84a49d5ea7	Modified Content doctype, added question child table for quiz	2019-02-19 13:03:59 +05:30
scmmishra	f05837a895	Updated Content Doctype	2019-02-19 13:03:59 +05:30
scmmishra	abd1d209fb	Added Content Doctype	2019-02-19 13:03:59 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization ... fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Gaurav	a4aa80fe05	feature(regional): Italian Localization ... Added setup.py for italy under regional Included fiscal regimes, tax exemption reasons and custom fields Issue #16259	2019-02-19 10:39:10 +05:30
Jigar Tarpara	1ac17ec1c4	Add credit month in validation	2019-02-19 10:21:01 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
Rohit Waghchaure	5821b672ad	fix: multi-uom not working for the pricing rule rate	2019-02-18 20:07:44 +05:30
Nabin Hait	750fe6eaea	fix: get item rate in bom	2019-02-18 18:56:08 +05:30
deepeshgarg007	9a19e06856	fix: Change Received qty to accepted qty and validation for indicators	2019-02-18 18:42:15 +05:30
Rohit Waghchaure	99e7362006	fix: Allow to make material request from draft job card	2019-02-18 18:26:50 +05:30
deepeshgarg007	48a7262fae	fix: Precision issue in POS payment	2019-02-18 15:05:36 +05:30
Anurag Mishra	879e5fd8bb	remove print and codacy	2019-02-18 14:43:55 +05:30
Anurag Mishra	42a106c7ba	Auditors print formats	2019-02-18 14:35:33 +05:30
rohitwaghchaure	1bcbe9069b	Merge pull request #16610 from jay-parikh/hotfix ... fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile	2019-02-18 12:43:57 +05:30
Rushabh Mehta	20db65ef77	Merge pull request #16694 from rmehta/refactor-comments ... fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-18 12:05:35 +05:30
Anurag Mishra	61f981ae05	Changes Requested	2019-02-18 11:43:32 +05:30
Rushabh Mehta	f3b33f3ab2	Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features ... feat(marketplace): seller profile page	2019-02-18 11:24:01 +05:30
Rushabh Mehta	1a6668ef3c	Merge pull request #16633 from pratu16x7/explore-2.0 ... feat(modules): Add getting started and help desk, merge settings	2019-02-18 11:20:14 +05:30
Rushabh Mehta	39c106dd05	fix(test): rename test in test_customer	2019-02-18 11:16:59 +05:30
Suraj Shetty	053d6a2ca1	Move reload doc before get query	2019-02-17 11:24:51 +05:30
Suraj Shetty	3a2f342ac1	Ignore duplicate entry	2019-02-16 21:09:24 +05:30
Suraj Shetty	1399fbe986	Move patch	2019-02-16 21:02:34 +05:30
Suraj Shetty	8cbe824c5b	Rerun item_barcode_chidtable_migrate patch	2019-02-16 17:54:15 +05:30
Suraj Shetty	cc0222a28a	Remove unwanted barcode field from item	2019-02-16 17:53:23 +05:30
Rushabh Mehta	7bb9eae685	Merge pull request #16541 from alyf-de/develop ... feat(regional): Germany module with address template	2019-02-16 10:54:28 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Frappe Bot	acf26c8569	bumped to version 11.1.6	2019-02-15 10:22:32 +00:00
Faris Ansari	8a01342e48	fix: Remove comment	2019-02-15 15:14:38 +05:30
Nabin Hait	09a4df74f0	Merge pull request #16645 from nabinhait/tds-fix ... fix: Ignore tds account while creating tax withholding category	2019-02-15 14:53:30 +05:30
Nabin Hait	eb0627356b	Merge pull request #16650 from nabinhait/general-ledger-fix ... fix: show values in account/party currency based in actual entry, no conversion	2019-02-15 14:53:12 +05:30
Nabin Hait	b5c249583a	Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux ... fix: Barcode scanning UX	2019-02-15 14:52:42 +05:30
Nabin Hait	b819f104e6	Merge pull request #16653 from nabinhait/item-variants ... fix: Enqueued item variants updation if there are more than 30 variants	2019-02-15 14:51:14 +05:30
Nabin Hait	c45962e3ef	Merge pull request #16675 from deepeshgarg007/purchase-fix ... fix: Purchase order item description fix	2019-02-15 14:50:38 +05:30
Nabin Hait	aa80a223d8	Merge pull request #16674 from deepeshgarg007/address-rep-fix ... fix: Address and contact report	2019-02-15 14:26:16 +05:30
Nabin Hait	8788a5c712	Merge pull request #16676 from nabinhait/get-item-details ... fix: get item details	2019-02-15 14:24:46 +05:30
Nabin Hait	b1cbe221b7	Merge pull request #16677 from nabinhait/total-qty-patch-fix ... fix: Consider parenttype while updating total qty in transactions	2019-02-15 14:24:30 +05:30
Nabin Hait	a0c9c7501b	Update update_total_qty_field.py	2019-02-15 14:24:08 +05:30
Tropicalrambler	3a88bc43dc	fix: typo in salary register report field name (#16670) ... When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.	2019-02-15 13:40:44 +05:30
Sagar Vora	379e6a4635	Merge branch 'hotfix' into address-rep-fix	2019-02-15 13:08:42 +05:30
Nabin Hait	4df7679c65	fix: Get outstanding invoices	2019-02-15 13:08:04 +05:30
Sagar Vora	ebdd8a9710	Merge branch 'hotfix' into purchase-fix	2019-02-15 13:04:32 +05:30
Sagar Vora	921f468950	Merge branch 'hotfix' into get-item-details	2019-02-15 13:03:04 +05:30
Nabin Hait	6f7a4d94ce	fix: Consider parenttype while updating total qty in transactions	2019-02-14 19:34:43 +05:30
Nabin Hait	f66c6874ca	Merge pull request #16652 from nabinhait/work-order-fix ... fix: Make work order from production plan considering already ordered qty	2019-02-14 18:50:30 +05:30
Nabin Hait	54f8ed1282	Merge branch 'hotfix' into item-variants	2019-02-14 18:50:11 +05:30
Nabin Hait	c3698e458f	Merge pull request #16666 from nabinhait/deferred-revenue-fix ... fix: errors in deferred revenue booking	2019-02-14 18:49:01 +05:30
Nabin Hait	1c6a1dd5c0	Merge branch 'hotfix' into general-ledger-fix	2019-02-14 18:37:40 +05:30
Nabin Hait	0d1ccc357f	fix: get item details	2019-02-14 18:30:10 +05:30
deepeshgarg007	867ca63750	fix: Purchase order item description fix	2019-02-14 18:10:47 +05:30
Deepesh Garg	20008946a3	Merge branch 'hotfix' into address-rep-fix	2019-02-14 17:37:41 +05:30
Deepesh Garg	4902f7b2a0	fix: Show tasks in timesheet with status as Closed (#16660)	2019-02-14 17:32:52 +05:30
deepeshgarg007	34f4f24e21	fix: Address and contact report	2019-02-14 17:26:49 +05:30
Nabin Hait	29fcb14c42	fix: errors in deferred revenue booking	2019-02-13 17:18:12 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648)	2019-02-13 16:58:46 +05:30
Anurag Mishra	4f0fd38209	refractor	2019-02-13 16:46:05 +05:30
Faris Ansari	a748ca69e7	fix: Validate invalid fields in Item Variant Settings ... - Some fields like barcodes cannot be copied in Item Variants - Wrote a patch that deletes the fields if they exist - Also, validate in controller	2019-02-13 13:02:39 +05:30
rohitwaghchaure	a0aaeafae8	Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg ... fix: validation message for work order	2019-02-13 09:49:25 +05:30
Faris Ansari	795102125c	Merge branch 'hotfix' into fix-barcode-scanning-ux	2019-02-12 18:31:06 +05:30
Nabin Hait	db527bfb24	fix: Enqueued item variants updation if there are more than 30 variants	2019-02-12 18:30:00 +05:30
Nabin Hait	1a3c27bbea	fix: Make work order from production plan considering already ordered qty	2019-02-12 17:38:37 +05:30
Faris Ansari	5631ffca68	fix: Barcode scanning UX	2019-02-12 17:12:48 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	6447069e50	fix: show values in account/party currency based in actual entry, no conversion	2019-02-12 16:41:20 +05:30
Sagar Vora	6837ae3377	bumped to version 11.1.5	2019-02-12 16:54:29 +05:50
karthikeyan5	4324dc6ea8	fix(marketplace): fixing hubmarket server specific error	2019-02-12 15:12:23 +05:30
karthikeyan5	4df6003bd9	feat(marketplace): seller profile page	2019-02-12 15:12:23 +05:30
karthikeyan5	2894f7935a	feat(marketplace): featured Items for sellers	2019-02-12 15:12:23 +05:30
karthikeyan5	88baf53cc1	feat(marketplace): navigation link to seller profile from item page	2019-02-12 15:12:23 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes ... Multiple fixes	2019-02-12 13:56:06 +05:30
Prateeksha Singh	426468183f	fix(getting_started): main domain specific masters	2019-02-12 13:08:21 +05:30
Nabin Hait	c46d995480	Merge pull request #16628 from Zlash65/fix-noti-patch ... fix: Notification Control delete	2019-02-12 13:04:45 +05:30
Nabin Hait	e6abee4bd5	Merge pull request #16643 from Zlash65/field-fix ... fix: Fieldtype and Fetch From fixes	2019-02-12 13:04:00 +05:30
Nabin Hait	ca536efe7b	Merge pull request #16640 from nabinhait/pur_reg_fix ... fix: show project even if PI is directly created	2019-02-12 13:01:18 +05:30
Deepesh Garg	da7c20e474	fix: Validate task dates in project (#16586) ... * fix: Validate task dates in project * fix: Test case fix and validation only if date exists * fix: Added dates in error messages	2019-02-12 12:55:50 +05:30
Rohit Waghchaure	e0412a177c	fix: validation message for work order	2019-02-12 11:47:16 +05:30
Zlash65	fc88029d7d	fix: fix item field for clinical procedure template	2019-02-12 11:38:27 +05:30
Zlash65	b614fb1d45	fix: make finance book field as link field and rectify fetch_from	2019-02-12 11:30:58 +05:30
Nabin Hait	afef9c1cc7	fix: Ignore tds account while creating tax withholding category	2019-02-12 11:28:20 +05:30
Zlash65	fd3998cfc9	fix: make branch as link field	2019-02-12 11:27:23 +05:30
Prateeksha Singh	9adad2988d	feat(getting_started): Minimum requirements to setup	2019-02-12 08:37:53 +05:30
Prateeksha Singh	08a6de6b41	fix(modules): shorten descriptions	2019-02-12 07:41:52 +05:30
Nabin Hait	ab50211e18	fix: show project even if PI is directly created	2019-02-11 18:25:18 +05:30
Anurag Mishra	aaa57026ac	Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report	2019-02-11 17:02:59 +05:30
Anurag Mishra	f70d4089bc	fix: codacy	2019-02-11 17:02:20 +05:30
Sagar Vora	4e92414850	Merge branch 'hotfix' into gross-and-net-profit-report	2019-02-11 16:00:28 +05:30
sahil28297	1a7e438fb2	fix(pstch): allow duplicate entries (#16632)	2019-02-11 15:53:04 +05:30
Rohan Bansal	d635f722fc	fix(stock_balance): Make balance qty and value columns more visible	2019-02-11 15:22:01 +05:30
Prateeksha Singh	9d4a183074	fix(modules): Merge Settings into one, Setup --> Settings	2019-02-11 15:14:50 +05:30
rohitwaghchaure	d95c8cfac3	Merge pull request #16621 from netchampfaris/fix-warehouse-currency ... fix: Set company_currency for Warehouse Tree	2019-02-11 14:58:02 +05:30
Prateeksha Singh	01a045a488	feat(modules): Add getting started and help desk	2019-02-11 14:01:04 +05:30
Anurag Mishra	a032f0528e	new report gross-and-net-profit-report	2019-02-11 13:12:44 +05:30
Zlash65	a206f06af9	delete notification control's docctype entry	2019-02-11 12:01:01 +05:30
Nabin Hait	bb6438af5a	Merge pull request #16537 from nabinhait/stock-balance-fix ... fix: Fixed error on stock balance report	2019-02-11 11:00:01 +05:30
Rushabh Mehta	c8018bdeb1	fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-09 21:10:29 +05:30
Faris Ansari	453964728d	fix: Set company_currency for Warehouse Tree	2019-02-09 20:27:42 +05:30
Nabin Hait	17e0513270	fix: message if stock reco is enqueued	2019-02-08 16:56:26 +05:30
Nabin Hait	8d4bb3e327	fix: backflush only if transferred item is present in work order	2019-02-08 16:56:26 +05:30
Nabin Hait	450fe309d6	fix: allow updating title of material request	2019-02-08 16:56:26 +05:30
Nabin Hait	e3b0f4f9f6	fix: removed account type filter on employee advance account	2019-02-08 16:56:26 +05:30
Nabin Hait	27af6b377f	fix: defered accounting fixes	2019-02-08 16:56:26 +05:30
Jay Parikh	1906f6da3a	Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588	2019-02-08 11:13:09 +00:00
Aditya Hase	e53a6a6723	Merge branch 'develop' into fix-py3	2019-02-08 12:51:05 +05:30
Nabin Hait	208ce5dcea	fix: removed module type for learn	2019-02-08 12:25:30 +05:30
Aditya Hase	13808b4cc9	fix(py3): Convert to float before comparison	2019-02-08 12:03:25 +05:30
Aditya Hase	2a3c39f38a	fix(py3): Convert dict.values() to list for indexing	2019-02-08 12:02:57 +05:30
Aditya Hase	46d7456782	fix(py3): Convert list to filter for indexing	2019-02-08 12:02:14 +05:30
Prateeksha Singh	e31cdb5b85	fix(modules): add ERPNext settings module	2019-02-08 08:06:23 +05:30
Aditya Hase	a86a569787	fix(py3): Convert dict.values() to list for indexing	2019-02-07 22:21:06 +05:30
Aditya Hase	3e954734d0	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	6e1bb60b58	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	e1f867f29f	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	d9ce732d3e	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	a9f20d801d	Merge pull request #16599 from adityahase/python3-fix ... fix(py3): Use six.text_type instead of unicode	2019-02-07 22:20:41 +05:30
Aditya Hase	691c166a56	fix(py3): Use six.text_type instead of unicode	2019-02-07 20:35:52 +05:30
Aditya Hase	0b1dc32fcb	Merge pull request #16597 from adityahase/python3-fix ... fix(py3): Use range instead of xrange	2019-02-07 18:17:37 +05:30
Aditya Hase	b9dc031e86	fix(py3): Use range instead of xrange	2019-02-07 18:10:30 +05:30
Prateeksha Singh	3423407314	feat(module_links): rearrange links	2019-02-07 09:58:22 +05:30
Prateeksha Singh	9b14d46c1d	purge(modules): remove old desktop icon configs	2019-02-07 09:58:22 +05:30
Prateeksha Singh	063af4ed08	config(modules): Rearrange links	2019-02-07 09:58:22 +05:30
Prateeksha Singh	b5eb16faeb	feat(config): add some onboarding cues	2019-02-07 09:58:22 +05:30
Prateeksha Singh	ce27cffaad	refactor(desk_icon): Remove reference and patches to Desktop Icon	2019-02-07 09:58:21 +05:30
Prateeksha Singh	2c14704398	feat(modules): Add Retail module, update others	2019-02-07 09:57:10 +05:30
Prateeksha Singh	7cd6ebeb6d	feat(explore_page): rearrange links	2019-02-07 09:57:10 +05:30
Raffael Meyer	ff878c0c1d	fix formatting and names	2019-02-07 03:28:27 +01:00
Faris Ansari	504f317434	fix: BOM Stock Calculated Report (#16585) ... - Cast null values to 0 to avoid mathematic errors	2019-02-07 07:15:38 +05:30
Faris Ansari	8ae5dbcac8	fix: Set barcode in Item row after scanning barcode (#16591)	2019-02-07 07:09:49 +05:30
Himanshu	088886e082	Remove illegal character after break (#16589)	2019-02-07 07:09:20 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Sagar Vora	8aa34a0ce0	bumped to version 11.1.4	2019-02-05 19:00:38 +05:50
karthikeyan5	4cb0a250a0	fix(marketplace): bug in filtering menu_items ... > UX improvment for incomplete feature	2019-02-05 18:07:48 +05:30
Nabin Hait	efff826e15	Merge pull request #16556 from nabinhait/payroll-cost-center ... fix: Don't force fetch cost center from company in payroll entry	2019-02-05 13:32:16 +05:30
Nabin Hait	8a46df5c4b	Removed duplicate fields	2019-02-05 13:31:32 +05:30
Nabin Hait	38b05a1296	fix: Set default cost center in payroll entry	2019-02-05 10:46:41 +05:30
Nabin Hait	294319e71b	fix: Don't force fetch cost center from company in payroll entry	2019-02-05 10:37:41 +05:30
Nabin Hait	ad69e29334	Merge pull request #16548 from nabinhait/stock-balance-item ... fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-05 10:36:47 +05:30
Nabin Hait	1c288ca4ab	Merge pull request #16558 from deepeshgarg007/production_plan ... fix: Validation while getting raw materials for production in Production Plan	2019-02-05 10:35:16 +05:30
Nabin Hait	fe6f1ad244	Update production_plan.py	2019-02-05 10:34:58 +05:30
Nabin Hait	d4e029665c	Merge pull request #16569 from nabinhait/salary-allow-on-submit ... fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-05 10:31:24 +05:30
Nabin Hait	b6d2c7eb80	Merge pull request #16570 from saurabh6790/jinja_injection_fix ... fix: access request parameter directly	2019-02-05 10:31:08 +05:30
Nabin Hait	7b93e738ad	Merge pull request #16576 from nabinhait/pay_reco_fix ... fix: Optimising payment reconciliation queries	2019-02-05 10:28:03 +05:30
Nabin Hait	025e780f31	Merge pull request #16575 from rohitwaghchaure/fixed_job_card_not_working ... fix: job card not working if transfer against work order	2019-02-05 10:27:12 +05:30
Nabin Hait	ac18498ca5	fix: Optimising payment reconciliation queries	2019-02-04 21:13:43 +05:30
Rohit Waghchaure	780c6b0d77	fix: job card not working if transfer against work order	2019-02-04 21:04:48 +05:30
Chinmay Pai	125505f2aa	fix(purchase_invoice): fix undefined variable ... fixes issue while creating purchase invoice Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-04 16:30:20 +05:30
Saurabh	bbebceb31a	fix: access request parameter directly	2019-02-04 15:56:23 +05:30
Nabin Hait	ff05ee50e0	fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-04 14:42:57 +05:30
Deepesh Garg	d442d06947	Update production_plan.py	2019-02-03 12:45:20 +05:30
dgarg007	f667cff5a6	fix: Validation while getting raw materils for production in Production Plan	2019-02-02 21:57:00 +05:30
Saif Ur Rehman	590491779a	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 ... # Conflicts: # erpnext/stock/doctype/item/item.py	2019-02-02 02:49:04 +05:00
Saif Ur Rehman	00aaa48779	test(Item): test_item_defaults	2019-02-02 02:43:44 +05:00
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Saif Ur Rehman	c8b61007b0	Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults ... # Conflicts: # erpnext/setup/doctype/brand/brand.json # erpnext/stock/get_item_details.py	2019-02-01 17:05:46 +05:00
Saurabh	aba611e09f	Merge branch 'hotfix' into project_status_email_fix	2019-02-01 15:01:26 +05:30
Nabin Hait	e1c75a9d55	fix: fixed salary structure assignment patch (#16546) ... * fix: fixed salary structure assignment patch * fix: patch	2019-02-01 12:25:40 +05:30
Nabin Hait	f3f4ce9b87	fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-01 12:01:19 +05:30
Rohit Waghchaure	a4645b6d17	fix: check open status projects for project status update	2019-02-01 11:37:22 +05:30
Raffael Meyer	fef07eeae2	Merge remote-tracking branch 'upstream/develop' into develop	2019-01-31 22:16:26 +01:00
Sagar Vora	ec5faaeae6	Merge branch 'hotfix' into stock-balance-fix	2019-01-31 18:46:06 +05:30
Nabin Hait	9ea19b8fe1	fix: Fixed error on stock balance report	2019-01-31 15:53:25 +05:30
Sagar Vora	56cbfe4bb0	Merge branch 'master' into develop	2019-01-31 13:34:32 +05:30
Sagar Vora	fea55fc018	bumped to version 11.1.3	2019-01-31 13:53:07 +05:50
Nabin Hait	a85f008f30	Merge pull request #16528 from adityahase/payment-request-usability ... fix(accounts): fetch subscription details only if required fields are populated	2019-01-31 10:27:27 +05:30
Sagar Vora	7ea2497b9a	Fix salary patch (#16531) ... fix: salary structure assignment patch, add .vscode to gitignore	2019-01-31 09:17:29 +05:30
Sagar Vora	76728b87ab	fix: value missing for selling settings - sales_update_frequency (#16530)	2019-01-31 08:19:38 +05:30
Sagar Vora	7a1c40c7c1	Merge branch 'master' into develop	2019-01-30 20:09:45 +05:30
Sagar Vora	664e21acbf	bumped to version 11.1.2	2019-01-30 20:29:45 +05:50
Aditya Hase	245b73b94f	fix(search): Fix possible reflected XSS attack vector (#16522)	2019-01-30 19:56:04 +05:30
Aditya Hase	66833f109b	fix(accounts): fetch subscription details only if required fields are populated	2019-01-30 19:40:40 +05:30
Nabin Hait	78fc158b39	Merge pull request #16527 from nabinhait/bom-fix ... fix: Default value for 'raw materials rate based on' in BOM	2019-01-30 18:35:49 +05:30
Saurabh	429996752d	fix: patch fixes (#16524)	2019-01-30 17:45:48 +05:30
Nabin Hait	16d7b49d73	fix: Default value for 'raw materials rate based on' in BOM	2019-01-30 17:27:08 +05:30
Saurabh	a342138625	Merge branch 'master' into develop	2019-01-30 12:38:58 +05:30
Saurabh	bb2031941e	bumped to version 11.1.1	2019-01-30 13:08:00 +06:00
Saurabh	5c12490709	fix: patch to add guardian role if not exists	2019-01-30 11:52:53 +05:30
rohitwaghchaure	25e63e806c	fix: modified date (#16520)	2019-01-30 11:46:34 +05:30
Sagar Vora	1c44a6a0ba	fix: set version to 11.1.0, remove staging_version	2019-01-29 18:52:50 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	1a4cd3b66a	bumped to version 11.1.0	2019-01-29 18:46:34 +05:50
Sagar Vora	606bd37316	fix: change changelog version to 11.1.0	2019-01-29 17:55:46 +05:30
Sagar Vora	b5dda63ddd	fix: change changelog version to 11.1.0	2019-01-29 17:54:47 +05:30
Sagar Vora	51a27b3524	fix: unsaved merge conflict	2019-01-29 17:52:47 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Sagar Vora	b32d9458b5	bumped to version 10.1.81	2019-01-29 17:30:19 +05:50
Nabin Hait	f8e9734f16	Merge pull request #16514 from sagarvora/changelog ... docs: changelog for v11.0.4	2019-01-29 16:27:07 +05:30
rohitwaghchaure	a95ed44d3d	fix: test case for fiscal year (#16516)	2019-01-29 16:24:53 +05:30
Nabin Hait	9f33c208d7	Update v11_0_4.md	2019-01-29 16:07:07 +05:30
Sagar Vora	7ef69b68f8	Update v11_0_4.md	2019-01-29 15:52:57 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price ... BOM raw materials price	2019-01-29 14:58:40 +05:30
Sagar Vora	115a252f55	docs: changelog for v11.0.4	2019-01-29 14:40:10 +05:30
Nabin Hait	4e45663297	fix(stock): get item price based on party	2019-01-29 14:02:08 +05:30
Sagar Vora	8f6509fa9a	Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months	2019-01-29 13:04:20 +05:30
Sagar Vora	9520e345bd	fix: better error messages	2019-01-29 13:03:46 +05:30
Nabin Hait	1df9a23e7b	Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay ... feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:02:56 +05:30
Rohit Waghchaure	07f75a3e54	feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:00:18 +05:30
Rohit Waghchaure	a8e743e3c4	fix: fiscal year always be for 12 months	2019-01-29 12:55:04 +05:30
Nabin Hait	6f7cc8b186	Merge pull request #16505 from deepeshgarg007/pos_issue ... feat: Enhancement in POS functionality	2019-01-29 12:51:00 +05:30
Nabin Hait	82421e24f6	Merge branch 'develop' into usregional	2019-01-29 12:14:11 +05:30
Nabin Hait	25cb13c0f8	Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes ... fix(human resources): gross pay calculation issue	2019-01-29 12:08:11 +05:30
Nabin Hait	7fc9825954	Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2 ... feat: List Active Healthcare Practitioner	2019-01-29 11:52:55 +05:30
Nabin Hait	8ba9545b72	Merge pull request #16498 from nabinhait/stock-ledger-report ... fix(stock): Escaping issue in stock ledger report	2019-01-29 11:30:15 +05:30
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	3b8623e207	Merge pull request #16491 from adityahase/ar-fix ... fix(ar-summary): Changes to column list to match recent changes	2019-01-29 11:28:02 +05:30
Nabin Hait	1467962f8a	Merge pull request #16490 from nabinhait/gst_settings_perm ... GST Settings permission and regional taxes creation	2019-01-29 11:27:18 +05:30
Nabin Hait	ff2922cbbb	Merge pull request #16488 from deepeshgarg007/price_list ... fix(sales_invoice): fetch customer price list if available before pos price list	2019-01-29 11:24:22 +05:30
Nabin Hait	7c0fbfab0a	Merge pull request #16482 from pipech/staging-fixes ... fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field	2019-01-29 11:23:05 +05:30
Nabin Hait	3ccc16e4e0	Merge pull request #16449 from scmmishra/remove-foundation ... feat: Deprecated In App Help	2019-01-29 11:20:23 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Nabin Hait	1c5d681f65	Merge pull request #16500 from scmmishra/v10-remove-docs ... feat: [v10] Deprecate In App Help	2019-01-29 11:05:25 +05:30
Nabin Hait	8fae0b3017	Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied ... [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2019-01-29 11:03:44 +05:30
Nabin Hait	b44b200e7c	Merge branch 'hotfix' into fix-scorecard	2019-01-29 11:00:07 +05:30
Aditya Hase	9acb885e60	fix(sqli): Avoid SQL Injection with sender param (#16509)	2019-01-29 10:52:37 +05:30
Navdeep Ghai	ec570026e1	Merge branch 'hotfix' into salary-slip-net-pay-fixes	2019-01-29 09:12:37 +04:00
Nabin Hait	385e3bb284	Merge pull request #16446 from Zlash65/jv-fix ... fix(accounts): wrong filters sent to fetch reference name in Journal Entry	2019-01-29 10:41:15 +05:30
navdeepghai1	92bb84aa70	Changed static precision(2) value to system setting currency_precision value	2019-01-28 16:54:58 +04:00
deepeshgarg007	f0cfe98860	fix: Added missing semicolon and removed null from parameter	2019-01-28 17:58:44 +05:30
deepeshgarg007	0bee62b460	fix: Made period fields read only and added validation for multiple entries by same user	2019-01-28 12:45:11 +05:30
Sagar Vora	a1a946fcd6	Merge branch 'hotfix' into fix-scorecard	2019-01-28 12:20:55 +05:30
navdeepghai1	aac404a155	Fixed net_pay calculation issue	2019-01-28 10:42:16 +04:00
Raffael Meyer	1f72b44f12	add german module with address template	2019-01-27 23:32:41 +01:00
deepeshgarg007	4e4b200972	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue	2019-01-27 22:54:34 +05:30
deepeshgarg007	c2ffcc5e71	feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher	2019-01-27 16:09:07 +05:30
scmmishra	1b63fa1920	[fix] Formatting issues	2019-01-25 20:45:04 +05:30
scmmishra	e1f5d22a02	[fix] Code formatting, removed trailing spaces	2019-01-25 20:45:04 +05:30
scmmishra	000e216354	[feat] Added docsUrl variable to configure help_links	2019-01-25 20:44:45 +05:30
scmmishra	0be2aa33ac	[fix] Links now redirect to erpnext.com	2019-01-25 20:41:54 +05:30
scmmishra	c6c1628c8a	[feat] Modified help config	2019-01-25 20:41:54 +05:30
Nabin Hait	1187d61b56	fix(stock): Escaping issue in stock ledger report	2019-01-25 17:07:29 +05:30
deepeshgarg007	76556e1a3e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into price_list	2019-01-25 16:50:06 +05:30
deepeshgarg007	8c84b7b888	fix: Doctype Name correction	2019-01-25 16:44:45 +05:30
deepeshgarg007	49cca7ac76	fix: Customer based price_list in online POS	2019-01-25 16:41:01 +05:30
Nabin Hait	01ca3e5e36	fix(manufacturing): Get raw materials rate from price list ignoring party	2019-01-25 16:25:15 +05:30
Nabin Hait	3476a457ad	fix: minor	2019-01-25 16:22:36 +05:30
Saif Ur Rehman	392d019bd0	fix(Item Tax Patch): Converted global variables to local	2019-01-25 15:09:43 +05:00
Shivam Mishra	67c338fd51	[fix] Fixed links ... Previous commit missed the links starting with `http://`	2019-01-25 15:17:44 +05:30
scmmishra	f44dfb1582	[fix] Formatting issues	2019-01-25 14:56:30 +05:30
scmmishra	d71de2a23e	[fix] Code formatting, removed trailing spaces	2019-01-25 14:27:23 +05:30
scmmishra	9731a02657	[feat] Added docsUrl variable to configure help_links	2019-01-25 13:14:11 +05:30
scmmishra	3f9b231f31	[fix] Links now redirect to erpnext.com	2019-01-25 12:56:27 +05:30
deepeshgarg007	1f9a6febdd	fix: Assign given price list if POS price list is not available	2019-01-25 11:53:55 +05:30
Nabin Hait	f05d91d317	Merge branch 'develop' into Item-Tax-Template-V12	2019-01-25 11:26:47 +05:30
Nabin Hait	596c1b3489	Merge pull request #16220 from SaiFi0102/Party-Ledger-Summary ... feat: Party Ledger Summary Report	2019-01-25 11:22:55 +05:30
Nabin Hait	ddc65dfb87	fix: delete taxes and charges template while deleting company	2019-01-25 11:04:14 +05:30
Nabin Hait	50e552321b	Merge pull request #16363 from scmmishra/leave-application-naming ... fix: Naming series not reflecting in leave application	2019-01-25 10:34:01 +05:30
Nabin Hait	cce96758fc	Merge pull request #16484 from netchampfaris/add-logging-for-failed-exchange-rate ... chore: Add error logging for failed get_exchange_rate call	2019-01-25 10:33:03 +05:30
Nabin Hait	42462fac9d	Merge pull request #16465 from nabinhait/eway_bill ... fix(accounts): Validate gst accounts defined in GST Settings in eway bill report	2019-01-25 10:00:06 +05:30
Nabin Hait	f1ff5c24ff	Merge pull request #16469 from sagarvora/minor-gstin ... fix(regional): remove duplicate validation for GSTIN	2019-01-25 09:59:45 +05:30
Nabin Hait	05f1c0e1b9	Merge pull request #16470 from netchampfaris/fix-jinja-unicode-formatting ... fix: Don't use .format in jinja templates	2019-01-25 09:57:37 +05:30
Nabin Hait	e21bdf020c	Merge pull request #16472 from deepeshgarg007/cost_center ... fix(cost_center): Bug fix in update_cost_center_number argument name	2019-01-25 09:56:52 +05:30
Nabin Hait	76d93e7220	Merge pull request #16474 from deepeshgarg007/email_digest_fix ... fix: Wrong argument fix in email digest filters	2019-01-25 09:55:47 +05:30
Nabin Hait	a6ab38665d	Merge pull request #16487 from netchampfaris/fix-gst-pos-invoice ... fix: Dont show 0 amount taxes and tax breakup	2019-01-25 09:54:07 +05:30
Nabin Hait	393080ecbe	Merge pull request #16492 from rohitwaghchaure/ascii_code_issue_pos_offline_not_working ... fix: ascii codec while opening offline POS	2019-01-25 09:50:41 +05:30
Nabin Hait	f6459335da	Merge pull request #16493 from rohitwaghchaure/bank_reconcilliation_entry_issue ... fix: bank reconcilliation showing multiple entries against one JV	2019-01-25 09:50:07 +05:30
Nabin Hait	fc9e733d7f	Merge pull request #16483 from surajshetty3416/stock-levels-based-on-permission ... fix: Show stock levels in Item master based on user permissions	2019-01-25 09:48:43 +05:30
Suraj Shetty	1c9dd67f15	Merge branch 'staging-fixes' into add-logging-for-failed-exchange-rate	2019-01-25 09:22:46 +05:30
Rohit Waghchaure	e14cc8f2b6	fix: bank reconcilliation showing multiple entries against one JV	2019-01-25 00:23:41 +05:30
Saif Ur Rehman	37d7b80572	Merge branch 'Item-Tax-Template' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-24 23:41:35 +05:00
Saif Ur Rehman	3d275af67b	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json	2019-01-24 23:40:16 +05:00
Saif Ur Rehman	d5c7410ad1	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/buying/doctype/supplier/supplier.json # erpnext/patches.txt # erpnext/selling/doctype/customer/customer.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-24 23:34:16 +05:00
Rohit Waghchaure	74df01d3d1	fix: ascii code while opening offline POS	2019-01-25 00:03:35 +05:30
rohitwaghchaure	7e4cf62a15	Merge pull request #16370 from rohitwaghchaure/show_outward_entries_in_negative ... Show outward entries in negative for Bank Clearance Summary report	2019-01-24 22:13:40 +05:30
Aditya Hase	a40c43e414	fix(ar-summary): Changes to column list to match recent changes	2019-01-24 19:13:32 +05:30
Nabin Hait	2a1aedfff1	fix(setup): Create regional taxes on creation on company	2019-01-24 17:56:19 +05:30
Nabin Hait	49b41e49ae	fix: Added permissions in GST Settings and added filters for accounts based on company	2019-01-24 17:55:44 +05:30
deepeshgarg007	c48efaba6e	fix(sales_invoice): fetch customer price list if available before pos profile price list	2019-01-24 17:15:38 +05:30
Faris Ansari	d6f837c5e5	fix: Dont show 0 amount taxes and tax breakup	2019-01-24 17:10:33 +05:30
Faris Ansari	badf1c42e0	chore: Add error logging for failed get_exchange_rate call	2019-01-24 16:28:53 +05:30
Suraj Shetty	7a45887fa1	fix typo	2019-01-24 16:26:48 +05:30
Suraj Shetty	dd0496f7aa	Add missed out field field	2019-01-24 16:18:43 +05:30
Suraj Shetty	c165838228	Filter bin list based on warehouses that are accessible to the user	2019-01-24 15:45:46 +05:30
pipeCh	c16c7fffb4	fixed for "Select Serial Numbers" dialog won't fill mandatory field	2019-01-24 15:00:07 +07:00
Suraj Shetty	41b3756df5	fix: patch to replace Project icon with Projects icon (#16374) ... * Delete duplicate projects icon from desktop.py * Fix patch (to replace project to projects)	2019-01-24 10:57:05 +05:30
deepeshgarg007	0c38cf06a5	fix: Wrong argument fix in email digest filters	2019-01-23 19:11:24 +05:30
deepeshgarg007	19ab86a3a7	fix:(cost_center): fix for update cost center number	2019-01-23 17:28:13 +05:30
Sagar Vora	e9778d9556	fix: do not use built-in "input", reload_doc	2019-01-23 17:13:31 +05:30
Sagar Vora	f51661b225	fix: allow operators, make weighting_function mandatory	2019-01-23 16:42:28 +05:30
Faris Ansari	853d3fd1ab	fix: Don't use .format in jinja templates ... - Jinja doesn't allow unicode strings to be formatted in templates	2019-01-23 16:34:22 +05:30
Sagar Vora	9aeabce3d3	fix: trailing whitespace, duplication & more	2019-01-23 16:01:19 +05:30
Sagar Vora	d75095b04c	fix(regional): remove duplicate validation for GSTIN	2019-01-23 14:40:01 +05:30
Sagar Vora	57d7c837aa	fix: supplier scorecard test	2019-01-23 14:26:35 +05:30
Sagar Vora	fb256d68ff	Merge branch 'fix-supplier-scorecard' of /home/snv/Work/master_bench/apps/erpnext into fix-scorecard	2019-01-23 14:13:40 +05:30
Sagar Vora	037d0f8ba6	fix(buying): make supplier scorecard usable	2019-01-23 14:11:25 +05:30
Frappe Bot	e415cce1a9	Merge branch 'staging' into develop	2019-01-23 08:19:00 +00:00
Frappe Bot	2d5bf69dc4	bumped to version 11.0.3-beta.37	2019-01-23 08:12:19 +00:00
Frappe Bot	34121bc81a	Merge branch 'master' into staging-fixes	2019-01-23 08:08:55 +00:00
Frappe Bot	342854f6f2	bumped to version 10.1.80	2019-01-23 08:08:53 +00:00
Nabin Hait	06607fda4e	fix: removed print statement	2019-01-23 12:15:48 +05:30
Nabin Hait	141c543f97	Update journal_entry.js	2019-01-23 12:14:55 +05:30
Nabin Hait	36706c04bb	Merge pull request #16451 from nabinhait/unicode-issue ... fix: Unicode issue in purchase invoice	2019-01-23 12:11:00 +05:30
Nabin Hait	d2e2ca31ac	Merge pull request #16460 from nabinhait/pricing-rule-issue ... fix: Enforce pricing rule based on rate on server side	2019-01-23 12:09:12 +05:30
Nabin Hait	fb8c0bd664	Merge pull request #16464 from adityahase/flakes ... style: Linting fixes	2019-01-23 12:08:57 +05:30
Nabin Hait	5b2922f76c	Merge pull request #16466 from nabinhait/project-nonetype ... fix(projects): None type handling while updating tasks	2019-01-23 12:07:25 +05:30
Nabin Hait	4ef578e1c4	Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports ... fix: Multiple fixes in the reports	2019-01-23 12:05:36 +05:30
Nabin Hait	49e09624d6	fix(projects): None type handling while updating tasks	2019-01-23 10:43:00 +05:30
Nabin Hait	8c2a2c8f60	fix(accounts): Validate gst accounts defined in GST Settings in eway bill report	2019-01-23 10:33:47 +05:30
Aditya Hase	819a16d0f5	fix(dead-code): Remove .py files (#16462)	2019-01-23 07:57:08 +05:30
Aditya Hase	f79937d64b	style: Remove unused imports	2019-01-23 00:28:37 +05:30
Aditya Hase	55a08dee78	style: Remove unusued local variable	2019-01-23 00:28:02 +05:30
Aditya Hase	4b4265f8a7	fix(dead-code): Remove .py files (#16457)	2019-01-22 20:54:21 +05:30
FinByz Tech Pvt. Ltd	237a871f17	fix: NoneType object has no attribute "gstin" (#16458) ... * fix: NoneType object has no attribute "gstin" * fix: handle NoneType values	2019-01-22 20:49:06 +05:30
Nabin Hait	da32916396	fix: Enforce pricing rule based on rate on server side	2019-01-22 19:06:06 +05:30
Aditya Hase	f3c22f342c	fix(unicode): Import unicode_literals in every file	2019-01-22 18:36:10 +05:30
Sagar Vora	c4bda9fac3	Merge branch 'staging' into develop	2019-01-22 18:17:09 +05:30
Sagar Vora	5555b2802f	bumped to version 11.0.3-beta.36	2019-01-22 18:37:09 +05:50
Sagar Vora	c84e3fe21b	Merge branch 'master' into staging-fixes	2019-01-22 18:16:13 +05:30
Sagar Vora	2a9a867f05	bumped to version 10.1.79	2019-01-22 18:35:44 +05:50
Saif Ur Rehman	74a3370095	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/patches.txt # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/sales_order/sales_order.json	2019-01-22 16:20:40 +05:00
Sagar Vora	4d1a9b10ed	Merge branch 'staging' into develop	2019-01-22 15:56:39 +05:30
Sagar Vora	64d774d178	bumped to version 11.0.3-beta.35	2019-01-22 16:05:56 +05:50
Nabin Hait	a5270e561f	fix: Unicode issue in purchase invoice	2019-01-22 15:43:04 +05:30
Sagar Vora	ceacacc320	Merge branch 'master' into staging-fixes	2019-01-22 15:37:05 +05:30
Sagar Vora	1e61dd024b	bumped to version 10.1.78	2019-01-22 15:53:48 +05:50
Rohit Waghchaure	ddd9136d10	Renamed field and added finance book column in the trial balance simple report	2019-01-22 14:11:57 +05:30
Aditya Hase	d157ae17b7	fix(ar-summary-report): Changes to column list to match recent changes in AR report	2019-01-22 13:37:54 +05:30
Zlash65	270c4c2a87	fix: push party filter only if applicable	2019-01-22 12:47:25 +05:30
Zlash65	c8d632ddff	fix: add set query for payroll entry in JV	2019-01-22 12:46:13 +05:30
Nabin Hait	22923ed663	Merge branch 'staging-fixes' into pr_staging_fixes_2	2019-01-22 10:51:59 +05:30
Nabin Hait	f0ea152022	Merge pull request #16289 from Anurag810/Quality-inspection-fix ... fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)	2019-01-22 10:49:55 +05:30
Nabin Hait	a334ed879f	Update __init__.py	2019-01-22 10:41:50 +05:30
Nabin Hait	9adfd2d7b4	Merge pull request #16419 from rohitwaghchaure/project_update_status_code_and_design_refactoring ... fix: Project update status feature's code and design refactored	2019-01-22 10:02:34 +05:30
Nabin Hait	b9b8d575bc	Merge pull request #16435 from deepeshgarg007/support-fix ... fix(accounts_receivable): Bug fix in accounts receivable report	2019-01-22 09:59:17 +05:30
Nabin Hait	48fa697d54	Merge pull request #16439 from nabinhait/disable-rounded-total ... fix: Disable rounded total field's value honours docfield's default value	2019-01-22 09:58:06 +05:30
Nabin Hait	16bbf09947	Merge pull request #16440 from rohitwaghchaure/not_able_to_submit_work_order ... fix: not able to submit work order	2019-01-22 09:57:49 +05:30
Rohit Waghchaure	de718dacb2	fix: Code cleanup	2019-01-21 19:47:17 +05:30
scmmishra	f2d0be7299	[feat] Modified help config	2019-01-21 19:35:46 +05:30
scmmishra	dd461636e3	[feat] Updated all help_links	2019-01-21 19:35:02 +05:30
Rohit Waghchaure	11ce45077d	[Fix] Not able to submit work order	2019-01-21 19:18:52 +05:30
Nabin Hait	a39f324682	fix: Disable rounded total field's value honours docfield's default value	2019-01-21 18:50:50 +05:30
deepeshgarg007	3565395e7a	Merge branch 'email_digest' of https://github.com/deepeshgarg007/erpnext into email_digest	2019-01-21 15:03:51 +05:30
deepeshgarg007	aab6d0e028	fix(email_digest): Linkes annual income and annual expense to profit and loss statement	2019-01-21 15:01:40 +05:30
deepeshgarg007	ff1078f271	fix(minor): fetch payment terms if voucher nos are available	2019-01-21 09:43:56 +05:30
Tyler Matteson	7928a685c8	Feat: US Regional module, added test, changed address template reference to convention	2019-01-20 09:55:44 -05:00
Deepesh Garg	f7fe08c487	Merge branch 'develop' into email_digest	2019-01-20 16:53:41 +05:30
Tyler Matteson	fdb8e4d427	Merge branch 'usregional' of https://github.com/agritheory/erpnext into usregional	2019-01-19 14:26:41 -05:00
Saif Ur Rehman	31d58eac01	fix(Party Ledger Summary): Added Supplier/Customer Name column	2019-01-19 15:28:53 +05:00
Saif Ur Rehman	55566b7f8e	fix(Party Ledger Summary): Codacy fix	2019-01-19 15:12:08 +05:00
Himanshu	79d4400c16	fix: Offline pos fix (#16424) ... * Offline POS fix * Fixed items search and load items	2019-01-19 14:01:38 +05:30
Saif Ur Rehman	fcaed12a53	Merge branch 'Party-Ledger-Summary' of https://saifi0102@github.com/SaiFi0102/erpnext.git into Party-Ledger-Summary	2019-01-19 13:18:23 +05:00
Aditya Hase	442c85c006	fix(marketplace): Capitalize marketplace factory class to support router changes (#16428)	2019-01-18 21:28:37 +05:30
Saif Ur Rehman	398f593e5f	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt	2019-01-18 17:33:19 +05:00
Faris Ansari	f523611e12	Merge branch 'hotfix' into leave-application-naming	2019-01-18 14:30:39 +05:30
Rohit Waghchaure	7e71e132a3	Added patch	2019-01-18 11:47:31 +05:30
deepeshgarg007	3c9dd73f91	Added company filters for reports	2019-01-18 11:29:37 +05:30
Nabin Hait	0c44701901	Merge pull request #16375 from deepeshgarg007/company_address ... feat: Company address and GST field addition in sales order, purchase order, purchase receipt	2019-01-18 10:57:57 +05:30
Nabin Hait	bace4d3e6d	Merge pull request #16358 from adityahase/naming-series ... feat(naming): Deferred naming for SLE and GL Entry	2019-01-18 10:55:30 +05:30
Nabin Hait	bef2c22d23	Fix: merge conflict	2019-01-18 10:15:47 +05:30
Nabin Hait	6202d0ed68	fix: NoneType comparison with int error	2019-01-18 09:40:24 +05:30
Nabin Hait	30667c160d	test: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Nabin Hait	5a87ac0ad8	fix: Inter company stock transfer for serialised items	2019-01-18 09:36:18 +05:30
Tyler Matteson	53a6492f29	FEAT: US Regional Module with IRS 1099 reporting	2019-01-17 14:04:51 -05:00
Rohit Waghchaure	425dff93d7	fix: Project update status code and design refactored	2019-01-17 19:21:44 +05:30
deepeshgarg007	00f989a916	fix(email_digest): fix in account heads	2019-01-17 17:59:52 +05:30
Rohit Waghchaure	fa7ee0b3b6	Added dafult bank account in the customer/supplier	2019-01-17 15:45:27 +05:30
Rohit Waghchaure	f725816809	Enhance: Added field limit in the Payment Reconciliation to handle large entries	2019-01-17 12:54:14 +05:30
deepeshgarg007	753c5d7514	fix(Codacy): Possible Sql injections	2019-01-17 12:28:56 +05:30
ks093	61c781325d	Fix to show low stock message. ... In case of order being placed with stock quantity more than available, message showing stock available wasn't showing due to tuple unpacking not happening correctly.	2019-01-17 12:16:43 +05:30
ks093	1ed819bb10	Refresh quotation_series field to show series	2019-01-17 12:09:04 +05:30
Deepesh Garg	bce62a4bcc	Delete __init__.py	2019-01-16 22:57:45 +05:30
Deepesh Garg	70657d06f4	Delete pending_sales_order.json	2019-01-16 22:57:20 +05:30
Deepesh Garg	b8e0bfc335	Delete pending_quotation.json	2019-01-16 22:56:30 +05:30
Deepesh Garg	9cf9cb0e00	Delete __init__.py	2019-01-16 22:55:48 +05:30
Deepesh Garg	9da018d59c	Delete quotation.json	2019-01-16 22:55:10 +05:30
Deepesh Garg	59b9d363c9	Delete purchase_order.json	2019-01-16 22:54:45 +05:30
Deepesh Garg	23b7f0def4	Delete __init__.py	2019-01-16 22:54:17 +05:30
Deepesh Garg	e95a4053cf	Delete sales_order.json	2019-01-16 22:53:53 +05:30
Deepesh Garg	e6e1f2a46f	Delete __init__.py	2019-01-16 22:53:28 +05:30
Deepesh Garg	e4303111b4	Delete __init__.py	2019-01-16 22:53:00 +05:30
Deepesh Garg	9fb871c040	Delete pending_purchase_order.json	2019-01-16 22:52:27 +05:30
Deepesh Garg	3f5fea97fa	Delete __init__.py	2019-01-16 22:52:07 +05:30
deepeshgarg007	12b409b94a	Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest	2019-01-16 22:33:17 +05:30
deepeshgarg007	f8bbcc56b7	refactor(email_digest): Fixes in email digest links and reports	2019-01-16 22:22:48 +05:30
Nabin Hait	c8ac825f0d	Merge branch 'hotfix' into leave-application-naming	2019-01-16 17:54:35 +05:30
Nabin Hait	873442a55d	Merge branch 'staging-fixes' into Party-Ledger-Summary	2019-01-16 17:52:45 +05:30
Nabin Hait	983d102a19	Merge branch 'staging-fixes' into Quality-inspection-fix	2019-01-16 17:52:30 +05:30
Nabin Hait	cd40d87ebd	Merge branch 'staging-fixes' into pr_staging_fixes_2	2019-01-16 17:52:01 +05:30
Nabin Hait	4fd710a392	Merge branch 'staging-fixes' into company_address	2019-01-16 17:51:49 +05:30
Nabin Hait	28ccaa3c88	Merge branch 'staging-fixes' into Gross-Profit-Return-Fix	2019-01-16 17:49:22 +05:30
Nabin Hait	3dd5f55412	feat(stock-reco): Fetch items in stock reco based on group warehouse	2019-01-16 16:20:05 +05:30
Nabin Hait	78ccbe24a3	fix(test): BOM raw materials rate from price list as per uom	2019-01-16 16:00:25 +05:30
Nabin Hait	158e7dcd8b	fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM	2019-01-16 16:00:25 +05:30
Nabin Hait	3dde949419	feat(mr_against_so): Merge same items from different BOMs	2019-01-16 15:59:39 +05:30
Sahil Khan	693e81db48	more bis fixes	2019-01-16 15:59:39 +05:30
Sahil Khan	34766c0c50	BIS issue fixes	2019-01-16 15:59:39 +05:30
Saif Ur Rehman	fccb1e55ec	fix(Gross Profit Report): corrected fieldnames in return invoice query	2019-01-16 14:36:55 +05:00
Deepesh Garg	7bb7f95aa8	Merge branch 'staging-fixes' into company_address	2019-01-16 11:17:55 +05:30
Nabin Hait	29552c1ec4	Merge pull request #16304 from netchampfaris/fix-item-group-pagination ... fix(website): Pagination in child item groups	2019-01-16 10:31:48 +05:30
Nabin Hait	38703080c9	Merge pull request #16360 from adityahase/demo ... fix(demo): Look for "Total" instead of "'Total'" in report results	2019-01-16 10:23:59 +05:30
Nabin Hait	7686aa9ff6	Merge pull request #16400 from Zlash65/fix-deff ... fix: for deferred settings for Item	2019-01-16 10:16:00 +05:30
Nabin Hait	7b3ee0e31c	Merge pull request #16403 from saurabh6790/patch_sequnce_fix ... Patch sequence fix	2019-01-16 10:15:14 +05:30
Nabin Hait	7213895095	Merge pull request #16404 from Zlash65/fix-asset-category ... fix: Asset Category field as link type and read only	2019-01-16 10:14:21 +05:30
Nabin Hait	f0571ddf4b	Merge pull request #16393 from diamorafaela/quotation-currency ... fix: Quotation to Sales Order with different currency	2019-01-16 10:13:44 +05:30
Nabin Hait	d98315c41c	Merge pull request #16402 from sagarvora/fix-patch-testing ... fix(tests): change patch order, optimise Travis	2019-01-16 10:13:14 +05:30
Saurabh	7d630b3e29	Merge branch 'master' into staging-fixes	2019-01-15 19:41:09 +05:30
Saurabh	529cc1ca51	bumped to version 10.1.77	2019-01-15 19:46:36 +06:00
Rohit Waghchaure	affeb3dfec	Added on account amount field in Accounts Payable/Receivable Summary	2019-01-15 17:38:31 +05:30
deepeshgarg007	7278834d25	Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest	2019-01-15 17:02:12 +05:30
Rohit Waghchaure	1a4c1e11cb	Fix: total invoiced amount in Accounts Receivable Summary report showing blank	2019-01-15 17:01:34 +05:30
Zlash65	cef56b5147	fixes asset category field as link type and read only	2019-01-15 16:26:58 +05:30
Rohit Waghchaure	b2d08a498b	Added bank account field in the payment entry	2019-01-15 16:11:29 +05:30
Zlash65	a3dd798bad	clean if conditions	2019-01-15 16:05:42 +05:30
Rohit Waghchaure	bdee57ca8d	Added finance book in trial balance and fixed cost center not working issue in trial balance	2019-01-15 15:52:52 +05:30
Saif Ur Rehman	f86123ad5a	feat(Party Ledger Summary): Include columns for discount and other adjustments	2019-01-15 15:18:43 +05:00
Sagar Vora	876d868fa1	fix(tests): change patch order, optimise travis	2019-01-15 15:45:33 +05:30
Rohit Waghchaure	df7215dcb2	Added supplier name in the tds report	2019-01-15 14:48:06 +05:30
Saurabh	68ea608ca8	fix: import unicode_literals	2019-01-15 14:47:32 +05:30
Zlash65	627be1de51	minor fixes for deferred calculations	2019-01-15 14:16:50 +05:30
NahuelOperto	9080221d46	fix: added test cases	2019-01-14 12:12:56 -03:00
Nabin Hait	d92024bb0f	Merge branch 'hotfix' into leave-application-naming	2019-01-14 20:26:01 +05:30
Nabin Hait	acd7f73d57	Merge branch 'hotfix' into group_warehouse_stock_reco	2019-01-14 20:25:53 +05:30
Nabin Hait	55c672eefd	Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied	2019-01-14 20:25:22 +05:30
Nabin Hait	4ed7cfc515	tests(cost-center-company): Validate cost center's company and revent tests	2019-01-14 17:14:39 +05:30
Himanshu	cccc78e197	fix: Qms icon color and label fix (#16293) ... * qms color fix according to palette * changed qms icon and color * patch to change icon * fix no module named v12_0 * removed spacing in desktop icon * fix: line break * renamed QM to Quality * patch to rename quality management to quality * resolve merge conflicts	2019-01-14 14:36:54 +05:30
Saif Ur Rehman	502f15ba1b	test: test_party_details_tax_category	2019-01-12 19:07:39 +05:00
Saif Ur Rehman	bbd1e47758	test: test_tax_calculation_with_item_tax_template	2019-01-12 18:28:15 +05:00
rohitwaghchaure	ba54209c86	[Fix] Exchange rate revaluation, get entries not working if accounts of the other currency than company currency not available (#16379)	2019-01-12 17:58:00 +05:30
NahuelOperto	7facc34851	fix: removed filter from method validate	2019-01-11 10:46:38 -03:00
deepeshgarg007	2e9c2ff545	Merge branch 'develop' of https://github.com/frappe/erpnext into email_digest	2019-01-11 15:57:48 +05:30
Fisher Yu	2cd49f51e2	fix issue #16284, child table copy (#16285) ... * fix issue #16284, child table copy V11 Child table from Clipboard Excel error, can't multiply sequence by non-int of type 'float' * Update get_item_details.py consider the empty string case * Update get_item_details.py	2019-01-11 15:31:33 +05:30
Rushabh Mehta	d254af9fea	fix(patch): set_backup_limit.py	2019-01-11 15:07:26 +05:30
Nabin Hait	5c86cf54a2	Merge pull request #16288 from Anurag810/task-fixes ... [fix] 'Expected End Date' in task should not be later than 'Expected End Date' of project	2019-01-11 14:21:58 +05:30
Anurag Mishra	cd8908362a	Changes Requested Done	2019-01-11 12:23:23 +05:30
Saif Ur Rehman	5085673030	test: fix for Item Tax Template v12	2019-01-11 03:53:43 +05:00
Nabin Hait	7e3c80bd8a	Merge pull request #16213 from nabinhait/pplan_fix ... fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse	2019-01-10 17:57:28 +05:30
Nabin Hait	0d208851a4	Fix(stock-reco): Fixed codacy issues	2019-01-10 17:56:11 +05:30
Sagar Vora	f99e013ebc	fix: gstin validation should work when there is no state (#16378)	2019-01-10 11:57:24 +05:30
Sagar Vora	07cf4e8f5b	fix: use division consistent with Python 3 & other changes	2019-01-10 11:14:58 +05:30
Nabin Hait	187bdf08a6	Merge pull request #16319 from SaiFi0102/Gross-Profit-Exclude-Opening-Invoice ... fix: Exclude Opening Invoice from Gross Profit Report and Company Dashboard Chart	2019-01-10 10:55:41 +05:30
Nabin Hait	afbdaa525e	Merge pull request #16365 from hiousi/patch-1 ... fix: variant can not get its price	2019-01-10 10:36:27 +05:30
Nabin Hait	c693cd7f10	Merge pull request #16341 from Mangesh-Khairnar/date-range-fix ... fix: Sales Analytics Period Range	2019-01-10 10:35:31 +05:30
Saif Ur Rehman	fc5c9b8ab8	chore: Move Item Tax Template patch to v12	2019-01-10 04:34:14 +05:00
Saif Ur Rehman	8d61794540	Merge branch 'Item-Tax-Template' of https://github.com/SaiFi0102/erpnext.git into Item-Tax-Template-V12 ... # Conflicts: # erpnext/patches.txt # erpnext/stock/doctype/item/item.json	2019-01-10 04:23:40 +05:00
Saif Ur Rehman	edd0e2476f	chore: Updated item.json, no changes	2019-01-10 04:16:10 +05:00
deepeshgarg007	720020319f	fix(Codacy): removed unused variable	2019-01-09 21:56:45 +05:30
deepeshgarg007	c039f70496	Test Cases for ... account balance report	2019-01-09 21:56:45 +05:30
deepeshgarg007	8621869d24	Created multiple reports and linked them to email digest	2019-01-09 21:56:45 +05:30
deepeshgarg007	2b47d39274	feat: Links for reports in email digest	2019-01-09 21:54:40 +05:30
karthikeyan5	2825b929c1	fix(GSTIN Validation - india): added checksum validation for GSTIN	2019-01-09 19:15:10 +05:30
Deepesh Garg	9c5e9d79f1	Merge branch 'staging-fixes' into company_address	2019-01-09 17:19:20 +05:30
deepeshgarg007	d29ee97307	Addition of GST fields in Sales Order,Purchase Order,Purchase Receipt	2019-01-09 17:09:11 +05:30
Rohit Waghchaure	701c762a68	Show outward entries in negative for Bank Clearance Summary report	2019-01-09 14:21:03 +05:30
Saif Ur Rehman	2689dea72a	fix: Give higher precedence to set_warehouse in get_item_details while setting item level warehouse	2019-01-09 13:43:06 +05:00
Jamsheer	319ca86c81	fix: Test Fee Validity	2019-01-09 13:29:20 +05:30
Saif Ur Rehman	eb7277d2d4	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/patches.txt	2019-01-09 11:25:53 +05:00
Saif Ur Rehman	091cfba5fc	test: Added test for get_item_tax_template and get_item_tax_map	2019-01-09 11:24:30 +05:00
Jamsheer	c0ac849776	fix: Helathcare Prcatitioner custom query escaped	2019-01-09 11:48:41 +05:30
Jamsheer	45c5138eaf	fix: updated options for abdomen in Vital Signs	2019-01-09 11:19:27 +05:30
Jamsheer	f2d7e3309f	fix: Patient Appointment - Calendar - status != Cancelled	2019-01-09 11:19:27 +05:30
Jamsheer	17bb0da278	fix: remove print statement	2019-01-09 11:19:27 +05:30
Jamsheer	c3804230cd	fix: Patient - Quick Entry enabled	2019-01-09 11:19:27 +05:30
Jamsheer	52ac72e63e	fix: Validate Patient Appointment	2019-01-09 11:19:27 +05:30
Jamsheer	c0097ad729	feat: Filter active Healthcare Practitioner	2019-01-09 11:19:27 +05:30
Jamsheer	fb7b5292b3	fix: Clinical Procedure - consume stock if items present	2019-01-09 11:19:27 +05:30
Jamsheer	3e01891e22	fix: Traverse note from procedure prescription to appointment	2019-01-09 11:19:27 +05:30
Jamsheer	f3c4f5a901	fix: Clinical Procedure - copy fields from appointment	2019-01-09 11:19:26 +05:30
Jamsheer	f4d0fcb836	fix: patient - user welcome email configuration	2019-01-09 11:19:26 +05:30
Jamsheer	b2c9268ece	fix: Patient Appointment - Calendar - set color from appointment type	2019-01-09 11:19:26 +05:30
hiousi	9671438435	Update get_item_details.py	2019-01-08 22:23:45 +01:00
hiousi	1516e29609	[fix] variant can not get its price ... get_price_list_rate() return empty dict before trying to get the item price for a variant.	2019-01-08 18:34:08 +01:00
Nabin Hait	bf0b6fd8a9	Merge pull request #16342 from finbyz/staging-fixes ... fix: rounded total if available while caclulating advance paid	2019-01-08 20:29:32 +05:30
Nabin Hait	c13b0562ba	Merge pull request #16337 from Anurag810/Employee ... fix: Employee Onboarding/Seperation task Assignment	2019-01-08 20:27:43 +05:30
Nabin Hait	142d8aa973	Merge pull request #16321 from rohitwaghchaure/fixed_bank_clearance_negtive_value_amt ... fix: negative amount showing in the bank clearance summary report	2019-01-08 20:25:26 +05:30
Nabin Hait	e6ec6cccfa	Merge pull request #16316 from Anurag810/purchase-invoice-fixes ... fix: expense head of asset items in purchase invoice	2019-01-08 20:23:14 +05:30
Nabin Hait	0f3ccba741	Update test_asset.py	2019-01-08 20:23:01 +05:30
Nabin Hait	2da5937864	Merge pull request #16314 from surajshetty3416/patch-to-rename-additional-salary-component ... fix: patch to rename additional salary component	2019-01-08 20:21:16 +05:30
scmmishra	e2762df90b	Fix: Naming series not reflecting in leave application	2019-01-08 17:38:28 +05:30
Saurabh	afec3ca89a	Merge branch 'staging' into develop	2019-01-08 17:09:36 +05:30
Saurabh	1836285c01	bumped to version 11.0.3-beta.34	2019-01-08 16:52:38 +06:00
rohitwaghchaure	ffdadbf97f	fix: fallback to stock uom if uom is not defined (#16329) ... * [minor] Code cleanup * fix: remove 'or' condition, won't execute	2019-01-08 16:21:25 +05:30
Saif Ur Rehman	380b4b0926	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json # erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json # erpnext/buying/doctype/purchase_order/purchase_order.json # erpnext/buying/doctype/purchase_order_item/purchase_order_item.json # erpnext/buying/doctype/supplier/supplier.json # erpnext/buying/doctype/supplier_quotation/supplier_quotation.json # erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json # erpnext/selling/doctype/quotation/quotation.json # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/selling/doctype/sales_order/sales_order.json # erpnext/selling/doctype/sales_order_item/sales_order_item.json # erpnext/setup/doctype/item_group/item_group.json # erpnext/stock/doctype/delivery_note/delivery_note.json # erpnext/stock/doctype/delivery_note_item/delivery_note_item.json # erpnext/stock/doctype/item/item.json # erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json	2019-01-08 13:41:46 +05:00
Nabin Hait	c190192d5f	Merge pull request #16277 from deepeshgarg007/loyalty-program-fix ... fix: Loyalty program issue fix in customer dashboard	2019-01-08 12:15:57 +05:30
Nabin Hait	4c08aaef3d	Merge pull request #16290 from deepeshgarg007/stock-recon ... fix: Unorderable type error while making stock reconciliation entry	2019-01-08 11:55:49 +05:30
Nabin Hait	4216d86dd9	Merge pull request #16296 from deepeshgarg007/update_items_bug ... fix: Validation while updating items in sales order	2019-01-08 11:54:52 +05:30
Nabin Hait	49ca9dceb2	Merge branch 'staging-fixes' into report-fix	2019-01-08 11:53:06 +05:30
Nabin Hait	4e3e784691	Merge pull request #16335 from deepeshgarg007/accounts-receivable-fix ... perf: Customer contact column in accounts receivable report	2019-01-08 11:52:20 +05:30
Deepesh Garg	7c45f45ebc	fix: Divide by zero exception fix in item wise purchase register (#16247) ... * Do not prepare row if stock quantity is not available * Update item_wise_purchase_register.py	2019-01-08 08:34:28 +05:30
Aditya Hase	85c6a0f002	fix(test): Do not rely on order by name	2019-01-08 00:09:37 +05:30
Aditya Hase	0c16424d7d	fix(naming): Use creation instead of name to order SLEs	2019-01-08 00:09:36 +05:30
Aditya Hase	972f659fd5	fix(naming): Use creation instead of name to order GL Entries	2019-01-08 00:09:30 +05:30
Aditya Hase	7bc692d48d	feat(naming): Deferred naming for Stock Ledger Entry and GL Entry ... For fast lockless insertions use hash as autonaming method for temporarily naming Stock Ledger Entry and GL Entry In an hourly run scheduled job rename these entries using autoname options	2019-01-08 00:07:54 +05:30
Aditya Hase	41d189a34c	fix(demo): Look for "Total" instead of "'Total'" in report results	2019-01-07 23:01:40 +05:30
Saif	e5091cbc0f	chore: Updated DocType JSON Files to Clean Up Git Diff of Other PRs (#16356) ... * chore: Updated DocType json files to clean up git diff of other PRs * fix: remove auto-generated file	2019-01-07 18:19:30 +05:30
Sagar Vora	7d60c03ed9	Merge branch 'staging-fixes' into pplan_fix	2019-01-07 15:54:16 +05:30
Sagar Vora	f5a00dc0c1	Merge branch 'hotfix' into is_fixed_asset_checkbox_not_copied	2019-01-07 15:45:33 +05:30
Sagar Vora	cad20abe83	Merge branch 'staging-fixes' into loyalty-program-fix	2019-01-07 15:32:40 +05:30
Sagar Vora	a4af874a43	Merge branch 'staging-fixes' into update_items_bug	2019-01-07 15:21:02 +05:30
Sagar Vora	278d7a44f9	Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component	2019-01-07 15:12:44 +05:30
Sagar Vora	92cab55c72	Merge branch 'staging-fixes' into purchase-invoice-fixes	2019-01-07 15:03:37 +05:30
Sagar Vora	fd78339a7c	Merge branch 'staging-fixes' into not_able_to_access_report_quoted_item_comparison	2019-01-07 14:54:44 +05:30
Sagar Vora	26e5c9480b	Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd	2019-01-07 14:30:23 +05:30
Sagar Vora	1310c238a9	Merge pull request #16350 from rohitwaghchaure/code_cleanup_general_ledger ... fix: replaced str to cstr in genral ledger report	2019-01-07 14:28:27 +05:30
Sagar Vora	f733a39089	fix: remove trailing whitespace	2019-01-07 14:24:01 +05:30
Sagar Vora	fbadb19d93	Merge branch 'staging-fixes' into Gross-Profit-Exclude-Opening-Invoice	2019-01-07 13:55:43 +05:30
Sagar Vora	d40743a570	fix: 14th digit may not be zero	2019-01-07 13:38:43 +05:30
Sagar Vora	3c74266763	fix: PEP8 recommended whitspace	2019-01-07 13:13:16 +05:30
Sagar Vora	23a1b98957	fix: remove unnecessary code	2019-01-07 13:10:18 +05:30
Saif Ur Rehman	848bbac05e	Added patch for Item Tax Template	2019-01-07 05:32:38 +05:00
Saif Ur Rehman	f484f0d6e8	Added test for Tax Rule based on Tax Category	2019-01-07 00:37:01 +05:00
Rohit Waghchaure	ed6725172d	Replaced str to cstr in genral ledger report	2019-01-06 20:07:18 +05:30
Saif Ur Rehman	13a6c0aeff	Fix tests	2019-01-06 18:14:18 +05:00
Deepesh Garg	0eca1646e6	Merge branch 'staging-fixes' into loyalty-program-fix	2019-01-06 12:16:54 +05:30
Deepesh Garg	4772ae2755	Merge branch 'staging-fixes' into stock-recon	2019-01-06 12:16:45 +05:30
Deepesh Garg	16745c2553	Merge branch 'staging-fixes' into update_items_bug	2019-01-06 12:16:37 +05:30
Deepesh Garg	627b566445	Merge branch 'develop' into opportunity-lost-reason	2019-01-06 12:16:26 +05:30
Deepesh Garg	b12c7358b1	Merge branch 'staging-fixes' into report-fix	2019-01-06 12:16:11 +05:30
Deepesh Garg	f840c92c10	Merge branch 'staging-fixes' into accounts-receivable-fix	2019-01-06 10:35:12 +05:30
Saif Ur Rehman	7ea6554f1f	Merge branch 'staging' of https://github.com/frappe/erpnext.git into Item-Tax-Template ... # Conflicts: # erpnext/selling/doctype/quotation_item/quotation_item.json # erpnext/stock/doctype/item/item.json	2019-01-06 04:43:13 +05:00
Saif Ur Rehman	b1288b75ba	fix: Test Records	2019-01-06 04:41:13 +05:00
Frappe Bot	fdd5d54d41	Merge branch 'staging' into develop	2019-01-05 09:11:15 +00:00
Frappe Bot	0d54271d15	bumped to version 11.0.3-beta.33	2019-01-05 09:11:14 +00:00
finbyz	5efc7973ea	Minor Fix for Rounded Total	2019-01-05 11:12:11 +05:30
Mangesh-Khairnar	e2ea987610	fixed edge cases for yearly, weekly and monthly views	2019-01-05 00:15:31 +05:30
Mangesh-Khairnar	676a106d7a	(refactor) removed unnecessary code	2019-01-05 00:15:31 +05:30
Mangesh-Khairnar	8e47a543f6	(fix) multiple years in yearly view	2019-01-05 00:15:31 +05:30
Himanshu	75ab042632	removed lowercase regex	2019-01-04 17:13:43 +05:30
Deepesh Garg	1bb9287b2d	Merge branch 'staging-fixes' into update_items_bug	2019-01-04 14:15:40 +05:30
Suraj Shetty	aea25b147f	Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component	2019-01-04 13:45:56 +05:30
Sahil Khan	3ac57c756b	fix: remove print statement from test case	2019-01-04 12:57:34 +05:30
deepeshgarg007	eabf260706	fix :Test cases for accounts receivable report	2019-01-04 12:34:28 +05:30
Anurag Mishra	bb6a7eb9d3	refractor	2019-01-04 12:32:51 +05:30
Anurag Mishra	add6bf35a3	Fix: Employee Onboarding/Seperation task Assignment	2019-01-04 11:36:30 +05:30
Anurag Mishra	68aedfd176	typo	2019-01-04 11:00:07 +05:30
deepeshgarg007	9de81cda77	Added Customer contact column in accounts Receivable	2019-01-04 10:54:24 +05:30
Anurag Mishra	f2b29a0488	typo	2019-01-04 10:54:05 +05:30
Himanshu	547229fef1	PAN card validation in GST	2019-01-03 23:20:38 +05:30
deepeshgarg007	32f054b901	Added customer group column in item-wise-sales-history report	2019-01-03 22:57:18 +05:30
Suraj Shetty	6fe5c5c84d	Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component	2019-01-03 16:59:30 +05:30
Rohit Waghchaure	8bac5b6e73	[minor] Employee is reqd to preview salary slip from salary structure	2019-01-03 16:20:35 +05:30
Nabin Hait	47c9826b6f	test(reco-warehouse): Get items for group warehouse	2019-01-03 15:24:59 +05:30
Himanshu	53c040f838	Gst number validation fix	2019-01-03 12:50:18 +05:30
Rohit Waghchaure	3dc5b93db7	[Fix] Report quoted item comparison not working	2019-01-03 12:19:44 +05:30
Saif Ur Rehman	648bd15b2a	Force item_tax_rate on setting item details server-side	2019-01-03 04:03:54 +05:00
Sagar Vora	c14c7c84e3	fix: leave application and timesheet tests	2019-01-02 21:28:11 +05:30
Rohit Waghchaure	1ff1fc4725	[Fix] Negative amount showing in the bank clearance summary	2019-01-02 17:56:08 +05:30
Anurag Mishra	4c8c50e464	test case fixed	2019-01-02 17:52:28 +05:30
Suraj Shetty	0f8eb37e1c	Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component	2019-01-02 17:47:59 +05:30
Saif Ur Rehman	016f29f09b	fix: error due to passing None in scrub	2019-01-02 16:22:22 +05:00
Saif Ur Rehman	e194a655df	fix: is_opening != 'Yes'	2019-01-02 16:09:34 +05:00
Anurag Mishra	772e2c4e20	test cases	2019-01-02 15:59:58 +05:30
rohitwaghchaure	9c69e40970	Merge pull request #16312 from rohitwaghchaure/fix_not_able_to_delete_department ... [Fix] Not able to delete department	2019-01-02 15:58:24 +05:30
Anurag Mishra	5865fcca3c	fix: expense head of asset items in purchase invoice	2019-01-02 14:36:07 +05:30
Deepesh Garg	74306cc5ea	Merge branch 'staging-fixes' into update_items_bug	2019-01-02 14:10:23 +05:30
deepeshgarg007	8c4bd951a8	fix(Codacy): Deleted unused imports and files	2019-01-02 13:24:12 +05:30
deepeshgarg007	9c0c633259	fix: Added validation for stock reconciliation in stock ledger entry	2019-01-02 11:31:55 +05:30
Suraj Shetty	c349ae26b9	Add patch to rename additional salary component ... - Should fix https://pastebin.com/xsNHPAh6 (happens when clicking links option in menu of Employee master)	2019-01-02 09:31:11 +05:30
Charles-Henri Decultot	94e35e7a7e	Fix #15917 (#16311)	2019-01-01 22:25:13 +05:30
deepeshgarg007	8300f5ede7	fix: Codacy issues and added test case	2019-01-01 20:28:49 +05:30
deepeshgarg007	78ad6c4cb7	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into loyalty-program-fix	2019-01-01 19:46:08 +05:30
deepeshgarg007	9eb99dc61e	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into stock-recon	2019-01-01 18:40:24 +05:30
deepeshgarg007	318dc422bc	Updated test Cases for update_child_rate_qty	2019-01-01 18:30:33 +05:30
deepeshgarg007	1451304526	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into update_items_bug	2019-01-01 17:13:37 +05:30
Saif Ur Rehman	fac6b59627	Exclude opening invoices in Gross Profit Report	2019-01-01 16:33:22 +05:00
Rohit Waghchaure	c186f153ff	Added test cases	2019-01-01 15:03:56 +05:30
Anurag Mishra	0885485a61	changes	2019-01-01 15:00:16 +05:30
Anurag Mishra	77d779424b	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into task-fixes	2019-01-01 14:38:54 +05:30
Anurag Mishra	a3b5f5f6e4	Test case	2019-01-01 14:11:59 +05:30
Rohit Waghchaure	8f62aec2e3	[Fix] Not able to delete department	2019-01-01 14:06:40 +05:30
deepeshgarg007	de1e6fc1c4	Merge branch 'develop' of https://github.com/frappe/erpnext into opportunity-lost-reason	2019-01-01 08:57:18 +05:30
deepeshgarg007	c5a0b2edb6	Lost opportunity report	2018-12-31 16:34:16 +05:30
deepeshgarg007	5e9c7e2203	fix:Test cases for opportinity	2018-12-31 16:24:46 +05:30
Nabin Hait	137a24f457	Merge pull request #16253 from chdecultot/sales_summary_correction ... [Fix] Filter cancelled and draft payments in sales payment summary	2018-12-31 12:02:19 +05:30
Nabin Hait	c466825a8a	Merge pull request #16272 from frappe-pr-bot/translations-2018-12-24 ... [Translation] Updated Translations	2018-12-31 11:59:13 +05:30
Nabin Hait	cacbdec565	Merge pull request #16283 from rohitwaghchaure/fix_not_able_to_delete_customer ... [Fix] Not able to delete customer if contact is available	2018-12-31 11:55:24 +05:30
deepeshgarg007	dc218ebeeb	test :test case for setting opportunity as lost	2018-12-29 22:11:19 +05:30
deepeshgarg007	d9a768a88f	feat: Set lost reasons in opportunity and quotation using table multiselect	2018-12-29 19:33:44 +05:30
Saif Ur Rehman	f6a83daae6	fix: update item_tax_template account_type server-side validation	2018-12-29 02:27:03 +05:00
Saif Ur Rehman	eeead1d777	fix: Only load transaction's company's tax accounts in item tax map	2018-12-29 02:25:00 +05:00
Saif Ur Rehman	fd531a6b5e	feat: Tax Category based on Address	2018-12-29 01:49:11 +05:00
rohitwaghchaure	f07cde6351	Merge pull request #16306 from rohitwaghchaure/removed_duplicate_fields ... [Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item	2018-12-28 17:49:52 +05:30
sahil28297	50f0a99330	fix: Checks for status in employee and for date range in upload attendance. (#16279) ... * fix: checks for status in employee and for date range in upload attendance. 1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour. 2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date. * remove "import erpnext" * fix: replace frappe.db.sql with frappe.db.get_all * fix: refactored using list comprehension * fix: query refactoring * fix: combining list comprehensions * travis debugging * fix: doc.save	2018-12-28 17:15:56 +05:30
Anurag Mishra	3637e14e9f	refractor	2018-12-28 17:11:52 +05:30
Anurag Mishra	0c8411d085	test cases sucess	2018-12-28 16:53:00 +05:30
Rohit Waghchaure	df4fe922c0	[Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item	2018-12-28 16:46:36 +05:30
Nabin Hait	fcbe410c2f	feat(stock-reco): Fetch items based on group warehouse	2018-12-28 16:31:05 +05:30
Faris Ansari	af75d9a384	fix(website): Pagination in child item groups ... Item groups pages which had child item groups were not paged at all despite having next, prev buttons	2018-12-28 14:47:51 +05:30
Saif Ur Rehman	e414a92d55	fix: Run get_item_tax_info and set_taxes serially	2018-12-28 04:59:42 +05:00
Saif Ur Rehman	aca374e478	feat: add_taxes_from_item_tax_template	2018-12-28 04:53:25 +05:00
Saif Ur Rehman	1ea98cbbe1	fix: missing line due to conflict resolution	2018-12-28 00:29:43 +05:00
Saif Ur Rehman	07acc2bf5a	Allow brand in quick entry	2018-12-27 23:10:20 +05:00
Saif Ur Rehman	7d9ee83d5a	-Fix for updated get_default_cost_center ... -Back to not updating item's defaults child table	2018-12-27 23:10:19 +05:00
Saif Ur Rehman	127b3f552b	At least add a row for old logic to work properly	2018-12-27 23:03:17 +05:00
Saif Ur Rehman	c819ea38a0	-Added Item Default child table for Brand ... -Item Default Precedence: Get defaults from Item Group, if no default, fetch from Brand -Remove auto set Item's Item Defaults from Item Group: Item Default should be manually entered to override both Item Group and Brand defaults	2018-12-27 23:01:54 +05:00
Charles-Henri Decultot	e87eb07e16	Correction for Travis	2018-12-27 17:38:57 +00:00
Charles-Henri Decultot	8d71015bf8	Cleanup journal entries	2018-12-27 16:43:26 +00:00
Charles-Henri Decultot	b7339d7dcb	Test travis	2018-12-27 15:30:56 +00:00
Charles-Henri Decultot	43c7bd57e4	Cancel existing payment entries for data integrity in test	2018-12-27 14:43:30 +00:00
Charles-Henri Decultot	641d3e0073	Add own records	2018-12-27 13:43:56 +00:00
deepeshgarg007	77cde832d6	Added validation for update items in purchase order as well	2018-12-27 15:56:51 +05:30
Charles-Henri Decultot	0f9c47c242	Remove pricing rule from items	2018-12-27 10:10:18 +00:00
Charles-Henri Decultot	02aa9fb240	Understand Travis	2018-12-27 08:46:29 +00:00
deepeshgarg007	ffb411d9e2	Validation while updating items in sales order	2018-12-27 14:12:05 +05:30
Suraj Shetty	3de12db2b1	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-27 09:05:25 +05:30
Saif Ur Rehman	677866824a	More work on Tax Category and Item Tax Template	2018-12-27 02:11:07 +05:00
Charles-Henri Decultot	d7777696d7	Corrections for Travis	2018-12-26 14:08:00 +00:00
Frappe Bot	9e09b3adbe	Merge branch 'staging' into develop	2018-12-26 12:16:20 +00:00
Frappe Bot	23beec2bd1	bumped to version 11.0.3-beta.32	2018-12-26 12:04:55 +00:00
deepeshgarg007	22e05b24f3	Fix for NoneType comparison with int error	2018-12-26 17:16:34 +05:30
Frappe Bot	e8c2fdfb8c	Merge branch 'master' into staging-fixes	2018-12-26 11:44:09 +00:00
Frappe Bot	9a9c9c2ba3	bumped to version 10.1.76	2018-12-26 11:09:34 +00:00
rohitwaghchaure	56c5d8b784	Merge pull request #16286 from rohitwaghchaure/fixed_patch_rename_bom_wo_fields ... [Fix] Patch rename_bom_wo_fields	2018-12-26 16:26:19 +05:30
Rohit Waghchaure	8406720a7a	[Fix] Patch rename_bom_wo_fields	2018-12-26 16:25:44 +05:30
Charles-Henri Decultot	9c1db688d1	Ignore pricing rule for Travis	2018-12-26 10:33:42 +00:00
rohitwaghchaure	53a38e8edc	Merge pull request #16257 from surajshetty3416/permission-fixes ... Fix user permission checks	2018-12-26 14:49:01 +05:30
Charles-Henri Decultot	899b9b1ea7	Codacy correction	2018-12-26 08:56:11 +00:00
Charles-Henri Decultot	9d31452c25	Remove ununsed variable	2018-12-26 08:38:42 +00:00
Charles-Henri Decultot	ed94317df9	Test cases	2018-12-26 08:36:32 +00:00
deepeshgarg007	a1d015cc2f	Initialized loyalty_point_details	2018-12-26 11:01:02 +05:30
Rohit Waghchaure	52a692ee08	[Fix] Not able to delete customer if contact is available	2018-12-26 02:34:13 +05:30
Himanshu	0209ef0fc5	Quality Management System (#15893) ... * Added QMS to ERPNext * changes * fixed * code refracted * refracted * some bugs fixed * changes * changes * test case * bug fix unit test * bug fix * refracted code * test warning fix * test case bug fix * removed whitespace * indentation bug fix * unit test bug fix * fixed Tree * bug fix * bug fix * code refactor * fixed procedure tree * removed unnecessary fields * hide fields * removed depricated unit test method * sql injection bug fix * code refactor and added mandatory fields * Removed Add Child from TreeView * Unit Test crashes Fix * code refactor * Fixed Status of Action * removed add button from Chart of Procedure * Fixed Unit Test for Quality Action * Chamged Measurement Unit to UOM * Changed Measurement Unit to UOM * Quality Action Unit Test Fix * Renamed Chart of Procedures to Tree of Procedures * Changes Objective input type to Text * Code Refactor * Quality Action Status option changed to "Close" for consistency * fixed action status indicator * Removed vscode folder * unit tests optimization * unit test fixes * code refactor * gitignore * bug fixes and code refactor * code refactor * unit test changes * changed quality action unit test * code refactor * code refactor * code refactor * indentation * code refactor * corrected typo * Removed jQuery hide() * code refracted * remove grid elements * Removed unnecessary conditions * onload fixed in feedback * code refracted * Removed add row button from Review and Customer Feedback * made autofill feild read only * automated scheduling of review	2018-12-25 17:42:31 +05:30
deepeshgarg007	64238ee91f	(Codacy Fix) Fixed indenttion	2018-12-25 16:28:39 +05:30
deepeshgarg007	12f5cefc12	Loyalty program issue fix in customer dashboard	2018-12-25 16:06:19 +05:30
Suraj Shetty	19f8e6bcf8	Fix typo	2018-12-25 15:30:09 +05:30
rohitwaghchaure	136c4c4820	Merge pull request #16016 from rohitwaghchaure/fixed_tax_withholding_issue ... [Fix] Tax Withholding, TDS is applying on the tax	2018-12-25 14:49:05 +05:30
Suraj Shetty	488aa86f70	Skip some codacy warnings	2018-12-25 14:46:44 +05:30
Suraj Shetty	8775204d63	Merge branch 'develop' into general-ui-fixes	2018-12-25 14:36:43 +05:30
Suraj Shetty	9180c48262	Fix patch entry	2018-12-25 14:34:38 +05:30
rohitwaghchaure	deb96dab3e	[Fix] Salary structure not saving (#16275)	2018-12-25 13:58:20 +05:30
Suraj Shetty	8d9960bdad	Fix patch entry	2018-12-25 12:33:37 +05:30
Suraj Shetty	bcd8f31e43	Add an entry of a patch in patches.txt	2018-12-25 11:16:49 +05:30
Rushabh Mehta	fafbb0278f	fix: reload parent after setting children	2018-12-24 22:09:15 +05:30
Rushabh Mehta	c9b1a35ac3	fix: set explicit idx for new item in update_child_qty_rate	2018-12-24 20:55:35 +05:30
Suraj Shetty	b763893f22	Fix quotes issue in item.js	2018-12-24 19:43:31 +05:30
Suraj Shetty	a3f28d40b0	Remove _label	2018-12-24 19:39:45 +05:30
Suraj Shetty	9c3dcfea76	Add a patch to rename accounts desktop icon to accounting	2018-12-24 17:00:40 +05:30
Suraj Shetty	67b311e95e	Make -> Create	2018-12-24 16:16:13 +05:30
Suraj Shetty	146be9f6a6	Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes	2018-12-24 16:08:43 +05:30
Rushabh Mehta	5d11abb0a2	fix(escaping): accounts_receivable.py	2018-12-24 16:03:24 +05:30
Suraj Shetty	242b16fdfd	Rename Accounts -> Accounting	2018-12-24 15:47:23 +05:30
frappe-pr-bot	67121f6c91	[Translation] Updated Translations	2018-12-24 11:57:19 +02:00
Rohit Waghchaure	94500a9d62	[Fix] TDS is applying on the tax	2018-12-24 15:13:52 +05:30
rohitwaghchaure	7ec5e80b70	[Fix] While making sales invoice from delivery note, system not remove the returned qty (#16141)	2018-12-24 14:55:31 +05:30
Nabin Hait	5a9579bae4	feat(quality): Check quality status before receipt/delivery (#16169)	2018-12-24 14:54:42 +05:30
Valmik	78bc405eeb	fix: set fieldname for frappe prompt (#16198)	2018-12-24 14:54:06 +05:30
Navdeep Ghai	c4d38c0afc	Fix the disappears of image bug after uploading and saving the employee (#16217) ... * Fix image disappears of image after uploading and saving the employee * Fix the codacy issue	2018-12-24 14:53:19 +05:30
KanchanChauhan	1790a6faaa	Set ignore_user_permission 1 for Company field in Item Default (#16167)	2018-12-24 14:48:09 +05:30
Rohan	349040db6d	fix(work_order): Set operations for Work Order when created from MREQ (#16154)	2018-12-24 14:42:34 +05:30
Charles-Henri Decultot	052033a76e	[Fix] Pos bugs (#16256) ... * Remove hard-coded values * Fix change pos profile + add campaign * Test case for coveralls * Remove unnecessary method	2018-12-24 14:39:30 +05:30
rohitwaghchaure	4265c5a772	Rename BOM and Work order fields (#16209) ... * Rename BOM and Work order fields * Rearranged BOM fields	2018-12-24 14:38:49 +05:30
Mangesh-Khairnar	70c5aa5f5d	[Enhancement] Pending SO Items for Purchase Request Report (#16188) ... * deleted old purchase request query report * [Enhancement] pending so items for purchase request report refactor * comments and format fix * test and minor fixes * test fixes	2018-12-24 14:25:47 +05:30
Shreya Shah	91ddadeefa	fix: add currency to options (#16199)	2018-12-24 14:25:12 +05:30
Frappe PR Bot	25fc5b879b	[Translation] Updated Translations (#16227)	2018-12-24 14:22:35 +05:30
Charles-Henri Decultot	083f1c5370	Safe decode project name for languages with special characters (#16254)	2018-12-24 14:21:33 +05:30
Shreya Shah	d2b9093ecc	fix: Check if items exist (#16248)	2018-12-24 14:21:07 +05:30
Charles-Henri Decultot	9100740ba9	[Fix] FEC: Correction of the export function (#16252) ... * Correction of the export function * Improve JS code * Codacy corrections * Codacy corrections	2018-12-24 14:20:35 +05:30
Raffael Meyer	ed3561279d	Update README.md (#16224)	2018-12-24 14:19:51 +05:30
rohitwaghchaure	1c1798c7f2	[Fix] Warehouse wise item balance age and value report not working (#16258)	2018-12-24 14:19:27 +05:30
Deepesh Garg	3ae2517867	Removed subscriber option form module page (#16270)	2018-12-24 14:16:57 +05:30
Suraj Shetty	83e3c4c0fa	Fix quote error	2018-12-24 11:11:04 +05:30
Suraj Shetty	772e8780b4	Merge branch 'staging-fixes' into permission-fixes	2018-12-24 10:35:12 +05:30
Suraj Shetty	b58c317abb	Fix daily_work_summary_settings migration patch	2018-12-24 10:26:39 +05:30
Suraj Shetty	b2965001d1	Replace 'Make' with 'Create'	2018-12-23 13:25:58 +05:30
Saif Ur Rehman	8ac261750b	Add and Modified DocTypes for Item Tax Template	2018-12-22 02:51:59 +05:00
Suraj Shetty	27c37e1b77	Minor fix	2018-12-21 12:43:46 +05:30
Frappe Bot	1b7c583c48	Merge branch 'staging' into develop	2018-12-21 05:46:23 +00:00
Frappe Bot	7067727c0c	bumped to version 11.0.3-beta.31	2018-12-21 05:46:22 +00:00
Suraj Shetty	89625b6eef	Rename learn to help	2018-12-21 11:04:32 +05:30
Suraj Shetty	b0a84f014e	Replace desktop icon for project list with desktop icon for projects module ... - Add a patch to fix already install instances	2018-12-20 20:12:37 +05:30
Charles-Henri Decultot	813485023b	Filter cancelled and draft payments	2018-12-20 14:04:00 +00:00
Nabin Hait	0866b2b75a	Update accounts_receivable.py	2018-12-20 14:11:20 +05:30
shreyashah115@gmail.com	ba8c041206	fix: Check if items exist	2018-12-20 13:23:51 +05:30
Suraj Shetty	7ed37ae6c3	Commonify code ... - use get_permitted_documents function to avoid code redundancy	2018-12-19 19:56:42 +05:30
deepeshgarg007	b645c2c75e	Rebase using staging-fixes and resolved conflicts	2018-12-19 18:47:36 +05:30
deepeshgarg007	530453e4fc	Added temp variables for outstanding, credit_note_amt instead of function calling	2018-12-19 18:43:07 +05:30
deepeshgarg007	5de603c6af	breaked up code into multiple functions	2018-12-19 18:43:06 +05:30
deepeshgarg007	4ac8fcf4af	Added test case for Accounts receivable report based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a944f88b94	Removed column for pdc date	2018-12-19 18:43:06 +05:30
deepeshgarg007	17544d7ad6	Refactored accounts receivable report for payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	e7a91b9526	Credit note fix	2018-12-19 18:43:06 +05:30
deepeshgarg007	f98adf2be5	Changed columns and added currency conditions	2018-12-19 18:43:06 +05:30
deepeshgarg007	b6c083706a	Allocation of credit note amount and pdc in payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	24f8d3ed0c	Add columns based on payment terms	2018-12-19 18:43:06 +05:30
deepeshgarg007	a8ab9b5c3d	Accounts Receivable report based on payment terms	2018-12-19 18:43:06 +05:30
Nabin Hait	a78947f2de	Merge pull request #16218 from deepeshgarg007/analytics-graph ... [Bug-fix] Analytics report graph skipping quarter values bug fix	2018-12-19 18:08:25 +05:30
Rohit Waghchaure	f6f503a1f6	[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2018-12-19 15:15:35 +05:30
Suraj Shetty	5555bf82f8	Capitalize marketplace factory class to support recent router changes (#16238)	2018-12-19 10:15:59 +05:30
Suraj Shetty	7ae2d59ffd	Merge branch 'staging-fixes' into permission-fixes	2018-12-18 15:41:03 +05:30
Suraj Shetty	a8d9bfdcfd	Fix: currency symbol issue in delivery note list (#16233)	2018-12-18 14:53:17 +05:30
Rohan	159897d88d	fix(customer): Fix Total Unpaid amount in Customer dashboard (#16234)	2018-12-18 14:52:23 +05:30
rohitwaghchaure	c4921d235a	Merge pull request #16225 from rohitwaghchaure/not_able_to_make_po_from_mr ... [Fix] Get items from material request not working for PO	2018-12-17 18:52:46 +05:30
rohitwaghchaure	c5c2124bba	Merge pull request #16226 from shreyashah115/fix-list ... Fix employee separation list	2018-12-17 18:52:05 +05:30
shreyashah115@gmail.com	a5dc08ee8e	fix: remove paid_amount and modify query	2018-12-17 16:47:17 +05:30
shreyashah115@gmail.com	0543f03b58	fix: Remove date_of_joining from field list	2018-12-17 15:02:30 +05:30
rohitwaghchaure	37d7d25018	Merge pull request #16207 from Zlash65/fix-qi ... [Minor] Make Quality Inspection in query configurable	2018-12-17 13:55:26 +05:30
rohitwaghchaure	d6ca23b277	Merge pull request #16219 from Zlash65/fix-holiday-leave ... [Minor] Fix Leave Application as half day on Holiday validation	2018-12-17 13:54:16 +05:30
rohitwaghchaure	c963ac20a6	Merge pull request #16211 from Zlash65/fix-pp ... [Minor] Get items for Material Requests fix	2018-12-17 13:52:25 +05:30
Rohit Waghchaure	4ac9ea0e85	[Fix] Get items from material request not working for PO	2018-12-17 11:18:46 +05:30
Zlash65	c8337c6d83	fix check for leave on holiday for half day	2018-12-15 21:15:45 +05:30
deepeshgarg007	1ee19e4167	Analytics report graph fix	2018-12-15 15:36:09 +05:30
Faris Ansari	871f4e5df5	Merge pull request #16201 from netchampfaris/fix-product-search ... fix(product-search): Include variants in product search	2018-12-14 16:36:42 +05:30
Nabin Hait	22a1e281a9	fix(variant): Show attribute values on single variant creation (#16204)	2018-12-14 14:22:45 +05:30
Faris Ansari	4994d84565	fix(pos-profile): Cleanup Form for POS Profile (#16208) ... - Remove pos_profile_name field and use `name` as Prompt - Reorganize form and label sections - Remove `apply_discount` which was not used	2018-12-14 14:19:14 +05:30
Nabin Hait	d8f497ce98	Merge branch 'staging-fixes' into pplan_fix	2018-12-13 16:59:15 +01:00
Nabin Hait	614559f234	fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse	2018-12-13 16:36:35 +01:00
Zlash65	82e01bc923	fix fetch material request items logic	2018-12-13 18:31:05 +05:30
Zlash65	9fde660aaf	make quality inspection in query configurable	2018-12-13 13:28:01 +05:30
Saurabh	e165fc0e1b	Merge branch 'staging' into develop	2018-12-13 10:45:32 +05:30
Saurabh	58a4f0e157	bumped to version 11.0.3-beta.30	2018-12-13 11:15:31 +06:00
Prateeksha Singh	4ba9594b04	[setup] domain not in array	2018-12-12 22:09:00 +05:30
Prateeksha Singh	9c5676292c	[setup] add defaults stage	2018-12-12 21:29:55 +05:30
Prateeksha Singh	58db3c1c7c	[setup] fix install_defaults	2018-12-12 21:29:55 +05:30
Prateeksha Singh	0e728972e9	[setup][minor] remove unused import	2018-12-12 21:29:55 +05:30
Prateeksha Singh	d59b61cbd9	[fixtures] re-add market_segments and sales_stages utils	2018-12-12 21:29:55 +05:30
Prateeksha Singh	4da8dced94	[setup] remove unused imports	2018-12-12 21:29:55 +05:30
Prateeksha Singh	b274f8cb2a	[fix] setup chart of accounts	2018-12-12 21:29:55 +05:30
Prateeksha Singh	47118ab72a	[setup] remove redundant code ... - [fix] domain setup from dictionary	2018-12-12 21:29:55 +05:30
Prateeksha Singh	9282e08099	[fix] >.< call setup_taxes	2018-12-12 21:29:55 +05:30
Prateeksha Singh	c3a49b9cad	[fix] set default_bank_account in company	2018-12-12 21:29:55 +05:30
Prateeksha Singh	c0f90beb7c	Rename 'Chat' to 'Gitter Chat'	2018-12-12 21:29:55 +05:30
Prateeksha Singh	1aee75aadc	[setup] separate out setup_company	2018-12-12 21:29:55 +05:30
Prateeksha Singh	8469b27c3a	[setup] add get_country_and_charts()	2018-12-12 21:29:55 +05:30
Prateeksha Singh	aeb8abf1ed	[setup] add market segments and sales stages	2018-12-12 21:29:55 +05:30
Prateeksha Singh	6f7233229e	[setup][fix] company fixtures	2018-12-12 21:29:55 +05:30
Prateeksha Singh	6bf22fa7d7	[setup][fix] get newly created root Territory for children	2018-12-12 21:29:55 +05:30
Prateeksha Singh	c1c057611e	[setup] bundle up fixtures and setup docs	2018-12-12 21:29:54 +05:30
Prateeksha Singh	dabf349599	[setup] don't premake company fixtures	2018-12-12 21:29:54 +05:30
Prateeksha Singh	b422458224	[setup] set the default fiscal year that was made	2018-12-12 21:29:54 +05:30
Prateeksha Singh	179d82702e	[setup] fetch setup config	2018-12-12 21:29:54 +05:30
Prateeksha Singh	39b8765961	[setup][init] setup as document records	2018-12-12 21:29:54 +05:30
Faris Ansari	907e9080c4	fix(product-search): Include variants in product search	2018-12-12 19:26:52 +05:30
Saif Ur Rehman	b53231595d	Using same filter for Sales Person from Accounts Receivable ... Added Customer/Supplier Ledger Summary in Accounts Module page	2018-12-12 15:46:50 +05:00
Saif Ur Rehman	b07d108bee	feat: Supplier Ledger Summary	2018-12-12 05:45:49 +05:00
Saif Ur Rehman	41236ed0e5	feat: Customer Ledger Summary report	2018-12-12 05:12:20 +05:00
Rushabh Mehta	eeab3ee5d3	fix(test): use frappe.db.rollback to revert deletion of fixture data (#16192) ... * debug(test): test_payroll_entry * debug(test): test_payroll_entry * debug(test): use frappe.db.rollback to undelete fixture data	2018-12-11 22:37:29 +05:30
Frappe Bot	fb2fdc4f4e	Merge branch 'staging' into develop	2018-12-11 09:55:01 +00:00
Frappe Bot	caed845f3e	bumped to version 11.0.3-beta.29	2018-12-11 09:55:01 +00:00
Pawan Mehta	377511165e	Simple Trial Balance (#16060)	2018-12-10 21:55:01 +05:30
Frappe Bot	8e1326f22f	Merge branch 'staging' into develop	2018-12-10 16:05:45 +00:00
Frappe Bot	ee97a46fde	bumped to version 11.0.3-beta.28	2018-12-10 16:05:45 +00:00
Rohan	c1eb94d37f	Revert "fix(delivery): update package total on validate (#16131)" ... This reverts commit f43433b43d.	2018-12-10 20:27:14 +05:30
Suraj Shetty	07e5786e1b	Fix user permission checks	2018-12-10 19:10:18 +05:30
Frappe Bot	5b50b2848d	Merge branch 'staging' into develop	2018-12-10 13:08:33 +00:00
Frappe Bot	0509d82701	bumped to version 11.0.3-beta.27	2018-12-10 13:08:33 +00:00
Tyler Matteson	afc55ca821	De-clutter, Regionalize and Domainify Accounts Module Configuration (on staging-fixes) (#16117)	2018-12-10 18:03:19 +05:30
Saif	b52bd9c093	AR/AP Report Enhancement (#16175) ... * Modified AR/AP print format * Filter Sales Person based on either Customer or Voucher's assigned Sales Person * -Added Sales Person column to Accounts Receivable Summary -Added all filters in AR/AP Summary Report as in AR/AP Report -Reordered filters for better grouping -Fixed a bug that customer_name was not unset after removing Customer from filter	2018-12-10 17:56:42 +05:30
Rohan	f43433b43d	fix(delivery): update package total on validate (#16131)	2018-12-10 17:47:31 +05:30
rohitwaghchaure	5472fff027	Added disabled field in the address (#16114)	2018-12-10 17:45:39 +05:30
Frappe Bot	65a9991d84	bumped to version 10.1.75	2018-12-10 12:14:33 +00:00
RicardoJohann	bc0ef0beca	Add Serial Number button in Delivery Note and Sales Invoice's Packing List (#16080)	2018-12-10 17:43:03 +05:30
rohitwaghchaure	398e47ecad	Merge pull request #16189 from rohitwaghchaure/transferred_qty_issue ... [Fix] Transferred qty cannot be null	2018-12-10 17:37:02 +05:30
Rohit Waghchaure	57633b75ed	[Fix] Transferred qty cannot be null	2018-12-10 17:36:01 +05:30
Stavros Anastasiadis	3d82b74ea4	Update Items in Submit state can add new row (#15644) ... * Update Items in Sumbit state can add new row In Sales Order and Purchase Order when docstatus is submitted user can use Update Item btn to add new child Items * Remove unused code line * Remove blocking db save thread line * Remove Company as not standard Field in Purchase Order Item * Minor indentation fix * Add Unit Test, add new row in update_child_qty_rate * Codacy fix	2018-12-10 17:30:55 +05:30
Sagar Vora	4c5bd253a2	fix(party dashboard): empty array is truthy, check for length (#16184)	2018-12-10 17:19:10 +05:30
Rohan	39b31ece31	fix(pos): Return empty dict if no results found (#16124)	2018-12-10 17:16:39 +05:30
Deepesh Garg	0c3c148316	Linking company address to pos profile (#16142) ... * Linking company address to pos profile * Translation fix	2018-12-10 16:22:38 +05:30
Nabin Hait	3248e0bb3e	Merge pull request #16163 from netchampfaris/hotfix-setupwizard-abbr ... fix(setup-wizard): Validate abbr length before switching to next slide	2018-12-07 15:20:23 +05:30
Nabin Hait	da9c96e9f5	Merge pull request #16150 from rohitwaghchaure/what_is_the_use_of_this_code ... Removed unnecessary code	2018-12-07 15:18:11 +05:30
Nabin Hait	1b529d997c	Merge pull request #16146 from rohitwaghchaure/remove_tax_amt_from_the_billed_amt_in_project ... [Fix] In project, tax amount is added in the total billed amount(sales) field	2018-12-07 15:17:35 +05:30
Nabin Hait	2bd6ab9fba	Merge pull request #16140 from KanchanChauhan/staging-fixes ... [Minor]Method path fix in Material Request js	2018-12-07 15:08:44 +05:30
Deepesh Garg	6967b44ac8	Merge branch 'hotfix' into list_view	2018-12-07 08:30:20 +05:30
Frappe Bot	7c2a5bddb1	Merge branch 'staging' into develop	2018-12-06 09:50:25 +00:00
Frappe Bot	4f1c659050	bumped to version 11.0.3-beta.26	2018-12-06 09:50:24 +00:00
Frappe Bot	ee5d7e6d0f	Merge branch 'master' into staging-fixes	2018-12-06 09:26:42 +00:00
Frappe Bot	be0a349a52	bumped to version 10.1.74	2018-12-06 09:14:35 +00:00
Nabin Hait	32c95c3292	Merge pull request #16113 from nabinhait/travis-fix ... fix(test): Fixed tests for discount with margin and period closing voucher	2018-12-06 11:58:56 +05:30
Faris Ansari	40c15348da	fix(setup-wizard): Validate abbr length before switching to next slide	2018-12-06 07:37:32 +05:30
rohitwaghchaure	f85856d9f8	Merge pull request #16155 from rohitwaghchaure/changed_parent_for_item_attribute_value ... [Fix] Permissions issue	2018-12-04 18:45:07 +05:30
Rohit Waghchaure	675567419b	[Fix] Permissions issue	2018-12-04 18:43:52 +05:30
Rohit Waghchaure	e61430b471	Removed unnecessary code	2018-12-03 18:54:26 +05:30
Rohit Waghchaure	636d186d08	[Fix] In project, tax amount is added in the total billed amount(sales) field	2018-12-03 16:04:08 +05:30
deepeshgarg007	114cc810a0	List view currency bug fix	2018-12-03 15:13:06 +05:30
Kanchan Chauhan	9dc85153e0	[Minor]Method path fix in Material Request js	2018-12-03 14:39:43 +05:30
Nabin Hait	3ecb995485	Merge pull request #16006 from gbm001/gbm001-item-barcodes-pull ... fix/feat: Allow extension of barcode types (without validation)	2018-12-03 14:39:14 +05:30
Nabin Hait	94eafb6674	Merge pull request #16005 from ESS-LLP/pr_staging_fixes ... [Feature][Fix] Healthcare - Patient Appointment	2018-12-03 14:38:32 +05:30
Nabin Hait	046a99acf8	Merge branch 'staging-fixes' into supplier-customer-dashboard-fix	2018-12-03 14:36:38 +05:30
Nabin Hait	02aad03e74	Merge pull request #16022 from ESS-LLP/fix-patch ... fix: healthcare patch	2018-12-03 14:36:02 +05:30
Nabin Hait	6b93f2fe0a	Merge pull request #16139 from Zlash65/fix-assess ... [Minor] Assessment Result fix	2018-12-03 14:33:01 +05:30
Nabin Hait	0b4ea25f83	Merge pull request #16138 from rohitwaghchaure/user_permissions_issue_item ... [Fix] Permissions issue while making item variants	2018-12-03 14:32:40 +05:30
Nabin Hait	dd7b020b01	fix(test): Fixed tests for period closing voucher	2018-12-03 14:24:41 +05:30
Nabin Hait	dce68422a7	Merge pull request #16133 from rohitwaghchaure/fixed_stock_value_diifference_calculation_for_stock_reco ... [Fix] Stock value difference calculation for stock reconciliation	2018-12-03 14:20:40 +05:30
Zlash65	db43c3af68	display message if details to fetch grade isnt filled up	2018-12-03 12:15:10 +05:30
Rohit Waghchaure	a8003c1af7	[Fix] Permissions issue while making item variants	2018-12-03 11:49:52 +05:30
deepeshgarg007	4c79274054	Fixed patch and deprecated grid reports	2018-11-30 18:01:22 +05:30
deepeshgarg007	ec5bbe351c	Row check fix for purchase analytics	2018-11-30 16:25:16 +05:30
Rohit Waghchaure	16b8ecbe05	[Fix] Stock value difference calculation for stock reconciliation	2018-11-30 16:20:52 +05:30
deepeshgarg007	94a3539015	Row check fix in stock analytics	2018-11-30 16:20:48 +05:30
deepeshgarg007	37b6a2ca0b	row check bug fix	2018-11-30 16:15:43 +05:30
Nabin Hait	eda0a6eb33	fix(test): Fixed tests for period closing voucher	2018-11-30 15:15:17 +05:30
rohitwaghchaure	ca332bdcdb	Revert "[Fix] Accounts receivable summary print is not working"	2018-11-29 18:15:29 +05:30
deepeshgarg007	ee05e358d1	Rewrote query using orm	2018-11-29 16:24:28 +05:30
deepeshgarg007	c981fb389b	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix	2018-11-29 14:57:50 +05:30
deepeshgarg007	3c7c4a61be	Test case fix	2018-11-29 14:28:01 +05:30
deepeshgarg007	3eef6411dd	Removed print statement	2018-11-29 13:10:02 +05:30
deepeshgarg007	9ed13f4a90	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into analytics-fix	2018-11-29 12:52:44 +05:30
deepeshgarg007	1a1c013b2a	Analytics report bug fixes and code cleaning	2018-11-29 08:34:47 +05:30
Ameya Shenoy	fe1f532bc0	Merge branch 'staging' into develop	2018-11-28 08:28:37 +00:00
Ameya Shenoy	5780e865b7	bumped to version 11.0.3-beta.25	2018-11-28 08:28:36 +00:00
Ameya Shenoy	2806d83362	Merge branch 'master' into staging-fixes	2018-11-28 08:12:48 +00:00
Ameya Shenoy	e3136c38e1	bumped to version 10.1.73	2018-11-28 07:57:27 +00:00
deepeshgarg007	ebe1e12a82	Codacy issue fixes	2018-11-28 08:21:54 +05:30
Nabin Hait	305c8b1fba	Merge pull request #16110 from shreyashah115/fix-timer ... [Timesheet] Element selector in Timer	2018-11-27 17:57:46 +05:30
Nabin Hait	f642f86982	Merge branch 'hotfix' into accounts_receivable_summary_print_issue	2018-11-27 17:56:49 +05:30
Nabin Hait	96598936ad	fix(test): Fixed tests for discount with margin and period closing voucher	2018-11-27 17:48:13 +05:30
deepeshgarg007	c1a3c72b49	final dashboard design	2018-11-27 17:09:12 +05:30
Rohit Waghchaure	10bcd5113c	[Fix] Accounts receivable summary print is not working	2018-11-27 16:25:35 +05:30
deepeshgarg007	f31caffa74	Changes in get_dashboard_info	2018-11-27 15:04:12 +05:30
Nabin Hait	3b16dd7377	Merge branch 'staging-fixes' into pr_staging_fixes	2018-11-27 14:19:49 +05:30
Nabin Hait	dfd79b0349	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-27 14:19:20 +05:30
Nabin Hait	676a2fbc8a	Merge branch 'staging-fixes' into hotfix-child-task-error	2018-11-27 14:17:23 +05:30
deepeshgarg007	6372fbba54	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into supplier-customer-dashboard-fix	2018-11-27 14:06:58 +05:30
Nabin Hait	3854940e42	Merge branch 'staging-fixes' into fix-patch	2018-11-27 13:26:05 +05:30
Nabin Hait	e4cc062cf1	Merge pull request #16109 from rohitwaghchaure/while_pulling_advanced_entry_system_uses_grand_total ... [Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 13:22:50 +05:30
Nabin Hait	b98d08a2cb	Merge pull request #16049 from rohitwaghchaure/incorrect_stock_value_difference_calculation ... [Fix] Incorrect stock value difference because of negative stock	2018-11-27 13:21:43 +05:30
Nabin Hait	0090b1aa16	Merge pull request #16058 from KanchanChauhan/reflinks-in-related-docs ... Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate	2018-11-27 13:20:39 +05:30
Nabin Hait	ccb03fb255	Merge pull request #16073 from deepeshgarg007/receivable-summary ... Accounts receivable summary print fix	2018-11-27 13:11:37 +05:30
shreyashah115@gmail.com	5281fe8e50	fix: Element selector	2018-11-27 13:11:30 +05:30
Nabin Hait	72fc1b57be	Merge pull request #16083 from Anurag810/new-fix-branch ... [fix] delivery note with quantity equal 0 #14211	2018-11-27 13:10:31 +05:30
Nabin Hait	3c31e4ad4b	Merge pull request #16088 from rohitwaghchaure/fixed_pos_profile_packing_items ... If is pos is enabled and no pos profile then use the item's default warehouse for packing materials	2018-11-27 13:10:14 +05:30
Nabin Hait	6743219dc2	Merge pull request #16094 from rohitwaghchaure/validate_due_date_for_purchase_invoice ... [Fix] Due Date cannot be before Posting Date should consider supplier invoice date for purchase invoice	2018-11-27 13:09:16 +05:30
Nabin Hait	5f7b37ee11	Merge pull request #16093 from rohitwaghchaure/manufacturing_settings_permissions_issue ... [Fix] No permission for Manufacturing Settings	2018-11-27 13:07:44 +05:30
Rohit Waghchaure	6cc2f52fa4	[Fix] System allocated grand total amount instead of non zero rounded total for advanced entry in the sales invoice	2018-11-27 12:07:03 +05:30
Nabin Hait	dde952d591	Merge pull request #16092 from deepeshgarg007/salary_slip ... Salary slip earnings and deductions table bug fix	2018-11-27 11:39:10 +05:30
Nabin Hait	9a06543453	Merge branch 'staging-fixes' into indicators-in-leave-applications	2018-11-27 11:38:29 +05:30
Nabin Hait	f48cf001ed	Merge branch 'staging-fixes' into test-fix	2018-11-27 11:37:22 +05:30
Nabin Hait	be65af5dfe	Merge pull request #16101 from SaiFi0102/patch-1 ... Company rename abbr to consider more DocTypes	2018-11-27 11:36:46 +05:30
Nabin Hait	57fa8759ee	Merge pull request #16102 from deepeshgarg007/fees ... Paid Amount not showing for fees in web portal fix	2018-11-27 11:36:27 +05:30
Nabin Hait	f806cfecaa	Merge branch 'staging-fixes' into SO-Validate-Set-GrossProfit	2018-11-27 11:18:54 +05:30
Kanchan Chauhan	2d0b788105	[Minor] Indicators in Leave Application	2018-11-27 10:37:23 +05:30
deepeshgarg007	bc513a8828	Removed paid amount form Fees doctype	2018-11-26 20:43:39 +05:30
deepeshgarg007	a9525de0da	paid amount fix in fees	2018-11-26 20:34:32 +05:30
Saif	6a9d9d76ef	Company rename abbr to consider more DocTypes	2018-11-26 19:56:13 +05:00
Nabin Hait	78d9fac0ce	Merge branch 'staging-fixes' into pr_staging_fixes	2018-11-26 20:25:34 +05:30
Nabin Hait	15951e6e93	Merge branch 'staging-fixes' into gbm001-item-barcodes-pull	2018-11-26 20:25:29 +05:30
Nabin Hait	93595fa60a	Merge branch 'staging-fixes' into hotfix-child-task-error	2018-11-26 20:24:47 +05:30
Nabin Hait	91c811f170	Merge branch 'staging-fixes' into new-fix-branch	2018-11-26 20:23:37 +05:30
Nabin Hait	c5064069c7	Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue	2018-11-26 20:23:11 +05:30
Nabin Hait	218fa51dba	Merge branch 'staging-fixes' into validate_due_date_for_purchase_invoice	2018-11-26 20:23:00 +05:30
Nabin Hait	73e3138a5b	Merge branch 'staging-fixes' into on_uncheck_is_return_clear_reference_number	2018-11-26 20:20:22 +05:30
deepeshgarg007	05c2989698	removed total from graph	2018-11-26 20:19:57 +05:30
Nabin Hait	7f02659425	Merge branch 'hotfix' into address_not_set_from_api	2018-11-26 20:16:54 +05:30
Nabin Hait	b32abde2ac	Merge branch 'staging-fixes' into bug-fixes	2018-11-26 20:05:09 +05:30
Saif Ur Rehman	5fdbc68ca3	Set Gross Profit on server-side validation of Sales Order	2018-11-26 19:32:16 +05:00
Rohit Waghchaure	b4a5993ece	On uncheck is return field clear the reference field	2018-11-26 20:02:01 +05:30
Nabin Hait	21983b8432	Merge pull request #16001 from jsukrut/staging-fixes ... [FIX][#15018][PATIENT Relation should be unique]	2018-11-26 20:01:19 +05:30
Nabin Hait	56dc5c1be3	Merge branch 'staging-fixes' into pos-profile-fix	2018-11-26 19:59:07 +05:30
Nabin Hait	212a29ae2c	Merge pull request #16028 from rohitwaghchaure/not_able_to_view_general_ledger ... [Fix] Not able to view general ledger for purchase invoice	2018-11-26 19:57:24 +05:30
Nabin Hait	25e60f3934	Merge pull request #16044 from ESS-LLP/fix-trial-balance ... fix: Trial Balance print	2018-11-26 19:56:27 +05:30
Nabin Hait	4191d7eb52	Merge pull request #16045 from SaiFi0102/GrossProfit-Fix-Buying-Amount-Multiple-Invoice ... Fixed get_buying_amount in Gross Profit report:	2018-11-26 19:55:06 +05:30
Nabin Hait	d0af0887be	Merge pull request #16051 from SaiFi0102/patch-1 ... Remove "Test" Letter Head	2018-11-26 19:47:07 +05:30
Nabin Hait	36f266355d	Merge branch 'staging-fixes' into fixed_holiday_list_not_working	2018-11-26 19:44:11 +05:30
Nabin Hait	736ce9a176	Merge pull request #16095 from SaiFi0102/BugFix-Rate-Calculation ... Fixed error due to incorrect use of 'this' while calculating rate	2018-11-26 19:31:25 +05:30
Saif Ur Rehman	147fa73d3f	Fixed incorrect use of 'this' causing errors calculating rate	2018-11-26 18:14:06 +05:00
Rohit Waghchaure	d1a85a3637	[Fix] Due date can not be greter than posting date validation should consider supplier invoice date for purchase invoice	2018-11-26 18:42:29 +05:30
Rohit Waghchaure	15ed7a6351	[Fix] No permission for Manufacturing Settings	2018-11-26 17:31:18 +05:30
Anurag Mishra	5b6dd58b3e	fixed ZeroDivisionError in sales_order.py	2018-11-26 17:22:50 +05:30
deepeshgarg007	bd87903b56	Added condition for default amount	2018-11-26 17:13:59 +05:30
Anurag Mishra	e657fe84b8	making validation generic for sales order,sales invoice,purchase order etc.	2018-11-26 17:13:10 +05:30
Anurag mishra	6ddb15b3df	fix(validate): Qty is mandatory in delivery note	2018-11-26 17:13:10 +05:30
Anurag mishra	7b2c445707	Delivery Note fixes	2018-11-26 17:13:10 +05:30
Nabin Hait	73ca3cfca6	fix(test): removed test print	2018-11-26 16:16:42 +05:30
deepeshgarg007	533066eb87	Salary slip bug fix	2018-11-26 15:04:21 +05:30
Rohit Waghchaure	3893ba302c	If is pos and no pos profile use the item's default warehouse for packing materials	2018-11-26 14:13:24 +05:30
Nabin Hait	2665c37f38	temp(travis): Print statement to fix travis	2018-11-26 11:05:28 +05:30
Nabin Hait	48e0e19b03	fix(test): Fixed salary slip and sales analytics test cases	2018-11-26 11:05:28 +05:30
Nabin Hait	2508d11097	fix(test): Test cases fixed	2018-11-26 11:05:28 +05:30
Nabin Hait	f77cd54a6c	fix(tds): Create tds payable under correct parent	2018-11-26 11:05:28 +05:30
deepeshgarg007	9cdece4ca2	Test case fix and other minor bug fix	2018-11-26 11:05:28 +05:30
deepeshgarg007	5dbb9f5312	Accounts receivable summary print fix	2018-11-23 19:54:08 +05:30
deepeshgarg007	a1cffc3490	minor changes in dashboard	2018-11-23 16:51:35 +05:30
deepeshgarg007	0e8c36473a	Added colspan to indicators	2018-11-23 11:22:24 +05:30
deepeshgarg007	920dc1400f	Customer/Supplier dashboard fix for multi company setup	2018-11-23 10:17:28 +05:30
Kanchan Chauhan	962397e6f4	Added href links for nextdoc on cancelling the Sales order, makes it easier to navigate	2018-11-22 15:15:06 +05:30
Rohit Waghchaure	037a151ef5	[Fix] New holiday list form is not working	2018-11-22 12:57:34 +05:30
Saif	2a2f2742eb	Remove "Test" Letter Head	2018-11-21 23:29:09 +05:00
Rohit Waghchaure	6424f47f3b	[Fix] Incorrect stock value difference because of negative stock	2018-11-21 23:18:41 +05:30
Ranjith	1879e91148	fix: Trial Balance	2018-11-21 16:04:05 +05:30
Saif Ur Rehman	23eef11cf5	Fixed get_buying_amount in Gross Profit report: ... To handle the case where there may be multiple invoices for a single delivery	2018-11-21 15:32:37 +05:00
Suraj Shetty	1eb098caf9	Add additional condition condition to get_pos_profile ... - If we have any POS Profile related to the user, that profile should be used	2018-11-21 14:36:58 +05:30
Rohan Bansal	f838597b5f	fix(task): Fix error when trying to convert a task into a group even if no child tasks exist	2018-11-20 13:18:05 +05:30
Rohit Waghchaure	770a13ebc3	[Fix] Not able to view general ledger for purchase invoice	2018-11-20 13:01:52 +05:30
Ranjith	5d2e52c4ef	fix: healthcare patch	2018-11-19 20:03:25 +05:30
frappe-pr-bot	2ed4d84cd3	[Translation] Updated Translations	2018-11-19 11:57:50 +02:00
Jamsheer	64e42e1e88	fix: Patient Appointment - update list view	2018-11-19 13:00:49 +05:30
Jamsheer	ee6b317ab5	fix: Patient Appointment - Code standards	2018-11-19 13:00:49 +05:30
Jamsheer	45695c9bcb	fix: Realign Patient Appointment fields	2018-11-19 13:00:49 +05:30
Jamsheer	dc3ae114cd	feat: Reschedule - Patient Appointment	2018-11-19 13:00:49 +05:30
Andrew McLeod	f99a68a695	feat: Added unit testing for Item Barcodes in item.py ... Adds three different barcodes and barcodes types to a test item and checks that they are added correctly. Adds a barcode that already exists, and checks a DuplicateEntryError is raised. Adds an invalid EAN barcode and checks InvalidBarcode (a subclass of ValidationError) is raised.	2018-11-16 13:55:55 +00:00
Andrew McLeod	5607762c0f	fix/feat: Allow extension of barcode types (without validation) ... Currently, it is difficult to add new custom barcode types for two reasons, both of which relate to validate_barcode in item.py: - There is a bug where barcode types with a space in, such as Code 128, are split in two (so barcode_type is checked against 'Code' and '128' rather than 'Code 128'). This is fixed by splitting the Options field against a newline, instead of spaces. - All barcodes are validated against the stdnum.ean library. This only handles EAN-8, EAN-13 and UPC-12 barcodes and any other barcode will fail. Barcodes with no type will continue to not be checked. Barcodes with the default barcode_types of EAN, UPC will continue to be checked. The non-default barcode_types of EAN-13 and EAN-8 will also be checked. The barcode_type is cast to upper case before this check is made so ean, upc, ean-13 and ean-8 will also be validated. This allows people to add their own barcode types, such as Code 128 and QR codes. Users can add custom validation of these barcodes using the usual hooks, but they cannot remove the standard validation.	2018-11-16 11:08:39 +00:00
Jsukrut	b9a95e29b7	[FIX][#15018][PATIENT Relation should be unique]	2018-11-16 11:30:12 +05:30
Ameya Shenoy	27a0c37963	css: build files in v10	2018-11-15 19:21:30 +00:00
Rohit Waghchaure	f4dc71661d	[Fix] Address not set from the API	2018-11-15 17:04:02 +05:30
deepeshgarg007	795686d1cc	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into bug-fixes	2018-11-15 16:30:48 +05:30
Frappe Bot	8c7373dfd0	Merge branch 'staging' into develop	2018-11-15 09:45:05 +00:00
Frappe Bot	d9dccaefba	bumped to version 11.0.3-beta.24	2018-11-15 09:42:35 +00:00
Frappe Bot	ef745b0197	bumped to version 11.0.3-beta.23	2018-11-15 09:37:17 +00:00
Frappe Bot	eb4969d24f	Merge branch 'staging' into develop	2018-11-15 09:26:03 +00:00
Nabin Hait	0aca5aad14	Merge pull request #15976 from deepeshgarg007/summary ... [Fix] Accounts receivable summary print format showing zero values	2018-11-15 14:52:16 +05:30
Nabin Hait	a0a2f58a21	Merge pull request #15985 from adityahase/perf-patch ... perf(patch): Use INSERT with ON DUPLICATE KEY UPDATE	2018-11-15 14:50:58 +05:30
Frappe Bot	a4fe912382	bumped to version 11.0.3-beta.23	2018-11-15 09:19:18 +00:00
Frappe Bot	98b4a1bc81	Merge branch 'master' into staging-fixes	2018-11-15 09:12:04 +00:00
Frappe Bot	2426d00dd6	bumped to version 10.1.72	2018-11-15 09:04:14 +00:00
Rohit Waghchaure	704796b1cb	Code optimization for consolidated financial statement report	2018-11-15 13:46:18 +05:30