15610 Commits

Author	SHA1	Message	Date
Prateeksha Singh	1d1696080e	[hub][publish] add search, fix multiple append	2018-07-26 08:36:33 +05:30
Prateeksha Singh	505f6f14e9	[hub][publish] select/deselect all items	2018-07-26 08:06:21 +05:30
Prateeksha Singh	9685d7c37a	[hub] registered vs read-only views	2018-07-26 01:12:00 +05:30
Prateeksha Singh	cf2d2a5c75	[hub][init] add publish items page	2018-07-25 20:02:12 +05:30
Nabin Hait	22fa99d040	Payroll Fixes	2018-07-25 18:21:39 +05:30
Nabin Hait	e50e0e4b30	Update repost_reserved_qty_for_production.py	2018-07-25 17:49:47 +05:30
Faris Ansari	6b07898ef0	semicolon	2018-07-25 17:07:26 +05:30
Faris Ansari	ed1190126e	Fix Syntax Error in hub_factory.js	2018-07-25 16:51:01 +05:30
Prateeksha Singh	bc8caefc19	[hub] add register as a seller page	2018-07-25 11:08:23 +05:30
Faris Ansari	0fbaa72504	Add review area	2018-07-25 00:49:11 +05:30
Zlash65	617532b2cb	Factory: class.extend -> es6 class	2018-07-24 14:20:10 +05:30
Nabin Hait	90bb5f43d5	Added more status in task web form	2018-07-24 11:33:05 +05:30
Ranjith Kurungadam	e51c175aca	Fix tests (#14991) ... * minor improv in fetching account * pass name field while creating tds doc * create tds fixture after creating tds account * Inpatient Record - Test - Fix * fix batch query	2018-07-24 11:07:28 +05:30
Faris Ansari	ea2d1b0a19	New page: marketplace ... - subpages: home, favourites, item, category	2018-07-23 18:44:46 +05:30
Nabin Hait	4037915b3c	Update setup.py	2018-07-23 18:05:55 +05:30
Nabin Hait	797497d22e	Fixed web form perm for tasks	2018-07-23 17:58:40 +05:30
Prateeksha Singh	ebb5662cb7	[revert] modules dropdown	2018-07-23 17:04:34 +05:30
Ameya Shenoy	218f2f841e	Merge pull request #14920 from codingCoffee/split_issue ... Split a given Issue into 2	2018-07-23 16:09:05 +05:30
Ameya Shenoy	769054e00d	Split a given Issue into 2 ... Bugs encountered: Once the dialog pops up, filling in the subject and pressing RETURN doesn't work. It fails to read the subject. The primary button needs to be clicked on. This is a generic issue, not related to this PR Behaviour: -[x] Add button on communication to split thread -[x] Popup asks for new subject -[x] Copy "Customer", "Sender" and other relevant fields to this issue -[x] Move thread and replies to new issue fixes #14600	2018-07-23 10:31:38 +00:00
Nabin Hait	0c0c345678	Added index on SLE based on batch_no, item and warehouse	2018-07-23 14:38:50 +05:30
yimesgen	20a80fee45	Update batch.py (#14905) ... * Update batch.py Performance improvements for pos stock availability checks on a particular warehouse due to the slowing down effects of the where clauses combined by the "and". * Update batch.py	2018-07-23 14:36:50 +05:30
Charles-Henri Decultot	6321a6b908	use standard dict method	2018-07-23 08:56:38 +00:00
Alchez	56bd5d8aaa	Fix finance book getter error when book doesn't exist (#14987)	2018-07-23 14:16:35 +05:30
Shreya Shah	cd717e422f	Modify renaming process of Account (#14839) ... * Disable renaming for Account Master * Update account name along with account number * Fix as per suggestions * Update account.js * Fix typo * Remove after_rename and before_rename methods * Modify test case * Modify field placement * Remove unused method	2018-07-23 14:15:20 +05:30
Jamsheer	425fb4c5f4	[Feature][Enhance] Healthcare Inpatient (#14940) ... * New DocTypes - Inpatient Record and Healthcare Service Unit Type * Patient Appointment - Button - Get Prescribed Procedure - hide after save * Patient Encounter - Schedule Inpatient button * Inpatient - Healthcare Fields and references Conflicts: erpnext/healthcare/doctype/lab_test/lab_test.json erpnext/healthcare/doctype/patient_appointment/patient_appointment.json erpnext/healthcare/doctype/patient_encounter/patient_encounter.json erpnext/healthcare/doctype/vital_signs/vital_signs.json * Healthcare Service Unit Type - Item Creation - UOM Fix * Healthcare Service Unit - healthcare service unit type fix * Inpatient Record - Admission Scheduled and Discharge Scheduled status * Patient - rename field inpatient to inpatient_status * Inpatient Record - rename field inpatient to status * Refactor - Inpateint Occupancy * Remove unused imports * Healthcare service unit - patch - fix * Healthcare IP - Codacy Fix * Inpatient Record - Encounter and Practitioner References * Patch - add healthcare service unit tree - enhance * Healthcare Setup - Remove - Lab Test and Item creation * Discharge note in Inpatient Record * Codacy fix * Inpatient Record - Update transfer service unit filter * Inpatient Record - Test	2018-07-23 13:05:35 +05:30
rohitwaghchaure	6b862fcae5	[Fix] Rounded total is not working in the purchase receipt (#14984)	2018-07-23 13:02:07 +05:30
Saurabh	a638400e5d	Merge pull request #14707 from chdecultot/stripe_improvements_4 ... Stripe Subscriptions	2018-07-23 12:11:58 +05:30
Faris Ansari	f585197045	Cleanup homepage	2018-07-23 11:55:07 +05:30
darthguru	f2d4e33eb5	Fixed IGST ISSUE (#14975) ... * Fixed IGST ISSUE the flag was not getting reset causing only the first IGST value to be shown and the rest went into SGST and CGST this fixes it * Update gstr_2.py	2018-07-23 11:52:26 +05:30
Ranjith Kurungadam	1e90dafef8	fixes Benefit Application, Additional Salary (#14971) ... * fix - add Additional Salary if multiple in one slip * fix - Benefit Appication, None comparison	2018-07-23 11:32:58 +05:30
Ranjith Kurungadam	68abe25371	fix - assigned Salary Structure query (#14965)	2018-07-23 11:31:46 +05:30
Zarrar	a22e0d0c99	return empty if no stock ledger entry found (#14968)	2018-07-23 11:31:04 +05:30
Shreya Shah	83dfc0a2b1	Add Priority field in issue webform and portal (#14967)	2018-07-23 11:14:00 +05:30
Faris Ansari	789ad180ea	Merge pull request #14969 from netchampfaris/financial-statement-reports ... Financial Reports fixes	2018-07-21 12:28:31 +05:30
Faris Ansari	b23d15fba9	Fix typo	2018-07-20 18:16:31 +05:30
Faris Ansari	5e096df5ae	columnDef => column	2018-07-20 16:35:51 +05:30
Faris Ansari	e7f864a4dd	Return early if filters not initialized	2018-07-20 16:31:01 +05:30
Prateeksha Singh	abca510f9a	Update conf.js	2018-07-20 16:07:50 +05:30
Faris Ansari	5986d59b01	Financial Reports ... - Update formatter for use with DataTable - Fetch Currency from filters and fallback to company currency	2018-07-20 15:11:55 +05:30
Charles-Henri Decultot	39418b1532	CSS correction due to latest version of develop	2018-07-20 09:37:22 +00:00
KanchanChauhan	0c3d345a9f	[Minor] Moved mandatory Company field from More Information section to top (#14950)	2018-07-19 14:39:31 +05:30
Ranjith Kurungadam	dff2ba72d3	test TDS calculation (#14919) ... * test TDS calculation * fix failing test cases * fix codacy	2018-07-19 14:34:05 +05:30
Saurabh	a8e24cba46	Merge patch and delete fields from subscription (#14941) ... * Delete subscription records after migrating all records to auto-repeat * delete old fields from subscription	2018-07-19 14:33:31 +05:30
Saurabh	139d165258	Merge pull request #14962 from saurabh6790/staging_version_1 ... Update staging version to support semantic versioning	2018-07-19 13:38:34 +05:30
Saurabh	dfdad651ea	Update staging version to support symentic versioning	2018-07-19 13:36:32 +05:30
Nabin Hait	9c5afc3620	website permission for support portal	2018-07-19 13:02:36 +05:30
Nabin Hait	47ce481394	Minor fix	2018-07-19 11:10:46 +05:30
Prateeksha Singh	627d0d58be	[fiscal-year] use to_date property	2018-07-18 18:09:28 +05:30
Prateeksha Singh	8ecfaaa707	[fix] format fiscal year docname to proper date before using 🤦 (#14955)	2018-07-18 18:03:27 +05:30
Saurabh	0bfbf8aa6f	[minor] remove conflicts	2018-07-18 17:21:07 +05:30
Saurabh	d7897f1c53	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
Saurabh	6c46b4edc4	bumped to version 10.1.43	2018-07-18 16:54:54 +06:00
Shreya Shah	8395a7ad6f	Modifications in last purchase rate button (#14948) ... * Make last purchase rate button visible until submitted * Move buttons - Get last purchase rate and link to material request buttons moved to toolbar under Tools button * Remove disable fetch last rate functionality * Make last purchase rate field read_only	2018-07-18 12:27:27 +05:30
Shreya Shah	9baa3bef8b	[Portal] Display issues raised by all users of a customer (#14947) ... * Display issues raised by all users of a customer * Fixed as per review	2018-07-18 12:25:38 +05:30
Faris Ansari	9e874af9ba	Query report print (#14935) ... * QueryReport - Only print visible columns in report - Use get_columns_for_print method instead of directly accessing report.columns * Query Report - Replace frappe.query_report_filters_by_name with new API	2018-07-18 09:28:44 +05:30
Charles-Henri Decultot	9d09343e57	Gocardless improvement and payment request correction	2018-07-17 16:15:30 +00:00
Rushabh Mehta	69fa808def	[minor] fixes + patch (#14937)	2018-07-17 18:22:51 +05:30
Shreya Shah	3c9839f832	Defaults in Item Group (#14874) ... * Add Defaults table in Item Group * Fetch defaults from Item group if not found in Item * Add patch * Remove default fields from Item Group * Set query for defaults * Fix Codacy * Modify test records * Modify budget.py and sales_order.py * Remove join from query * Else condition to avoid error if no defaults found * refrain from making item test records before item_group * default cost center fetch correction * Remove tab item group from query	2018-07-17 18:01:44 +05:30
rohitwaghchaure	6863b03790	Naming series increase even if there is an exception while saving the invoice from the backend (#14938)	2018-07-17 17:20:15 +05:30
rohitwaghchaure	a76067eea1	[Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order (#14899) ... * [Fix] Per billed showing as 100% in the sales order even if sales return has made against the sales order * Added test cases	2018-07-17 16:50:50 +05:30
Saurabh	af479c8192	set valid delivery date (#14890) ... * set valid delivery date * calculate delivery date based on diffrence in transation date and delivery date of ref doc	2018-07-17 16:49:32 +05:30
rohitwaghchaure	216f9373c9	Provision to select the cost center in the asset (#14934)	2018-07-17 16:47:51 +05:30
Shreya Shah	663b435919	Update modified time to fix patch (#14931)	2018-07-17 16:47:18 +05:30
Saurabh	e78a877202	patch fixes (#14936)	2018-07-17 16:38:11 +05:30
Nabin Hait	1e693fe6c9	Replaced spaces with tabs	2018-07-17 16:08:39 +05:30
Nabin Hait	26786bd35d	minor route fix for general ledger	2018-07-17 15:59:15 +05:30
rohitwaghchaure	5fe88ea93e	[Fix] Not able to update the current value of the prefixes which are defined in the autoname field (#14918)	2018-07-17 12:45:25 +05:30
Shreya Shah	fbeab5bf73	Show opening balance of leaves (#14925) ... * Show opening balance of leaves * Update employee_leave_balance.py	2018-07-17 11:59:51 +05:30
Ameya Shenoy	8ba1310915	[fix] Location test (#14921)	2018-07-17 11:57:49 +05:30
Zarrar	fc0a5833a5	run set query if doctype exist (#14929)	2018-07-17 11:57:06 +05:30
Suraj Shetty	a6f984366a	Fix typo	2018-07-16 18:39:01 +05:30
Zarrar	26c9b94cc6	[ Improv ] Loyalty Program more fixes and test case (#14888) ... * remove console statements * set account & cost center for redemption * add test case for single/multi tier & is_return scenario * reset tier when changing loyalty program * make loyalty fields non copy type * fix test case - delete si after every test to avoid interference	2018-07-16 18:11:53 +05:30
rohitwaghchaure	a3e070bc6b	[Fix] Invoices not showing in the gross profit report against which sales return entry has created (#14914)	2018-07-16 18:11:19 +05:30
Suraj Shetty	6dfc165193	Add patch to skip user perm check for doctype (#14873) ... * Add patch to skip user perm check for doctype Skip user permission check for doctypes where department link field was recently added * Remove new doctype entries * Skip doctypes if department field already exists (custom field) * Add patch to set department value based on employee * Update set_department_for_doctypes.py * Update skip_user_permission_check_for_department.py	2018-07-16 18:10:16 +05:30
Jamsheer	f926911399	[Enhance][Fix] Healthcare - DocType and Fields renaming (#14861) ... * Rename DT - Physician Schedule Time Slot to Healthcare Schedule Time Slot * Role name change * Rename DT - Physician Schedule to Practitioner Schedule * Rename DT - Physician Service Unit Schedule * Rename DT - Physician to Practitioner * Lab Test Template - field disabled in standard filter * Patient - customer creation fix * Rename DT - Consultation - Encounter * Patches.txt updated for rename doctypes and fields in Healthcare * Patch - Rename doctypes and fields in Healthcare Domain * Fix - Patch - rename_healthcare_doctype_and_fields * Vital Signs - New Fields - Abdomen, Tongue and Reflexes * Web Form - Patient - Personal Details * Rename DocType Physician to Healthcare Practitioner * Rename DocType Consultation to Patient Encounter * Web Form - Personal Details - Fix * Web Form - Personal Details - Codacy Fix * Healthcare patch run for all domain * Rename label Practitioner to Healthcare Practitioner * Rename Encounter to Patient Encounter	2018-07-16 18:08:53 +05:30
Ranjith Kurungadam	14e94f824e	fix - HRA India (#14911)	2018-07-16 16:12:46 +05:30
Shreya Shah	ffd2254944	Make item defaults non-collapsible (#14908)	2018-07-16 14:55:54 +05:30
Nabin Hait	656016b4e0	Reloaded location doctype in patch	2018-07-15 20:10:23 +05:30
rohitwaghchaure	526ab2ca30	[enhance] Allow transfer for manufacture in the BOM (#14891) ... * [enhance] Allow transfer for maufacture in the BOM * Added patch * Fix codacy * Fixed typo and added test cases	2018-07-15 20:04:41 +05:30
Zarrar	f579a2bd5d	[Minor] Fix Crop Cycle test record (#14901) ... * fix crop cycle test record * load crop cycle doc if not yet loaded * create test records for location * land unit -> location , update in patch for tree index	2018-07-15 20:04:24 +05:30
Charles-Henri Decultot	3fa3104dcc	Debug cleanup	2018-07-13 14:00:42 +00:00
Charles-Henri Decultot	c047bf88db	Rebase following Subscription corrections	2018-07-13 13:25:53 +00:00
Charles-Henri Decultot	7722b81c8e	Variable correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	a0b7236f66	Corrections following Saurabh's comments	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	90669a03b3	Test correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	da8b11fd12	Travis correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	8b3e841fbf	Travis correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	cde1f08af6	Review corrections	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	5a2ee41af3	Test correction	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	19a47c3e0a	Codacy corrections	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	bbed5d41ca	Remove remaining images	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	63e1dd5993	Remove doc	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	244b638fe3	Dev cleanup	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	a8d766f5f7	Remove payment plan reference	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	0134e13631	Subscription integration	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	f7ca908ea9	Corrections to Subscriptions	2018-07-13 13:15:59 +00:00
Charles-Henri Decultot	ba6f6d976d	Stripe integration corrections	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	a45ea63b5d	Codacy correction	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	6c2ad66522	Codacy corrections	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	a27673ecfe	Travis correction	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	79380c6a74	Travis correction	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	30da37fbb8	Move Stripe to ERPNext	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	e25d2ee66d	Update Stripe Documentation	2018-07-13 13:05:54 +00:00
Charles-Henri Decultot	6a40164dad	Payment Request modifications	2018-07-13 13:05:54 +00:00
Nabin Hait	03b597418a	Patch order fixed	2018-07-13 17:45:27 +05:30
Saurabh	3d825e5689	Subscription test and fixes (#14875) ... * Add dashboard on subscriber screen * Add Subscription and Subscription Plan to Account Dashboard * Fetch customer name while creating subscriber * [fix] add section for Subscription Period * minor fixes * optimization	2018-07-13 17:41:36 +05:30
rohitwaghchaure	3ffe89659a	[Fix] System always fetches the payment terms template from the company even if it's removed from the sales invoice (#14879)	2018-07-13 17:40:48 +05:30
Nabin Hait	b2da082798	Fixed logic and tests	2018-07-13 17:02:08 +05:30
Doridel Cahanap	6f06cc27e6	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
Alchez	df1eae8981	Merge the Land Unit doctype with the Location doctype (#14613) ... * Merge Land Unit with the Location doctype * Fix patch * [minor] modification to Location structure - Create a group node "All Land Units" and place all the land units under it - Remove "Linked Analysis" from location	2018-07-13 12:50:04 +05:30
Ameya Shenoy	5c3b69476d	shift to self-hosted frankfurter api (#14792)	2018-07-13 12:46:07 +05:30
KanchanChauhan	09e680b4aa	[Fix] Should not get approvers for disabled Departments (#14868)	2018-07-13 12:26:56 +05:30
Nabin Hait	da17ceea73	patch fixes	2018-07-13 12:04:06 +05:30
Ameya Shenoy	a559b0de5a	Role modifications for Shareholder (#14872) ... - Added roles: Accounts User, Accounts Manager, Sales Manager, Sales User, Sales Master Manager to Shareholder, Share Type and Share Transfer doctype	2018-07-13 11:34:19 +05:30
Saurabh	b6d5f1fea1	[fix] add staging version (#14871)	2018-07-13 11:33:31 +05:30
rohitwaghchaure	2d84945839	[Fix] Stock reconciliation wrong difference amount calculation (#14893)	2018-07-13 11:07:27 +05:30
Prateeksha Singh	0c51d40ad0	Merge pull request #14889 from pratu16x7/support-portal ... [fix][minor] search help alignment	2018-07-12 16:06:49 +05:30
Prateeksha Singh	4cc7957a2a	[fix][minor] search help alignment	2018-07-12 16:05:57 +05:30
Shreya Shah	8dc4c945dc	Fix UX (#14862)	2018-07-11 14:36:49 +05:30
Zarrar	5899d98077	[ Major ] Loyalty Program Fixes (#14863) ... * fix checking of customer_group & territory of customer in loyalty program * fetch and set applicable loyalty program - in customer.py if found 1 program, set it or show a message to set it manually - in sales invoice, if found 1 program for selected customer with no program set, set it else open a dialog with applicable options * removed disabled field, added from_date & to_date * loyalty program section made collapsible, added redeem check in it * setting loyalty program improvised, manual selection if multiple found * get_query added, amount calculation updated * args passed rectified for expiry_date * get loyalty_points logic improv, redemption_details logic added * improv based on from/to date and other rectification * code rectified based on different scenarios - is_return, cancel, make loyalty points entry improv	2018-07-11 14:35:43 +05:30
Zarrar	9a3b785a03	[Minor] Employee Separation Fix (#14867) ... * delete associated task & project forcefully in Employee Seapration cancel trigger * remove leftover print statement * remove console statements	2018-07-11 14:34:55 +05:30
Saurabh	e8345f9ae0	add key to trace beta version (#14859)	2018-07-10 19:05:38 +05:30
rohitwaghchaure	cc9c7d5e2a	[Fix] GSTIN not displaying in the address print (#14855) ... * [Fix] GSTIN not displaying in the address print * Made changes in the patch and set Patch as False * Update update_address_template_for_india.py	2018-07-10 15:41:42 +05:30
Alchez	9155e40bc7	[Fix] Set default CF in case none exist (#14829)	2018-07-09 16:57:42 +05:30
Frappe PR Bot	b48c769588	[Translation] Updated Translations (#14849)	2018-07-09 16:56:49 +05:30
rohitwaghchaure	07d0e9a2b2	Don't show disabled items in the stock balance report (#14851)	2018-07-09 16:56:41 +05:30
Saurabh	db7324890f	Merge branch 'master' into develop	2018-07-09 15:53:51 +05:30
Saurabh	07bb1811af	bumped to version 10.1.42	2018-07-09 16:23:50 +06:00
rohitwaghchaure	f07462860b	Merge pull request #14846 from shreyashah115/fix-digest ... Filter out pending orders based on company	2018-07-09 14:48:13 +05:30
Ranjith Kurungadam	ea089d67ce	Employee Benefit Application - fix (#14837)	2018-07-09 14:01:18 +05:30
rohitwaghchaure	720b06495c	[Fix] Not able to save project (#14848)	2018-07-09 13:57:16 +05:30
Shreya	83ad646af4	Filter out pending orders based on company	2018-07-09 12:14:03 +05:30
rohitwaghchaure	8179bcbabd	[Fix] Code cleanup (#14843)	2018-07-09 09:29:40 +05:30
rohitwaghchaure	e4a53f961a	[Fix] Unable to print Salary Register (#14844)	2018-07-09 09:28:56 +05:30
rohitwaghchaure	6be8bea934	Provision to view return entries in Sales Person-wise Transaction Summary (#14830)	2018-07-08 19:25:13 +05:30
Shreya Shah	21d3352aa2	Merge pull request #14835 from shreyashah115/print-hide ... Print hide loyalty program related fields	2018-07-06 18:36:47 +05:30
Zarrar	8111705f82	Merge pull request #14833 from Zlash65/min-ac-fix ... [Minor] Change field name in Accounts utils	2018-07-06 18:24:55 +05:30
Shreya	9bcb959f81	Print hide loyalty program related fields	2018-07-06 18:17:02 +05:30
Shreya Shah	c8c17ff5cf	Return if Item Defaults exist (#14834)	2018-07-06 18:07:28 +05:30
Zlash65	1aeca1d349	change name that fetches numbered value from acc & cc	2018-07-06 17:15:33 +05:30
Zarrar	17705f932d	[ Minor ] Cost Center Number field added in field's dialog (#14781) ... * cost center number field when creating new added field in the tree's dialog, necessary changes in the autoname function * rename function's name appropriately	2018-07-06 14:44:44 +05:30
Alchez	8f2a0f3d79	[Fix] Incorrect assignment of Serial No in POS Invoice (#14772) ... * Fix incorrect assignment of serial no in Sales Invoice through POS * Add conversion factor to quantity check	2018-07-06 14:36:52 +05:30
Ranjith Kurungadam	6429ba9ed9	Payroll Entry - fix query, get assignment by end date (#14827)	2018-07-06 13:30:40 +05:30
Saurabh	1cfcf70905	Resolved merge conflicts	2018-07-06 13:18:44 +05:30
Saurabh	778e06d0ee	bumped to version 10.1.41	2018-07-06 13:32:57 +06:00
rohitwaghchaure	3f5e80ebe3	Allow bulk edit for the sales invoice item (#14826)	2018-07-06 12:39:04 +05:30
Manas Solanki	da486eeebd	Loyalty Program (#12631) ... * First Cut for the Loyalty Program * finished the collection part * redmeption for the loyalty point update the loyalty point entry in the FIFO style make the accounting entry knocking the debtors account against the expense account selected in the loyalty program update the outstanding balance in the client side * completed for the desk viewe * wrap up for the desk and shopping cart * pos * fix and test the travis	2018-07-06 12:36:57 +05:30
rohitwaghchaure	ea943c6fe4	[Fix] Due date validate issue in the POS (#14825)	2018-07-06 12:28:58 +05:30
Ranjith Kurungadam	5d134e0465	TDS Calculate tax for whole period on deduct checkboxes (#14824) ... * Tax Exemption Proof Submission - fields submission_date, exemption_amount * Salary Detail - field tax_on_flexible_benefit, tax_on_additional_salary * Salary Slip - save tax for benefit, additional salary in Salary Detail, recalculate tax for whole period on deduct checkboxes	2018-07-06 11:57:32 +05:30
rohitwaghchaure	839320dca5	[Fix] Original Invoice outstanding is not updating after making Debit Note (#14821)	2018-07-06 10:42:15 +05:30
Andrew McLeod	686284261d	Added check to get_parent_item_groups; if called without an item group, return a default parents list of 'Home' only. (#14811)	2018-07-06 10:41:37 +05:30
rohitwaghchaure	82a9fde921	Added compact print option for the material request (#14799)	2018-07-06 10:40:51 +05:30
bobzz-zone	58236ffc1e	Update budget_variance_report.py (#14798) ... Make sure GL Entry only called once in each row	2018-07-06 10:39:00 +05:30
Saurabh	f403031449	[fix] Add Overdue status in Project Task	2018-07-05 19:38:59 +05:30
Rushabh Mehta	df23c7dc0c	[cleanup] bunch of UX fixes (#14787) ... * [cleanup] add dashboard to leave policy, employee form cleanup * [test] first_name in employee * [fix] tests * [fix] tests * [fix] tests * [hr] add more dashboards * [minor] fixes + ux	2018-07-05 15:19:28 +05:30
Rushabh Mehta	c1b430c8bd	[enhance] added priority to issue (#14815)	2018-07-05 11:38:02 +05:30
Zarrar	a3f6856d81	python 3 fix for sorted (#14814)	2018-07-05 10:37:39 +05:30
Nabin Hait	d4453aef68	Fixed permission issue	2018-07-04 16:38:10 +05:30
rohitwaghchaure	25f36489b3	Merge pull request #14805 from rohitwaghchaure/pos_ignore_pricing_issue_online ... [Fix] POS Profile ignore pricing rule not working for online pos	2018-07-04 16:26:48 +05:30
Rohit Waghchaure	5005e467a0	[Fix] POS Profile ignore pricing rule not working for online pos	2018-07-04 12:37:38 +05:30
Shreya Shah	430810f64c	Fix typo (#14802)	2018-07-04 10:17:36 +05:30
Aditya Hase	69711d2df2	Remove a redundant for loop that uses dict.iteritems() instead of six.iteritems(dict) (#14803) ... This should also fix #13909 as a side effect.	2018-07-04 10:17:17 +05:30
Zarrar	68a148e293	half_day enable/disable check (#14795)	2018-07-03 17:00:38 +05:30
rohitwaghchaure	205eae322b	[Fix] BOM replace timeout issue (#14782)	2018-07-03 15:06:38 +05:30
Nabin Hait	24ee7e5eb1	Patch fix	2018-07-03 13:15:47 +05:30
Nabin Hait	9911309631	Patch fixes	2018-07-03 13:06:49 +05:30
Nabin Hait	f4660d2479	Ignore calculating tds if amount/formula is mentioned in salary structure	2018-07-03 13:06:49 +05:30
Ameya Shenoy	935f4a474b	Prevent creation of more than 500 item variants (#14790)	2018-07-03 10:48:59 +05:30
Zarrar	c1225a84cc	fix css for coa dialog in setup wizard (#14793)	2018-07-03 10:35:31 +05:30
Britlog	4412f10918	Add missing fields in select, the same as in get_product_list_for_group (#14789)	2018-07-03 10:33:49 +05:30
Charles-Henri Decultot	6d97ab6f78	Make fields translatable (#14786)	2018-07-03 10:32:53 +05:30
Shreya Shah	aa62a62bb0	Add VAT related fields after printing settings fields (#14773)	2018-07-03 10:28:20 +05:30
Vishal Dhayagude	0e027a14a7	[minor] Link to Employee Separation template and Onbording template added in HR Module Page (#14748) ... * [minor] Link to Employee Separation template and Onbording template added in HR Module Page * [minor] Employee templated added in Employee Life Cycle Section	2018-07-03 10:20:02 +05:30
Shridhar Patil	4987c4ef53	on delete contact update issue (#14770) ... * on delete contact update isuue remove contact from issue if the deleted contact exists * moved issue update function to issue.py * Update formatting and comment	2018-07-03 10:10:04 +05:30
Suraj Shetty	27067b34e1	Rename (#14771) ... - Daily Work Summary Settings to Daily Work Summary Group in hr.py	2018-07-03 10:08:45 +05:30
Shreya Shah	93d60869ed	Fix patch (#14769) ... Income account instead of expense account	2018-07-03 10:07:32 +05:30
Ranjith Kurungadam	273e8e59ca	fix Salary Component (#14783)	2018-07-03 10:05:01 +05:30
Pawan Mehta	e734b7c17b	Add filters to show Draft salary slips in salary register (#14780) ... * [fix] #14778 * replace if-elif block with inline block	2018-07-03 10:01:19 +05:30
Frappe PR Bot	1baa811a40	[Translation] Updated Translations (#14776)	2018-07-03 09:59:57 +05:30
rohitwaghchaure	afe764264d	[Fix] Employee advance issues (#14750)	2018-07-01 16:48:00 +05:30
Charles-Henri Decultot	f02bef78f0	FEC report corrections (#14741) ... * Report corrections to match government requirements * Untranslatable headers * Remove unused onchange logic	2018-07-01 16:46:48 +05:30
Zarrar	dfe897b888	[ Fix ] UOM Conversion fix (#14768) ... * increase precision for conversion value * inverse the conversion data * update uom data * rectify conversion logic according to inversion of values * rectify test case for uom conversion * patch improv to correct conversion data	2018-07-01 16:45:53 +05:30
Ranjith Kurungadam	4dc5721ba5	fix - Benefit Application query (#14767)	2018-07-01 16:44:37 +05:30
Mohammed R Abukhamseen	8662a4f677	POS - Translate some text & numpad (#14765) ... * make label & placeholder translatable * numpad translatable * Update point_of_sale.js remove debugger	2018-07-01 16:44:09 +05:30
Nabin Hait	e3daaa63f0	Payroll fixes (#14758) ... * Ignore calculating tds if amount/formula is mentioned in salary structure * [fix] Paid amount in Journal Entry from Payroll Entry * fix codacy	2018-07-01 16:43:34 +05:30
Ranjith Kurungadam	b1a756cc9f	HRA Indian regional - field basic in company, calc changes (#14757)	2018-07-01 16:42:38 +05:30
rohitwaghchaure	1501a6e58e	[Fix] Data missing issue in stock ledger report (#14755)	2018-07-01 16:42:00 +05:30
rohitwaghchaure	01fe4a3726	[Fix] Consider the cancelled purchase receipt in backflush raw materials (#14753)	2018-07-01 16:41:39 +05:30
Ranjith	69b03a3b53	fix typo	2018-06-29 20:14:20 +05:30
rohitwaghchaure	c5183b7c2a	Merge pull request #14756 from rohitwaghchaure/fix_patch_for_set_salary_component_properties ... [Fix] Patch	2018-06-29 19:02:38 +05:30
Rohit Waghchaure	4178030c99	[Fix] Patch	2018-06-29 17:54:25 +05:30
Ranjith Kurungadam	fd7ef2e15c	Salary Component - field display, value dependency (#14747)	2018-06-29 16:53:56 +05:30
Ranjith Kurungadam	b402ccc0b5	Payroll Entry - make only one JE, separate JE for Flexi (#14752)	2018-06-29 16:48:49 +05:30
Nabin Hait	b192a4af77	reload doc in patch	2018-06-29 15:30:41 +05:30
Nabin Hait	6e86fb2540	Set user permissions for new departments based on company	2018-06-29 14:36:45 +05:30
Nabin Hait	c114ceb67d	Set salary component properties in existing components and salary structures	2018-06-29 14:36:45 +05:30
Manas Solanki	ee32a78e9f	Update bom_stock_calculated.py	2018-06-29 13:33:32 +05:30
Nabin Hait	104f62090d	Add filters for cost center in Budget Variance report	2018-06-29 12:25:03 +05:30
Himanshu Mishra	7aabef2026	Add configurable frequency in Selling Settings for update of project … (#14670) ... * Add configurable frequency in Selling Settings for update of project and company * remove redundant code * remove redundant code, only trigger calculation if order/invoice is present * removed dangling commas as per common convention in hooks * fix:handling multiple documents * Update selling_settings.json	2018-06-28 23:43:23 +05:30
Nabin Hait	d0c6184e24	minor patch fixes	2018-06-28 23:42:55 +05:30
rohitwaghchaure	191876f51b	[Fix] Bank Account mandatory (#14734)	2018-06-28 23:28:58 +05:30
Ranjith Kurungadam	a10f118ddd	Payroll Entry - Validate Attendance (#14738)	2018-06-28 23:28:07 +05:30
Nabin Hait	7324815fdb	map payment terms template from SO to SI	2018-06-28 23:12:02 +05:30
Charles-Henri Decultot	52fb43fc4f	Add no copy to payment terms template (#14725)	2018-06-28 23:06:30 +05:30
Charles-Henri Decultot	97fa94e77d	Journal and Entry number correction (#14720)	2018-06-28 23:05:58 +05:30
Cadmandata	d673afccf2	Updated comment in make_stock_entry() function (#14726) ... Purpose flag is used in make_stock_entry(**args) function, but it was not included in the comment inside the function.	2018-06-28 23:05:32 +05:30
Ranjith Kurungadam	f6e654eccc	Payroll Entry - fix deduct taxes (#14730)	2018-06-28 23:04:51 +05:30
rohitwaghchaure	cae945e743	Added validation and fixes UX for asset (#14727)	2018-06-28 23:04:25 +05:30
Ranjith Kurungadam	6ceed038e6	Fix benefits (#14735) ... * Employee Benefit Application - fix typo * Employee Benefits - fix field renamed	2018-06-28 23:02:58 +05:30
Manas Solanki	3ff7f79cc7	Merge pull request #14740 from manassolanki/fix-20 ... [minor] fix for the args in the frm.call	2018-06-28 20:47:25 +05:30
Manas Solanki	89e7f8b387	[minor] fix for the args in the frm.call	2018-06-28 20:44:53 +05:30
Rohit Waghchaure	ed71c36748	[Fix] Not able to save subcontracted purchase receipt	2018-06-28 18:36:35 +05:30
Ranjith Kurungadam	b66bde32f8	Payroll Entry - fix only one employee fetched (#14718)	2018-06-28 14:40:29 +05:30
Charles-Henri Decultot	8b22310d66	Allow auto repeat update (#14706) ... * Allow auto repeat update * Allow auto-repeat reference update	2018-06-28 14:27:58 +05:30
Zarrar	254ce645b1	[ Enhance ] Setup Wizard - Chart of Accounts (#14698) ... * enable selection of coa for user Give user option to select coa that's been verified along with standard and standard with numbers. Also added a button that opens a dialog and renders the selected chart * read chart from file and make a tree render-able dict of it * tree method to return node data for coa setup wizard	2018-06-28 14:15:34 +05:30
Shreya Shah	2fbc8509f5	Fix error message (#14716)	2018-06-28 14:14:28 +05:30
Pawan Mehta	c7897e491d	[fix] #14714 (#14715)	2018-06-28 14:13:56 +05:30
KanchanChauhan	168e66b107	Blanket Order translation fix for DE (#14711)	2018-06-28 14:13:24 +05:30
rohitwaghchaure	e27b85de4f	Added test cases for Overproduction against Work Order / Sales Order (#14704)	2018-06-28 12:48:28 +05:30
rohitwaghchaure	4c23be1821	Added test cases for subcontract (#14702)	2018-06-28 11:18:37 +05:30
Prateeksha Singh	5d227c9028	Revert "[hub] add link in modules"	2018-06-28 09:59:46 +05:30
Prateeksha Singh	84d358bd0a	Merge pull request #14708 from pratu16x7/hub-fixes ... [hub] add link in modules	2018-06-28 03:23:03 +05:30
Prateeksha Singh	2e0b5140e7	[hub] add link in modules	2018-06-28 03:17:39 +05:30
Manas Solanki	4933e6bfeb	Update test_finance_book.py (#14703)	2018-06-27 17:30:09 +05:30
Ranjith Kurungadam	23e235395e	Salary Slip - remove check query limited to one (#14699)	2018-06-27 17:29:40 +05:30
Shreya Shah	f2f54e741b	Merge pull request #14701 from shreyashah115/testing-1 ... [minor] Blanket order	2018-06-27 16:00:02 +05:30
Shreya	32b57da335	Make supplier_name and customer_name fields read only	2018-06-27 15:20:33 +05:30
Shreya	18bed504dc	Set target qty 0 ... If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.	2018-06-27 15:14:43 +05:30
Manas Solanki	b912374b96	[test] check the finance book via the journal entry	2018-06-27 15:07:15 +05:30
rohitwaghchaure	67d87e29e3	[Fix] Wrong rate calculation in Itemwise sales register report for multi uom (#14690)	2018-06-27 11:22:03 +05:30
Ranjith Kurungadam	53cdbe960e	Salary Slip - fix query (#14693)	2018-06-27 11:15:39 +05:30
Jamsheer	86aed90a5c	[Fix] - Get payroll period days (#14686) ... * Fix - get_payroll_period_days * Fix - get_payroll_period_days	2018-06-27 11:13:20 +05:30
Deepak kumar	55cf6c5f7e	Membership (#14688) ... * Correct the label and field name * Update membership.json	2018-06-27 09:17:33 +05:30
rohitwaghchaure	f3cf15fa0d	[Fix] While saving project getting timeout error (#14672)	2018-06-26 17:06:00 +05:30
Nabin Hait	e2a8120ef8	ignore user permissions for some fields	2018-06-26 15:27:34 +05:30
Prateeksha Singh	34aeefc0a1	[fix] yet another python attribute fetch	2018-06-26 12:18:29 +05:30
Manas Solanki	7707cee6b7	Merge pull request #14676 from KanchanChauhan/allow-only-submitted-bo ... Allow only submitted Blanket Order in PO/SO	2018-06-26 11:46:23 +05:30
Manas Solanki	860e169081	Update sales_order.js	2018-06-26 11:45:04 +05:30
Manas Solanki	0ebd0f0d62	Update purchase_order.js	2018-06-26 11:44:29 +05:30
Kanchan Chauhan	bddebb52d6	Allow only submitted Blanket Order in PO/SO	2018-06-26 09:31:27 +05:30
Rushabh Mehta	096b943b0c	[minor] fixes to moment.defaultDateFormat and daily work summary eplies	2018-06-25 22:38:20 +05:30
Frappe PR Bot	5c13cb3221	[Translation] Updated Translations (#14669)	2018-06-25 15:08:15 +05:30
mnaim-cloude8	56e4346ead	To fixed if if no schedule and disposal is NOT within the period. (#14637) ... * To fixed if if no schedule and disposal is NOT within the period, then opening accumulated depreciation not included. If no schedule, and disposal is within period, accumulated dep is the amount eliminated. * Update asset_depreciations_and_balances.py	2018-06-25 15:05:26 +05:30
Jamsheer	4f8deb92cc	[Fix] - Leave Perid - Grant Allocations (#14668) ... * Leave Perid - Grant Allocations - Fix * Codacy - string statement has no effect	2018-06-25 14:49:54 +05:30
Shreya Shah	d8031d1a53	Clear child table before appending (#14648)	2018-06-25 10:34:55 +05:30
rohitwaghchaure	34c187706d	[Enhance] Added Budget exception approver role in company (#14645) ... * [Enhance] Added Budget exception approver role in company * Added test cases for budget	2018-06-25 10:31:08 +05:30
Ranjith Kurungadam	b4ad3c3f77	Salary Structure Assignment - remove to_date (#14642) ... * Salary Structure Assignment - remove to_date * fix Salary Assignment - remove to_date * Salary Slip - fix codacy remove sting based query, add end_date to condition	2018-06-25 10:29:54 +05:30
Jamsheer	8044d09d50	[Enhance] Refactor (#14647) ... * Payroll Entry - Make Bank Entry button routes to Journal Entry list view * Salary Component - additional component and flexi not comes in same component * Salary Structure - refactor validation messages	2018-06-25 10:29:06 +05:30
rohitwaghchaure	3a595d07d0	[Fix] POS Closing Voucher, on save collected amount becomes zero issue and added test cases (#14649) ... * [Fix] POS Closing Voucher, on save collected amount becomes zero * Added test cases for the POS Closing Voucher	2018-06-25 10:10:29 +05:30
Jamsheer	648728f330	Fix - depends on lwp - employee benefit (#14644)	2018-06-22 17:28:29 +05:30
Jamsheer	b64161a389	Employee benefit - Last payroll period benefit (#14634) ... * Employee benefit - Last payroll period benefit * Method name refactor	2018-06-22 17:27:54 +05:30
Sushant Nadkar	00f0f0f5fc	Added adational filters to Tax Rule doctype (#14639)	2018-06-22 15:57:19 +05:30
Shreya Shah	5b64e98c5b	Fetch company on employee selection (#14633)	2018-06-22 15:41:57 +05:30
rohitwaghchaure	d3fb0fbb20	Added test cases for asset accounting, asset value adjustment (#14572) ... * Added test cases for asset accounting, asset value adjustment * Accounting entry for the asset created manually * Added asset movement test cases and validation * Added validation to make asset from purchase receupt, invoice only	2018-06-22 15:40:59 +05:30
Ranjith Kurungadam	ce26610d39	Fix tax calculation (#14635) ... * Salary Detail - field is_additional_component * TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax * fix indentation	2018-06-22 15:39:49 +05:30
Ameya Shenoy	4e96f55eff	Merge branch 'master' into develop	2018-06-22 05:10:29 +00:00
Ameya Shenoy	774f676a25	bumped to version 10.1.40	2018-06-22 05:10:27 +00:00
Prateeksha Singh	c92bbcb9fa	Merge pull request #14629 from pratu16x7/css-fixes ... [portal] fix item-preview column #13077	2018-06-21 22:47:41 +05:30
Prateeksha Singh	9a138f07f7	[portal] fix item-preview column #13077	2018-06-21 22:42:03 +05:30
Nabin Hait	3ebc15cc8f	test fixes	2018-06-21 17:55:32 +05:30
Nabin Hait	e5b3a56cea	Test case fixes	2018-06-21 15:21:17 +05:30
Zlash65	4cf46edabc	expense_claim related fix in payment entry ... outstanding amount calculation fix, manual entry of expense trigger calculation of allocation added	2018-06-21 15:18:13 +05:30
rohitwaghchaure	ae276bcaa1	Don't allow to sale asset item from POS (#14623)	2018-06-21 13:18:01 +05:30
Shreya Shah	c8a40f3ef0	[Tests] Employee Onboarding & Separation (#14606) ... * Set query on department * Add test for Employee Onboarding * Add fetch for Employee Separation fields * Add test for Employee Separation * Fix Staffing Plan test case	2018-06-21 13:06:47 +05:30
Sachin Mane	19a5a5dcf4	improve performance of stock_value retrieval using tabBin instead of … (#14584) ... * improve performance of stock_value retrieval using tabBin instead of stock ledger * rename fn * rename fn * Update warehouse.py	2018-06-21 13:01:48 +05:30
rohitwaghchaure	79e5b07e62	[Fix] Subscription method (#14604) ... * [Fix] Subscription method path * [Fix] Condition	2018-06-21 12:58:14 +05:30
rohitwaghchaure	4d80c05125	[Fix] Deferred account must be liability account (#14612)	2018-06-21 11:55:49 +05:30
Shreya Shah	22bb61b58c	Merge pull request #14608 from shreyashah115/fix-onboard ... [Enhance] Employee Onboarding & Separation	2018-06-21 11:51:39 +05:30
Jamsheer	f76dbbae68	Compensatory Leave Request (#14611) ... * Compensatory Leave Request - Validate Holidays and Attendance * Compensatory Leave Request - Cancel * Half Day in Compensatory Leave Request * Leave allocation on Compensatory Leave Request - Fix * Unused import	2018-06-21 11:38:38 +05:30
Nabin Hait	227489193b	Test case fixes	2018-06-21 11:36:13 +05:30
umaepoch	0484547150	BOM Stock Calculation Report (#14561) ... * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * BOM Stock Calculated * Update bom_stock_calculated.json	2018-06-21 11:27:54 +05:30
Zarrar	e25dcd2737	[Minor] Report related fixes (#14620) ... * fix in query incase list is empty * periodicity not found error when called from consolidated financial statements and custom cash flow is activated * unset currency filter to apply default currency or so * python 2 - 3 fix	2018-06-21 10:53:12 +05:30
Siddhi Sawant	51e4d641c8	Job Applicant Source (#14543) ... * New doctype - Job Applicant Source * Source and source name field in job applicant * Updated install_fixtures with default options * Update install_fixtures.py * Fixes codacy	2018-06-21 10:47:54 +05:30
Frappe PR Bot	748c0240db	[Translation] Updated Translations (#14615)	2018-06-21 10:34:28 +05:30
Charles-Henri Decultot	fc2292f08c	Email alert renamed to Notification (#14618)	2018-06-21 09:17:52 +05:30
Nabin Hait	3946b77555	changed fieldname of inventory section break in Item	2018-06-20 22:33:34 +05:30
Shreya Shah	b125ba9ed8	Update status if tasks have been completed (#14601)	2018-06-20 17:52:21 +05:30
Manas Solanki	616a6d2bc2	Test leave management (#14587) ... * test max allowed days in leave policy * test the leave period * test leave encashment	2018-06-20 17:47:45 +05:30
Suraj Shetty	be3ce16352	Daily work summary reply report (#14583) ... * Add daily work summary reply report * Show user name instead of email * Remove print statement * Change field datatype * ReRun Travis	2018-06-20 17:46:03 +05:30
Nabin Hait	7aae0e66df	minor fix	2018-06-20 17:45:39 +05:30
Bassam Ramadan	45725c2c7b	add missing brand filter to stock balance report (#14597) ... add missing brand filter to stock balance report	2018-06-20 17:41:29 +05:30
Shreya	3fd21d4273	Fix codacy	2018-06-20 16:09:16 +05:30
Shreya	5c6ade4bd8	Update and set status on the basis of project completion	2018-06-20 15:55:27 +05:30
Shreya	a5afd96019	Employee Onboarding and Separation lists	2018-06-20 15:55:14 +05:30
Saurabh	59798b4e88	resolved merge conflict	2018-06-20 15:23:25 +05:30
Saurabh	98b7bb5679	bumped to version 10.1.39	2018-06-20 15:51:40 +06:00
Zarrar	99017b173d	naming for asset maintenance task should be task name (#14607)	2018-06-20 14:53:13 +05:30
Ranjith Kurungadam	c1030a3958	fix - Employee Transfer, Promotion (#14603)	2018-06-20 12:42:58 +05:30
Jamsheer	a1bb94e59d	Pro-rata component consistency for monthly Salary slip (#14595) ... * Pro-rata component consistency for monthly Salary slip * Resolve merge conflict	2018-06-20 12:41:32 +05:30
Ranjith Kurungadam	05d00397d0	Update tax calculation (#14564) ... * Tax Slab remove to_amt mandatory, condition data type Code * Salary Slip - consider condition in tax slab * Payroll Period - help text for tax slab condition	2018-06-20 12:33:02 +05:30
Ranjith Kurungadam	4f9744a56d	HRA fix (#14589) ... * hra - fix var ref before assignment * Tax Exemption Category - remove deduction component	2018-06-20 11:10:56 +05:30
Jamsheer	55a2f4da71	Employee Benefit (#14571) ... * Rename - filed is_pro_rata_applicable to pay_against_benefit_claim * Employee Benefit Application - Validate previous benefit claim * Employee Benefit Claim - Code refactor * Salary Slip - additional salary - fix	2018-06-20 11:04:21 +05:30
Jamsheer	c526cad183	[Fix] Additional Salary Component and tax calculation (#14581) ... * Additional salary not include in tax calculation * Additional salary get doubled in salary slip via Payroll Entry - Fix * Salary Component - if is_additional_component hide flexi	2018-06-20 10:52:20 +05:30
Shreya Shah	222c550c29	Parse left out time (#14586)	2018-06-20 10:51:32 +05:30
Shreya Shah	0cb0c0b642	[Tests] Staffing Plan (#14585) ... * Add test case for Staffing Plan * Fix codacy	2018-06-20 10:50:54 +05:30
Zarrar	42f2d1a7a8	fix incase no customer fetched (#14596)	2018-06-20 10:50:11 +05:30
Ranjith Kurungadam	f972e7b259	Staffing Plan - remove department filter, query by dates (#14590)	2018-06-20 10:48:40 +05:30
rohitwaghchaure	fd5ac45775	[Fix] Not able to make invoice in the subscription (#14594)	2018-06-20 10:47:55 +05:30
Nabin Hait	a125a6199c	Allowed paid amount against debit/credit note	2018-06-19 12:07:02 +05:30
Shreya Shah	b0575265fb	Test case for Attendance Request (#14566) ... * Add test case for Attendance Request * Add a message if attendance not submitted * Add test for cancelled document	2018-06-19 10:47:40 +05:30
Shreya Shah	97124e92fa	[Fixes] Tax withholding category and Bank Guarantee (#14576) ... * Fetch withheld percentage * Set query for accounts on the basis of company * Fix bank guarantee error on submit * Remove errors caused by fields which are removed	2018-06-19 10:46:41 +05:30
Zarrar	ba1cdc6c57	fix opening invoice related authorization control - item=None (#14567)	2018-06-19 10:45:47 +05:30
Shreya Shah	cbff30f718	[Tests] Shift Planning (#14570) ... * Cancel shift assignment on cancellation of shift request * [minor] Fix shift type test * Modify test for shift request * Add test case for shift assignment * Fix syntax * Fix codacy	2018-06-19 10:45:33 +05:30
asbasawaraj	b0fafa9774	Additional fields in Certified Consultant DocType (#14573)	2018-06-19 10:43:55 +05:30
Shreya Shah	77de8dc102	Change Restaurant icon type to module (#14578)	2018-06-19 10:43:08 +05:30
Nabin Hait	875c941f3d	fixes in setting itemised tax breakup	2018-06-18 17:41:27 +05:30
Nabin Hait	8eeb5694ba	Fixed qty in item-wise sales history report	2018-06-18 17:41:27 +05:30
Nabin Hait	0bef91c241	minor fix in item type validation	2018-06-18 17:41:27 +05:30
Nabin Hait	ae02209b6a	Removed autoname of child table	2018-06-18 17:41:27 +05:30
Shreya Shah	5c3929c5ea	Fix positioning of fields (#14562)	2018-06-18 15:49:59 +05:30
Zarrar	e0adb6bbd6	cost_center overridden by company's default fix in SI (#14560)	2018-06-18 15:49:12 +05:30
Shreya Shah	1ac5585151	Bug - Add batch while creating serial nos (#14559)	2018-06-18 15:44:10 +05:30
Ranjith Kurungadam	5f7c7bfc78	remove patch to add hra fields (#14552)	2018-06-18 15:43:45 +05:30
Ranjith Kurungadam	6cca03195f	fix- Salary Structure filter (#14558)	2018-06-18 15:42:38 +05:30
Ranjith Kurungadam	28f49a5a8e	fix - link validation error (#14547)	2018-06-18 10:40:23 +05:30
Zarrar	80ff296e97	data not filled in acc. receivable report for some field fix (#14546)	2018-06-17 11:21:10 +05:30
Manas Solanki	efa191c72e	[minor fix] change the unicode/str to the datetime obejct (#14534)	2018-06-15 18:04:12 +05:30
rohitwaghchaure	83a2612a18	[Fix] Consolidated Financial Statement report (#14537)	2018-06-15 18:03:50 +05:30
rohitwaghchaure	77a45b43aa	Added expense account, cost center in the purchase order and material request item doctype and fix the code (#14535)	2018-06-15 18:03:31 +05:30
Shreya Shah	27eff99190	[minor] Fixes for Exchange rate revaluation doctype (#14533) ... * Add set query for account and party_type * Fix asset category error	2018-06-15 16:30:15 +05:30
Shreya Shah	5f855d5da4	Add test case for Inter company Journal Entry (#14531)	2018-06-15 15:33:21 +05:30
Ameya Shenoy	22c2f472e3	Merge branch 'master' into develop	2018-06-15 09:35:06 +00:00
Ameya Shenoy	ed77429496	bumped to version 10.1.38	2018-06-15 09:29:56 +00:00
Nabin Hait	380a74732c	salary structure related test case fixes	2018-06-15 14:42:12 +05:30
Nabin Hait	2f89a04511	create user permissions on save of employee	2018-06-15 13:16:44 +05:30
rohitwaghchaure	e647c1f3cb	Renamed asset adjustment to asset value adjustment (#14532)	2018-06-15 13:06:28 +05:30
Nabin Hait	fcaeea70d2	Update employee.py	2018-06-15 12:47:45 +05:30
Nabin Hait	5bc533f65d	Test case fixes	2018-06-15 11:59:58 +05:30
asbasawaraj	4c263480c9	Certfication Application Doctype and webform,Certfied Consultant DocType (#14528)	2018-06-15 10:04:19 +05:30
Ranjith Kurungadam	0e5c8283fa	Salary Slip - update period factor for tax calc (#14527)	2018-06-15 10:03:57 +05:30
Nabin Hait	2737b08f0f	blanket order related fixes	2018-06-14 18:07:34 +05:30
Shreya Shah	0b9b8d6826	Remove unused code (#14526)	2018-06-14 17:57:39 +05:30
Shreya Shah	02575d1f2c	Merge pull request #14205 from Alchez/frappe-contract ... [Feature] Managing Contracts in ERPNext	2018-06-14 17:57:02 +05:30
Ranjith Kurungadam	a8e047afc8	HRA tax exemption Indian regional (#14520) ... * remove HRA fields fom declaration, proof submission * HRA fields, methods India regional * Company - remove Payroll Settings * HRA India regional, override methods * Patch to add HRA fields for India	2018-06-14 17:56:16 +05:30
Manas Solanki	c7afbea708	Update bom.py (#14524)	2018-06-14 17:30:26 +05:30
Nabin Hait	d1f40ad0b6	minor fix	2018-06-14 17:09:55 +05:30
Shreya	cdd3982b44	[minor] Fix	2018-06-14 16:43:47 +05:30
Shreya	f333536446	Remove test_records.json and modify test	2018-06-14 16:43:07 +05:30
Nabin Hait	44341c1637	removed blanket order docs	2018-06-14 15:58:41 +05:30
Nabin Hait	b2d3c0f040	Update ordered qty in blanket order	2018-06-14 15:56:29 +05:30
Manas Solanki	9a31dd7062	test + documentation	2018-06-14 15:56:29 +05:30
Manas Solanki	2df1b31707	[minor] minor fixes along with the codacy	2018-06-14 15:55:38 +05:30
Manas Solanki	e5e87f7137	[feature] Blanket Order ... - Creaete Sales or Purchase order from the blanket order - If there is any blanket order for the customer/supplier rates will be fetched from that order - Manually selecting the Blanket order will change the rates accordingly - Upon submission of the order, the ordered qty will be updated in the Blanket Order	2018-06-14 15:55:38 +05:30
Manas Solanki	2fb63e1724	init the blanket order	2018-06-14 15:55:37 +05:30
Rushabh Mehta	1198d94904	[rename] Email Alert -> Notification	2018-06-14 13:18:21 +05:30
Shreya Shah	c3d1353ab5	Merge pull request #14518 from shreyashah115/patch-fix ... Check if table exists else return	2018-06-14 13:08:49 +05:30
Shreya	df385ac3c0	Check if table exists else return	2018-06-14 13:07:52 +05:30
Zarrar	14a9c0706b	Merge pull request #14461 from mntechnique/sales_partner_type ... Partner Type as Link field added in Sales Partner	2018-06-14 12:48:24 +05:30
Zarrar	6ffdf94003	[Fixes] Defaults and User-Permission based fixes in treeview (#14501) ... * utility function added for treeview function to distinguish defaults from user permission and return appropriate data * make use of utility function for treeview	2018-06-14 12:24:16 +05:30
Shreya Shah	06ef4270f2	Merge pull request #14447 from zerodhatech/loan_application ... [Enhancement] toggle required fields on select of repayment option in loan application	2018-06-14 12:05:46 +05:30
Jamsheer	c7743932ab	[Fix] HR Fixes (#14511) ... * Payroll Entry - fix in db query * Salary Structure Assignment - Company read_only = 1 * Fixes in hr util and benefit claim * Employee Benefit Application - Late application - fix	2018-06-14 11:55:17 +05:30
Zarrar	17089eeac3	[Minor] Fetching and appending items in Stock Reconciliation fix (#14509) ... * minor fix in get_list of items in stock reconciliation * reload doc fails because of backdated modified date * item and item defaults should load prior to shopify refactor * attribute value should't be none or empty, could be zero though * Update item.py	2018-06-14 11:54:18 +05:30
Shreya Shah	dd8fba6783	Do not check for batch on cancellation (#14506)	2018-06-14 11:49:45 +05:30
Saurabh	8e74df09a4	[fix] On deletion of salary slip decrease the series count (#14508)	2018-06-14 11:47:21 +05:30
Rushabh Mehta	0d19744b17	[fix] for notification	2018-06-14 09:23:32 +05:30
IOWEB TECHNOLOGIES	62805e2101	Fix unicode literal issue that prevents payment entries to be created (#14515)	2018-06-14 09:14:07 +05:30
rohitwaghchaure	fb997d6539	[Fix] Woocommerce test cases (#14513)	2018-06-14 09:13:39 +05:30
Prateeksha Singh	0738483343	[docs] remove docs folder 💥, update docs app to foundation (#14516)	2018-06-14 09:11:05 +05:30
Manas Solanki	687c6bb002	Merge pull request #14510 from rohitwaghchaure/test_cases_for_material_consumption ... [Fix] Travis for the test case test_material_consumption	2018-06-13 18:41:12 +05:30
Rohit Waghchaure	80d4477d1e	[Fix] Travis for test_material_consumption	2018-06-13 18:37:03 +05:30
Shreya Shah	a2056a39bd	Fix patch (#14503) ... * Modify patch to move leave approvers from Employee master to Department master * Rename child table names - Rename leave approver to leave approvers - Rename expense approver to expense approvers * Import cstr * Fix a condition	2018-06-13 17:11:17 +05:30
Manas Solanki	aa17294979	Update utils.py	2018-06-13 16:47:41 +05:30
Shreya Shah	3d73a6f7f2	Fetch details from Journal Entry in Accounts Payable report (#14495) ... * Fetch bill_no, bill_date from Journal Entry * Fix as per suggestion * Fetch details only if bill_no exists	2018-06-13 16:33:06 +05:30
FinByz Tech Pvt. Ltd	46c8ccc6a8	Fix conflict for taxable value having same item in GSTR-1 Report (#14492) ... * Update gstr_1.py Merge conflict for taxable value having same item * Update gstr_1.py * Minor Fix * Update gstr_1.py	2018-06-13 15:34:17 +05:30
Jamsheer	30f37b2eb1	Payroll Entry - Separate JE for flexi salary component (#14502) ... * Payroll Entry - Accrual entry - exclude only tax impact - and separate JE for Flexi in Bank Entry * Journal Entry - validate cheque info on submit * Payroll Entry - Make Bamk Entry - Separate JE for benefit component	2018-06-13 15:29:38 +05:30
Jamsheer	cc25eb00b5	Employee benefit application depends on lwp (#14494) ... * Employee benefit - pro-rata amount - depends on lwp and working days * HR Util - get holidays for employee * Employee Benefit Application - calculate remainig on max benefit * Employee benefit - late application - depends on lwp * missing semicolon	2018-06-13 15:14:24 +05:30
rohitwaghchaure	93e8bbac84	[Fix] Travis for employee_tax_exemption_declaration (#14500)	2018-06-13 15:12:32 +05:30
Shreya Shah	4fe2a91b9f	Remove docstatus=1 to show pending leaves as well (#14498)	2018-06-13 15:11:43 +05:30
Manas Solanki	9385cd5203	Merge pull request #14496 from rohitwaghchaure/stock_entry_test_cases ... [Fix] Travis for stock entry	2018-06-13 14:06:20 +05:30
Rohit Waghchaure	0eef3f665d	[Fix] Travis for stock entry	2018-06-13 13:06:25 +05:30
Manas Solanki	b12f0d90af	fix the timesheet	2018-06-13 12:30:02 +05:30
Jamsheer	f6d7b5d0c8	Salary slip - additional salary - deductions (#14476)	2018-06-13 11:36:43 +05:30
Tom Price	32c984cd3c	Fix fields being hidden by default. (#14490) ... Modify the title property to be sensible for general usage, unique and translatable. Add allow_in_quick_entry properties appropriately.	2018-06-13 11:14:44 +05:30
Manas Solanki	176e7c5ce2	fix the test case for the payroll (#14480) ... * fix the test case for the payroll * fix the shopify and stock entry * more structured test cases for payroll	2018-06-13 11:13:01 +05:30
Prateeksha Singh	d1fffb6ba1	Merge pull request #14484 from pratu16x7/help-portal ... [help-portal] don't show issues to guest	2018-06-12 17:40:36 +05:30
Prateeksha Singh	8d58429b69	[help-portal] don't show issues to guest	2018-06-12 17:39:12 +05:30
Nabin Hait	76c51b3068	minor ux fix	2018-06-12 16:29:10 +05:30
deepak-mnt	b95f60c6f3	minor changes	2018-06-12 16:04:49 +05:30
Rohit Waghchaure	b6381c66d8	[Fix] Purchase receipt test cases	2018-06-12 13:54:40 +05:30
rohitwaghchaure	a6b346f827	Merge pull request #14475 from rohitwaghchaure/asset_test_cases_fixes ... [Fix] Test cases for asset	2018-06-12 12:21:11 +05:30
Rohit Waghchaure	f270567c45	[Fix] Test cases for asset	2018-06-12 12:20:52 +05:30
Ranjith Kurungadam	138e6abaff	Salary Slip - update tax calculation, deduct tax for unsubmitted exemption proof (#14428)	2018-06-12 12:19:36 +05:30
Suraj Shetty	e06ecd2494	Check if user permission for employee exists (#14474) ... - Also check if user has permission to add user permission to avoid insufficient permission error while updating user profile	2018-06-12 12:06:41 +05:30
Jamsheer	8d66f1e45d	Employee benefit - Late employee benefit application (#14465) ... * HR Utils - get salary slip total benefit given for a payroll period * Late employee benefit application * Additional Salary - code refactor - get_amount * new line in salary detail json * Employee benefit late application - validation refactor * Codacy fix	2018-06-12 11:30:59 +05:30
rohitwaghchaure	2354c1eba3	Merge pull request #14467 from rohitwaghchaure/update_location_in_serial_no ... Code cleanup and fixes for the asset	2018-06-12 11:19:01 +05:30
Manas Solanki	65b55a53a6	Update test_leave_application.py	2018-06-12 11:18:01 +05:30
Rohit Waghchaure	ec2a2ac47e	[Fix] patch	2018-06-12 01:16:28 +05:30
Manas Solanki	d7f6d45e28	Merge pull request #14468 from manassolanki/fix-travis-1 ... fix the salary slip test cases	2018-06-11 19:29:28 +05:30
Manas Solanki	f226b50d6d	fix the salary slip test cases	2018-06-11 19:27:46 +05:30
Rohit Waghchaure	647d595158	Code cleanup and fixes for the asset	2018-06-11 19:15:08 +05:30
Shridhar Patil	c3f5849ac0	typo fixed	2018-06-11 18:26:45 +05:30
Manas Solanki	e832aa4fe2	Merge pull request #14436 from shreyashah115/fix-trav ... Travis again	2018-06-11 17:45:11 +05:30
Shreya Shah	157815ff0c	Patch for total quantity (#14458) ... * Add path to patches.txt * Modify patch	2018-06-11 17:32:17 +05:30
Jamsheer	0ca76323af	Clinical Procedure Template - get_item_details - fix (#14449)	2018-06-11 17:25:49 +05:30
Prateeksha Singh	252d0bf255	Merge pull request #14455 from frappe/kennethsequeira-patch-3 ... Fix minor div issue in Accounts index page	2018-06-11 16:33:51 +05:30
rohitwaghchaure	7cd59a2089	Merge pull request #14453 from rohitwaghchaure/item_alternative_fixes_for_backflush ... [Fix] Alternative item, transferred qty issue for backflush method	2018-06-11 15:44:37 +05:30
Shreya	9680dc476f	Remove commented code	2018-06-11 15:40:09 +05:30
deepak-mnt	bb6753f206	Merge branch 'develop' of https://github.com/frappe/erpnext into sales_partner_type	2018-06-11 15:01:43 +05:30
deepak-mnt	4ec283d775	patch for sales partner type field	2018-06-11 14:53:25 +05:30
Manas Solanki	7e8cbf288c	Update cost_center.py	2018-06-11 14:25:27 +05:30
Kenneth Sequeira	061492a9af	Fix minor div issue in Accounts	2018-06-11 14:24:19 +05:30
Rohit Waghchaure	86026d31cf	[Fix] Alternative item, transferred qty issue for backflush method	2018-06-11 14:11:00 +05:30
Rohit Waghchaure	cdec44ee81	Removed company data from test item records	2018-06-11 13:32:34 +05:30
Prateeksha Singh	ea7533fa75	[tax-breakup] store itemized tax by item_name when can	2018-06-11 13:31:33 +05:30
Shridhar Patil	6a00a17c14	toggle required fields on select of repayment option in loan application	2018-06-11 12:48:31 +05:30
rohitwaghchaure	7048925016	[Enhance] Standalone debit/credit note (#14269) ... * [Enhance] Standalone debit/credit note * Test cases * Test cases and documentation * Removed credit, debit note links from accounts module	2018-06-11 12:02:14 +05:30
Manas Solanki	3639b85663	Merge pull request #14363 from frappe/manassolanki-patch-10 ... PR to check the current state of Travis	2018-06-11 11:40:40 +05:30
Ranjith Kurungadam	e46639f47c	Employee Transfer allow same company, update internal work history (#14430)	2018-06-11 11:24:44 +05:30
Zarrar	88a90ff3b5	minor fix in account and account utils (#14432)	2018-06-11 11:21:17 +05:30
Shreya	83d5dc119b	Fix Employee tax declaration test case	2018-06-11 10:31:40 +05:30
Shreya	664f30a018	Fix asset maintenance json	2018-06-11 10:31:40 +05:30
Shreya	294238abfd	Fix shopify test case	2018-06-11 10:31:39 +05:30
Shreya	956277b121	Fix tests	2018-06-11 10:31:39 +05:30
Zarrar	65994210f6	fix patch to add email template in hr settings (#14427)	2018-06-08 16:57:06 +05:30
Zarrar	44175904c6	Tree fix (#14425) ... * use frm.set_value instead of this.set_value * generic methods moved to accounts/utils * clean up code, and make use of methods added in utils	2018-06-08 16:35:21 +05:30
Suraj Shetty	f553b53fbf	Add patch to set update_field and update_value (#14421) ... * Add patch to set update_field and update_value - set update_field and update_value if empty since expense claim workflow is dependent on it. * Set update_field for workflow state of leave application * Update patch entry * Fix bug * Update set_update_field_and_value_in_workflow_state.py	2018-06-08 16:28:36 +05:30
Alchez	ca8138fd13	[Agriculture] Sort crop tasks chronologically and optimize disease task creation (#14367) ... * Improve max crop period check and sort agriculture tasks chronologically * Reformat crop cycle logic and add field to optimize task creation	2018-06-08 14:55:07 +05:30
Doridel Cahanap	ebb530385a	Add Employee Status Temporary Leave (#14423)	2018-06-08 14:54:31 +05:30
rohitwaghchaure	8fc64a9717	[Fix] Travis data (#14422)	2018-06-08 14:43:50 +05:30
Zarrar	7ab70ca2d7	[ Fixes ] v11 Tree based doctype testing (#14419) ... * location tree fixes validate if child present while deleting, filter lists down only group enabled node * department tree fixes Adding child fix if added from rootnode with company filter applied. Rename consistency added. Validation added in on_trash * Company tree fix Check if child exist while deleting a node validation added. * Supplier Group tree fixes on_trash validation added if child node present * Cost Center tree fixes Adding child to root node throws error because parent_cost_center picks up root name	2018-06-08 14:33:15 +05:30
Gaurav Naik	094617d29a	Fix to allow migration of individual sites (#14413)	2018-06-08 11:44:27 +05:30
Shreya Shah	b9399d8781	Cancel attendance if leave application is cancelled (#14372) ... * Cancel attendance if leave application is cancelled * Fix as per review	2018-06-08 11:24:08 +05:30
Zarrar	8cd0f67b25	query fix if name contains apostrophe (#14370)	2018-06-07 16:48:31 +05:30
Zarrar	13f9851609	[Docs] Update doc for Supplier Group (#14373) ... * add breadcrumb for Supplier Group tree * change occurrences of supplier-type to supplier-group * update supplier-group doc, update pngs	2018-06-07 16:47:30 +05:30
Zarrar	209d8f36f7	doctype was not reloaded to pickup changes (#14371)	2018-06-07 16:43:55 +05:30
Prateeksha Singh	50ae6b891b	Merge pull request #14410 from pratu16x7/hub-fixes ... Hub fixes	2018-06-07 14:19:01 +05:30
rohitwaghchaure	2704bef0b3	Merge pull request #14368 from shreyashah115/fix-trav ... Some more travis fixes	2018-06-07 14:14:33 +05:30
Prateeksha Singh	00ab78d768	[hub] set page title dynamically	2018-06-07 14:13:00 +05:30
Shreya	88591314b0	Fix Leave Application test cases	2018-06-07 13:56:27 +05:30
Rohit Waghchaure	de82ad1c5f	[Fix] Clenaup code if supplier gstin is none	2018-06-07 13:24:25 +05:30
Prateeksha Singh	9a7f957ace	[hub] fix item page recursion	2018-06-07 12:40:40 +05:30
Shreya	88fe0d59d9	Fix daily work summary test	2018-06-07 11:22:26 +05:30
Shreya	4638d1ab97	Fix POS Profile test	2018-06-06 16:23:16 +05:30
Shreya	71316aaec8	Modify asset movement test cases and files	2018-06-06 15:55:30 +05:30
Zarrar	32a118d68c	fix precision in stock entry (#14366)	2018-06-06 15:06:52 +05:30
Saurabh	eb579a11e1	Fix demo (#14365) ... * fix demo * Update asset.json	2018-06-06 15:05:31 +05:30
Shreya	90bdfed3db	Modify all asset test cases	2018-06-06 14:27:55 +05:30
Manas Solanki	3504a2342e	PR to check the current state of Travis	2018-06-06 12:46:06 +05:30
Ranjith Kurungadam	cff14793d8	Salary Structure, Slip - make fields readonly (#14358) ... * Salary Structure, Slip - make fields readonly * codacy fixes * Salary Component - reorder fields, removed is_group for flexi * Update salary_structure.js	2018-06-06 12:04:25 +05:30
Ameya Shenoy	873e28d9b8	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
Ameya Shenoy	36cd433999	bumped to version 10.1.37	2018-06-06 05:41:37 +00:00
Charles-Henri Decultot	a774f3d7a0	POS closing voucher (#14270) ... * POS closing voucher * Codacy corrections + improvements * Codacy corrections * POS Closing Voucher improvements	2018-06-06 10:22:13 +05:30
Alchez	eb0ac37587	Fix ISO standard references in Agriculture (#14361)	2018-06-06 10:10:56 +05:30
Shreya Shah	59af3a0296	[Enhancement] UOM Conversion Factors (#13853) ... * new doctype UOM category * new doctype UOM Conversion Factor * bootstrap json data for uom conversions * uom conversion in item * Patch to add all conversions and categories * Fetch conversions multi-way * fix codacy * Rebase with develop * [minor] Fix * Add a test case * Improvise as per review comment * Add json data for UOMs * Commonify function and call from patch * Update uom_conversion_data.py	2018-06-06 09:44:46 +05:30
Sushant Nadkar	d458f7710f	[UX Improvement] Removed uri encoding from search results on front end (#14266) ... * removed uri encoding from search results on front end * decode search string using html2text	2018-06-06 09:23:38 +05:30
Shreya Shah	c37fd050c5	Remove unnecessary variable (#14352) ... * Remove unnecessary variable * Replace cur_frm with frm * Update material_request.js	2018-06-06 09:19:48 +05:30
Shreya	9aa7d8fe5f	Update asset related test cases	2018-06-06 04:27:59 +05:30
Shreya	80a1e156cb	Create location for asset test	2018-06-06 03:11:18 +05:30
Shreya	9c801b976d	Fix share transfer test	2018-06-06 02:58:23 +05:30
Shreya	8f692f9a27	Fix batch test	2018-06-06 02:09:17 +05:30