18745 Commits

Author	SHA1	Message	Date
Nabin Hait	5c4b7b32a1	Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic ... fix: Order Item attribute values dynamically	2019-04-26 00:21:39 +05:30
Nabin Hait	4c31acf5e4	Merge pull request #17382 from nabinhait/tax-exemption-dev ... refactor: Employee Tax Exemption (develop)	2019-04-26 00:20:46 +05:30
Nabin Hait	ec7a18737b	fix: test cases	2019-04-25 22:30:23 +05:30
Nabin Hait	6adfc5618d	fix: test cases	2019-04-25 21:42:26 +05:30
Nabin Hait	1d21d89d2f	Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop ... fix: Trial balance finance book issue	2019-04-25 20:34:38 +05:30
Nabin Hait	49446ba760	fix: test cases	2019-04-25 19:54:49 +05:30
Shivam Mishra	9fe7257bfc	fix (ui): refactored breadcrumbs	2019-04-25 19:44:37 +05:30
Shivam Mishra	2428485ebb	fix (ui): Card layout	2019-04-25 19:33:22 +05:30
Shivam Mishra	37a55345fd	feat: removed home page for lms role	2019-04-25 19:29:56 +05:30
Nabin Hait	04e7bf464f	refactor: Employee Tax Exemption	2019-04-25 18:53:39 +05:30
Nabin Hait	e70696e111	Merge branch 'develop' into pos-advance-dev	2019-04-25 17:53:56 +05:30
Rohit Waghchaure	c181064782	fix: Trial balance finance book issue	2019-04-25 17:51:09 +05:30
Nabin Hait	4a994d4eb8	fix: Don't allocate advance if pos	2019-04-25 17:49:38 +05:30
deepeshgarg007	ce809d57a2	Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po	2019-04-25 14:29:31 +05:30
deepeshgarg007	f34e4f0e36	fix: Test case for inter-company-transaction	2019-04-25 14:28:57 +05:30
deepeshgarg007	4a4ce12eb4	fix: Commonfied code for inter-company-transaction	2019-04-25 14:28:19 +05:30
Faris Ansari	dd201b0797	fix: Order Item attribute values dynamically	2019-04-25 13:03:50 +05:30
Rohit Waghchaure	9c1fa77f4e	fixed test cases	2019-04-25 11:57:27 +05:30
Rohit Waghchaure	691e03a36b	fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined	2019-04-25 11:57:20 +05:30
Nabin Hait	07e005f963	Merge pull request #17350 from nabinhait/item-tax-patch ... fix: create account if not exists in item tax patch	2019-04-25 10:40:46 +05:30
Nabin Hait	8784b0b134	Update move_item_tax_to_item_tax_template.py	2019-04-25 10:40:34 +05:30
deepeshgarg007	fef14182b7	Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po	2019-04-25 08:27:40 +05:30
Saif Ur Rehman	f1da53ed01	fix(Product Bundle Balance): Remove custom roles	2019-04-25 00:14:14 +05:00
Nabin Hait	2cb57dc3e7	Update move_item_tax_to_item_tax_template.py	2019-04-24 23:34:04 +05:30
Nabin Hait	d828f84da6	Merge pull request #17359 from netchampfaris/item-attribute-order-fix ... fix: Item Attribute Order	2019-04-24 23:16:34 +05:30
Deepesh Garg	ea9c758648	Merge pull request #17331 from deepeshgarg007/inactive_items ... feat: Inactive items report	2019-04-24 22:30:54 +05:30
Saif Ur Rehman	a012b63f9b	style: linting	2019-04-24 16:17:40 +05:00
Saif Ur Rehman	adc738f55d	style: linting	2019-04-24 14:43:46 +05:00
Saif Ur Rehman	35887f1c0a	feat: Product Bundle Balance Report	2019-04-24 13:37:25 +05:00
Faris Ansari	90d7150859	Merge branch 'develop' into item-attribute-order-fix	2019-04-24 11:58:27 +05:30
Faris Ansari	cb7ca63979	fix: Item Attribute Order fix	2019-04-24 11:57:40 +05:30
scmmishra	bf7d13a7be	Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2	2019-04-24 09:50:19 +05:30
Nabin Hait	0908907ae1	Merge branch 'develop' into aahi_loan_report	2019-04-24 09:37:52 +05:30
Nabin Hait	43324179d0	Merge pull request #17339 from KanchanChauhan/fix-stock-entry-feed ... fix: Subject of Stock Entry feed	2019-04-24 09:35:18 +05:30
Nabin Hait	08da372ae5	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-24 09:19:21 +05:30
Nabin Hait	8d3644d826	Merge pull request #17351 from nabinhait/rounded-salary-tax ... fix: Rounded tax amount in salary slip	2019-04-24 09:19:00 +05:30
Deepesh Garg	719dc506b9	Merge pull request #17352 from nabinhait/pos-advance ... fix: don't allocate advances if POS	2019-04-24 08:18:05 +05:30
Deepesh Garg	7dddc0c5bf	Merge branch 'develop' into fix-stock-entry-feed	2019-04-24 08:14:10 +05:30
Deepesh Garg	12af1c3837	Merge branch 'develop' into employee-skill-map	2019-04-24 00:03:04 +05:30
Rohan	d12e9426bd	fix(selling): Fix method to also consider return documents (#17340)	2019-04-23 23:08:26 +05:30
Nabin Hait	aa028d7856	fix: don't allocate advances if POS	2019-04-23 21:44:21 +05:30
Nabin Hait	c144f66dac	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-23 21:39:33 +05:30
Nabin Hait	90bca999dd	Merge branch 'develop' into inactive_items	2019-04-23 21:39:22 +05:30
Nabin Hait	09438562d4	Merge branch 'develop' into fix-stock-entry-feed	2019-04-23 21:39:04 +05:30
Nabin Hait	80a5cb3dcc	Merge branch 'develop' into item-tax-patch	2019-04-23 21:38:45 +05:30
Nabin Hait	acac41d62b	Merge branch 'develop' into rounded-salary-tax	2019-04-23 21:38:16 +05:30
Nabin Hait	5e0bc20ab8	Merge pull request #17337 from nabinhait/travis-fix-dev ... fix: Load doc before save	2019-04-23 21:35:18 +05:30
Audacityy	bf8d3658c9	Issue form reorder (#17346) ... * fix: Issue form reorder	2019-04-23 18:55:42 +05:30
Nabin Hait	553a3ea7d2	fix: create account if not exists in item tax patch	2019-04-23 18:46:17 +05:30
Nabin Hait	1f61a1ecf2	minot fix	2019-04-23 18:44:57 +05:30
Nabin Hait	6592a6bcd4	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-23 18:38:54 +05:30
Nabin Hait	8bbc0a0c3b	Merge branch 'develop' into inactive_items	2019-04-23 18:38:44 +05:30
Deepesh Garg	cb2c13fa50	fix: Stock Ledger report fix (#17343)	2019-04-23 17:29:59 +05:30
Nabin Hait	24b4a8722e	fix: Rounded tax amount in salary slip	2019-04-23 15:54:32 +05:30
Kanchan Chauhan	253c6f962d	fix: Subject of Stock Entry feed	2019-04-23 14:40:02 +05:30
Nabin Hait	64bfdd9596	fix: test cases	2019-04-23 13:37:19 +05:30
Nabin Hait	593242fa5c	fix: Calculate rate based on discount on server side only if not rate or pricing rule applied	2019-04-23 13:22:38 +05:30
Nabin Hait	319c912f91	fix: Load doc before save	2019-04-23 13:13:36 +05:30
Rushabh Mehta	77b82894ff	fix(style): buttons in address and contact	2019-04-23 07:57:31 +05:30
Suraj Shetty	df59c1573d	feat: Add training date field	2019-04-22 23:35:36 +05:30
deepeshgarg007	e3ea806390	fix: Ignore sql injections	2019-04-22 21:08:29 +05:30
deepeshgarg007	d5e7bf8f0f	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-22 21:07:27 +05:30
deepeshgarg007	4f57328924	Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po	2019-04-22 20:25:41 +05:30
deepeshgarg007	555f425da1	fix: Test case and styling fixes	2019-04-22 20:24:31 +05:30
Deepesh Garg	2ef7022385	fix: Remove print statements (#17333)	2019-04-22 19:25:18 +05:30
scmmishra	936f36ccda	fix: import frappe._ in lms.py	2019-04-22 18:55:19 +05:30
scmmishra	68b3203366	chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment	2019-04-22 18:50:08 +05:30
scmmishra	3673b25b64	fix: quiz is now visible to administrator	2019-04-22 18:10:19 +05:30
deepeshgarg007	d249325d98	Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po	2019-04-22 18:00:13 +05:30
deepeshgarg007	a89d1df655	fix: Typo fixes	2019-04-22 17:54:38 +05:30
scmmishra	804a74c01c	fix (ui): UI fixes to Video page	2019-04-22 17:52:48 +05:30
scmmishra	6c8f23b27e	fixed (ui): Fixed cards with better buttons	2019-04-22 17:51:30 +05:30
Nabin Hait	7f4e7b63d7	fix: Income tax period factor considering joining and relieving date	2019-04-22 17:39:36 +05:30
deepeshgarg007	bf2adae97d	fix: Ordering and datatype fixes in inactive items report	2019-04-22 17:15:23 +05:30
deepeshgarg007	8a5d556f53	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-22 16:59:33 +05:30
deepeshgarg007	425699d9f2	fix: Material request list_view status fixes	2019-04-22 16:54:52 +05:30
Nabin Hait	af309473f8	Merge pull request #17326 from rohitwaghchaure/moved_erpnext_related_methods_from_frappe_to_erpnext_develop ... fix: moved erpnext related methods from frappe to erpnext(cherry-picked)	2019-04-22 15:59:30 +05:30
Nabin Hait	8624957cbc	Merge pull request #17291 from prasadarr/listing-fixes ... fix: Allow system manager to access share ledger	2019-04-22 15:35:35 +05:30
Nabin Hait	28a7aec124	Update accounting.py	2019-04-22 15:35:13 +05:30
deepeshgarg007	6f57b05fed	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-04-22 15:26:55 +05:30
Rushabh Mehta	3bf71cc18e	fix(splash): revert to old image	2019-04-22 15:24:28 +05:30
Deepesh Garg	15a7b7ce71	fix: GSTR 3b report fixes (#17317) ... * fix: GSTR-3b report total taxable value fixes * fix: Test Cases	2019-04-22 15:22:36 +05:30
scmmishra	5079e6c1c1	chore: minor improvements	2019-04-22 14:48:32 +05:30
scmmishra	ac8d3479c9	feat: Added add_quiz_activity function to course_enrollment class	2019-04-22 14:38:51 +05:30
scmmishra	33969b7d7c	chore: Minor change to question doctype	2019-04-22 14:30:14 +05:30
Rohit Waghchaure	270d4e9f4e	fix: moved erpnext related methods from frappe to erpnext	2019-04-22 14:11:43 +05:30
scmmishra	66d239281c	chore: minor code improvements	2019-04-22 14:10:09 +05:30
Nabin Hait	d3cd98c45e	fix: Renamed depends_on_lwp to depends_on_payment_days	2019-04-22 13:45:45 +05:30
Nabin Hait	452f2c5694	Merge pull request #17322 from nabinhait/salary-structure-child-docstatus ... Salary structure child docstatus	2019-04-22 13:42:55 +05:30
Nabin Hait	36561801c2	Update set_salary_details_submitable.py	2019-04-22 13:38:06 +05:30
Anurag Mishra	35e52b5596	fix: fixed spelling	2019-04-22 13:37:03 +05:30
Saif Ur Rehman	a216844d2c	fix: Set Allocate Advance Automatically disabled by default	2019-04-22 12:10:40 +05:00
scmmishra	64d2fe0ad7	fix: Minor typo	2019-04-22 12:30:08 +05:30
scmmishra	4add826703	chore: Minor code improvements ... - Changed variable name in `get_content` function - Added proper exceptions for `get_topic` and `get_content` functions in lms	2019-04-22 12:28:13 +05:30
deepeshgarg007	06c20400ee	feat: Track purchase receipt status in Material Request	2019-04-22 12:25:14 +05:30
scmmishra	da2c90cd18	chore: renamed get_program api functions ... - `get_program` is renamed to `get_program_and_enrollment_status` - `get_program_detail` is renamed to `get_program` - Minor code improvements	2019-04-22 12:21:40 +05:30
scmmishra	9967d27b9a	chore: renamed ambiguous variable names in lms.py	2019-04-22 12:08:41 +05:30
Faris Ansari	733ff48d51	fix: Refactor for Print Format changes (#17242) ... - Rename Server to Jinja - Rename Js to JS	2019-04-22 12:08:18 +05:30
scmmishra	d78c326f95	chore: renamed get_topic_meta to get_student_topic_details	2019-04-22 12:06:28 +05:30
scmmishra	d5973fe4bc	chore: renamed get_course_meta to get_student_course_details	2019-04-22 12:05:22 +05:30
scmmishra	327334a830	chore: refactor utils.get_current_student	2019-04-22 12:03:17 +05:30
scmmishra	823d89cf66	fix (linting): codacy fixes	2019-04-22 11:46:22 +05:30
Nabin Hait	89d3aaf349	Merge pull request #17310 from nabinhait/ar-fix-develop ... fix: Total row alignment in AR report	2019-04-22 11:11:38 +05:30
Suraj Shetty	2a9b17efd4	Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map	2019-04-21 23:53:54 +05:30
Suraj Shetty	079684f7da	feat: Task type (#17311) ... * feat: Add task type doctype	2019-04-20 23:37:49 +05:30
Nabin Hait	d21bacfc21	fix: Total row alignment in AR report	2019-04-20 10:58:58 +05:30
Nabin Hait	65b3a849d3	Merge pull request #17306 from surajshetty3416/fix-employee-permission ... fix: Do not create employee user permission if already exists	2019-04-20 01:44:06 +05:30
Nabin Hait	ee43f9d154	Merge pull request #17305 from nabinhait/inv-disc-fix1 ... fix: fetch party account as discounted receivable account in payment entry	2019-04-20 01:40:55 +05:30
Nabin Hait	d8783343f3	Merge pull request #17283 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom_develop ... fix: Requested Items To Be Ordered report showing records even if material request is fully ordered(Cherry-picked)	2019-04-20 01:27:31 +05:30
Suraj Shetty	98390dae49	fix: Do not create employee user permission if already exists	2019-04-19 21:52:08 +05:30
Nabin Hait	c8b1351e87	fix: fetch party account as discounted receivable account in payment entry	2019-04-19 21:33:29 +05:30
Nabin Hait	4a5bed5c07	fix: fetch party account as discounted receivable account in payment entry	2019-04-19 21:33:29 +05:30
Nabin Hait	06f992f850	Merge pull request #17299 from nabinhait/inv-disc-fixes ... fix: Close loan considering latest invoice outstanding balance	2019-04-19 21:27:02 +05:30
Nabin Hait	a6e09826b3	Merge pull request #17297 from netchampfaris/index-item-route ... fix: Add index to Item route	2019-04-19 20:11:29 +05:30
Nabin Hait	375f051b24	Merge pull request #17277 from nabinhait/invoice-discounting-fixes ... Invoice discounting fixes	2019-04-19 20:00:18 +05:30
Nabin Hait	d2797be1cd	fix: Close loan considering latest inv outstanding balance	2019-04-19 15:33:05 +05:30
Nabin Hait	8da71cebb7	fix: test cases	2019-04-19 15:10:02 +05:30
Rohit Waghchaure	72cc7508b0	fix: Requested Items To Be Ordered report showing records even if material request is fully ordered	2019-04-19 14:57:38 +05:30
Faris Ansari	1d78aae2af	fix: Add index to Item route ... Increases route resolve time if there are lots of Items.	2019-04-19 14:03:25 +05:30
Nabin Hait	0aa036cda5	Merge pull request #17294 from scmmishra/trial-detail-fix ... fix: fixed trial details	2019-04-19 13:18:03 +05:30
Nabin Hait	48e1e04df2	Merge pull request #17286 from rohitwaghchaure/task_not_able_to_search_by_name_in_global_search_develop ... fix: task name was not able to search by name in global search (Cherry-picked)	2019-04-19 13:06:42 +05:30
Prasad R	198c7ae73d	fix: show 2 missing doctypes in Accounts	2019-04-19 12:43:58 +05:30
scmmishra	a55d32236a	fix: fixed trial details	2019-04-19 12:22:30 +05:30
Prasad R	e1a6022c8c	fix: Allow system manager to access share ledger	2019-04-19 10:57:21 +05:30
Rohit Waghchaure	94f43ca2e2	fix: task name was not able to search by name in global search	2019-04-18 22:39:42 +05:30
Rohit Waghchaure	376db4f6b7	fix: credit amount in account's currency not be consider if debit amount is present in the general ledger	2019-04-18 22:06:22 +05:30
deepeshgarg007	c841bd486a	feat: Added validations and mapper to create inter company mapper	2019-04-18 20:10:31 +05:30
deepeshgarg007	90262f84af	feat: Added custom button to make inter company order	2019-04-18 20:09:07 +05:30
deepeshgarg007	100bd29dfd	feat: Updated doctypes for sales and purchase order	2019-04-18 20:08:20 +05:30
Nabin Hait	c99c712913	fix: Validate and update invoice discounting status on JE submit/cancel	2019-04-18 15:52:50 +05:30
Nabin Hait	8170585faf	fix: Don't fetch already discounted invoice	2019-04-18 15:13:18 +05:30
Nabin Hait	36bb3f55f2	fix: Added invoice discounting dashboard	2019-04-18 14:47:44 +05:30
Suraj Shetty	3aa5e125bd	feat: Add employee training section to the employee skill map	2019-04-18 12:46:33 +05:30
deepeshgarg007	767a00fa8d	feat: Logic for query and report creation for inactive items	2019-04-18 08:45:10 +05:30
deepeshgarg007	4d1df416e9	fix: Reordered and deleted unnecessary filters	2019-04-18 08:29:21 +05:30
Nabin Hait	0050652be9	Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop ... fix: GSTR-1 B2C Small report fix	2019-04-17 17:32:29 +05:30
Nabin Hait	3a2d6a4043	Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements ... feat: Production plan enhancements	2019-04-17 17:31:14 +05:30
Nabin Hait	26dd192516	Merge pull request #17263 from rohitwaghchaure/finance_book_blank_issue_develop ... fix: If finance book filter is not set then show all the entries(Cherry-pick)	2019-04-17 17:22:45 +05:30
Shivam Mishra	f3cc87455a	Merge pull request #17249 from scmmishra/auto-fetch-serial ... feat: Auto fetch serial numbers	2019-04-17 17:15:27 +05:30
Rohit Waghchaure	38238b0cfd	fixed test cases	2019-04-17 15:56:00 +05:30
scmmishra	fed4fd0f02	style: linting issue fixed	2019-04-17 15:46:15 +05:30
Shivam Mishra	63921ebbc9	style: fixed formatting ... Fixed formatting for for auto_fetch_serial_number	2019-04-17 15:29:29 +05:30
deepeshgarg007	cab2d82ea8	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-17 11:35:56 +05:30
scmmishra	5522cf8c26	fix: codacy linting	2019-04-17 10:26:21 +05:30
Faris Ansari	1cf9fa9662	fix: Refactor Upload Attendance (#17241) ... New API frappe.ui.FileUploader https://github.com/frappe/frappe/pull/7253	2019-04-17 09:45:46 +05:30
deepeshgarg007	9f873e97fa	fix: Remove print statement	2019-04-16 20:58:22 +05:30
deepeshgarg007	c354a17383	fix: Code cleanup	2019-04-16 20:56:49 +05:30
deepeshgarg007	e5a869bc45	fix: GSTR-1 B2CS report fix	2019-04-16 20:08:12 +05:30
Rohit Waghchaure	7aee809571	fix: If finance book filter is not set then show all the entries	2019-04-16 19:35:18 +05:30
Rohit Waghchaure	00d73cda50	fix: POS not working if user has access of multiple company	2019-04-16 18:43:16 +05:30
Rohit Waghchaure	34ee41a35e	fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items	2019-04-16 18:26:11 +05:30
scmmishra	6d3302b0cc	style (codacy): code formatting fixes	2019-04-16 18:25:53 +05:30
deepeshgarg007	508e815db0	feat: Added filters and columns for inactive items report	2019-04-16 17:07:13 +05:30
scmmishra	ed4b052df8	style (codacy): code formatting fixes	2019-04-16 17:03:25 +05:30
scmmishra	46901076be	feat: Use standard serial picker to add as well as update serial numbers	2019-04-16 17:01:01 +05:30
scmmishra	c791c3b24b	fix: Minor bug in serial no auto fetch api	2019-04-16 16:07:32 +05:30
scmmishra	eee5c38911	feat: Use controller for serial no. API	2019-04-16 15:57:51 +05:30
scmmishra	61d6b677e4	feat: Show standard serial number selector in item grid form	2019-04-16 15:17:27 +05:30
Rushabh Mehta	59c5a16037	fix(account_balance_timeline): remove unused import	2019-04-16 15:11:45 +05:30
scmmishra	407496b528	chore: minor changes to labels	2019-04-16 13:32:41 +05:30
Nabin Hait	0c896c38f8	Merge pull request #17244 from hrwX/delivery_note_fix_v12 ... fix(Delivery Note): show get items even if note has been amended	2019-04-16 13:20:26 +05:30
Himanshu	ef848fda2a	fix: let user delete the elements of items	2019-04-16 13:17:20 +05:30
Nabin Hait	00e9659e3f	Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated ... Fixed Company Abbr Update Was Not Able To Update Account	2019-04-16 12:51:13 +05:30
scmmishra	19a41ed16d	chore: code cleaning	2019-04-16 12:51:05 +05:30
scmmishra	41cf945247	feat (UX): Refactored batch selector	2019-04-16 12:47:39 +05:30
Nabin Hait	d2044c0f23	Merge pull request #17184 from frappe/akurungadam-patch-1 ... fix: misleading condition example in field options	2019-04-16 12:44:17 +05:30
scmmishra	8ec54c2214	feat: Added auto fetch serial numbers API	2019-04-16 12:20:55 +05:30
scmmishra	b98612ff5b	feat: Added auto fetch logic and button for client	2019-04-16 12:20:42 +05:30
Himanshu Warekar	810dde2e0b	fix: show get items even if note has been amended	2019-04-16 12:20:35 +05:30
Suraj Shetty	006c3dccf9	feat: Add logic to auto fetch skill from designation doc ... - Set today as default evaluation date	2019-04-16 12:14:44 +05:30
Nabin Hait	b5199951ad	Merge pull request #17239 from nabinhait/pr-pi ... fix: Invoice against partially returned DN/PR	2019-04-16 11:54:12 +05:30
Rushabh Mehta	1c2eb51a91	fix(api)	2019-04-16 11:12:34 +05:30
Suraj Shetty	354c70a0e7	feat: Init employee skill map doctype	2019-04-16 10:20:32 +05:30
Suraj Shetty	a0f7656ffc	feat: Add skill child table to designation doctype ... - To record skills required of a particular designation	2019-04-16 10:19:53 +05:30
Nabin Hait	29997e2631	fix: Invoice against partially returned DN/PR	2019-04-16 09:55:42 +05:30
Nabin Hait	c066bbde06	Merge pull request #17235 from hrwX/remove_asset_permission_v12 ... fix(Asset): Remove user permission for employee in asset	2019-04-16 09:45:40 +05:30
Rushabh Mehta	6dff8038e6	fix(account_balance_timeline)	2019-04-16 09:35:46 +05:30
Rushabh Mehta	7efe01578d	fix(account_balance_timeline)	2019-04-16 09:33:21 +05:30
Faris Ansari	557520148e	fix: Item Variant Attribute Order (#17237) ... - Show Item Variant Attributes in order they appear in child table	2019-04-15 23:19:44 +05:30
Himanshu Warekar	9b7c7787e6	Merge develop	2019-04-15 22:56:41 +05:30
Himanshu Warekar	3e503f213b	fix: remove user permission for emp in asset	2019-04-15 22:50:22 +05:30
Nabin Hait	a5265113ce	Merge pull request #17232 from karthikeyan5/develop-woocommerce-fix ... fix(woocommerce integration): 403 error and adding defaults	2019-04-15 21:17:16 +05:30
Nabin Hait	e9d9576cd7	Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting ... Invoice Discounting	2019-04-15 21:14:19 +05:30
karthikeyan5	605a0a0570	fix(woocommerce integration): travis fix ... (cherry picked from commit 2518a2ab169948cff56bfbbedbf7198327b33f25)	2019-04-15 19:47:13 +05:30
karthikeyan5	13563dc495	fix(woocommerce integration): fix strange travis error ... the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings' (cherry picked from commit df3e8853aeedb4991e7f8b1c878adb7ba849a063)	2019-04-15 19:47:13 +05:30
karthikeyan5	63f8cda069	fix(woocommerce integration): possible travis fix ... possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)" (cherry picked from commit a0b7ff60b8c3303a405c98eac11e71cd556ba166)	2019-04-15 19:47:13 +05:30
karthikeyan5	69f0ce178e	fix(woocommerce integration): error in new-site ... resolving "Could not find UOM: Nos" error in travis (cherry picked from commit 97383716e633ae0911238fc02ffc659ad705b41a)	2019-04-15 19:47:13 +05:30
karthikeyan5	307e6a8825	fix(woocommerce integration): defaults in settings ... (cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)	2019-04-15 19:47:02 +05:30
karthikeyan5	2b0a8de74f	fix(woocommerce integration): fixing 403 error ... (cherry picked from commit 6784335e2ca3ea8883f08b3d94101f525f37bf1e)	2019-04-15 19:45:38 +05:30
Nabin Hait	076cc38c29	fix: Outstanding amount on making payment against discounted invoice	2019-04-15 18:42:10 +05:30
Rushabh Mehta	6aaac1e9db	fix(assign): do not assign if administrator	2019-04-15 16:58:45 +05:30
Rushabh Mehta	44b0cb6383	Merge pull request #17194 from rmehta/dashboard-refactor ... fix(dashboard): as per new features	2019-04-15 16:52:54 +05:30
Nabin Hait	d584cfbf43	Fixed merge conflict	2019-04-15 16:16:25 +05:30
Nabin Hait	fa8f13dc98	Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos ... fix: POS takes lot of time to load the items data	2019-04-15 10:11:31 +05:30
Nabin Hait	6ecc83aaf0	Merge pull request #17182 from hrwX/revert_salary_slip ... Revert(Salary Slip): Wrong Formula	2019-04-15 10:08:53 +05:30
Nabin Hait	e7e2e93419	Merge pull request #17183 from netchampfaris/duplicate-variant-check-d ... fix: Validate variant attributes only if is_new	2019-04-15 10:08:28 +05:30
Nabin Hait	8ab393448f	Merge pull request #17218 from netchampfaris/item-price-packing-unit-d ... fix: Set default value for Packing Unit as 0	2019-04-15 10:06:45 +05:30
Nabin Hait	9fd3f10b67	Merge pull request #17220 from Anurag810/payment-entry-fix ... fix: handle for party type member in payment entry (v12)	2019-04-15 10:06:08 +05:30
rohitwaghchaure	033b1babe8	Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation ... feat: Added bank account no in bank reconcilliation	2019-04-14 16:10:19 +05:30
scmmishra	5b9df676a4	fix: minor bug in breadcrumb routing	2019-04-13 18:53:49 +05:30
Deepesh Garg	1b0edbc8b3	fix: GSTR3b 3b template fix (#17224)	2019-04-13 18:37:08 +05:30
Anurag Mishra	95714297a4	fix: handle for party type member in payment entry	2019-04-12 15:03:46 +05:30
Suraj Shetty	c90364f94d	feat: Add task weight for employee onboarding activity (#17216) ... This activity weight will be used to update the task weight	2019-04-12 14:12:03 +05:30
Faris Ansari	581e5fbfda	fix: Set default value for Packing Unit as 0 ... The default value 1 assumes Items will be always packed in integer quantities. This is not the usual case.	2019-04-12 12:39:12 +05:30
Rushabh Mehta	54ba900e72	Merge pull request #17214 from rmehta/auto-assign-issue ... feat: auto assign lead/opportunity to lead owner, customer account manager	2019-04-12 11:11:59 +05:30
Nabin Hait	851acc30b3	Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue ... fix: Fixed Sanctioned Amount Update Issue in Expense Claim	2019-04-12 11:06:02 +05:30
Nabin Hait	165e92ad5b	Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times ... fix: Taxes and charges table not clear the existing rows if the template is changed	2019-04-12 11:02:37 +05:30
Rushabh Mehta	4f49ce4124	feat: auto assign lead/opportunity to lead owner, customer account manager	2019-04-12 09:04:17 +05:30
Rohit Waghchaure	2454d89068	Optimized the code to fix slow loading of items in the POS	2019-04-11 19:52:00 +05:30
Rohit Waghchaure	72cc37e8da	fix: Taxes and charges table not clear the existing rows if the template is changed	2019-04-11 18:35:15 +05:30
scmmishra	ff970a8062	Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2	2019-04-11 18:32:19 +05:30
Basawaraj Savalagi	9ce8c3061f	Fixed Sanctioned Amount Update Issue in Expense Claim	2019-04-11 16:30:11 +05:30
Rushabh Mehta	d625c32ab1	fix(dashboard): for frappe updates, and a new splash logo	2019-04-11 16:13:58 +05:30
Mangesh-Khairnar	3ab2a18088	Merge branch 'develop' into so-on-hold	2019-04-11 15:49:06 +05:30
Faris Ansari	6472ed2c1e	Merge pull request #16941 from Mangesh-Khairnar/po-on-hold ... Feature: Purchase order on hold	2019-04-11 15:36:54 +05:30
Nabin Hait	65cca62ef9	fixed merge conflict	2019-04-11 12:32:43 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
rohitwaghchaure	92b190febb	Merge pull request #17199 from Anurag810/pos_running_items ... fix: item order by idx in pos(v12)	2019-04-11 11:53:22 +05:30
Nabin Hait	0f62b13dd8	Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items ... fix: sales return not working for product bundle items	2019-04-11 11:44:57 +05:30
Nabin Hait	961d7ace4a	Merge pull request #17189 from nabinhait/sales-person ... fix: Made employee optional in sales person	2019-04-11 11:37:08 +05:30
Nabin Hait	38351587fc	Merge pull request #17197 from nabinhait/training-feedback ... fix: training feedback code cleanup	2019-04-11 11:36:50 +05:30
Anurag Mishra	4c29d80cf1	fix: minor fixes	2019-04-11 11:14:32 +05:30
Anurag Mishra	accf310aa3	fix: start date and loan period should be mandatory	2019-04-11 11:08:07 +05:30
rohitwaghchaure	4898d1936b	Merge pull request #17200 from Anurag810/pos_running ... fix: order by idx(v11)	2019-04-11 10:57:05 +05:30
rohitwaghchaure	22d6eb3eaa	Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix ... fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method	2019-04-11 09:58:02 +05:30
rohitwaghchaure	6cd114b467	Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice ... fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled	2019-04-11 09:57:45 +05:30
Rohit Waghchaure	9665a531fc	fix: item variant test cases	2019-04-11 09:56:00 +05:30
scmmishra	5214c5cdb3	fix: Minor fix to test program	2019-04-10 20:37:45 +05:30
scmmishra	8c89083647	fix: test fixes for program doctype	2019-04-10 20:02:39 +05:30
scmmishra	7a1c649dbd	fix: Test fixes	2019-04-10 19:02:06 +05:30
Anurag Mishra	9a2ae67f86	fix: order by idx	2019-04-10 17:57:23 +05:30
Rohit Waghchaure	f3a9552e48	fix: item variant test cases	2019-04-10 17:57:09 +05:30
Anurag Mishra	5ab5f77fd4	fix: order by idx	2019-04-10 17:53:45 +05:30
scmmishra	d2917a8c38	feat: Fixed test data for student doctype	2019-04-10 17:50:26 +05:30
Rohit Waghchaure	49907e746b	fix: test cases	2019-04-10 17:33:32 +05:30
Rohit Waghchaure	45d0b31d44	fix: test cases	2019-04-10 17:25:08 +05:30
Rohit Waghchaure	b286fc99b8	fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled	2019-04-10 16:16:30 +05:30
Nabin Hait	c8c678f747	fix: training feedback code cleanup	2019-04-10 15:56:16 +05:30
Basawaraj Savalagi	05458b7fc6	Fixed Company Abbr Update Was Not Able To Update Account	2019-04-10 13:33:43 +05:30
Rohit Waghchaure	bb0d4e37b9	fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method	2019-04-10 03:14:11 +05:30
Nabin Hait	b305f38869	fix: Made employee optional in sales person	2019-04-09 20:06:11 +05:30
Rohit Waghchaure	30fda3ee54	feat: Added bank account no in bank reconcilliation	2019-04-09 18:58:23 +05:30
Rushabh Mehta	bead5b33f4	fix(dashboard): as per new features	2019-04-09 18:38:03 +05:30
Anoop	cb278975f3	fix: misleading condition example in field options ... condition example corrected - gender=\"Male\" to gender==\"Male\"	2019-04-09 18:10:41 +05:30
Mangesh-Khairnar	63cf56f406	style: change function call to anonymous function call	2019-04-09 17:47:25 +05:30
Faris Ansari	4da3d0015a	fix: Validate variant attributes only if is_new	2019-04-09 17:40:53 +05:30
Nabin Hait	7dcdb93596	Merge pull request #17178 from Anurag810/timesheet_report_fixes ... fix: timesheet_report (WN-SUP41913)	2019-04-09 17:28:22 +05:30
Himanshu Warekar	5632dbdd18	revert: wrong formula	2019-04-09 16:53:54 +05:30
Rohit Waghchaure	0e9cd2e00a	feat: Production plan enhancements	2019-04-09 16:53:38 +05:30
Nabin Hait	1245139c51	Merge branch 'develop' into invoice-d	2019-04-09 15:27:13 +05:30
Anurag Mishra	67e6da2086	fix: Removed Extra page on generating pdf in print formats	2019-04-09 15:19:05 +05:30
Anurag Mishra	ef11d378d4	fix: UI on generating pdf in print format	2019-04-09 15:19:05 +05:30
Anurag Mishra	ed82e8ba3b	fix: removed before from accounts_controlle.pyr and fetch the gl from frontend	2019-04-09 15:19:05 +05:30
Anurag Mishra	b62cfffdea	fix: Print Auditing print format	2019-04-09 15:19:05 +05:30
Anurag Mishra	22867f7fa5	fix: added currency	2019-04-09 15:06:49 +05:30
Anurag Mishra	3e8b8a4359	fix: filters and some conditions	2019-04-09 14:34:56 +05:30
scmmishra	acc0fa3b00	fix: Added desciption in program test record	2019-04-09 13:20:11 +05:30
scmmishra	bae2d669b5	fix: codacy linting issues	2019-04-09 12:57:56 +05:30
scmmishra	abb35ad308	fix: Possible fix for failing tests	2019-04-09 12:38:42 +05:30
Mangesh-Khairnar	b70b048fa2	style: change type comparison for boolean expression	2019-04-09 12:26:52 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Mangesh-Khairnar	a2facd4dd2	style: change function call to anonymous function	2019-04-09 12:07:44 +05:30
scmmishra	b7d9efe901	Merged develop in lms	2019-04-09 11:39:12 +05:30
Rushabh Mehta	0d3986c9f6	fix(dashboard): account timeline for balance sheet accounts	2019-04-09 11:36:41 +05:30
scmmishra	dd889f8796	fix: Fixed hero image field in COurse and Topic	2019-04-09 11:36:31 +05:30
Anurag Mishra	17fbafa390	fix: filters,added total,only submitted doc,considered fraction	2019-04-09 11:31:11 +05:30
Faris Ansari	aac7719dd9	fix: Translated string method in Jinja (#17174)	2019-04-08 21:50:58 +05:30
scmmishra	88f0c464b4	feat: Added breadcrumbs	2019-04-08 19:56:21 +05:30
Rushabh Mehta	da3f07221c	fix(dashboard): accounting timeline query fix	2019-04-08 19:38:55 +05:30
Rushabh Mehta	3882a41c51	fix(dashboard): simpler way to get account timeline from first principles	2019-04-08 19:05:12 +05:30
Rushabh Mehta	1412a681f3	Revert "fix: Raise exception if apps are on incompatible branches"	2019-04-08 17:10:56 +05:30
Rushabh Mehta	fbc56c6d97	fix(style): left padding in marketplace view	2019-04-08 17:02:22 +05:30
Mangesh-Khairnar	1934a76cd8	feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107) ... * enhancement: add status field in ordered itemd to be delivered * enhancement: add status field in purchase order itemd to be received * enhancement: add a status column in the billed reports	2019-04-08 16:29:59 +05:30
Saurabh	00a5e7a1d0	bumped to version 11.1.20	2019-04-08 15:39:03 +06:00
Nabin Hait	f1698bb2df	fix: unique variant based on	2019-04-08 14:59:43 +05:30
Nabin Hait	79c9d5d24a	Merge pull request #17146 from Anurag810/timesheet-report ... feat: Timesheet report	2019-04-08 10:33:44 +05:30
Rohit Waghchaure	3771db92b8	fix: sales return not working for bundle items	2019-04-06 17:34:40 +05:30
rohitwaghchaure	bc02ee23e0	Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order ... feat: provision to unlink advance payment entry on cancelation of order	2019-04-06 12:30:05 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
Saurabh	63fabc3723	bumped to version 11.1.19	2019-04-05 17:29:22 +06:00
Nabin Hait	398e4b9472	fix: Ignore item tax patch if old schema does not exists	2019-04-05 16:41:17 +05:30
Nabin Hait	e6ee43b102	Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj ... feat: add date of joining column in salary register	2019-04-05 16:02:48 +05:30
Nabin Hait	374b85b38e	Merge pull request #17140 from hrwX/pe_supp_inv_v12 ... fix(Payment Entry): Return Bill No on for Payment Entry	2019-04-05 15:59:58 +05:30
Nabin Hait	d70476fbc8	Merge pull request #17139 from hrwX/pe_supp_inv_v11 ... fix(Payment Entry): Return Bill No for Payment Entry	2019-04-05 15:59:43 +05:30
Nabin Hait	843e440191	Merge branch 'hotfix' into validate_stock_transaction_v11	2019-04-05 15:41:26 +05:30
Nabin Hait	9302a19d74	Merge pull request #17135 from hrwX/validate_stock_transaction_v12 ... fix(Item): check transactions for batch, serial check	2019-04-05 15:40:19 +05:30
Nabin Hait	1580e24946	Merge pull request #17137 from netchampfaris/item-group-clean-description ... fix(Item Group): Don't clean description html	2019-04-05 15:39:44 +05:30
Nabin Hait	603dce428b	Merge pull request #17144 from nabinhait/variant-fix ... fix: Default variant Based on	2019-04-05 15:38:15 +05:30
Anurag Mishra	0dc62e8747	fix: Removed raw query and used frappe.get_all	2019-04-05 14:36:43 +05:30
Anurag Mishra	f71c147ea8	Added mandatory feilds to the report	2019-04-05 14:36:43 +05:30
Anurag Mishra	5c17e7760b	fix: readability	2019-04-05 14:36:43 +05:30
Anurag Mishra	b57c024ff7	feat: Project Billing Summary for timesheet	2019-04-05 14:36:43 +05:30
Anurag Mishra	61aab377b6	Minor Fixes	2019-04-05 14:36:42 +05:30
Anurag Mishra	3d27aabdeb	Commonify code	2019-04-05 14:36:42 +05:30
Anurag Mishra	94514ffee9	feat: timesheet Employee Summary Report	2019-04-05 14:36:42 +05:30
Mangesh-Khairnar	3c251663bb	style: add type comparison for boolean expression	2019-04-05 14:10:05 +05:30
rohitwaghchaure	e334413b34	Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if ... fix: incorrect auto POS profile selected in the sales invoice	2019-04-05 13:04:05 +05:30
Mangesh-Khairnar	e7d53540de	feat: add doj column in salary register	2019-04-05 12:56:11 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Nabin Hait	a3357e4e86	fix: Default variant Based on	2019-04-05 12:10:36 +05:30
John Clarke	b733984ca1	fix: Remove duplicate Timesheet item (#17066)	2019-04-05 11:02:25 +05:30
rohitwaghchaure	fc471ed63b	Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop ... fix: incorrect POS profile selected	2019-04-05 09:59:16 +05:30
Rohit Waghchaure	c2ed03f77a	always set the company from the POS Profile	2019-04-05 09:58:04 +05:30
Rohit Waghchaure	e8e3fb175d	fix: incorrect POS profile selected	2019-04-05 09:57:52 +05:30
Rohit Waghchaure	4324f43a06	always set the company from the POS Profile	2019-04-05 09:54:55 +05:30
rohitwaghchaure	cbdd3304a4	Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos ... fix: POS search items not works properly if item group filter has applied	2019-04-05 00:45:53 +05:30
Rohit Waghchaure	f7a83cb4f5	fix: incorrect POS profile selected	2019-04-05 00:42:48 +05:30
cjpit	0c87895afc	fix(node_modules): remove hardcoded symlink (#16975) ... * add node_modules directory to gitignore * remove node_modules symlink	2019-04-05 00:12:26 +05:30
Himanshu Warekar	b30f584410	fix: return bill_no	2019-04-04 19:55:13 +05:30
Himanshu Warekar	6443d7dd10	refactor: declare bill_on at function start	2019-04-04 19:54:23 +05:30
Himanshu Warekar	ad32324c4c	fix: get bill_no	2019-04-04 19:50:23 +05:30
Rohit Waghchaure	0a4aee0206	fix: POS search items not works properly if item group filter has applied	2019-04-04 16:02:15 +05:30
Faris Ansari	7a0a05d8f1	fix(Item Group): Don't clean description html	2019-04-04 15:53:16 +05:30
Himanshu Warekar	cdd79e3c40	fix: check transactions for batch, serial check	2019-04-04 15:26:35 +05:30
Rohit Waghchaure	55d3bcac37	fix: not able to change pos profile	2019-04-04 15:26:00 +05:30
Himanshu Warekar	7f253b679a	pull from hotfix	2019-04-04 15:19:44 +05:30
Himanshu Warekar	28db545947	fix: check transactions for batch, serial check	2019-04-04 15:02:25 +05:30
Nabin Hait	82bd388993	Merge pull request #17122 from frappe/asbasawaraj-remove-location-from-abbreviation-doctypes ... fix: Removed Location from Abbreviation Update DocTypes	2019-04-04 11:50:33 +05:30
Nabin Hait	9087efa5be	Merge pull request #17131 from Anurag810/desk-fixes ... fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).	2019-04-04 11:49:56 +05:30
Nabin Hait	b861c4bc46	Merge pull request #16895 from Alchez/hotfix-shipping-charge-override ... fix(transaction): Fix shipping rule charge override by tax template	2019-04-04 11:48:48 +05:30
Nabin Hait	e0a9835f30	Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix ... fix(Party Ledger Summary): Show all adjustment entries as columns	2019-04-04 11:45:36 +05:30
Nabin Hait	0747273ea4	Merge pull request #17028 from sagarvora/field_order ... fix(accounts): dependent field should be displayed after source link field	2019-04-04 11:45:01 +05:30
Nabin Hait	94c822f5f0	Merge pull request #17022 from hrwX/cost_center_fix ... fix(Purchase Invoice): Cost Centre as per company	2019-04-04 11:43:44 +05:30
Nabin Hait	9eeb3715f0	Merge pull request #16992 from hrwX/cost_center ... fix(Purchase Invoice): Cost Centre as per company	2019-04-04 11:43:35 +05:30
Nabin Hait	2df623c693	Merge pull request #17072 from kennethsequeira/auto-re-val ... fix: spelling in validation message for Auto-reorder	2019-04-04 11:40:08 +05:30
Nabin Hait	1e5664ba5f	Update item.py	2019-04-04 11:39:55 +05:30
Nabin Hait	f4ae29320f	Merge pull request #17087 from deepeshgarg007/payment_entry ... Party type validation in payment entry	2019-04-04 11:39:00 +05:30
Anurag Mishra	76795aa086	fix: desk for selling module sales invoice now avaialble at module page	2019-04-04 11:38:42 +05:30
Nabin Hait	f86a01446f	Merge pull request #17086 from adityahase/check-version-hf ... fix: Raise exception if apps are on incompatible branches	2019-04-04 11:17:04 +05:30
Nabin Hait	9ee417888e	Merge pull request #17092 from nabinhait/ar-ap-print ... fix: Show Sales Person in AR/AP print is optional	2019-04-04 11:02:26 +05:30
Nabin Hait	2c869bd486	Merge pull request #17101 from hrwX/india_setup ... fix(India): Add HSN/SAC in setup	2019-04-04 11:02:11 +05:30
Himanshu Warekar	5ccc4731d0	fix: typo fix	2019-04-04 11:02:05 +05:30
Himanshu	c930cb10fa	fix: remove duplicate doctype	2019-04-04 11:01:10 +05:30
Nabin Hait	91b1875ccf	Merge pull request #17099 from nabinhait/return-precision-issue ... fix: Validate returned qty with ref qty considering field precision	2019-04-04 10:59:26 +05:30
Nabin Hait	2092a8b1cf	Merge pull request #17100 from nabinhait/gl-entry-precision ... fix: Validate gl entry debit/credit as per field's precision	2019-04-04 10:59:06 +05:30
Nabin Hait	6ffdddc100	Merge pull request #17126 from rmehta/warehouse-account-description ... fix(kaizen): warehouse account description	2019-04-04 10:50:52 +05:30
Nabin Hait	fdf52a82d6	Merge pull request #17127 from rmehta/warehouse-account-fix-develop ... fix(kaizen): warehouse account description	2019-04-04 10:50:42 +05:30
Nabin Hait	3149596b53	Merge pull request #17102 from hrwX/hsn_india_v12 ... fix(India): HSN Code	2019-04-04 10:49:55 +05:30
Nabin Hait	b652421a54	Merge pull request #17106 from nabinhait/loan-link ... fix: Added link for loan in HR module page	2019-04-04 10:49:37 +05:30
Nabin Hait	d2c370a215	Merge pull request #17113 from deepeshgarg007/item-register ... fix: Divide by zero exception handling	2019-04-04 10:49:13 +05:30
Rushabh Mehta	3720e64506	fix(kaizen): warehouse account description	2019-04-04 09:02:41 +05:30
Rushabh Mehta	1f0edabda8	fix(kaizen): warehouse account description	2019-04-04 08:58:34 +05:30
Rushabh Mehta	e7b6b46309	Merge pull request #17109 from PawanMeh/fixes_16894_v11 ... fix: Amazon v11 integration issues	2019-04-03 22:54:43 +05:30
asbasawaraj	d2b69445b1	Removed Location from Abbreviation Update DocTypes	2019-04-03 17:05:53 +05:30
rohitwaghchaure	fb48686d82	Merge pull request #17118 from rohitwaghchaure/_incorrect_prezzototale ... fix: incorrect PrezzoTotale	2019-04-03 16:33:56 +05:30
Rohit Waghchaure	a2f71cdeec	fix: incorrect PrezzoTotale	2019-04-03 16:10:14 +05:30
Nabin Hait	b1f3f04d71	fix: Validate gl entry debit/credit as per field's precision	2019-04-03 12:30:25 +05:30
deepeshgarg007	5ad7b655cf	fix: Divide by zero exception handling	2019-04-03 09:11:03 +05:30
Mangesh-Khairnar	b2dc6ef165	style: fix the message for reason for hold	2019-04-02 18:01:14 +05:30
hello@openetech.com	ea00f8cbc3	[fix] #16894	2019-04-02 14:22:23 +05:30
Rushabh Mehta	43257c8cc3	fix(rename): Help Desk => Support	2019-04-02 08:59:15 +05:30
rohitwaghchaure	c0435f21c2	Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop ... fix: incorrect calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 23:15:17 +05:30
rohitwaghchaure	b035bf7f39	Merge pull request #17095 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo ... fix: incorrect calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 23:14:56 +05:30
Nabin Hait	9d431a8a83	fix: Added link for Expense Claim in HR module page	2019-04-01 21:06:12 +05:30
Nabin Hait	948cc631c6	fix: Added link for loan in HR module page	2019-04-01 20:58:20 +05:30
Himanshu Warekar	656d8e4557	fix(India): HSN Code	2019-04-01 19:38:43 +05:30
Himanshu Warekar	624477cb21	fix(India): Add HSN/SAC in setup	2019-04-01 19:25:28 +05:30
Nabin Hait	b4263a41c6	fix: Validate gl entry debit/credit as per field's precision	2019-04-01 19:11:34 +05:30
Nabin Hait	88f036a171	fix: Validate returned qty with ref qty considering field precision	2019-04-01 18:41:31 +05:30
Rohit Waghchaure	58f489fec8	fix: calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 18:18:27 +05:30
Nabin Hait	0049986efd	Merge pull request #17088 from nabinhait/hsn-fixes ... fix: Fetch HSN code only if empty	2019-04-01 18:17:26 +05:30
Deepesh Garg	6b320bea81	fix: GSTR3b test case fix (#17094)	2019-04-01 17:55:01 +05:30
Rohit Waghchaure	ebc2437516	fix: calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 17:50:31 +05:30
Rohit Waghchaure	6f3f2185ab	fix: pos takes more time to add an item in the cart	2019-04-01 16:45:47 +05:30
Nabin Hait	51d08786dc	fix: Show Sales Person in AR/AP print is optional	2019-04-01 16:24:23 +05:30
scmmishra	a409400e58	feat: added hero image field	2019-04-01 15:42:38 +05:30
scmmishra	d3bae4e8b5	feat: better cards in lms	2019-04-01 15:38:56 +05:30
rohitwaghchaure	f4d8457905	Merge pull request #17090 from rohitwaghchaure/pos_qty_decrement_not_working ... fix: POS qty decrement freezing the screen	2019-04-01 14:57:33 +05:30
Rohit Waghchaure	e994494e3e	fix: POS qty decrement freezing the screen	2019-04-01 14:29:55 +05:30
Nabin Hait	f4af608408	fix: Fetch HSN code only if empty	2019-04-01 11:51:54 +05:30
deepeshgarg007	4614eb219b	Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry	2019-04-01 11:48:07 +05:30
Aditya Hase	b841cb2a66	fix: Raise exception if apps are on incompatible branches	2019-04-01 11:36:57 +05:30
Nabin Hait	4873875c1c	Merge pull request #17038 from netchampfaris/fix-leave-application-condition ... fix: Missing "and" in filter conditions	2019-04-01 11:15:36 +05:30
Nabin Hait	093f4c529b	Merge pull request #17055 from deepeshgarg007/tds ... fix: TDS payable monthly report fix	2019-04-01 11:12:45 +05:30
Anurag Mishra	5402451b35	feat: Loan repayment report ... Co-authored-by: crescent28 <mitali@erpnext.com>	2019-04-01 10:57:36 +05:30
Rohit Waghchaure	614f5adf6d	fix: code cleanup	2019-04-01 10:53:08 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	70b996af73	fix: test cases	2019-03-31 20:34:52 +05:30
scmmishra	751e75bb4c	chore: set lms as home page for lms user role	2019-03-31 18:31:53 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
deepeshgarg007	d0b98d74de	fix: Allow doctype only in party account types	2019-03-30 19:44:31 +05:30
Nabin Hait	f9f04ed89e	fix: woocommerce settings	2019-03-30 17:39:40 +05:30
Nabin Hait	da7a193f11	fix(stock): Fixed stock balance and stock ledger report	2019-03-30 15:53:04 +05:30
Kenneth Sequeira	4f5839eb65	fixed spelling in validation message ... fixed typo in auto-reorder validation message	2019-03-30 15:37:51 +05:30
Saurabh	75b4de3e20	bumped to version 11.1.18	2019-03-30 15:30:36 +06:00
rohitwaghchaure	892f675cf7	Merge pull request #17069 from frappe/revert-16950-fix-issue-credit ... feat: Revert "Fix(Delivery Note): Fix issue credit note"	2019-03-30 14:25:08 +05:30
rohitwaghchaure	223bd45e06	Merge pull request #17039 from surajshetty3416/fix-bom-item-subquery-issue ... fix: Subquery in get_bom_items method	2019-03-30 14:23:25 +05:30
rohitwaghchaure	725f37cea5	Revert "fix(Delivery Note): Fix issue credit note"	2019-03-30 13:21:50 +05:30
rohitwaghchaure	f3a1fa0bae	Revert "Fix(Delivery Note): Fix issue credit note"	2019-03-30 12:33:54 +05:30
rohitwaghchaure	b6505bddeb	Merge pull request #17025 from hrwX/fix_issue_credit ... fix(Delivery Note): Fix issue credit note	2019-03-30 12:31:29 +05:30
rohitwaghchaure	5fdbdd50f9	Merge pull request #16950 from hrwX/fix-issue-credit ... Fix(Delivery Note): Fix issue credit note	2019-03-30 12:31:18 +05:30
Himanshu	52ae923566	fix(Update GSTIN): remove '.__' from template (#17061) ... '.__' Avoid Server Side Template Injection	2019-03-30 12:11:27 +05:30
Himanshu	20c17b8229	fix(Update GSTIN): remove '.__' from template (#17062) ... '.__' Avoid Server Side Template Injection	2019-03-30 12:11:01 +05:30
rohitwaghchaure	43d79eaa92	Merge pull request #17057 from hrwX/bank_reconciliation_fix ... fix(Bank Reconciliation): get credit and debit as float and not string	2019-03-30 10:16:12 +05:30
rohitwaghchaure	9d159be826	Merge pull request #17064 from rohitwaghchaure/not_able_to_create_chart_of_account ... fix: user not able to create chart of account in parent if child has no chart of account	2019-03-30 10:14:19 +05:30
rohitwaghchaure	689a967443	Merge pull request #17065 from rohitwaghchaure/not_able_to_create_chart_of_account_develop ... fix: user not able to create chart of account in parent if child has no chart of account	2019-03-30 10:13:55 +05:30
Deepesh Garg	56e23e7d47	feat: GSTR1 json format download (#16887) ... * feat: download gstr-1 b2b in json in its appropriate json format * fix: download file as raw type * feat: added logic to convert export gst data to its json * code commonify and logic for b2cl added * fix: Codacy and typo fixes * fix: B2B json creation fixes * fix: Filter customer by category * fix: Fetch fp from to date	2019-03-29 22:22:54 +05:30
scmmishra	6f82f96816	Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix	2019-03-29 20:05:40 +05:30
rohitwaghchaure	8dadd4b0b2	Merge pull request #17059 from rohitwaghchaure/cherry_pick_test_case_fix ... fix: cherry-pick item variant test cases fix	2019-03-29 19:32:30 +05:30
Rohit Waghchaure	cc59fcd75e	fix: user not able to create chart of account in parent if child has no chart of account	2019-03-29 19:23:04 +05:30
Rohit Waghchaure	fd2b1385a3	fix: user not able to create chart of account in parent if child has no chart of account	2019-03-29 19:20:47 +05:30
scmmishra	29dc744354	fix: healtcare unit type enable toggle	2019-03-29 19:00:45 +05:30
Himanshu	6343a697a2	fix(Salary Slip): Consider Leave without Pay for calculation (#16926) ... while net salary calculation, it was not considering actual days worked but now it will consider it	2019-03-29 18:48:56 +05:30
rohitwaghchaure	13752774ab	Merge pull request #17000 from scmmishra/hotfix-task-status ... fix: Task overdue status propagates to project	2019-03-29 18:44:36 +05:30
rohitwaghchaure	706cf7d3d2	Merge pull request #17001 from scmmishra/develop-task-status ... fix: task overdue status propagates to project	2019-03-29 18:44:17 +05:30
Himanshu	6b54649bfe	fix(Salary Slip): Consider Leave without Pay for calculation (#17023) ... Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist	2019-03-29 18:32:23 +05:30
Rushabh Mehta	c4599c21c3	fix(test): item variant	2019-03-29 18:30:00 +05:30
Nabin Hait	92797eee87	Merge pull request #17052 from deepeshgarg007/patch-fix ... fix: Add patch to move item tax to item tax template	2019-03-29 16:37:17 +05:30
Rushabh Mehta	1c68ddc9c0	Merge pull request #17045 from rmehta/fix-sla-auto-update ... fix(sla): update agreement status on save'	2019-03-29 16:25:40 +05:30
Himanshu Warekar	95003cbbca	fix: get credit and debit as float and not string	2019-03-29 16:21:59 +05:30
Himanshu Warekar	f7f85f7379	fix: get credit and debit in float and not string	2019-03-29 16:19:15 +05:30
deepeshgarg007	4092ead41e	fix: fetch account only if available	2019-03-29 16:19:04 +05:30
Faris Ansari	eec89ba4cb	Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-leave-application-condition	2019-03-29 16:06:38 +05:30
Rushabh Mehta	048e5f44b5	fix(test): item variant	2019-03-29 14:34:14 +05:30
rohitwaghchaure	e38c0e8716	Merge pull request #17053 from rohitwaghchaure/pos_items_not_loading_v12 ... fix: POS items not loading	2019-03-29 13:54:11 +05:30
Rohit Waghchaure	b00c16470d	fix: POS items not loading	2019-03-29 13:47:45 +05:30
Nabin Hait	7b2c52b6f2	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 13:26:46 +05:30
Nabin Hait	862f77cc13	Merge branch 'deferred_revenue' into hotfix	2019-03-29 13:26:16 +05:30
Nabin Hait	66d07c2700	fix(accounts): Indentation	2019-03-29 13:25:11 +05:30
scmmishra	2b7e158e50	feat: Quiz attempt limits is configurable ... - Added a 'no limit' check to `check_quiz_completion` in utils.py - Added disabled flag for questions in quiz component - Refactored `get_quiz_without_answers` to send attempt limit data to client	2019-03-29 12:45:08 +05:30
Nabin Hait	d4e038b6ca	Merge branch 'hotfix' of https://github.com/frappe/erpnext into develop	2019-03-29 12:41:48 +05:30
Nabin Hait	cf7538c17f	Merge pull request #17046 from nabinhait/deferred_revenue ... Refactor: deferred revenue booking logic	2019-03-29 12:39:36 +05:30
deepeshgarg007	4f1926bcfe	fix: Add patch to move item tax to item tax template	2019-03-29 12:10:44 +05:30
scmmishra	d4ed56af02	fix: navbar login bug	2019-03-29 11:03:34 +05:30
rohitwaghchaure	043cfe99ad	Merge pull request #17051 from rohitwaghchaure/accounts_receivable_summary_issue ... fix: accounts receivable summary	2019-03-29 09:28:21 +05:30
Rohit Waghchaure	9da14747aa	fix: accounts receivable summary	2019-03-29 09:26:40 +05:30
Rohit Waghchaure	573d1dd31f	fix: bank reconciliation not working	2019-03-28 20:39:49 +05:30
Nabin Hait	86fb523ea7	fix(accounts): codacy fixes	2019-03-28 20:06:57 +05:30
Nabin Hait	0a90ce5cf6	Refactored deferred revenue booking logic	2019-03-28 19:43:02 +05:30
Rushabh Mehta	cf33f4fd53	fix(sla): update agreement status on save'	2019-03-28 18:49:23 +05:30
Rohit Waghchaure	d5e45481cd	fix: code cleanup	2019-03-28 17:09:57 +05:30
rohitwaghchaure	a8c9b81d93	Merge pull request #17040 from rohitwaghchaure/pricing_rule_not_working_for_item_groups ... fix: pricing rule mixed connditions not working for item group	2019-03-28 16:52:55 +05:30
Rohit Waghchaure	39a41e7427	fix: pricing rule mixed connditions not working for item group	2019-03-28 16:51:57 +05:30
Faris Ansari	f04988a02f	fix: Missing "and" in filter conditions	2019-03-28 15:42:07 +05:30
scmmishra	cea851522f	feat: Added custom navbar	2019-03-28 15:33:08 +05:30
scmmishra	6123ff3251	fix: styled program card	2019-03-28 15:32:54 +05:30
Suraj Shetty	6262c9ed6a	fix: Subquery in get_bom_items method	2019-03-28 14:59:27 +05:30
scmmishra	9b7ac3e7d2	fix: fixed joining date bug on lms profile	2019-03-28 14:47:22 +05:30
scmmishra	281902f530	chore: clean up	2019-03-28 14:35:15 +05:30
scmmishra	394e93c2bf	chore: Minor fixes on profile page	2019-03-28 14:34:23 +05:30
scmmishra	209250ccae	fix: Profile page cards ... - Only show attempted quizzes - Show 0 percent complete if program is enrolled but unattempted	2019-03-28 14:27:51 +05:30
scmmishra	c03db190d2	fix: layout for hero image of program card	2019-03-28 14:15:30 +05:30
Saurabh	84a18f5b18	Merge branch 'master' into develop	2019-03-28 13:54:34 +05:30
Saurabh	f2036dd1d1	bumped to version 11.1.17	2019-03-28 14:21:58 +06:00
scmmishra	29aaee1488	feat: Added youtube video component	2019-03-28 13:44:25 +05:30
scmmishra	92e311d9d7	feat: refactored YoutubePlayer component	2019-03-28 13:44:05 +05:30
scmmishra	15f6faad9b	fix: Video stops on closing modal	2019-03-28 13:11:00 +05:30
scmmishra	526af9d268	feat: added Youtube Video component	2019-03-28 13:10:42 +05:30
Saurabh	1271dea39b	Merge pull request #17035 from gaurav-naik/issue-17033 ... fix(regional,italy): autoset tax id, cf from customer before validating	2019-03-28 12:46:24 +05:30
rohitwaghchaure	89a2577ae5	Merge pull request #17032 from surajshetty3416/fix-group-same-items-in-printview ... fix(print): Fix group same items for print view	2019-03-28 12:42:22 +05:30
scmmishra	9bfe3a0315	feat: Added Program Intro Video modal	2019-03-28 12:20:24 +05:30
Gaurav	bd80fd13cb	fix(regional,italy): autoset company cf, tax_id before validating	2019-03-28 12:18:03 +05:30
Saurabh	ea19250884	Merge pull request #16859 from rohitwaghchaure/added_new_tags_e_invoice_xml ... fix: added tags for discount amount, multiple customer po no, delivery notes	2019-03-28 11:19:44 +05:30
Faris Ansari	8fdcda7d6d	Merge pull request #16411 from adityahase/dashboard ... feat: Accounting Dashboard	2019-03-28 11:16:41 +05:30
Gaurav	010acf75fa	fix(regional,italy): autoset tax id, cf from customer before validating missing values ... Fixes issue #17033	2019-03-28 10:42:29 +05:30
Himanshu	4d45ca08de	fix(Issue): Time left and display only if Agreement exists (#17014) ... * fix: time left and display only if agreement * fix: remove div if present * code refactor * use frappe.scrub * code formatting Co-Authored-By: hrwX <himanshuwarekar@yahoo.com> * remove unused fields * remove unsed return value	2019-03-28 07:24:54 +05:30
Suraj Shetty	a7992ecb62	style: Fix formatting	2019-03-27 20:32:42 +05:30
Suraj Shetty	abc2a64d5e	fix: Commonify get gl_entry code by moving it to accounts_controller	2019-03-27 20:25:18 +05:30
scmmishra	233db67451	Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2	2019-03-27 18:27:05 +05:30
scmmishra	f04ceaec95	chore: removed commented code	2019-03-27 18:14:59 +05:30
scmmishra	5b57d977d8	fix: single primary action on LMS home	2019-03-27 18:14:41 +05:30
scmmishra	3d39b88e7c	feat: LMS now supports multiple correct choice questions	2019-03-27 18:01:14 +05:30
Sagar Vora	d20ecb0a71	fix(accounts): dependent field should be displayed after source link field	2019-03-27 17:42:42 +05:30
Rohit Waghchaure	1b7059b867	fix: ImponibileImporto calculation	2019-03-27 15:33:47 +05:30
scmmishra	1b63c87929	feat: refactored update status	2019-03-27 15:04:55 +05:30
scmmishra	2405e14dde	Merge branch 'hotfix-task-status' of github.com:scmmishra/erpnext into hotfix-task-status	2019-03-27 15:02:35 +05:30
scmmishra	36824cf7fb	feat: refactored update status	2019-03-27 15:01:40 +05:30
Himanshu Warekar	a86f3a7d80	remove issue credit note	2019-03-27 10:01:18 +05:30
rohitwaghchaure	fa638443bc	Merge pull request #16925 from rohitwaghchaure/stock_entry_enhancements ... feat: stock entry enhancements	2019-03-26 22:50:54 +05:30
rohitwaghchaure	4510e3a836	Merge pull request #17020 from rohitwaghchaure/offline_pos_duplicate_records_making ... fix: offline pos, duplicate records creating	2019-03-26 22:49:42 +05:30
Himanshu	e43b6beff0	fix(Leave Balance Report): total allocated leaves not calculated properly (#16969) ... * fix: total alloted leaves not calculated properly * fix: Possible SQL injection * typo fix in sql query * prevent sql injection again ? * Use ORM for query	2019-03-26 21:42:12 +05:30
Himanshu Warekar	1b05ed042f	Cost Center as per company	2019-03-26 20:25:54 +05:30
Rohit Waghchaure	22ebaf1b11	fix: added tags for discount amount, multiple customer po no, delivery notes	2019-03-26 20:19:46 +05:30
Rohit Waghchaure	1df62097f6	fix: offline pos, duplicate records creating	2019-03-26 19:15:53 +05:30
Prateeksha Singh	6d2bb9126a	Merge pull request #17019 from pratu16x7/hotfix-stock_entry_from_bom ... fix(uom): Get items as per UOM defined in BOM	2019-03-26 18:00:50 +05:30
Nabin Hait	411f66a177	Merge pull request #17006 from deepeshgarg007/account-fix ... fix: Ignore root company validation setting in company master	2019-03-26 17:49:21 +05:30
deepeshgarg007	3eeb1cacb0	fix: Change name to Allow Account Creation against Child Company in company master	2019-03-26 17:18:06 +05:30
Prateeksha Singh	a0927c1ba6	fix: correct use of include_item_in_manufacturing	2019-03-26 16:55:13 +05:30
Nabin Hait	8aaee57921	fix(uom): Get items as per UOM defined in BOM, fixes #15081	2019-03-26 16:53:13 +05:30
Anurag Mishra	10c1db1b28	fix: removed empty row on getting invoices	2019-03-26 16:30:31 +05:30
rohitwaghchaure	e196b3120e	Merge pull request #16961 from rohitwaghchaure/stock_ageing_warehouse_wise ... feat: Stock ageing report warehouse wise	2019-03-26 16:21:17 +05:30
Anurag Mishra	ca4117e652	feat: seting status and indicators on list view	2019-03-26 16:03:00 +05:30
Anurag Mishra	702c6e00da	fix: route on loan Disbursement and Closing	2019-03-26 16:00:43 +05:30
deepeshgarg007	c45c2bdabb	fix: Missing semicolon	2019-03-26 15:38:38 +05:30
deepeshgarg007	7aefc15352	fix: Allow to add child account if ignore validation checked	2019-03-26 15:09:29 +05:30
Anurag Mishra	78903b1e57	fix: test for invoice payment by setting default Bank Account	2019-03-26 12:59:30 +05:30
Rohit Waghchaure	5816fc2801	Renamed subcontract to Send to Subcontractor	2019-03-26 12:52:49 +05:30
Rohit Waghchaure	ffbeb02428	renamed purpose in stock entry	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	c7b916ac46	fix: test cases	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	4389cf0c48	feat: provision to make Maintenance Schedule from sales invoice	2019-03-26 12:52:32 +05:30
Rohit Waghchaure	9faed1b433	feat: added button get items from material request in stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	8ce2d50706	Added test cases	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	186c758087	feat: added good in transit feature in the stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	1f2f9cf360	feat: added stock entry type master to select purpose in the stock entry	2019-03-26 12:52:31 +05:30
Rohit Waghchaure	327c194144	Added hsn code field in the stock entry item table	2019-03-26 12:52:08 +05:30
Raffael Meyer	fdbb516a1b	fix(projects): Auto-set employee and company in Timesheet (#16743) ... * fix(projects): auto-set employee and company * only set employee and company if document is unsaved * use frm.set_value()	2019-03-26 12:47:36 +05:30
Rohit Waghchaure	4ae221946b	renamed report	2019-03-26 11:14:06 +05:30
deepeshgarg007	1c785a99b1	fix: Added setting in company to ignore root company validation	2019-03-25 22:32:29 +05:30
Mangesh-Khairnar	324e06cba0	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-03-25 18:51:13 +05:30
Rohit Waghchaure	1c1d0bb1c7	feat: commonified item group wise target variance report	2019-03-25 17:56:43 +05:30
rohitwaghchaure	7779bb3839	Merge pull request #17010 from rohitwaghchaure/rename_pricing_rule_child_doctypes ... fix: rename pricing rule child doctype names	2019-03-25 17:50:02 +05:30
Mangesh-Khairnar	b3ec508655	feat: record reason for hold as comment	2019-03-25 17:29:14 +05:30
Mangesh-Khairnar	5e474f4664	fix: add server-side validation for closed sales order for linked material request	2019-03-25 17:28:20 +05:30
Mangesh-Khairnar	c423d6f2e4	fix: validate sales order linked work order creation on server side	2019-03-25 17:27:33 +05:30
Mangesh-Khairnar	bcb8b135f2	feat: ask reason for putting sales order on hold	2019-03-25 17:27:16 +05:30
Faris Ansari	843b7f6dd5	fix: Reorder Currency column to fix print (#17008) ... Every Financial Report's 2nd column is Currency, which is an implicit requirement to Print them properly. In this case, Income column was not printed. This fixes that.	2019-03-25 15:50:36 +05:30
Rohit Waghchaure	4ed7d035cb	fix: incorrect paid amount in accounts receivable summary report	2019-03-25 15:37:25 +05:30
Rohit Waghchaure	4792a84b5f	fix: rename pricing rule child doctype names	2019-03-25 14:28:08 +05:30
rohitwaghchaure	794b6b6c0d	Merge pull request #17004 from surajshetty3416/fix-bank-reconciliation-entries-hotfix ... fix: Show consolidated amount of payment entries in Bank reconciliation	2019-03-25 14:11:47 +05:30
Rushabh Mehta	5770ad9e8c	Merge pull request #16963 from itusedyetnew/develop ... Fix:stock_values_on removed append function on string	2019-03-25 12:03:53 +05:30
Rushabh Mehta	689490e4de	Merge pull request #16986 from hrwX/italy_xml_fix ... fix(Italy Customisation): Include fiscal code in invoice xml if present	2019-03-25 11:57:30 +05:30
deepeshgarg007	4f9ac0ad55	fix: Child company account currency fix	2019-03-25 11:39:25 +05:30
Shivam Mishra	ec56122876	fix: minor fix in test	2019-03-25 11:36:43 +05:30
scmmishra	26e5c753db	fix: Typo in update_status	2019-03-25 11:35:28 +05:30
scmmishra	1af3c41da3	fix: Typo in update_status	2019-03-25 11:34:33 +05:30
Suraj Shetty	67876d1026	fix: Show amount of entry based on diff of credit and debit	2019-03-25 11:19:07 +05:30
scmmishra	f7f32634c8	feat: Added check for no end date and refactored query	2019-03-24 20:43:15 +05:30
scmmishra	a2e801e840	fix: Added check for no end date	2019-03-24 20:38:47 +05:30
scmmishra	5869ba1470	feat: Added filter to query	2019-03-24 20:27:32 +05:30
scmmishra	e7cf06b3c6	fix: task overdue status propagates to project	2019-03-24 18:23:41 +05:30
scmmishra	6ab6d35f92	fix: Task Overdue status propagates to project ... - Used ORM instead of a SQL for set_task_as_overdue - update_status function compares the time and marks the appropriate task as overdue - The on_update hook makes the changes in project as well	2019-03-24 18:17:13 +05:30
rohitwaghchaure	6fabcdd5b3	Merge pull request #16978 from rohitwaghchaure/sales_partner_wise_reports ... feat: sales partner reports	2019-03-24 14:52:45 +05:30
rohitwaghchaure	9673d0ddae	fix: description missing in the XML (#16985)	2019-03-24 12:19:58 +05:30
Himanshu Warekar	92593bb717	fix: Cost center as per company	2019-03-23 19:46:31 +05:30
Frappe Bot	b07a5d449d	Merge branch 'master' into develop	2019-03-23 07:25:03 +00:00
Frappe Bot	021ccf572a	bumped to version 11.1.16	2019-03-23 07:25:02 +00:00
Zarrar	963d62b701	feat: Chart of Accounts Importer (#16623) ... * bare doctype created for COA utility * improvise doctype's design * validation to check no transaction exist for the company * download file and import coa - client side logic added * download csv template to create custom chart * read the custom csv uploaded and parse it to appropriate format * convert list of list to nested tree structure * preview the uploaded chart before actual import * toggle field based on necessity * tweak create_charts and build_json logic to incorporate COA Import utility * code cleanify and validation call added * code enhancement for flexibility and validation added * show import button only if data is validated * unset existing data and load new accounts * disable coa fields if parent_company set, minor improv * file api fix * added progress bar * codacy fixes * fix: Add account number in template * fix: TDS account exception handling fix	2019-03-23 10:30:12 +05:30
Himanshu	138e030055	CodiceFiscale should be after IdFiscaleIVA	2019-03-22 23:22:52 +05:30
Saif Ur Rehman	7d1c1aa28f	fix(Party Ledger Summary): Show all adjustment entries as columns ... Consider only Income Account or Expense Account account type for adjustment amounts Check if GL Entry's is_opening == "Yes"	2019-03-22 17:18:32 +05:00
Himanshu Warekar	1d04ea1212	fix: include fiscal code in invoice xml if present	2019-03-22 17:47:57 +05:30
rohitwaghchaure	56e491bccd	Merge pull request #16983 from rohitwaghchaure/allow_on_submit_for_budget_fields ... feat: enabled allow on submit for action fields in the Budget	2019-03-22 15:34:41 +05:30
Prateeksha Singh	cc1a022d63	fix: correct use of include_item_in_manufacturing	2019-03-22 14:58:22 +05:30
Rushabh Mehta	d562e9530e	fix(link): help link in selling	2019-03-22 14:46:12 +05:30
Rushabh Mehta	c0de5b741e	fix: remove gitter chat	2019-03-22 14:32:00 +05:30
Nabin Hait	95705412f3	fix(uom): Get items as per UOM defined in BOM, fixes #15081	2019-03-22 13:19:17 +05:30
Rushabh Mehta	da87a491ab	Merge pull request #16816 from finbyz/hotfix ... fix: Rounding adjustment in Rounded Total	2019-03-22 12:51:09 +05:30
Rushabh Mehta	2537b7fce8	Merge branch 'develop' into hotfix-work-order-item-name	2019-03-22 12:48:56 +05:30
Rushabh Mehta	7678c7b179	Merge pull request #16869 from rohitwaghchaure/not_able_to_submit_purchase_receipt ... fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-22 12:47:06 +05:30
Rushabh Mehta	9c43c8f00b	Merge pull request #16554 from SaiFi0102/Brand-Item-Defaults-V12 ... feat: Brand Item Defaults (v12)	2019-03-22 12:46:04 +05:30
Rushabh Mehta	ff04142d9b	Merge pull request #16848 from alyf-de/hotfix-1 ... fix(projects): change fieldtype of billing amounts to Currency	2019-03-22 12:44:18 +05:30
Rushabh Mehta	7defd6f3b5	Merge pull request #16749 from Alchez/hotfix-cancelled-payments ... fix(payments): Only check for Draft or Submitted payments while cancelling payment requests	2019-03-22 12:43:52 +05:30
Rushabh Mehta	b0a7cbb591	Merge pull request #16905 from frappe/netchampfaris-patch-1 ... fix: Update Training Level	2019-03-22 12:43:00 +05:30
Rushabh Mehta	199aae0fe8	Merge pull request #16861 from Anurag810/asset_fixes ... fix: passing the correct argument in get_depreciation_amount	2019-03-22 12:42:46 +05:30
Rushabh Mehta	fc4eefcb22	Merge pull request #16871 from rmehta/attendance-from-leave ... feat: Pre mark attendance for Leave Application	2019-03-22 12:41:47 +05:30
Rohit Waghchaure	9c214b6129	feat: enabled allow on submit for action fields in the Budget	2019-03-22 12:08:09 +05:30
Rushabh Mehta	2f9c7171fa	Merge pull request #16980 from chdecultot/fec_correctioon ... fix: [Regional] [FEC report] Mapping issue in sql query	2019-03-22 12:05:51 +05:30
Deepesh Garg	22b61607c6	feat: GSTR3B Report JSON creation and Print Format (#16595) ... * feat: Created doctype for GSTR3B report and added boilerplate code * feat: Updated gst_fields and patches for gst_category * feat: Functions for calculating itc amount * fix: Patched eligibility_for_itc_field * fix: Updated set_category for gst * fix: Function for setting iter_state supplies * fix: Changed route to regional module, minor fix in inster_state_supply grouping and fixes in print format * fix(style): Added missing semicolon and removed unused imports * fix: Patch field only if column is available * fix: Make custom fields only for india sepecific company * fix: Add intro to gstr3b report * fix: Updated patch in patches.txt * fix: Update patches.txt * fix: Update patch to set GST Category * fix: Add fields for nil rated and non gst in item master * fix: Added logic for nil rated and non gst inward flow * fix: Initial test case for GSTR3B Report * fix: Codacy fixes * fix: Test Case fixes * fix: Add link for gstr_3b_report in accounting module * fix: Updated report template * fix: Changes in GSTR3B Report doctype * fix: Added function to get missing field invoices * fix: Added more test cases * fix: Item not found error in test case * fix: Key error in state numbers * fix: Changes in GSTR3b Doctype * fix: Changed functions to method * fix: Minor fix in patch * fix: Add gst_ctegory in GST Reports * fix: Minor fixes in patch and itc_mapping * fix: Query to patch itc field * fix: Patch registered customers and fix for multiple gst accounts * fix: Test case * fix: Total taxable calculation logic fix and template enhancement * fix: Calculate txval seperately * fix: itc amount calculation fix and patch improvement * fix: Updated test_cases for itc calculation * fix: Missing field query * fix: Multiple minor fixes inreport * fix: Added transalations in GSTR3B-Form * fix: Use double underscore for translation * fix: GST fields ordering fix * fix: Print form precision fix and get_period function fix	2019-03-21 20:47:47 +05:30
Charles-Henri Decultot	a7cf7fbccc	Fix: Mapping issue in sql query	2019-03-21 13:28:14 +00:00
Deepesh Garg	3a05b3501c	fix: Failing test case on develop (#16974)	2019-03-21 12:53:12 +05:30
Saurabh	3c95387926	Merge branch 'master' into develop	2019-03-20 14:39:49 +05:30
Saurabh	83cc587f8f	bumped to version 11.1.15	2019-03-20 15:03:00 +06:00
Faris Ansari	3ba91d7e19	fix: Add /all-products to sitemap	2019-03-20 14:11:22 +05:30
Faris Ansari	d77fe38513	fix: Remove no_sitemap property	2019-03-20 14:11:05 +05:30
rohitwaghchaure	f45db71ba2	Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working ... fix: Cost center from PO to PI is not mapping	2019-03-20 13:40:05 +05:30
Rohit Waghchaure	f288866130	fix: Cost center from PO to PI is not mapping	2019-03-20 13:34:28 +05:30
Mangesh-Khairnar	2ffa87ea34	feat: added erpnext doctype via hooks (#16930)	2019-03-20 13:25:48 +05:30
scmmishra	43e9375642	feat [WIP]: Added multiple choice question component	2019-03-20 13:25:02 +05:30
Rohit Waghchaure	65d9435fd5	feat: sales partner reports	2019-03-20 12:05:21 +05:30
itusedyetnew	8aafbd22de	stock_values_on append function on string	2019-03-20 11:10:41 +05:30
Rohit Waghchaure	ca9f93cdc2	feat: Stock ageing warehouse wise	2019-03-20 02:14:54 +05:30
rohitwaghchaure	e521f51e5f	Merge pull request #16955 from rohitwaghchaure/sales_person_showing_wrong_on_ars ... fix: Accounts receivable report, remarks showing in the sales person column	2019-03-19 18:17:15 +05:30
Mangesh-Khairnar	7fc1bc0b27	fix: handle an empty match query condition in leave application (#16931)	2019-03-19 18:14:02 +05:30
Rohit Waghchaure	a322687897	fix: Accounts receivable report, remarks showing in the sales person column	2019-03-19 18:10:08 +05:30
Himanshu	f3e5213190	feat(Support): Service Level Agreements (#16828) ... * init SLA * Added more inputs to the forms * set priority of issue * Removed UOM in favor of hours for tracking * updated js to autofill values * Removed unwanted fields * timer functionality * code refactor * parenthesis fix * fixed typo * added new fields * Updated fields * Updated fields for issue doctype * Updated fields for issue doctype * changed doctype structure * added new fields to issue * code refactor * new function to set criticality level * changed dropdown options * set timer for sla * calculation of resolution and response time * stopwatch counter * dashboard changes * renamed sla to support contract * countdown timer section * issue doctype changes * removed unwanted imports * fixed wrong response time and resolution time * update response and resolution time * calculate time to respond and resolve * feature enhancements * probable scheduling bug fix * fixed scheduling issue support sent out of support time * removed issue criticality link from support * Changed day order * skip date validation when support contract is default * removed mandatory field * fix scheduling conditions for now * code refactor * removed duplicate doctypes * fixed day inserted twice in service level * check to not add another default contract * default support contracts * removed commented code * removed unused imports * fix sla for non-listed days * reduced redundant code and optimized it and starting unit tests * added condition check to compute days correctly * renamed doc as per guidelines and added conditions for scheduling * removed per day support timings * added response and resolution time to support contract * scheduling based on hours kinda fix * set sla before_update and finally fixed time scheduling out of support time * DocType Issue removed test_records and rewrote test cases * test cases and codacy fixes * Doctype SLA instead of Support Contract to avoid confusion with Contract * fixed tests failing due to change in options for time period * change naming to Prompt * remove unknown doctype from help_desk * revert unwanted changes to default * refactor get_list for fetching service_level_agreement * change datatypes * fix tests * refactored tests * remove unused imports * code and comments refactor for better understandability * removed and renamed doctype to service days and minor fixes * Refactor test cases for response and resolution time for issue * add validation to check if response time < resolution time * minor fix for checking if current day is start day * calculate time in js rather than python * fix: parenthesis fixing customer dashboard * json changes to rename sections * refactor: alignment * refactor: beautify code * fix: use frm api to get the element * fix: replace '__' with '_' * refactor: remove pointless test	2019-03-19 16:47:56 +05:30
rohitwaghchaure	40046721b2	Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors ... fix: POS, cost center not added against debtors	2019-03-19 16:38:07 +05:30
Rohit Waghchaure	8808a3fc8e	fix: POS, cost center not added against debtors	2019-03-19 15:32:05 +05:30
rohitwaghchaure	4904ce649e	Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt ... fix: advance amount is not calculating properly	2019-03-19 15:26:41 +05:30
Rohit Waghchaure	1a6e01542a	fix: advance amount is not calculating properly	2019-03-19 15:06:01 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
scmmishra	000e706337	feat: Only student progress is recorded in LMS ... Changes - Instructors can freely audit the course and their progress will not be recorded - Added check for super access for get_program in utils.py - Guests can view topics page - Instructors can see explore topic button - Content Activity is only saved for a student in lms.py - Modified variable names in topic.py	2019-03-19 12:30:43 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965) ... - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
Himanshu Warekar	642a5b69f5	fix: change customer to supplier	2019-03-18 21:53:33 +05:30
Himanshu Warekar	2f5f17fcbb	refactor: fix issue credit note	2019-03-18 21:46:26 +05:30
scmmishra	7ad5619318	feat: Set default role to LMS User for signup in Education	2019-03-18 19:11:44 +05:30
scmmishra	eaed1ae3d6	fix: Added import statement for translate wrapper	2019-03-18 19:11:07 +05:30
scmmishra	f2c638f8ab	fix (minor): Replaced text editor with small text in course doctype	2019-03-18 18:38:51 +05:30
scmmishra	acc278de9c	feat: Added validations for question doctype ... - A question must have more than two options - A question must have at least one correct option	2019-03-18 18:38:18 +05:30
scmmishra	5c646e60f5	fix: Auto course enrollment for enrolled programs in LMS	2019-03-18 18:37:35 +05:30
scmmishra	a0978a2aab	chore: Cleaned up quiz.py	2019-03-18 18:37:06 +05:30
Rushabh Mehta	f060831cce	fix(escaping): make_italian_localization_fields.py	2019-03-18 18:04:34 +05:30
Rohit Waghchaure	5b43e2f31a	code cleanup	2019-03-18 17:00:44 +05:30
rohitwaghchaure	2046024de9	Merge pull request #16942 from hrwX/invoice-creation-tool ... fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation	2019-03-18 15:48:55 +05:30
scmmishra	e3dea29f58	fix: Minor UI fix	2019-03-18 15:44:55 +05:30
Himanshu	ac199580af	fix(Customer Ledger): ambiguous error in where clause (#16914) ... fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary	2019-03-18 15:44:54 +05:30
scmmishra	621cad8781	fix: Default program list ... Shows two latest programs if no program is set as featured	2019-03-18 15:40:47 +05:30
scmmishra	c22eef28f7	fix: LMS Title ... Shows default company name if LMS title not set	2019-03-18 15:36:49 +05:30
scmmishra	dcbe7e5490	fix: Added permissions for instructor ... Also made description mandatory in program	2019-03-18 15:29:30 +05:30
scmmishra	b2c745827f	fix: Removed accidentally added course doctype in list	2019-03-18 15:28:49 +05:30
rohitwaghchaure	ac9f38bfc2	Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap ... feat: added cost center filter in AR/AP reports	2019-03-18 14:22:15 +05:30
Rohit Waghchaure	d4e4316d0b	fix: test cases and codacy	2019-03-18 14:18:49 +05:30
Zlash65	01086ff60c	codacy fixes	2019-03-18 12:50:29 +05:30
Zlash65	11bba571af	test case added to check account syncing	2019-03-18 12:50:29 +05:30
Zlash65	cc65447e62	fix: chart of accounts field toggling improv	2019-03-18 12:50:29 +05:30
Zlash65	f71cb8dc6d	fix: return if no descendants found	2019-03-18 12:50:28 +05:30
Zlash65	73acb8c837	fix: set chart of accounts based on parent company on server side	2019-03-18 12:50:28 +05:30
Zlash65	d787ef8b8e	feat: sync account created for a group company to all its descendants	2019-03-18 12:50:28 +05:30
Zlash65	88c990901d	fix: added validation to if account is being added to child company	2019-03-18 12:50:28 +05:30
Zlash65	0407bf1e00	fix: override primary action button, change filter to root company	2019-03-18 12:50:27 +05:30
Zlash65	2def228da8	feat: allow adding account only if topmost parent company ... - hidden filter for Parent Company added - Add button overriden with new condition	2019-03-18 12:50:27 +05:30
Zlash65	a57d58f756	feat: once company is saved, parent_company cannot be selected	2019-03-18 12:50:27 +05:30
Zlash65	1a4bfdd090	feat: selecting parent_company should disable chart_of_accounts based fields	2019-03-18 12:50:27 +05:30
Himanshu Warekar	aa03ea2a56	disbale pl check for Sales and Purchase Invoice	2019-03-18 12:36:42 +05:30
Rohit Waghchaure	ace95d5a67	feat: added cost center filter in AR/AP reports	2019-03-18 12:21:00 +05:30
Mangesh-Khairnar	db96db2897	style: change position of hold and resume button	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	e613c4f380	test: purchase order on hold	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	873c579bb4	fix: check for both hold and closed status in po	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	4f74313baf	feat: record reason for hold as comment	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	a1afd78723	feat: add validation for on hold purchase order	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	439546c83c	feat: add on hold status in purchase order	2019-03-18 12:14:25 +05:30
scmmishra	b854d64401	Merge branch 'develop' of github.com:frappe/erpnext into lms-beta-v2	2019-03-18 11:51:27 +05:30
Aditya Hase	42640cb908	fix(dashboard): Add configuration to chart source	2019-03-18 11:18:43 +05:30
Deepesh Garg	3ead70ba3c	fix: Change IBAN Account length from 25 to 30 (#16847)	2019-03-18 08:22:57 +05:30
Deepesh Garg	2ae7ed4cf0	fix: Gross profit report fix (#16935)	2019-03-17 09:49:24 +05:30
Mangesh-Khairnar	b343407236	refactor: change validate email add to validate email address	2019-03-16 13:40:58 +05:30
rohitwaghchaure	fd33c55760	Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit ... feat: added provision to disable CWIP accounting in asset settings	2019-03-16 12:18:36 +05:30
rushin29	08a209bc52	fix: gst_state_number for address with Unregistered GST (#16798)	2019-03-15 15:28:50 +05:30
rohitwaghchaure	ef74e94374	Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card ... feat: child table to add multiple time logs in job card	2019-03-15 11:46:33 +05:30
Rushabh Mehta	349a1157ef	Merge pull request #16717 from jigartarpara/fix_payment_term_template ... fix: Add credit month in validation	2019-03-15 09:03:54 +05:30
Rushabh Mehta	b7abdf1222	Merge pull request #16851 from JoyceBabu/develop ... fix: Add 'Half-Yearly' option to Earned Leave Frequency	2019-03-15 09:02:43 +05:30
Rushabh Mehta	957a3307ae	Merge pull request #16634 from Alchez/hotfix-stock-balance-balance ... fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report	2019-03-15 09:02:20 +05:30
Rushabh Mehta	59a3012a5c	Update payment_request.py	2019-03-15 08:57:49 +05:30
Rushabh Mehta	e5d79f3621	Merge pull request #16673 from Alchez/feat-task-from-issue ... feat(issue): Create and view Tasks from Issues	2019-03-15 08:55:20 +05:30
Anurag Mishra	ed190bb329	fix: codacy	2019-03-14 18:14:20 +05:30
Anurag Mishra	1c7baaeba5	test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices	2019-03-14 16:45:02 +05:30
Anurag Mishra	6deffbd6e8	test: loan_return date and loan Sanctioned on submit	2019-03-14 16:44:49 +05:30
Anurag Mishra	4a538ba78a	Resolve merge conflict	2019-03-14 16:43:16 +05:30
Nabin Hait	ed96591618	feat(accounts): Invoice Discounting	2019-03-14 16:42:44 +05:30
scmmishra	0bcae95d3c	chore: Fixed config for education	2019-03-14 15:46:51 +05:30
scmmishra	21823f5f66	feat: Added test for program_enrollment	2019-03-14 15:44:01 +05:30
scmmishra	e3b7e1381d	feat: Moved make_course_activity to test_course_activity.py	2019-03-14 15:34:13 +05:30
scmmishra	8aa6ac7b03	feat: Moved setup_program to test_program.py	2019-03-14 15:32:22 +05:30
scmmishra	a98e936d26	chore: Removed LMS Activity Doctype	2019-03-14 15:24:26 +05:30
scmmishra	88b2244468	feat: Added test for course_enrollment	2019-03-14 15:19:20 +05:30
scmmishra	c75b513e2c	fix: Enrollment bug	2019-03-14 15:16:14 +05:30
scmmishra	34fa33d324	fix: Config bug, added type doctype	2019-03-14 15:14:25 +05:30
Bassam Ramadan	e14758c897	fix: add returns field to cashier closing (#16911)	2019-03-14 15:01:50 +05:30
Rushabh Mehta	947d573276	Merge pull request #16892 from hrwX/uae_fix ... fix(UAE): Fetch from fix for UAE customizations	2019-03-14 14:20:32 +05:30
Rushabh Mehta	e8258fc352	Merge pull request #16854 from jay-parikh/hotfix ... fix: Default Company to Total Stock Summary Report	2019-03-14 14:18:36 +05:30
Rushabh Mehta	2352ce92cc	Merge pull request #16849 from frappe/bcornwellmott-patch-1 ... fix: Add date to currency exchange caching	2019-03-14 14:18:09 +05:30
Rushabh Mehta	d63e0f490c	Merge pull request #16856 from hrwX/sales-work-fix ... fix(Work Order): fetch item info when making work order from sales order	2019-03-14 14:17:40 +05:30
Rushabh Mehta	20af5a2b40	Merge pull request #16866 from deepeshgarg007/additional ... fix: Removed relieving date validation form additional salary	2019-03-14 14:16:18 +05:30
Rushabh Mehta	bd9622bfd5	Merge pull request #16918 from Alchez/hotfix-party-payments ... fix(transaction): Add link to payments made by Customer / Supplier in their dashboards	2019-03-14 14:14:42 +05:30
Rohan Bansal	82433845e5	fix(transaction): Add link to payments made by Customer / Supplier in their dashboards	2019-03-14 13:18:55 +05:30
scmmishra	14d70ce444	chore: updated education config	2019-03-14 12:31:25 +05:30
Rushabh Mehta	f49d0d8058	Merge pull request #16890 from Anurag810/timesheet ... feat: Timesheet Reports	2019-03-14 10:31:23 +05:30
Rushabh Mehta	6e2286f5f0	Merge pull request #16897 from PawanMeh/fixes_16894 ... fixes: Amazon v12 integration issues	2019-03-14 10:30:29 +05:30
Aditya Hase	3b75551739	feat(dashboard): Render Account Balance Timeline is a time series	2019-03-12 14:47:21 +05:30
Aditya Hase	59fc039c77	style: Linting fixes	2019-03-12 14:47:21 +05:30
Aditya Hase	1e0f9a2882	feat(dashboard): Use caching decorator for dashboard	2019-03-12 14:47:21 +05:30
Aditya Hase	76158e6643	feat(dashboard): Export chart source doc to JSON file	2019-03-12 14:47:21 +05:30
Aditya Hase	675c1d3a5a	refactor(dashboard): Move Soure settings to account_balance_timeline.js	2019-03-12 14:47:20 +05:30
Aditya Hase	09f2ed2e69	refactor(dashboard): Move dashboard.py to account_balance_timeline.py	2019-03-12 14:47:20 +05:30
Aditya Hase	d85b0ae602	fix(dashboard): Remove unused variables	2019-03-12 14:47:20 +05:30
Aditya Hase	2fa1d9caed	fix(dashboard): Remove print statement	2019-03-12 14:47:20 +05:30
Aditya Hase	15c0cfff0f	refactor(dashboard): Convert indentation to tabs	2019-03-12 14:47:20 +05:30
Aditya Hase	4b171ddebb	feat(dashboard): Remove hardcoded company filter	2019-03-12 14:47:20 +05:30
Aditya Hase	3b593e44c6	feat(dashboard): Set account from filters	2019-03-12 14:47:20 +05:30
Aditya Hase	5911e100ad	fix(dashboard): Consider opening balance	2019-03-12 14:47:20 +05:30
Aditya Hase	6cadf77073	feat(dashboard): Add Time Grain filter	2019-03-12 14:47:20 +05:30
Aditya Hase	c888e52788	feat(dashboard): Add missing dates	2019-03-12 14:47:20 +05:30
Aditya Hase	8896374413	feat(dashboard): Add timespan filter	2019-03-12 14:47:20 +05:30
Aditya Hase	953229fa47	feat(dashboard): Create Accounting dashboard from General Ledger Report	2019-03-12 14:47:20 +05:30
Anurag Mishra	641e412853	fix: Removed raw query and used frappe.get_all	2019-03-12 13:12:31 +05:30
Rohan Bansal	f4bce6a66e	fix(issue): Replace Make buttons on Issue and Task with a dashboard	2019-03-12 12:48:13 +05:30
Rohan Bansal	bf7c69f3c4	fix(issue): Don't auto-set project	2019-03-12 12:48:13 +05:30
Rohan Bansal	fa77b591ac	fix(issue): View Tasks against an Issue	2019-03-12 12:48:13 +05:30
Rohan Bansal	2ba21fb66c	fix(issue): Add issue name in Task and fix description in Issue	2019-03-12 12:48:13 +05:30
Rohan Bansal	5327d0253d	feat(issue): Create tasks from issues	2019-03-12 12:40:32 +05:30
Rohan Bansal	6cbd3998fb	fix(work_order): Use single update query	2019-03-12 12:15:37 +05:30
Rohan Bansal	b4745ec668	fix(work_order): Change Work Order title to show item name instead of item code	2019-03-12 12:13:02 +05:30
Anurag Mishra	9a1adc7c49	Added mandatory feilds to the report	2019-03-12 11:00:02 +05:30
Faris Ansari	47f1080f1e	fix: Update modified	2019-03-12 10:57:35 +05:30
Faris Ansari	175709ed50	fix: Update Training Level ... - Rename Expert to Intermediate, since it was ambiguous with Advance	2019-03-12 10:55:39 +05:30
Faris Ansari	2221151132	fix: Update Training Level	2019-03-12 10:55:11 +05:30
Anurag Mishra	34e1f92a7e	fix: readability	2019-03-11 18:17:22 +05:30
Anurag Mishra	1218255178	feat: Project Billing Summary for timesheet	2019-03-11 17:43:44 +05:30
Rohan Bansal	90972cfbf9	fix(transaction): Avoid shipping rule charge override by tax template	2019-03-11 15:00:48 +05:30
pawan	c0e1000919	fix: SKU issue	2019-03-11 14:58:17 +05:30
pawan	7c3e017ac3	fix: Amazon integration issues	2019-03-11 14:47:57 +05:30
Rohit Waghchaure	267723f57b	fix: stock ledgre report not working	2019-03-11 14:06:00 +05:30
Anurag Mishra	9b64baa734	Minor Fixes	2019-03-11 12:02:25 +05:30
Anurag Mishra	59f4556d95	Commonify code	2019-03-11 11:58:34 +05:30
Anurag Mishra	e86ac3c8d4	feat: timesheet Employee Summary Report	2019-03-11 11:58:28 +05:30
Rohit Waghchaure	52729bf369	feat: child table to add multiple time logs in job card	2019-03-11 00:02:32 +05:30
Himanshu Warekar	1692fbaf1c	fetch from fix	2019-03-08 18:37:34 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
Frappe Bot	3406229152	bumped to version 11.1.14	2019-03-08 09:39:32 +00:00
Rushabh Mehta	96842c9de6	fix(typo): leave_application.py	2019-03-08 12:36:43 +05:30
Rushabh Mehta	701c0b792c	feat: Pre mark attendance for Leave Application	2019-03-08 12:30:42 +05:30
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	821a002125	feat: added provision to disable CWIP accounting in asset settings	2019-03-08 10:51:37 +05:30
Nabin Hait	9ec4816b32	Update item_barcode_childtable_migrate.py	2019-03-08 10:44:13 +05:30
Saif Ur Rehman	e62bd893c5	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 ... # Conflicts: # erpnext/stock/doctype/item/test_item.py	2019-03-08 01:29:39 +05:00
deepeshgarg007	78a32ae172	fix: Remove validation for relieving date from additional salary	2019-03-07 20:00:07 +05:30
Anurag Mishra	1b0f5fd430	fix: pass correct argument to method get_deprication_amount	2019-03-07 16:17:00 +05:30
Rushabh Mehta	703a597478	fix(patch): update customization options if completed is not present	2019-03-07 13:03:40 +05:30
Rushabh Mehta	e9db0d2c61	fix(minor): update task list label from Closed to Completed	2019-03-07 12:50:02 +05:30
rohitwaghchaure	d4754619d0	Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table ... fix: scan barcode not adding the barcode value in the items table	2019-03-07 11:29:56 +05:30
Himanshu Warekar	7ab961f798	remove debug code	2019-03-06 23:53:38 +05:30
Himanshu Warekar	59699bf46e	[debug] locally tests passed but travis failed	2019-03-06 23:33:03 +05:30