brotherton-erpnext

Author	SHA1	Message	Date
Zlash65	06fd51bf69	patch fix for instructor	2018-05-14 17:16:27 +05:30
Zlash65	d25a264e5b	create and update department records patch	2018-05-14 16:07:28 +05:30
Zlash65	03ad0f2f4a	set query for department based on company	2018-05-14 16:07:28 +05:30
Zlash65	9a8f5bd6c7	set department name with company abbr	2018-05-14 16:07:27 +05:30
Zlash65	39668609ce	improv department tree	2018-05-14 16:07:27 +05:30
Zlash65	366ca92ba7	move default_currency on top	2018-05-14 16:07:27 +05:30
Zlash65	513f13df27	patch fix	2018-05-14 16:05:16 +05:30
Faris Ansari	404f39d373	[fix] apply price list in_apply_price_list flag remains true if server exception occurs	2018-05-14 15:46:45 +05:30
Zlash65	39097c7fbe	codacy fix	2018-05-14 15:34:45 +05:30
Shreya Shah	bbee9b6cc4	[Enhancement] Monthly Attendance Report (#13970 ) * Update Attendance on Approval of Leave * Separate out leaves on the basis of its type * Remove commented code * Make attendance records if not found * Fix Codacy * Replace bad code in attendance.py	2018-05-14 14:30:58 +05:30
Manas Solanki	661332dab5	[fix] honour the shopping cart setting when showing the stock and non-stock item (#13988 )	2018-05-14 14:30:30 +05:30
Zarrar	8646ed45bc	button triggers not working in tasks table (#13973 )	2018-05-14 14:29:01 +05:30
Faris Ansari	69b0535e10	[fix] Incorrect currency conversion in Itemised Tax Breakup (#14006 )	2018-05-14 14:19:31 +05:30
Suraj Shetty	f93cc57e8a	Ignore user permission for 'variant Of' in Item (#14013 ) - Since mostly variant of is null it gets filtered out if user permission is applied. And since variant is a link to item itself there is no need to check user permission for it as user permission gets applied on Item anyways.	2018-05-14 14:07:20 +05:30
Shreya Shah	ba6cb8ae4b	[Healthcare] Fix UI (#14011 ) * Fix UI * Fix Calendar View	2018-05-14 14:06:31 +05:30
Faris Ansari	a7387b45ec	[fix] Get items from BOM error in python 3 (#14012 )	2018-05-14 14:05:52 +05:30
Jamsheer	236be22648	Payroll entry - get employee fix	2018-05-14 13:32:50 +05:30
Rohit Waghchaure	ebe1ebead2	[Fix] 'ProductionOrder' object has no attribute 'set_work_order_operations'	2018-05-14 13:21:45 +05:30
Jamsheer	d0b0c87f40	get additional salary component in salary slip	2018-05-14 12:16:46 +05:30
Jamsheer	08b60a1a62	New Doctype - Additional Salary Component	2018-05-14 12:16:46 +05:30
Jamsheer	a5028c8e54	Salary Structure - filter updated, Salary Component - fields re-arranged	2018-05-14 12:16:45 +05:30
Jamsheer	b5c5c471b4	Formula on Salary Component Master	2018-05-14 12:16:45 +05:30
Jamsheer	4bd7cdb018	Salary Structure Assignment - filters applied	2018-05-14 12:13:47 +05:30
Manas Solanki	a27d29b349	enable deferred revenue in the item master	2018-05-14 12:07:14 +05:30
Zlash65	f665189ab3	tree based changes	2018-05-14 11:45:38 +05:30
Zlash65	93d6b555d7	added fixtures for supplier-group, changed analytics report accordingly	2018-05-14 11:45:38 +05:30
Zlash65	c88ce364ce	treeview implemented for supplier group	2018-05-14 11:45:38 +05:30
Zlash65	540d7aa635	patch to reload_doc and rename field	2018-05-14 11:45:38 +05:30
Zlash65	2e0809801d	controller and other changes	2018-05-14 11:45:38 +05:30
Zlash65	890707854d	config/utility level changes	2018-05-14 11:45:38 +05:30
Zlash65	0a50554417	doctype level changes	2018-05-14 11:45:38 +05:30
Zlash65	4437a5ed18	json level changes	2018-05-14 11:45:38 +05:30
Zlash65	3387a35fed	rename supplier-type to supplier-group	2018-05-14 11:42:30 +05:30
rohitwaghchaure	a8c49f26d3	Merge pull request #14002 from rohitwaghchaure/search_item_spelling_issue Fixed spelling	2018-05-14 00:44:29 +05:30
Rohit Waghchaure	eee830eafe	Fixed spelling	2018-05-13 16:17:18 +05:30
Saurabh	c1acbdfb69	[fix] overlapping dates	2018-05-12 17:45:39 +05:30
Saurabh	a35dad7610	add get leave period method	2018-05-12 17:45:39 +05:30
Faris Ansari	f2b3307136	Remove escaped customer string (#13986 ) - no need to escape strings that are passed to the values parameter of the sql method - this query was failing for inputs like "D'Arby" which have quotes	2018-05-11 21:07:27 +05:30
Jamsheer	46b23f8e6e	Salary Structure Refactor, Formula on Salary Component Master (#13967 ) * Salary structure refactor * Salary Structure Assignment - filters applied * Formula on Salary Component Master * Salary Structure - filter updated, Salary Component - fields re-arranged * Payroll Entry - get_employee_list fix * Salary Structure Assignment - Validate Duplicate Assignment * Salary Structure Assignment - filters for salary structure	2018-05-11 21:05:24 +05:30
Pawan Mehta	c53e35368d	Shift Management - Documentation and Tests (#13997 ) * [fix] #13996 * codacy fix	2018-05-11 21:03:50 +05:30
Gaurav Naik	9502476c67	Accounting Period overlap validation	2018-05-11 07:53:12 +05:30
Gaurav Naik	6c92cff226	Accounting Period autoname	2018-05-11 07:52:50 +05:30
Ranjith	ded636097e	Tax Declaration, Proof Submission tests	2018-05-10 15:42:04 +05:30
Ranjith	5a8e6427f4	Tax Declaration, Proof Submission, validation	2018-05-10 15:06:49 +05:30
Ranjith	85d2d571c5	update hr menu, field subcategory in child table	2018-05-10 15:04:32 +05:30
Ranjith	e1c556b7e0	Doctype Employee Tax Exemption Sub Category	2018-05-10 15:02:57 +05:30
Ranjith	96121c598e	Tax Declaration, Proof Submission, field company	2018-05-10 15:02:00 +05:30
Kanchan Chauhan	d560da950d	[Minor] Show only active driver in Delivery Trip	2018-05-10 10:42:56 +05:30
Jamsheer	9032c9d91d	Documentation - updated	2018-05-09 19:19:34 +05:30
Nabin Hait	9d215c2d9b	Set operations on production order while making from Material Request	2018-05-09 18:32:54 +05:30
Nabin Hait	b9fed2aa38	Removed company from Finance Book and related changes	2018-05-09 15:10:29 +05:30
Gaurav Naik	a78a0e241f	Added finance book filtering logic to financial_statements.py	2018-05-09 15:03:40 +05:30
Gaurav Naik	8cbbdfdf30	Added finance book filter to financial_statements.js	2018-05-09 15:03:05 +05:30
Gaurav Naik	40559d5f5c	Added finance book filter logic to ReceivablePayable	2018-05-09 15:02:55 +05:30
Gaurav Naik	70ac2d2c51	Added finance book filter in accounts_receivable.js	2018-05-09 15:02:23 +05:30
Gaurav Naik	cddda8ac5f	Added finance book filter in accounts_payable.js	2018-05-09 15:02:11 +05:30
Gaurav Naik	57856b475c	Added finance book filter logic in general_ledger.py	2018-05-09 14:58:15 +05:30
Gaurav Naik	460d96f16d	Added finance book filter to General Ledger	2018-05-09 14:57:36 +05:30
Gaurav Naik	a6d3cbfbc5	Added finance book field to GL Entry doctype	2018-05-09 14:56:52 +05:30
Gaurav Naik	30f9e0f547	Set finance book in make_gl_entries	2018-05-09 14:56:39 +05:30
Gaurav Naik	a948726ddd	Added Finance Book doctype	2018-05-09 14:53:51 +05:30
Manas Solanki	fbe548e4be	[Enterprise] Bank Guarantee Enhancements (#13960 )	2018-05-09 14:49:53 +05:30
Vishal Dhayagude	3cf0d51e65	[fix] Compounding error in task weight (#13958 ) * [fix] Compounding error in task weight * [minor] minor changes * [fix] Requested Changes added	2018-05-09 10:42:39 +05:30
Jamsheer	63a8f83076	Leaves - Documentation	2018-05-08 18:45:41 +05:30
Nabin Hait	3881e98000	Staffing plan for group company	2018-05-08 18:36:14 +05:30
Jamsheer	4573e6609f	Leave Type - remove field is_parental_leave	2018-05-08 18:33:49 +05:30
Nabin Hait	b2800eeb2a	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-05-08 16:34:35 +05:30
Nabin Hait	9036b9ee85	Merge branch 'master' into develop	2018-05-08 16:31:42 +05:30
Nabin Hait	0ff31f0ebf	bumped to version 10.1.31	2018-05-08 17:01:38 +06:00
Nabin Hait	247bd94824	Merge branch 'staffing' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-staffing	2018-05-08 16:30:18 +05:30
Zarrar	f2df7f32fa	update subscription to auto_repeat across dashboards (#13956 )	2018-05-08 16:06:36 +05:30
Nabin Hait	3e47fbb2f0	assign salary structure custom button	2018-05-08 16:05:04 +05:30
Saurabh	40349f4b00	[fix] add stock entry link on Material Request Dashboard (#13950 )	2018-05-08 15:23:51 +05:30
Saurabh	b36517158b	[fix] cheque print template coordinates (#13959 )	2018-05-08 15:23:29 +05:30
Jamsheer	bec950428c	HR Utils - Trailing whitespace	2018-05-08 12:50:14 +05:30
Manas Solanki	cf26b2ca1c	[minor] fix for the student report card	2018-05-08 12:39:02 +05:30
Jamsheer	fe882bc68a	Leave Application - Test - Leave allowed, applicable after, maximum continuos days	2018-05-08 12:36:51 +05:30
Jamsheer	3153734e7e	Leave Application - validate applicable after for leave type	2018-05-08 12:36:51 +05:30
Jamsheer	62a93533fc	Leave Policy - Validate Annual alloction for leave type	2018-05-08 12:36:51 +05:30
Jamsheer	d7bfa2303f	Leave allocation - validate max leave allocation days for a leave type	2018-05-08 12:36:51 +05:30
Jamsheer	b42f3d41ab	Compensatory Leave Request - Validate and Create leave allocation for compnsatory leave type	2018-05-08 12:36:51 +05:30
Jamsheer	b408b158dd	Leave allocation - link to leave period and compensatory leave request	2018-05-08 12:35:40 +05:30
Jamsheer	8c4386f016	Leave Type - new field is_compensatory	2018-05-08 12:35:40 +05:30
Jamsheer	c7aaf0ba67	Leave Period - Validate and Create Leave Allocation	2018-05-08 12:35:40 +05:30
Jamsheer	0e2cc5574d	HR Util methods	2018-05-08 12:35:40 +05:30
Jamsheer	9d857579af	Attendance Request - validate and create attendance	2018-05-08 12:35:40 +05:30
Jamsheer	b41baa228c	Attendance Request - link to company	2018-05-08 12:35:40 +05:30
Jamsheer	a9c82b6464	Attendance - link to attendance request	2018-05-08 12:35:40 +05:30
Shreya Shah	204c3bc37e	Remove Production Planning Tool docs (#13946 ) * Remove Production Planning Tool docs * Remove Offer Letter Occurrences * Rename Employee Loan Occurrences	2018-05-07 18:21:03 +05:30
bghayad	1184a7300a	Adding Payments View for Fees (#13939 ) * Adding View Payments For Fees * Adding View Payments For Fees * Adding Payments View For Fees	2018-05-07 18:20:37 +05:30
Nabin Hait	b7613af73c	Merge branch 'enterprise_sprint' of https://github.com/frappe/erpnext into enterprise_sprint	2018-05-07 16:13:33 +05:30
Nabin Hait	330fae8652	minor fixes	2018-05-07 16:11:35 +05:30
Shreya Shah	7bd83f3d8e	Rename occurrences for Production Order to Work Order (#13944 )	2018-05-07 15:27:21 +05:30
Ranjith	c36578e8d3	Job Opening - display vacancies only on staffing plan	2018-05-07 14:19:40 +05:30
Ranjith	f220e89d9f	Job Opening - get planned opening, validate vacancies by Staffing Plan	2018-05-07 13:58:54 +05:30
Ranjith	e4cda0380a	Staffing Plan - validations, get employee count on designation change, calc estimated cost	2018-05-07 13:54:49 +05:30
Nabin Hait	fdc67a577f	Merge branch 'multi-company-transations' of https://github.com/shreyashah115/erpnext into shreyashah115-multi-company-transations	2018-05-07 13:12:16 +05:30
Ranjith Kurungadam	95c5c055f8	Optional leave (#13931 ) * Optional Holiday - move holiday list from leave type to leave period * Optional Leave - validate on Leave Application * test Optional Leaves	2018-05-07 12:43:08 +05:30
Nabin Hait	d5220c0ff4	minor fix	2018-05-07 12:22:57 +05:30
Nabin Hait	01f5df72cc	Merge branch 'employee_promotion_transfer' of https://github.com/ESS-LLP/erpnext-healthcare into ESS-LLP-employee_promotion_transfer	2018-05-07 11:55:52 +05:30
Rah Yuliantoro	b3882cacd9	update coa and company default (#13937 ) * Update standard_chart_of_accounts.py adding account for employee advances * Update standard_chart_of_accounts_with_account_number.py adding account for employee advances * Update company.py adding accounts for default fields in company doctypes * Update company.py Missing some default accounts for fields in company doctype	2018-05-07 11:39:35 +05:30
Nabin Hait	ba70ff0904	Exchange rate revaluation (#13932 ) * Added account data on child table * Added Journal Entry button and functionality * Add docs * Refactoring and cleanup of Exchange Rate Revaluation	2018-05-05 18:22:56 +05:30
Ranjith	86b81e99e5	codacy fixes	2018-05-05 16:49:51 +05:30
Nabin Hait	338e1b6e91	Merge branch 'master' into develop	2018-05-05 14:33:35 +05:30
Nabin Hait	ea199f9cd9	bumped to version 10.1.30	2018-05-05 15:03:33 +06:00
Ranjith	9505ea93cf	codacy fixes	2018-05-05 14:32:42 +05:30
Nabin Hait	161f35a687	Update sales_invoice.py	2018-05-05 14:32:31 +05:30
Ranjith	715780b78b	Employee Promotion, Transfer - documentation	2018-05-05 13:51:34 +05:30
Ranjith	a68a108234	Employee Promotion, Transfer - test submit before date, create new employee	2018-05-05 13:43:15 +05:30
Ranjith	56b58017d1	Employee Promotion, Transfer - validate, submit, cancel workflow	2018-05-05 13:41:48 +05:30
Ranjith	fddfffd3e6	Employee Promotion, Transfer - modal to add details to child table	2018-05-05 13:27:26 +05:30
Ranjith	ea60225760	Employee Promotion, Transfer - update child table, added fields	2018-05-05 13:25:46 +05:30
Nabin Hait	4bbe5fbefc	Fixes related to auto repeat	2018-05-05 12:32:59 +05:30
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +05:30
Nabin Hait	723fe8fb1b	bumped to version 10.1.29	2018-05-05 12:43:29 +06:00
mnaim-cloude8	c3b4464df8	Remove unnecessary field.	2018-05-04 22:06:35 +08:00
Rohit Waghchaure	3e0a937cb8	[Fix] Tax not changes when user change the POS profile in the sales invoice	2018-05-04 19:20:20 +05:30
Shreya Shah	88aa3ec275	[Report] HSN-wise-summary of outward supplies (#13803 ) * hsn wise summary report * renamed * added total amount column * moved total amount column	2018-05-04 18:33:14 +05:30
Jamsheer	bd63f0056a	Patient medical record updation and deletion fixes (#13891 )	2018-05-04 18:13:28 +05:30
Pawan Mehta	5e7b2eb338	Add Calendar View to Attendance doctype (#13919 ) * [fix] #13917 * codacy fixes * remove company * add status * fix date issue * code optimizations * change sql	2018-05-04 18:12:35 +05:30
creador30	dae8f1b353	Search for item_code (#13912 ) Item query can be called from custom script to search for an additional field. In this case the item_name, item_group and item_description are still searchable, but not item_code. As the item code is a must have field in search results, I have added this to the non-changable search fields in this query.	2018-05-04 18:12:03 +05:30
Shreya Shah	55daa9cd24	fix taxable amount for same items (#13927 )	2018-05-04 18:01:23 +05:30
Shreya Shah	764b9bfeba	cint for Item field has_variants (#13916 ) * convert none type value to int * Fix typo	2018-05-04 17:58:36 +05:30
Suraj Shetty	dcc90e3312	Add fix to support changes in user permission (#13923 ) https://github.com/frappe/frappe/pull/5494	2018-05-04 17:52:57 +05:30
Shreya Shah	eec0209e3c	Fetch mandatory reqd from server side (#13924 )	2018-05-04 17:51:10 +05:30
Nabin Hait	62b985d405	[fix] Update show_in_website in template	2018-05-04 12:21:15 +05:30
KanchanChauhan	f4feedace4	Allow changing of Address after Submit (#13747 )	2018-05-03 19:08:54 +05:30
Suraj Shetty	57fbebb630	Update user permission doc (#13695 )	2018-05-03 19:07:07 +05:30
Suraj Shetty	00cced12a0	Success Action (#13666 ) * success action config for sales invoice * remove "Notification Control" doctype and its usage * add default success action after_install or while migration (patch) * rename for_doctype to ref_doctype * case change * minor fix * Remove unnecessary code * Replace message with translatable message * Fix 'cannot import error'	2018-05-03 19:06:32 +05:30
Shreya Shah	ecb9315ea1	Inter Company Journal Entry (#13683 ) * rebase with enterprise_sprint * Add Inter company account checkbox in Account master * Add Inter Company Journal Entry Voucher Type in Journal Entry * Make Inter Company Journal Entry button * Dialog to select company for Inter Company Journal Entry * Map relevant fields in the Inter Company Journal Entry and reference links * Rebase * Add Documentation	2018-05-03 19:04:36 +05:30
Zarrar	6f3594b2e4	[Enhance] GL Entry - ability to multiselect party (#13769 ) * change dynamic link to multiselect field and improv * print based fix * refactor changes according to multiselect changes	2018-05-03 19:00:43 +05:30
rohitwaghchaure	1aa3a11546	On auto-creation of new Fiscal Year, send Email notification to the account users (#13789 )	2018-05-03 18:59:26 +05:30
Saurabh	ed393d1025	[fix] consider user permissions in leave application calendar view (#13902 ) * [fix] consider user permissions in leave application calendar view * add hr settings to control leave calendar view * add patch	2018-05-03 18:52:25 +05:30
Nabin Hait	ed376cacc8	Set Qty in transactions based on serial no via Stock Settings (#13897 )	2018-05-03 16:24:52 +05:30
rohitwaghchaure	125c0caf12	Added brand in item price doctype, item prices report (#13900 )	2018-05-03 16:23:57 +05:30
Shreya Shah	c4323cb6ba	remove set query (#13908 )	2018-05-03 16:19:56 +05:30
Shreya Shah	c10820e93e	fix error (#13907 )	2018-05-03 16:09:34 +05:30
mnaim-cloude8	e21ad0e641	Add printing details section for Job Offer. To fetch correct letter head for company selected at Job Offer.	2018-05-03 15:43:25 +08:00
Prateeksha Singh	a7c6ff8f3e	Merge pull request #13837 from shreyashah115/serial-batch-linking Serial No. and Batch No. linking	2018-05-02 15:11:19 +05:30
Saurabh	e85a43c1c6	Merge branch 'master' into develop	2018-05-02 14:48:10 +05:30
Saurabh	4f6b68fef2	bumped to version 10.1.28	2018-05-02 15:18:09 +06:00
Shreya	27e4e244b6	fix codacy	2018-05-02 14:34:14 +05:30
Shreya	ae0b31c31d	changes as per the reviews	2018-05-02 14:34:14 +05:30
Shreya	b47302dd52	unlink reference on cancellation of any invoice	2018-05-02 14:34:14 +05:30
Shreya	c804f424ab	update reference fields on both invoices	2018-05-02 14:34:14 +05:30
Shreya	79584b1cbd	validations to check price list and currencies	2018-05-02 14:34:14 +05:30
Shreya	99ae0439d7	mapping of relevant fields	2018-05-02 14:34:14 +05:30
Shreya	0bd987ab03	validations before routing to invoice	2018-05-02 14:34:14 +05:30
Shreya	ed80cf1f2e	Inter company invoice reference link field	2018-05-02 14:34:14 +05:30
Shreya	30b2480cfe	make inter company invoice button on Invoices	2018-05-02 14:34:14 +05:30
Shreya	462e18ad2e	Allowed To Transact With child table in Customer & Supplier	2018-05-02 14:34:14 +05:30
Shreya	59512aaaaa	Internal Supplier check in Supplier	2018-05-02 14:34:14 +05:30
Shreya	7946ca216e	Internal Customer check in Customer	2018-05-02 14:34:14 +05:30
Nabin Hait	d2861df939	Renamed Health Insurance to Employee Health Insurance	2018-05-02 14:34:14 +05:30
Nabin Hait	43274de5df	Removed employee table from Salary Structure and added employee name in all forms	2018-05-02 14:33:37 +05:30
Nabin Hait	e9ad03e23e	Documents order in hr page	2018-05-02 14:31:27 +05:30
Nabin Hait	501a64becd	Added links in HR module	2018-05-02 14:31:03 +05:30
Shreya Shah	24e8f31be1	[Enterprise] Patch and child table changes (#13656 ) * [patch] rename field * Employee Property History child table * remove child tables	2018-05-02 14:29:44 +05:30
Nabin Hait	2f77ccce1b	New doctypes for HR and Accounting (#13652 )	2018-05-02 14:27:19 +05:30
Umair Sayed	cd00f8f458	Updated domain pages (only content) and added few new help pages. (#13835 ) * domain pages update * domain docs * domain pages * help and domain pages	2018-05-02 12:21:35 +05:30
rohitwaghchaure	0065624fe0	Tax amount showing under wrong tax header in the report (#13843 )	2018-05-02 12:20:55 +05:30
Faris Ansari	eae2ddac69	validate_conversion_rate in taxes_and_totals (#13880 )	2018-05-02 12:19:30 +05:30
Zarrar	284de4c15a	updated modified time - reload issue in patch (#13881 )	2018-05-02 12:14:59 +05:30
Shreya	0456ced796	remove unused code	2018-05-01 19:00:06 +05:30
Shreya	eb54331d5f	removed color field from sales order and work order	2018-05-01 18:56:06 +05:30
Shreya	fd47b92138	renamed color field	2018-05-01 18:55:17 +05:30
Shreya	9c688f6dbf	color field for calendar in leave application	2018-05-01 18:55:17 +05:30
Shreya	a7b2fc9250	color field for calendar in sales order and work order	2018-05-01 18:55:17 +05:30
Shreya	62907472f3	color field for calendar in task	2018-05-01 18:54:20 +05:30
Shreya	d71c0c1720	color field for calendar in holiday list	2018-05-01 18:54:20 +05:30
Shreya	4c8a08effb	color field for calendar in course schedule	2018-05-01 18:54:20 +05:30
Faris Ansari	5df63e36d4	Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix	2018-05-01 10:52:15 +05:30
Faris Ansari	bd99606a14	Change msgprint to unobtrusive alert	2018-05-01 10:52:02 +05:30
Zarrar	b0a46f397a	display customer's name while printing receivable report (#13830 )	2018-04-30 19:40:18 +05:30
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Prateeksha Singh	9b2078feab	[fix] setup_website, fixes #11143	2018-04-30 18:11:20 +05:30
Nabin Hait	d39386bd55	Renamed some salary related fields	2018-04-30 16:21:37 +05:30
Shreya	96e45902fd	codacy	2018-04-30 15:54:34 +05:30
Faris Ansari	30304e68ff	[fix] Current stock qty calculation in case of different UOM	2018-04-30 15:44:49 +05:30
Shreya	14bd43d5eb	minor changes	2018-04-30 15:30:42 +05:30
Shreya Shah	05ad2802c6	Travis test fixes for leave application (#13790 ) * test fix * expense claim test fix * fix payroll entry test case	2018-04-30 11:14:56 +05:30
Zarrar	6bc500bffa	[Minor] Validate dates in Salary Structure (#13807 ) * validate date * fix date trigger issue	2018-04-30 11:14:09 +05:30
Adam Dawoodjee	3cd4fce710	Typo fix (#13809 )	2018-04-30 11:13:18 +05:30
Faris Ansari	8be895091e	Set is_pos to 0 in Opening Invoice Tool (#13810 )	2018-04-30 11:13:06 +05:30
Gaurav Naik	c925a38f79	Ignore mandatory for default warehouses (#13812 )	2018-04-27 15:31:11 +05:30
Manas Solanki	0536baacc2	Remove the duplicate description	2018-04-27 12:46:56 +05:30
Faris Ansari	9f739fe87d	Handle item_wise_tax_detail invalid value while item renaming (#13778 )	2018-04-26 18:48:01 +05:30
Kenneth Sequeira	b01f998b49	Update tracking-project-profitability-using-cost-center.md (#13792 ) Fixed typo in the title.	2018-04-26 18:40:14 +05:30
AravindPranera	805f09a3fe	Accounts receivable aging based on supplier due date (#13801 )	2018-04-26 18:02:37 +05:30
deepak-mnt	b712d1905d	Override after_rename method to fetch cost center number on changing from title	2018-04-26 17:04:06 +05:30
deepak-mnt	b379998961	Added Update Cost Center Number button and it's functionality	2018-04-26 17:00:08 +05:30
Nabin Hait	2f82bce387	minor fix	2018-04-26 16:32:17 +05:30
rohitwaghchaure	7e8a7ac6ee	Provision to select opening stock in stock reconciliation (#13802 )	2018-04-26 16:30:35 +05:30
Shreya	a20157af17	on item, warehouse and batch triggers, fetch serial nos based on batch	2018-04-26 14:39:21 +05:30
Shreya	7461d28ae0	add batch when creating serial nos	2018-04-26 14:39:21 +05:30
Shreya	4a2fe605b3	batch no field in serial no doctype	2018-04-26 14:39:21 +05:30
Nabin Hait	25ccd1acbb	minor fix in asset	2018-04-26 12:16:38 +05:30
Nabin Hait	dc75be8b6c	Show company column in order in consolidated financial statement	2018-04-26 12:16:38 +05:30
Siddhi Sawant	a16c8d0a2b	Establishment / Effective Date field in the Company master (#13723 )	2018-04-26 12:16:38 +05:30
Rohit Waghchaure	4110e00b2d	[Fix] general ledger group by validation	2018-04-26 12:16:38 +05:30
Rohit Waghchaure	26decaad6c	[Fix] Profit and loss statment	2018-04-26 12:16:38 +05:30
Nabin Hait	074928cf6c	Company field added in department	2018-04-26 12:16:38 +05:30
Nabin Hait	f164203520	Fixed merge conflict	2018-04-26 12:16:18 +05:30
Nabin Hait	ee09408dcc	Minor fixes	2018-04-26 12:16:18 +05:30
Pawan Mehta	2215d4c593	Shift Management (#13667 ) * [fix] #13634 * review_changes * rename function * rename function	2018-04-26 12:16:18 +05:30
rohitwaghchaure	efff6e53de	Consolidated financial statement (#13678 ) * added fields to support treeview * tree file added, nestedset implemented * patch added to reload doc and configure lft rgt * Added consolidated financial statement report	2018-04-26 12:16:18 +05:30
rohitwaghchaure	fb9af38106	Group by party in general ledger report (#13649 ) * Group wise Ledger for Customer and Supplier * commonify group by fields	2018-04-26 12:16:18 +05:30
Pawan Mehta	0a17f8d51b	remove shift schedule tool (#13658 )	2018-04-26 12:16:18 +05:30
Nabin Hait	8076d6ddc8	Renamed Health Insurance to Employee Health Insurance	2018-04-26 12:16:17 +05:30
Nabin Hait	265426a5a6	Minor fixes	2018-04-26 12:14:02 +05:30
Nabin Hait	81706fdb46	Update rename_field_max_days_allowed.py	2018-04-26 12:14:02 +05:30
Nabin Hait	551844881b	Removed employee table from Salary Structure and added employee name in all forms	2018-04-26 12:14:01 +05:30
Nabin Hait	fcdca7f2a0	Documents order in hr page	2018-04-26 12:13:46 +05:30
Nabin Hait	f914bd374d	Added links in HR module	2018-04-26 12:13:24 +05:30
Shreya Shah	b15ef8450f	[Enterprise] Patch and child table changes (#13656 ) * [patch] rename field * Employee Property History child table * remove child tables	2018-04-26 12:13:06 +05:30
Pawan Mehta	8f14cb590c	Add grade to employee master (#13654 )	2018-04-26 12:12:45 +05:30
Nabin Hait	1c13e70d13	New doctypes for HR and Accounting (#13652 )	2018-04-26 12:12:29 +05:30
Shreya Shah	ec38044fe2	New DocTypes for HR Module (#13650 ) * New DocType Employee Incentive * New DocType Shift Type * New DocType Shift Assignment * New DocType Shift Assignment Tool * New DocType Shift Request * New DocType Salary Structure Assignment * Added Permissions * New DocType Employee Lifecycle Process * New DocType Employee Lifecycle Activity Type * New DocType Employee Lifecycle Activity * New DocType Employee Lifecycle Process Template * New DocType Employee Lifecycle Process Template Detail * Permissions and Auto Name * New DocType Staffing Plan * New DocType Staffing Plan Detail * Added fields in Job Opening * New DocType Employee Transfer * New DocType Employee Promotion * [minor]	2018-04-26 12:10:13 +05:30
Rushabh Mehta	369afce43c	[patch] ignore validations while creating custom fields for gst via patch	2018-04-26 10:10:03 +05:30
Kanchan Chauhan	7826dd1aeb	Typo Fix in Work Order	2018-04-25 13:48:47 +05:30
Prateeksha Singh	c23230faea	Merge pull request #13786 from pratu16x7/hotfix [fix] featured product thumbnail	2018-04-25 13:04:19 +05:30
Prateeksha Singh	6855b87f76	[fix] featured product thumbnail	2018-04-25 13:03:11 +05:30
Saurabh	1d5bbe1081	Merge branch 'master' into develop	2018-04-25 12:46:50 +05:30
Saurabh	47f6e32920	bumped to version 10.1.27	2018-04-25 13:16:48 +06:00
Rohit Waghchaure	bf416cfbf8	[Fix] POS Patch	2018-04-25 12:32:22 +05:30
Saurabh	63590496c1	[fix] resolved merge conflicts	2018-04-25 11:32:54 +05:30
Saurabh	132dac9712	bumped to version 10.1.26	2018-04-25 12:01:48 +06:00
rohitwaghchaure	57914f140e	[HotFix] Taxes not adding in POS sales invoice (#13776 )	2018-04-24 19:19:47 +05:30
Nabin Hait	5643c3ead2	Minor fix in reloading email template	2018-04-24 17:51:13 +05:30
Shridhar Patil	02c93a3d05	[bug] Leave application ui issues fixed (#13740 ) * validate to_date in leave application if to_date is less than from_date show message to user reset to_date value to '' * var declaration and semicolon missed * Updated popup message	2018-04-24 14:45:11 +05:30
Kenneth Sequeira	70330e8379	fixed user permission video link (#13774 )	2018-04-24 14:12:41 +05:30
Shreya Shah	3cf35f2496	fix syntax (#13773 )	2018-04-24 12:20:21 +05:30
Shreya Shah	4dc453d131	Loan Management for the Members (Non Profit Module) (#13149 ) * Renamed - Employee Loan Application to Loan Application, Employee Loan to Loan and field Employee Loan Account to Loan Account * Patch added * Dynamic link fields 'applicant' and 'applicant_type' * Member link visible only if domain non profit is active * Modified loan_dashboard * Make Repayment Entry button * Common file loan_common.js for loan and loan_application * repayment schedule rows selection in dialog * validation if repayment amount > total paid amount * repayment only if disbursement is done, make repayment by selecting the installment which falls in the current month * fetch nowdate if disbursement date not found * Rebased with develop * updated non-profit module page * updated patch for renamed fields * dialog to select repayment entries * hidden field to store reschedule paid status * update paid check in loan on journal entry updation * calculate total paid * updated docs * codacy fix	2018-04-24 12:19:36 +05:30
bghayad	1c3830c53f	Student Account Ledger Button (#13591 ) * Student Account Ledger Button * Student Account Ledger Button * Student Account Ledger Button * Student Account Ledger Button	2018-04-24 12:12:11 +05:30
Kenneth Sequeira	5becde7a45	embedded social login keys set up videos (#13659 )	2018-04-24 12:11:29 +05:30
hiousi	38de994788	do not copy template description to variant if not in allow fields (#13726 )	2018-04-24 12:10:45 +05:30
Saurabh	9738d52d5f	Merge branch 'master' into develop	2018-04-24 12:09:40 +05:30
Saurabh	ad4ede0e23	bumped to version 10.1.25	2018-04-24 12:39:38 +06:00
Shreya Shah	6db3d84cc0	remove unused code (#13765 )	2018-04-24 12:07:40 +05:30
Saurabh	d2065ce3bf	typo fix	2018-04-24 12:07:37 +05:30
Rohit Waghchaure	31edddace6	[Fix] Tax not changes when user change the POS profile in the sales invoice	2018-04-24 11:43:31 +05:30
Saurabh	2e7a45dbb4	resolved merge conflicts	2018-04-24 11:16:13 +05:30
Saurabh	8f29159fb7	Merge branch 'hotfix'	2018-04-24 11:12:07 +05:30
Saurabh	d9f1b539dc	bumped to version 10.1.24	2018-04-24 11:42:07 +06:00
Deepak kumar	022ac50160	Reverse Journal Entry (#13637 ) * [Fix] #13605 * fixes codacy * minor changes * Added naming series for reverse journal entry * added reference_type and reference_name	2018-04-24 10:52:28 +05:30
Manas Solanki	276a92539d	Update move_leave_approvers_from_employee.py	2018-04-23 14:55:19 +05:30
Prateeksha Singh	c0ec3c3f7b	[fix] cal view start end date field discrepancies	2018-04-23 13:32:59 +05:30
Zarrar	68a7ee22f2	order_by for gantt error fix (#13752 )	2018-04-23 13:22:03 +05:30
Shreya Shah	828f5ab29e	Patch fixes (#13754 ) * reload doc * remove unused code	2018-04-23 13:21:35 +05:30
Manas Solanki	60aa1170d5	Merge pull request #13762 from manassolanki/fix-patient-appointment fixed the gantt view of patient appointment	2018-04-23 12:39:28 +05:30
Manas Solanki	9630aa3d7f	fixed the gantt view of patient appointment	2018-04-23 12:37:11 +05:30
Kenneth Sequeira	d4991cc49f	Assets Docs Update (#13749 ) * asset depreciation auto booking image added * commit 3	2018-04-23 11:35:24 +05:30
tundebabzy	dbdf462e56	fix conflict	2018-04-22 23:49:26 +01:00
tundebabzy	f65ee888c0	spelling: canceled --> cancelled	2018-04-22 23:43:08 +01:00
Zlash65	fa5ecb066e	typo fix in leaderboard	2018-04-22 12:11:01 +05:30
Nabin Hait	c36524ec54	Update chart_of_accounts.py	2018-04-20 11:00:20 +05:30
Shreya Shah	44e719d64c	[Enhancement] Leave Application and Expense Claim (#13645 ) * child table employee expense approver * set query in department * mandatory approver check in hr settings * triggers on leave and expense approver * fetch all parent approvers from department hierarchy * fixes * patch to move employee approvers from employee to department * removed hard coding of roles * modify approvers list query * commonified functions * patch * renamed standard reply occurrences * removed leave approvers table from Employee master * email templates for leave application notification * set default email templates for leave in hr settings * notify by email template * approval status in expense claim * render template in patch * removed unused code * Single child table department approver * read instead of render template	2018-04-19 20:58:52 -08:00
Saurabh	cba3570cf6	Merge pull request #13734 from rohitwaghchaure/pos_special_character_item_issue [Fix] Item with special character not adding in the POS cart	2018-04-19 15:58:35 +05:30
Saurabh	5b7503c074	Merge pull request #13691 from saurabh6790/supp_180417_1 [hotfix] multiple fixes	2018-04-19 15:57:35 +05:30
Rohit Waghchaure	8441dd9184	[Fix] Item with special character not adding in the POS cart	2018-04-19 12:55:06 +05:30
Julian Robbins	78869f1e77	Update manual-feedback-request.md (#13709 ) Changed wording to reflect current wording of Feedback Request rather than 'Ask a Feedback'	2018-04-18 03:12:30 -08:00
Zarrar	59f7b8c4a1	issue routing to report (#13710 )	2018-04-18 02:56:02 -08:00
Saurabh	2476a8aab9	a[fix] check content before making in condition	2018-04-17 20:45:06 +05:30
Saurabh	46ffbb74ff	fix cheque print measurements	2018-04-17 20:44:37 +05:30
tundebabzy	280c7a410a	code review: make use of db_insert and change `Auto Repeat` to `auto_repeat`	2018-04-17 11:32:17 +01:00
tundebabzy	20721942ad	code review: use `delete from` to delete records	2018-04-17 11:31:23 +01:00
tundebabzy	5988da9a31	code review: revert changes	2018-04-17 11:30:35 +01:00
Saurabh	492aff2a8b	[fix] check if academic_year exists (#13665 )	2018-04-17 14:21:40 +05:30
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
matmyers	742da8cfce	removed duplicate keys (#13675 )	2018-04-17 12:20:57 +05:30
Saurabh	46743d00d6	Merge branch 'master' into develop	2018-04-17 12:00:21 +05:30
Saurabh	5b866db6bc	bumped to version 10.1.23	2018-04-17 12:30:19 +06:00
Saurabh	9fbb8192e1	[fix] do not escape % while using clause (#13677 )	2018-04-17 11:56:46 +05:30
Faris Ansari	d7a3b78fdf	[py3] Cast dict_keys to list (#13663 )	2018-04-16 14:39:37 +05:30
Saurabh	ea1408f2e0	[fix] enqueue salary slip print email after completing accounting entries (#13633 )	2018-04-15 21:38:49 -08:00
Saurabh	f2a941b1a4	[fix] check if supplier value exists (#13616 )	2018-04-15 21:37:14 -08:00
Sanjay Kumar	bc83daf0fa	#13478 : Default Accounts in Item from Item Group (#13635 ) * remove external app reference and update get_warehouse_list * resolve #13478 : Default Accounts in Item from Item Group	2018-04-15 21:36:37 -08:00
Saurabh	ea49deb315	Merge branch 'master' into develop	2018-04-15 12:54:50 +05:30
Saurabh	c3d43e672b	bumped to version 10.1.22	2018-04-15 13:24:49 +06:00
Sathisha Poojary	16ce8ed7d5	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-04-14 12:05:11 +05:30
Faris Ansari	ed34a442a8	Obey currency filter in financial statement prints #pdd (#13648 )	2018-04-13 21:34:00 -08:00
Shreya Shah	a952e40b56	fix tab (#13651 )	2018-04-13 19:33:40 +05:30
Shreya Shah	6bf4e5b73b	Department Tree (#13567 ) * Department Tree * print hide fields * create 'All Departments' as parent on setup * patch to set lft rgt * fix translatable string	2018-04-13 15:09:26 +05:30
Nabin Hait	642d39098a	Fixed merge conflict	2018-04-13 14:38:57 +05:30
Nabin Hait	d6aadef395	Merge branch 'hotfix'	2018-04-13 14:38:23 +05:30
Nabin Hait	11c899bc1f	bumped to version 10.1.21	2018-04-13 15:08:22 +06:00
Nabin Hait	00efeb26f4	Email Account field added in Issue	2018-04-13 14:30:26 +05:30
Nabin Hait	4566d1f60c	Email Account field added in Issue	2018-04-13 13:26:06 +05:30
Faris Ansari	f8dd4c2d7b	[fix] Financial report column values during print (#13627 )	2018-04-12 17:28:40 +05:30
Siddhi Sawant	a0bbc0846b	GST purchase invoice with tax breakup details (#13561 )	2018-04-12 14:50:48 +05:30
rohitwaghchaure	1129ac711e	[Fix] Patch (#13610 )	2018-04-12 14:48:23 +05:30
rohitwaghchaure	2ea593bdd8	[Fix] POS Profile data not set in the sales invoice (#13568 )	2018-04-12 13:37:08 +05:30
Frappe PR Bot	59a2a653d0	[Translation] Updated Translations (#13570 )	2018-04-12 13:36:55 +05:30
Ahmed Madi	02fd6f56d6	Update leave_application.py (#13575 ) Make get_holidays function white listed	2018-04-12 13:31:50 +05:30
Pawan Mehta	c0727633e7	[fix] #13589 (#13590 )	2018-04-12 13:31:08 +05:30
rohitwaghchaure	098b444f6f	[minor] Toggle required opportunity item table based on with items field (#13584 )	2018-04-12 13:26:50 +05:30
rohitwaghchaure	e72bde5159	Removed expired items from the list of POS items (#13582 )	2018-04-12 13:26:11 +05:30
Nabin Hait	c10e106f8f	Optimization related to large number of items (#13606 )	2018-04-12 13:25:03 +05:30
Ameya Shenoy	848d34f1a8	Minor fixes (#13609 ) - typo renamed make_prod_order_test_record to make_wo_order_test_record, whereever it was missed	2018-04-12 13:21:16 +05:30
rohitwaghchaure	2c111b7b14	Minor fix (#13600 )	2018-04-11 02:20:06 -08:00
Sanjay Kumar	6225b769a6	remove external app reference and update get_warehouse_list (#13597 )	2018-04-11 02:19:36 -08:00
Rushabh Mehta	fb5d678b0c	[minor] cache refactor and workflow docs (#13598 )	2018-04-11 00:38:19 -08:00
Doridel Cahanap	ad76f9ad70	[Enhancement] Work Order Material Consumption (#13384 ) * Work Order Material Consumption * Test cases and other minor fixes * Test cases fixes * Travis Fixes * Work Order Material Consumption Request Changes * Update work_order.js	2018-04-09 10:31:28 +05:30
Sathisha Poojary	99e3ca0f67	Create a new doctype for bank so that we can suport other bank statements dynamically.	2018-04-07 19:00:05 +05:30
Sathisha Poojary	6b8eb645c4	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-04-07 16:41:43 +05:30
Nabin Hait	e9638be032	fixed merge conflict	2018-04-06 15:18:27 +05:30
Nabin Hait	1ff9e0432a	bumped to version 10.1.20	2018-04-06 15:36:09 +06:00
rohitwaghchaure	c0f149a3be	[Fix] Delivery notification for delivery trip (#13543 )	2018-04-06 14:26:26 +05:30
Dominik Ottenbreit	82eac06505	Add Order Confirmation to PO (#13421 )	2018-04-06 11:51:18 +05:30
rohitwaghchaure	2ae6cfda5f	[Fix] Item variant details report (#13545 )	2018-04-06 11:49:04 +05:30
KanchanChauhan	4691af6348	Get Payment Schedule from Sales Order to Sales Invoice (#13497 )	2018-04-06 11:23:19 +05:30
Kenneth Sequeira	2d79e46fbd	updated images for print format (#13498 )	2018-04-06 11:22:37 +05:30
Jamsheer	86fd8cbf68	Healthcare dashboard (#13533 ) * Healthcare Dashboards * Lab Test and Template - field marked in_filter = True	2018-04-06 10:29:23 +05:30
rohitwaghchaure	22d9f0a4aa	[Fix] Bin not deleted on delete of an item (#13539 )	2018-04-06 10:29:07 +05:30
Rushabh Mehta	dccfb54a0f	[fix] [ux] allow account to be created via form (#13509 )	2018-04-06 10:28:08 +05:30
Zarrar	92109b01fd	translate while creating items from user progress (#13530 )	2018-04-06 10:27:55 +05:30
Manas Solanki	b2f9af71d2	Update setup.py	2018-04-05 21:35:29 +05:30
Pawan Mehta	f41963536e	Group email fields together and add IFSC Code (#13535 ) * [fix] #13534 * change field order cell no	2018-04-05 14:54:51 +05:30
Prateeksha Singh	59147c0368	Merge pull request #13538 from pratu16x7/hub-fixes [fix] company listing context	2018-04-05 14:53:11 +05:30
Prateeksha Singh	4b7dcfad54	[hub] add hub settings access regardless	2018-04-05 14:50:42 +05:30
Prateeksha Singh	420c79041e	[fix] company listing context	2018-04-05 14:44:16 +05:30
Suraj Shetty	97d84eb509	remove apply user permission (#13505 )	2018-04-05 12:10:46 +05:30
Zarrar	0e3b000e81	sql syntax fix (#13529 )	2018-04-05 10:34:30 +05:30
Rohit Waghchaure	920a3ff0b8	[Fix] POS freeze when rate button pushed	2018-04-04 18:06:19 +05:30
rohitwaghchaure	aa7cddef5c	Merge pull request #13511 from rohitwaghchaure/table_styling [Fix] Width and margin for account receivable pdc print format	2018-04-04 16:34:21 +05:30
Rohit Waghchaure	3d2b3d37d4	[Fix] Width and margin for account receivable pdc print format	2018-04-04 16:01:33 +05:30
Nabin Hait	2b682c82e8	Fixed merge conflict	2018-04-04 11:40:16 +05:30
Nabin Hait	adddb15380	bumped to version 10.1.19	2018-04-04 11:56:19 +06:00
Nabin Hait	5fd79f7f77	Update stock_ledger.py	2018-04-04 11:20:16 +05:30
Vishal Dhayagude	2505c74d64	Place of Supply set on save Delivery Note if Customer Address Present (#13492 )	2018-04-04 11:05:21 +05:30
frappe-pr-bot	6623cdc244	[Translation] Updated Translations	2018-04-03 15:49:16 +02:00
Vinayak Jethe	df83148d7c	Woocommerce Integration (#13217 ) * WIP for WooCommerce Integration * WIP for WooComm Integration * WIP WooComm * Added Woocommerce Settings * Woocommerce Settings Enable Sync Makes fields mandatory * Woocommerce whitelisted endpoints * [Clean Up] Woocommerce Settings * Verify Webhook Data * Fix Verify Webhook * WIP WooComm * WIP and working few modules * Customer creating partially * Customer creation successful * Refactored Customer code * WIP Address * Fixed address and customer bug. Now working fine * WIP for products. Creation of items successful * Handling json for product * Products creating and updating properly * Custom checkbox for required doctypes * Product feature fully completed * WIP orders * Sales order working properly * Orders mapping successfully * New version Customer Working Properly * Items creation properly * Working on sales order * Orders comming successfully * Bug fixes * Fixed date format for delivery date * Code Cleanup * Woo setting page modified * Fixed minor bug * Fixes * Minimum Viable Product * Cleanup * Removed duplicate file from erpnext config * Added more default changes to woo settings * Fixes as per required * Fixes * Bug fix * few changes and fix * Fixing * Fixes with test * Added Test for Woocommerce - Emulates request * Fix woocommerce test * fix woocommerce test * verify_request: py3 ready * Codacy fixes * WooCommerce Integration Docs * Codacy changes * Codacy fixes * User set tax account * Fixes for account * Fix for warehouse issue * Docs updated * Codacy fix * Updated Docs * Minor changes * Tested added for repeat order and cleanup * Minor change * docs and gifs renamed according to convention * Doc updated	2018-04-03 11:17:03 +05:30
Prateeksha Singh	b60a52b194	Hub Market (#13325 ) * [hub] enable hub with OAuth token from user's client ID * [hub] settings schema for adding users * [hub] image view style listing * [hub] broken image link fallback * [wip] * [hub] bootstrap timeline * [hub] setup quick view * [hub] reformat ratings, add companies autocomplete filter * [hub] common listing frames * [hub] setup sort selector * [hub] timeline * [hub] customize list header * [hub] genuine form fieldtypes * [hub] review products * [hub] suggest missing categories remotely * [hub] Wishlist; header and title templates * [hub] link wishlist, remove company migration * [hub] calculate ratings	2018-04-03 10:44:13 +05:30
Suraj Shetty	c5effbf009	Data export tool doc (#13419 ) * data export tool docs * change doc gif path	2018-04-03 10:43:08 +05:30
Frappe PR Bot	dc0a92c8de	updated translations (#13485 )	2018-04-02 23:46:54 +05:30
Rushabh Mehta	d5f9ebd008	[optimize] item queries (#13480 )	2018-04-02 23:37:33 +05:30
Rohit Waghchaure	395d61b998	[Fix] Travis	2018-04-02 15:11:47 +05:30
rohitwaghchaure	eedc0ac681	[Fix] chart of accounts root type is mandatory issue in charts.erpnext.com (#13467 )	2018-04-02 12:49:38 +05:30
Britlog	220864b4f7	Allow decimal quantities in pos (#13471 )	2018-04-02 10:55:04 +05:30
Charles-Henri Decultot	6860036b01	Agriculture module corrections (#13438 ) * Agriculture module corrections * Update ternary_plot.js	2018-04-02 10:51:53 +05:30
Nabin Hait	c825e914d1	Added indexes for lft, rgt on nestedset doctypes (#13420 )	2018-04-02 10:43:46 +05:30
Shreya Shah	d021e45301	exclude current doc while validating (#13450 )	2018-04-02 10:43:19 +05:30
Zarrar	e9ca5e81d2	hide add_child for root node (#13444 )	2018-04-02 10:40:39 +05:30
Shreya Shah	5d71609f0b	Timer fixes (#13443 ) * alert for exceeded time only when dialog is open * fetch row having an activity without from_time * fixes if timesheet created from work order * reset timer limit exceeded	2018-04-02 10:32:39 +05:30
Manas Solanki	a7f5589564	fix for the update button in the sales invoice (#13435 )	2018-04-02 10:32:00 +05:30
Nabin Hait	edd320e338	Optimisation of warehouse_account_map (#13454 )	2018-04-02 10:30:17 +05:30
Kenneth Sequeira	84fe32d05c	removed pos-view article since it is deprecated (#13456 )	2018-04-02 10:26:43 +05:30
Shreya Shah	a8df73c263	typo in landed cost voucher doc (#13472 )	2018-04-02 10:16:27 +05:30
rohitwaghchaure	40a5a3063c	[Fix] Allow zero valuation rate if previous sle has zero valuation rate (#13432 )	2018-04-02 10:14:49 +05:30
Nabin Hait	af98f5d14d	Sort accounts by account number in financial statements (#13423 )	2018-04-02 10:14:32 +05:30
Shreya Shah	d17c24f969	set query in payment account (#13446 )	2018-04-02 10:13:48 +05:30
Manas Solanki	0289ad285f	fix the route filters and payment account (#13447 )	2018-04-02 10:13:22 +05:30
Shreya Shah	562227db8f	db escape as single quote in address causes error (#13451 )	2018-04-02 10:12:37 +05:30
Achilles Rasquinha	9c1cac80fe	Merge pull request #13445 from shreyashah115/typo-in-payroll Typo in Payroll Entry	2018-04-01 10:29:16 +05:30
Sathisha Poojary	1de5669574	Rename Bank Statement Settings appropriately and allow auto populating some settings for supported banks	2018-03-31 10:30:34 +05:30
Sathisha Poojary	f698a1bcbe	Minor typo with major error	2018-03-31 01:19:52 +05:30
Sathisha Poojary	f069e1c83c	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-03-31 00:55:56 +05:30
Rohit Waghchaure	5e0cabc538	[Fix] POS not opening	2018-03-30 14:29:18 +05:30
Gaurav Naik	03016e5000	Exploded view for BOM Stock Report (#12506 ) * Multilevel BOM Stock Report prototype * Rechristened multilevel to exploded view * Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation * Used BOM Explosion item in query for exploded view * Removed trailing whitespaces for Codacy compliance	2018-03-30 13:03:19 +05:30
Shreya	9240eaa0a6	typo for accrual journal entry	2018-03-30 12:19:11 +05:30
Manas Solanki	618940b5c9	Merge pull request #13433 from manassolanki/fix-pe minor fix for the program enrollment tool	2018-03-29 16:37:54 +05:30
Manas Solanki	ccf2b7b08b	minor fix for the program enrollment tool	2018-03-29 16:36:59 +05:30
Nabin Hait	ff2e4c898a	Fixed merge conflict	2018-03-29 13:57:39 +05:30
Nabin Hait	cae2723920	bumped to version 10.1.18	2018-03-29 14:23:00 +06:00
rohitwaghchaure	badc855400	[Fix] BOM validation issue for scrap item (#13429 )	2018-03-29 13:48:38 +05:30
Manas Solanki	a4502c4f6b	Merge pull request #13430 from codingCoffee/child_doc_perm_fix Permisssion fixes for child table	2018-03-29 13:27:08 +05:30
Manas Solanki	1f02c62339	Merge pull request #13431 from manassolanki/fix-22 fix the item varint details	2018-03-29 13:26:14 +05:30
Manas Solanki	ef770b593a	fix the item varint details	2018-03-29 13:25:00 +05:30
Ameya Shenoy	c5d222253a	Permisssion fixes for child table Related to commit 595929eb2432140a27dc262d4d78aca4ec5455c3 frappe.client.[get_list, get, get_value] when called on child table needs parent as an argument or it throws an error by default	2018-03-29 13:16:08 +05:30
Manas Solanki	94769d81a8	Update get_item_details.py	2018-03-29 11:15:05 +05:30
rohitwaghchaure	edd63a178f	Merge pull request #13418 from rohitwaghchaure/pdf_and_alignment_issue [Fix] Alignment and date issue in PDC report	2018-03-28 17:17:37 +05:30
Rohit Waghchaure	ace68cd283	[Fix] Alignment and date issue in PDC report	2018-03-28 15:53:29 +05:30
Nabin Hait	4d9e104284	Merge branch 'master' into develop	2018-03-28 15:51:18 +05:30
Nabin Hait	0794816527	bumped to version 10.1.17	2018-03-28 16:21:16 +06:00
Nabin Hait	7041a45294	Update fix_reserved_qty_for_sub_contract.py	2018-03-28 15:50:14 +05:30
Dominik Ottenbreit	561e2a534b	Add Project Standard Filters (#13417 )	2018-03-28 14:25:51 +05:30
rohitwaghchaure	68ba4fd697	[Fix] Multi-batch selection issue in POS (#13407 )	2018-03-28 12:33:15 +05:30
rohitwaghchaure	a3c3dec5a2	[enhance] Item Alternative (#13121 ) * [enhance] Item Alternative * Added two way provision in item alternative * Test Cases * documentation	2018-03-28 11:51:44 +05:30
Nabin Hait	a6746407e5	Fixed waiting qty in item dashboard data	2018-03-28 11:16:12 +05:30
Nabin Hait	6c35822a35	Merge branch 'master' into develop	2018-03-28 10:40:14 +05:30
Nabin Hait	63e40b52af	bumped to version 10.1.16	2018-03-28 11:10:12 +06:00
Nabin Hait	2e203e53c6	Update fix_reserved_qty_for_sub_contract.py	2018-03-28 10:38:55 +05:30
Sathisha Poojary	148c4f9724	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2018-03-28 00:27:32 +05:30
Sathisha Poojary	0512eec54b	Some minor changes addressing manual doctype renaming issues	2018-03-28 00:22:59 +05:30
Shreya Shah	c0201877dd	fixed column fieldnames for translations (#13406 )	2018-03-27 18:45:42 +05:30
Nabin Hait	9db28ef90d	Minor fix in patch	2018-03-27 16:00:57 +05:30
Zarrar	7f4cd3f5ea	Update Docs for Work Order (#13403 ) * update docs * rename files, update pngs * update pngs for timesheet, leftover changes	2018-03-27 14:59:49 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +05:30
Nabin Hait	00279f27f3	bumped to version 10.1.15	2018-03-27 14:52:27 +06:00
Nabin Hait	f620dae8ca	Null issue fixed in gstr reports	2018-03-27 14:15:36 +05:30
Nabin Hait	9d7fe1f7cd	Indicator fix for stock entry item table	2018-03-27 13:30:11 +05:30
Prateeksha Singh	ffaed1ce2e	Merge pull request #13404 from pratu16x7/variants Enumerate numeric values in variant dialog	2018-03-27 12:18:13 +05:30
Prateeksha Singh	be368fe94b	Enumerate numeric values in variant dialog	2018-03-27 12:17:15 +05:30
Shreya Shah	ba4f32be5c	set default warehouse instead of product bundle's warehouse for packed_items in delivery note (#13398 )	2018-03-27 11:32:10 +05:30
rohitwaghchaure	85f63a3866	[Fix] Showing to bill even if per deliverd in sales order is 99.9996 (#13392 )	2018-03-27 11:31:44 +05:30
Shreya Shah	149f7ee875	[Fix] General Ledger Report (#13374 ) * error fix if party_type = student or shareholder * clear party filter when party_type changes to avoid error throw * dict with values of party_name in utils.js * fetch party_name from erpnext.utils.get_party_name * Update general_ledger.py	2018-03-27 11:29:25 +05:30
rohitwaghchaure	c9a1eb1081	[Fix] Not able to delete row in modal table (#13377 )	2018-03-27 11:26:43 +05:30
rohitwaghchaure	2e560cb25d	[Fix] Same serial no returned two times (#13378 )	2018-03-27 11:24:50 +05:30
Nabin Hait	651b612909	Fixed logic for reserved qty for subcontract and production and written a patch (#13396 ) * Fixed logic for reserved qty for subcontract and production and written a patch * repost reserved qty for filtered bins	2018-03-27 11:24:20 +05:30
Manas Solanki	398eac3f4c	message in the program enrollment tool (#13393 )	2018-03-27 11:21:47 +05:30
Frappe PR Bot	7db805a031	[Translation] Updated Translations (#13394 )	2018-03-27 11:21:08 +05:30
Shreya Shah	f3025f1596	operation time in grid view (#13400 )	2018-03-27 10:34:05 +05:30
Prateeksha Singh	e45f957ad9	Merge pull request #13363 from shreyashah115/timer Timer in Timesheets!	2018-03-27 10:28:50 +05:30
Sathisha Poojary	0b5fea1491	Initial changes to manually migrating bank statemet work from app to erpnext	2018-03-26 01:12:18 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
Nabin Hait	3fdda7a9b7	bumped to version 10.1.14	2018-03-23 16:35:06 +06:00
Shreya Shah	9bcadf8126	Tax Id in some reports and print formats (#13373 ) * tax-id in sales and purchase registers * tax-id in general ledger print_format * tax-id in accounts payable * tax-id in accounts receivable	2018-03-23 15:04:37 +05:30
rohitwaghchaure	492de67d7b	Added consumed material cost in project (#13365 )	2018-03-23 15:02:04 +05:30
Nabin Hait	80a9f523d5	Minor fix AR/AP summary report	2018-03-23 13:02:27 +05:30
Shreya	8bb0f05451	added task field	2018-03-23 11:46:45 +05:30
Shreya	7619cd2e14	updated docs for timesheet	2018-03-23 11:41:56 +05:30
Shreya	822ba21f38	codacy fix	2018-03-23 11:41:56 +05:30
Shreya	559011404a	removed timesheet.html, appended it as a helper function	2018-03-23 11:41:56 +05:30
Shreya	5bf24be704	minor fixes	2018-03-23 11:41:56 +05:30
Shreya	8f06266838	all fields editable	2018-03-23 11:41:55 +05:30
Shreya	5714260af4	replaced status with completed checkbox	2018-03-23 11:41:55 +05:30
Shreya	09937f3753	modified timer start button	2018-03-23 11:41:55 +05:30
Shreya	faff9d3bb2	thanks to faris for the css	2018-03-23 11:41:55 +05:30
Shreya	68ec22a90c	moved timer.js to public/js	2018-03-23 11:41:55 +05:30
Shreya	05e516efc4	Start the timer on the basis of time diff between now_time and timestamp	2018-03-23 11:41:55 +05:30
Shreya	7cc288a6db	New activity dialog removed, read only fields editable if no rows found, add a new row on timer start	2018-03-23 11:41:55 +05:30
Shreya	36040ce5f9	new field actual_end_time to record completed time	2018-03-23 11:41:55 +05:30
Shreya	dcce87d4a8	CSS modifications	2018-03-23 11:41:55 +05:30
Shreya	cd140da3ec	new dialog to create activity	2018-03-23 11:41:55 +05:30
Shreya	643528a3b8	added status field	2018-03-23 11:41:55 +05:30
Shreya	8f4e93f104	removed stop button and added a complete button	2018-03-23 11:41:55 +05:30
Shreya	eeaba29e5b	read only fields project and hours	2018-03-23 11:41:55 +05:30
Shreya	6a1bf70627	alert sound when timer exceeds the given hours	2018-03-23 11:41:55 +05:30
Shreya	1cfd28d50d	timer in timesheet	2018-03-23 11:41:55 +05:30
Faris Ansari	35397a1033	Salary Register (#13367 ) - convert date range to from_date and to_date	2018-03-22 15:26:45 +05:30
Nabin Hait	e3f0412570	Pass doc while autonaming item	2018-03-22 12:13:21 +05:30
rohitwaghchaure	6a2d073fe1	Merge pull request #13353 from PawanMeh/fixes_13352 Add total qty to offline POS	2018-03-22 11:36:32 +05:30
rohitwaghchaure	23fa8893a8	[Fix] Division by zero issue (#13362 )	2018-03-22 11:16:00 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344 )	2018-03-22 11:12:02 +05:30
Manas Solanki	0f6c35d63f	Update update_project_in_sle.py	2018-03-21 18:24:45 +05:30
Faris Ansari	4fc74333bd	Fix Icons for Expense Claim and Timesheet (#13359 )	2018-03-21 17:54:09 +05:30
Kenneth Sequeira	6a92cdc358	Update cost-center.md (#13354 ) Fixed link to missing image for cost centre.	2018-03-21 17:52:52 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357 )	2018-03-21 17:52:41 +05:30
Manas Solanki	e010ddf65f	Student Report Card (#13346 ) * finalise the assessment report * minor fixes for button * fix the travis and codacy	2018-03-21 17:50:42 +05:30
Zarrar	969c8aaf52	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-21 11:17:49 +05:30
Manas Solanki	c711445b91	add the student as party type (#13348 )	2018-03-21 10:12:27 +05:30
rohitwaghchaure	2b88ac948e	[Fix] Special character issue (#13350 )	2018-03-21 10:04:47 +05:30
pawan	53a4d2c430	[fix] #13352	2018-03-21 09:19:36 +05:30
Faris Ansari	ce08aabc84	Add Kanban Board button in project (#13345 )	2018-03-20 19:03:32 +05:30
Zlash65	0859018c48	unindented code	2018-03-20 16:29:27 +05:30
Siddhi Sawant	c672530210	[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316 ) * Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats * Update gst_pos_invoice.json Updated its 'disabled' property. * Update pos_invoice.json Updated its 'disabled' property. * Shows change amount only if it exists * Updated disable property of print formats	2018-03-20 14:31:14 +05:30
Britlog	e3a9b9fe49	[Website] Price in items list and sales uom management (#13335 ) * Price in items list and sales uom management * Price in product search page * Display website stock in sales uom * Add set_product_info_for_website to avoid duplicate code * Add price uom in item list and page * Update product.py	2018-03-20 14:28:44 +05:30
Zarrar	9a01baac1d	explicitely provide order_by (#13338 )	2018-03-20 14:08:44 +05:30
Achilles Rasquinha	0575b3e1c3	fixed inconsistent tab error (#13339 )	2018-03-20 14:07:25 +05:30
Charles-Henri Decultot	d0ac69704f	Chained log report doc (#13314 )	2018-03-20 13:12:28 +05:30
Zarrar	c5b061834b	doctype dropdown rectify, validate series is set (#13305 )	2018-03-20 13:06:18 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902 ) * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Doridel Cahanap	c893268dea	Add Health Insurance Doctype and link to Employee (#13257 )	2018-03-20 12:37:02 +05:30
Deepak kumar	656ff36c76	[Feature] Advance Account Balance in Employee Advance (#13263 ) * added due advance amount field to show due amount * fixes codacy * made whitelisted method * Update employee_advance.js	2018-03-20 12:35:02 +05:30
Nabin Hait	d97c5a04b2	minor fix in item naming	2018-03-20 12:31:05 +05:30
Tom Price	cd525299ee	[Feature] Add default duration and color to appointment type (#13296 ) * Add default duration and color to appointment type When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment. `Appointment Type.color` is used in the calendar display. * Remove accidental fixed date from git * Update modified timestamp to ensure migrations. Set to the timestamp of dd506a0961437540872c01d3487b8e37806c0bb0	2018-03-20 12:08:44 +05:30
Mark Walker	f572522f25	Copy source project into Purchase Order Item (#13321 )	2018-03-20 12:06:04 +05:30
renzodemie	417dfed214	Daily Reminder (#12938 ) * for email sending * test commit for new branch * Removed test changes * test commit renzo * Email sending * Project Uo * Project Update * "My first commit" * "My second commit" * "My second commit" * Holiday is included * delete idea * first pull * first pull * "My third commit" * Delete idea * delete again * "Edit Time" * "Edit Time" * Naming series and bug fixing * "Edit current day and time" * "Proper naming series, hidden time and date" * Project and Project Update dashboard * dashboard * Remove hooks for PR * Remove hooks for PR * Remove hooks for PR * Deleted project_time.py * Corrected indention * Hook back to original * Delete project_time.py * "Modified time" * Fix indention * Sample * FRM * FRM * Time fix * Hooks original state * "Modified time" * Added permission to Project User * Added function/method to be called in order to create project update for the specific project * Naming series * this is not included * Fix minor bug * Indent again * "Reformat Code" * "Check Indent" * Indent again and again * semi colon * "Check Again Indent" * "Check again Indent" * "Check again Indent" * ind * "Check again Indent" * "Check again Indent" * Generate Project update With button in email * [] * "Erro Summary" * "Add syntax for the communcation" * "add summary code" * "Modified Summary code" * "Modified Summary code" * "Fix update ID and set localhost" * Fix time and date error in project_update Fix naming series problem in project_update * included "not updated" in project update * Bug in Number of Drafts * "add notes in summary" * Correct code * With error * Removed the method * Minor fixes * Correction for daily summary	2018-03-20 11:58:15 +05:30
Nabin Hait	8a8966ce9b	minor fix	2018-03-20 11:19:57 +05:30
Achilles Rasquinha	ecc4fdd3ef	Check Set Sales Target Item exists in User Slides	2018-03-19 22:21:45 +05:30
Achilles Rasquinha	d0786b45c3	fix issue	2018-03-19 22:17:37 +05:30
Achilles Rasquinha	60da37b502	Merge pull request #13329 from shreyashah115/travis-fix [Fix] Travis	2018-03-19 19:10:21 +05:30
Saurabh	2777fd4332	[fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328 )	2018-03-19 18:29:01 +05:30
Shreya	9602bf4ba3	patch fix	2018-03-19 18:17:54 +05:30
Shreya	5042dd32da	undefined args error	2018-03-19 17:45:39 +05:30
Shreya	4d347b1ca0	travis fix	2018-03-19 17:31:19 +05:30
Achilles Rasquinha	034834d671	Merge pull request #13326 from shreyashah115/fix-travis [Fix] Travis	2018-03-19 17:00:34 +05:30
Shreya	f7b39438d2	travis fix	2018-03-19 14:19:55 +05:30
Achilles Rasquinha	3099ea67a1	Merge pull request #13303 from achillesrasquinha/py3 unordered types None vs int	2018-03-19 11:54:24 +05:30
Achilles Rasquinha	3d85951c1f	Merge pull request #13304 from achillesrasquinha/hotfix-hub [HOTFIX] Hub Domain Change	2018-03-19 11:54:13 +05:30
Achilles Rasquinha	1e95323679	Fixed dict_keys concatenation	2018-03-18 10:08:43 +05:30
Manas Solanki	7b91042ae6	Merge pull request #13310 from manassolanki/student-report-card addition of student report card generation tool	2018-03-16 02:00:07 +05:30
Manas Solanki	633a39144d	addition of student report card generation tool	2018-03-16 01:57:45 +05:30
Achilles Rasquinha	94b41ea4f6	removed debugging	2018-03-15 12:53:22 +05:30
Achilles Rasquinha	d8f7de9946	fixed patch for hub	2018-03-15 12:48:32 +05:30
Nabin Hait	c8cd4ba6f7	Merge branch 'master' into develop	2018-03-15 12:38:43 +05:30
Nabin Hait	60200eaf0d	bumped to version 10.1.13	2018-03-15 13:08:41 +06:00
Nabin Hait	1e4cfb4bf5	Fixes in setting po nos manually in sales invoice	2018-03-15 12:27:24 +05:30
Nabin Hait	70abac0061	Get territory from sales invoice	2018-03-15 12:19:16 +05:30
Achilles Rasquinha	a4a62d5ea1	unordered types None vs int	2018-03-15 12:18:37 +05:30
Nabin Hait	bb5caf8fad	Merge branch 'master' into develop	2018-03-14 13:33:38 +05:30
Nabin Hait	6c09297bcd	bumped to version 10.1.12	2018-03-14 14:03:36 +06:00
Nabin Hait	363cedde76	Fixed minor issue	2018-03-14 13:32:14 +05:30
Nabin Hait	d21ad807b5	Merge branch 'master' into develop	2018-03-13 18:13:44 +05:30
Nabin Hait	c8c733bc54	bumped to version 10.1.11	2018-03-13 18:43:42 +06:00
Shreya Shah	7acc8cb747	fix else condition (#13295 )	2018-03-13 18:12:19 +05:30
Nabin Hait	e01dcc170c	Merge branch 'master' into develop	2018-03-13 17:11:52 +05:30
Nabin Hait	56882033bf	bumped to version 10.1.10	2018-03-13 17:41:49 +06:00
Nabin Hait	74c817e7f9	Update update_reserved_qty_for_purchase_order.py	2018-03-13 17:10:14 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	baac05955b	bumped to version 10.1.9	2018-03-13 16:44:02 +06:00
Nabin Hait	89346967da	Reverted #13259 (#13291 )	2018-03-13 16:01:11 +05:30
Nabin Hait	97e890d0b3	Fix in unallocated amount calc in payment entry (#13288 )	2018-03-13 15:57:34 +05:30
Ameya Shenoy	95763bc233	Purchase Order fixes (#13287 ) - Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied' - Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.	2018-03-13 15:51:56 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290 )	2018-03-13 15:46:59 +05:30
Ranjith Kurungadam	369ba85499	Physician Schedule fixes (#13284 ) * move button add schedule to grid * Physician Schedule- add slots for multiple days * fix patient image view	2018-03-13 14:50:24 +05:30
Achilles Rasquinha	cbfcb3e61d	string_types from basestirng	2018-03-12 19:15:29 +05:30
Zarrar	0702f29860	Add Ends-On field in the Lead doctype (#13147 ) * add ends_on date in lead to be mapped with calendar event * set default ends_on to 1 hour from contact_time	2018-03-12 18:49:54 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
rohitwaghchaure	13460f023d	[Fix] Batch value showing as item value while making batch (#13281 )	2018-03-12 17:20:50 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Nabin Hait	04f50be306	bumped to version 10.1.8	2018-03-12 16:01:03 +06:00
Ameya Shenoy	b34ab7549a	fixed subject to task_name (#13278 )	2018-03-12 15:24:01 +05:30
Shreya Shah	aa54d934b8	make stock qty negative (#13276 )	2018-03-12 15:23:28 +05:30
Zarrar	c35665fa60	update physician patch fail (#13277 )	2018-03-12 15:21:53 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195 ) * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
Shreya Shah	58797481f0	uncheck report hide (#13256 )	2018-03-12 13:08:01 +05:30
Kenneth Sequeira	b48557fdc6	payment terms video tutorial in videos/learn (#13258 ) * payment terms video tutorial in videos/learn * Update payment-terms.md	2018-03-12 13:07:21 +05:30
Shreya Shah	ef4c3b8e2f	add has variants in standard filter (#13251 )	2018-03-12 11:20:49 +05:30
rohitwaghchaure	12aa4265ff	Don't allow to set negative quantity if transaction is not return entry (#13255 )	2018-03-12 11:20:30 +05:30
Shreya Shah	69d9f51dbb	if price list not found, set default selling/ buying price list from settings (#13259 )	2018-03-12 11:15:49 +05:30
Prateeksha Singh	9362cf37e0	[charts] update charts API	2018-03-12 09:54:56 +05:30
tundebabzy	2970630ed2	Merge branch 'develop' into new-subscription	2018-03-12 02:00:34 +01:00
Nabin Hait	fd75d554d2	Payment Terms Template added in test_ignore for Company	2018-03-09 18:52:14 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	096d136460	bumped to version 10.1.7	2018-03-09 17:08:50 +06:00
Nabin Hait	c3889d85a1	Update shopping_cart.js	2018-03-09 16:28:25 +05:30
Achilles Rasquinha	138a4850fe	Merge pull request #13252 from achillesrasquinha/py3 sort by name accounts for trial balance.	2018-03-09 15:23:28 +05:30
Achilles Rasquinha	dc61c6b975	sort by name accounts	2018-03-09 15:23:08 +05:30
Achilles Rasquinha	1d7665fca1	sort by name accounts	2018-03-09 15:22:20 +05:30
Nabin Hait	052333ea63	subctracting stock entry should also be considered as consumed qty	2018-03-09 14:30:32 +05:30
tundebabzy	3d26003c1f	add column breaks to Subscription	2018-03-09 09:37:06 +01:00
tundebabzy	8889b70ba1	Merge branch 'develop' into new-subscription	2018-03-09 09:10:48 +01:00
Nabin Hait	0357fbc9c1	commonfied regional function for checking delete permission	2018-03-09 13:19:52 +05:30
Nabin Hait	096c05ca6f	Fixes for regional feature of Nepal	2018-03-09 13:11:00 +05:30
theopen-institute	38cbd71352	prevent deletion of sales invoices if country is nepal	2018-03-09 12:39:40 +05:30
Achilles Rasquinha	b4de7e3d07	removed has_key, used pythonic in (#13236 ) * removed has_key, used pythonic in * Update bom.py	2018-03-09 12:35:47 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165 ) * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
tundebabzy	e69747ca6d	[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243 ) * add mode of payment field to Payment Term * add mode of payment field to Payment Terms Template Detail * add mode of payment field to Payment Schedule * add mode of payment in `get_payment_term_details`	2018-03-09 12:23:53 +05:30
Shreya Shah	aadd30d194	fetch delivery date on add-row only if item_code exists (#13250 )	2018-03-09 12:19:35 +05:30
Zarrar	3fd634783d	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-09 12:10:45 +05:30
Harsh Patel	22e6f8d4c2	Fixes for #13071 (#13234 )	2018-03-08 16:23:59 +05:30
rohitwaghchaure	acd3479269	Bank POS transactions in bank reconciliation (#13225 )	2018-03-08 16:22:39 +05:30
rohitwaghchaure	a32e57ae82	[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233 )	2018-03-08 16:21:13 +05:30
Ranjith Kurungadam	a3a63177a1	fix- cannot cancel consultation, remove updating age (#13226 )	2018-03-08 16:20:22 +05:30
Achilles Rasquinha	b2f7092f9e	Merge pull request #13235 from achillesrasquinha/py3 removed has_key	2018-03-08 14:22:36 +05:30
Achilles Rasquinha	87dab14576	removed has_key	2018-03-08 14:21:48 +05:30
Ameya Shenoy	d2eec91b2c	indentation fix	2018-03-08 13:27:11 +05:30
Achilles Rasquinha	9efd6e80d2	fixed tabs	2018-03-08 13:20:48 +05:30
Achilles Rasquinha	987934d8ee	fixed tabs	2018-03-08 13:16:08 +05:30
Achilles Rasquinha	abd365fd90	Merge pull request #13228 from achillesrasquinha/py3 [FIX] filter to list	2018-03-08 13:11:58 +05:30
Achilles Rasquinha	908289d40a	[FIX] filter to list	2018-03-08 13:10:51 +05:30
Jamsheer	665b48773f	Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211 ) * New Document - Patient Service Unit * Physician - schedule based on patient service unit * Consultation - Remove validation on submit * Consultation - Label changed from Drug Prescription to Medication * Availability check and book appointment based on service unit, appointment invoice creation optimized * patch fixes * Patient Service Unit - field - overlap_appointments * Patient Appointment - Service Unit based scheduling and booking * Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment * Codacy fixes on PR #13211 * Codacy fixes on PR #13211 * Fee validity test -fixes * Fee Validity - test - fixes	2018-03-08 13:08:35 +05:30
Achilles Rasquinha	11241044b2	Merge pull request #13227 from achillesrasquinha/py3 [FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:58:21 +05:30
Achilles Rasquinha	9050998e06	[FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:55:41 +05:30
theopen-institute	1bfa243190	fix patch that causes error on bench update (#13222 )	2018-03-08 11:20:40 +05:30
lasalesi	470977fa13	corrected setup wizard tax rates for Switzerland 2018 (#13220 ) (#13221 )	2018-03-08 11:19:56 +05:30
tundebabzy	1643cce479	fetch journal entry details (#13218 )	2018-03-08 11:17:17 +05:30
Manas Solanki	bb42e3b411	Merge pull request #13214 from manassolanki/assessment-report-fix minor fix for key error in assessment reports	2018-03-07 16:30:35 +05:30
Manas Solanki	586e9400b1	minor fix for key error	2018-03-07 16:28:21 +05:30
Shreya Shah	c3bf1fa009	[Fixes] Chapter DocType (#13213 ) * fetch chapter head from member doctype instead of user * add enabled in grid view and set default as 1	2018-03-07 16:27:30 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043 )	2018-03-07 15:39:40 +05:30
Vishal Dhayagude	668ec25d19	Allow Item variant Rename (#13161 ) * [WIP] Item varient rename * [wip] Item Variant * [fix] Item Varient Rename * [fix] Item Attribution Rename * removed unwanted code	2018-03-07 15:31:08 +05:30
Nabin Hait	c50d7446b5	Merge branch 'master' into develop	2018-03-07 13:09:07 +05:30
Nabin Hait	36b4faab48	bumped to version 10.1.6	2018-03-07 13:39:05 +06:00
Saurabh	2b59a851c4	Merge pull request #13166 from saurabh6790/patches_fixes [fix] use join instead of subquery	2018-03-07 12:59:03 +05:30
Manas Solanki	857d4f7a0b	Merge pull request #13209 from manassolanki/guardian-fix allow renaming of the guardian	2018-03-07 12:53:40 +05:30
Manas Solanki	12d7bfb658	allow renaming of the guardian	2018-03-07 12:52:31 +05:30
Raghavendra Kamath	6193b92b70	Add new logo in splash image and optimise pngs (#13206 )	2018-03-07 12:39:38 +05:30
Saurabh	ca6e223694	[fix] use join instead of subquery	2018-03-07 12:13:32 +05:30
rohitwaghchaure	343ba85e3a	Merge pull request #13203 from saurabh6790/pe_fix [fix] setup_party_account_field on init	2018-03-07 12:11:46 +05:30
Manas Solanki	1fa992564a	fix the desktop icon for course schedule	2018-03-07 12:08:52 +05:30
Saurabh	a65b28772f	[fix] setup_party_account_field on init	2018-03-06 18:22:01 +05:30
Achilles Rasquinha	78064b7a45	Update patches.txt	2018-03-05 17:53:23 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Nabin Hait	491ce05b8d	bumped to version 10.1.5	2018-03-05 15:17:18 +06:00
Saurabh	2cfcbf933d	Patches fixes (#13163 ) * [fix] if serialised items not found then return * [fix] unicode encoding in patch	2018-03-05 13:01:15 +05:30
Zarrar	2550180a05	remove updating territory for customers on change (#13162 )	2018-03-05 12:32:41 +05:30
Zarrar	950fff0ba1	changes according to the workflow (#13160 )	2018-03-05 11:30:53 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033 ) * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
Vishal Dhayagude	35b665cb26	[new] Create multiple warehouse address and fetch address to stock entry (#13109 ) * [new] Create multiple warehouse address and fetch address to stock entry * [fix] Deleted unwanted field and added patch to link warehouse details to Address * [fix] Codacy fixed * [fix] Modified patch for warehouse address * [fix] Modified patch for warehouse address * [fix] Patch updated and removed contact details from stock entry * [fix] Patch Updated	2018-03-05 11:10:01 +05:30
Zarrar	4417cb0006	improve multiple add dialog, populate parent's depends on with child tasks (#13142 )	2018-03-05 11:08:15 +05:30
Kenneth Sequeira	89795c3f69	Doc imp (#13148 ) * added intro, item and prices video, fixed image links in item and prices * update 2: first 5 videos added * added all videos to the user manual * updated .gitignore	2018-03-05 11:06:44 +05:30
Zarrar	1e4e004667	leave application assigned by naming_series (#13158 )	2018-03-05 11:05:59 +05:30
rohitwaghchaure	a6a4e86dc8	[Fix] System only shows 20 attribute values while making variants (#13155 )	2018-03-05 11:03:59 +05:30
rohitwaghchaure	0eb8bb2511	[Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152 )	2018-03-05 11:03:27 +05:30
rohitwaghchaure	67cfa81de2	[Fix] Stock Ageing report does not work with group warehouse (#13151 )	2018-03-05 11:00:42 +05:30
tundebabzy	458a1fe61a	codacy	2018-03-03 18:11:48 +01:00
tundebabzy	ef605d5f00	codacy	2018-03-03 18:03:04 +01:00
tundebabzy	3b1251ef47	codacy tinzz	2018-03-03 17:36:07 +01:00
tundebabzy	2379451b68	codacy tinzz	2018-03-03 17:18:47 +01:00
tundebabzy	fbdd5d30e9	more tests and bug fixes	2018-03-03 11:19:18 +01:00
tundebabzy	024c28acf7	fix proration logic to reduce possibility of rounding errors	2018-03-03 10:32:02 +01:00
tundebabzy	79a01561d5	enhancement: do nothing if `cancel_sbscription` is called for cancelled subscription	2018-03-03 07:39:44 +01:00
tundebabzy	d43422c18e	enhancement: ensure subscription is cancelled before attempting to restart	2018-03-03 07:37:59 +01:00
tundebabzy	e13570f343	codacy review	2018-03-02 12:27:12 +01:00
tundebabzy	9e863b9572	Merge branch 'develop' into new-subscription	2018-03-02 11:10:27 +01:00
tundebabzy	c15dc21b7d	clean up	2018-03-02 11:00:15 +01:00
tundebabzy	49d34df8f4	more tests	2018-03-02 10:16:57 +01:00
tundebabzy	688fd6b205	prorate invoice when cancelling subscription	2018-03-02 10:16:42 +01:00
tundebabzy	4499e5351c	add article	2018-03-02 06:51:33 +01:00
tundebabzy	16afa8765e	tiny refactor of invoice setting logic	2018-03-01 17:16:41 +01:00
tundebabzy	9df4f0bd43	fix: apply_discount_on field should be of type Select not Data	2018-03-01 17:12:43 +01:00
tundebabzy	8670c85827	make sure default `apply_discount_on` is set when creating invoice	2018-03-01 17:11:14 +01:00
tundebabzy	ca5cf35a99	fix: task should explicitly call `commit` and rollback if error	2018-03-01 17:06:39 +01:00
tundebabzy	36c18c913e	docstrings	2018-03-01 16:44:10 +01:00
tundebabzy	0ec445214c	hook to hourly scheduler	2018-03-01 11:54:32 +01:00
tundebabzy	78fb12663a	fix test	2018-03-01 11:27:48 +01:00
tundebabzy	b91ec79494	update tests and more tweaks	2018-03-01 10:47:00 +01:00
tundebabzy	7eabbd93e1	update start date alone after restarting subscription	2018-03-01 09:09:23 +01:00
tundebabzy	2a11c18383	set initial invoice period based on subscription start	2018-03-01 08:47:38 +01:00
tundebabzy	a93fa16bce	freeze screen while waiting for updates on subscription	2018-03-01 08:45:56 +01:00
rohitwaghchaure	a942722619	[Fix] Timeout issue while saving multilevel BOM (#13118 )	2018-03-01 13:15:25 +05:30
tundebabzy	328adedbc8	adds `start` field to record subscrption start date	2018-03-01 08:45:01 +01:00
Nabin Hait	c10bbd6aa7	Editable unallocated amount in pe (#13130 ) * editable unallocated amount in payment entry to handle multi currency * set unallocated amount on server side * some minor fixes * Fixes in territory patch * removed print * minor fixes	2018-03-01 13:14:14 +05:30
Rohit Waghchaure	855d843e55	[Fix] Sales invoice email prompt not working	2018-03-01 13:06:01 +05:30
Harsh Patel	5bebbbe7a9	[Feature] Supplier warehouse link field on purchase order (#13051 ) * Multiple Features: [New] Supplier warehouse link field on purchase order for sub-contracting [New] Auto select supplier warehouse while making purchase receipt from purchase order * Set default to_warehouse in stock entry as the supplier warehouse	2018-03-01 11:33:25 +05:30
rohitwaghchaure	0df95fa781	Multi-UOM for sales/purchase return (#13132 ) * Multi-UOM for sales/purchase return * Update sales_and_purchase_return.py	2018-03-01 11:31:33 +05:30
Charles-Henri Decultot	bc7a549fdb	Gocardless integration (#13008 ) * GoCardless integration * Addition of a method for determining if the email should be sent or not * Correction for Tests * Codacy fix * Documents moved to ERPNext * Codacy fix * Codacy fixes * Remove method where not necessary and replace with hasattr	2018-03-01 10:59:21 +05:30
Zarrar	6578bc11b6	wrong query formed to delete events (#13119 )	2018-03-01 10:54:55 +05:30
Nabin Hait	f68dc69078	Set auto created serial nos in incoming transactions in case of multi UOM (#13112 ) * Create user from Employee * Set auto created serial nos in incoming transactions in case of multi uom	2018-03-01 10:54:24 +05:30
tundebabzy	3fecbb98c5	Make Expense Claim from Employee Advance #13053 (#13074 ) * allow to make expense claim from employee advance * make expense claim only if claimed amount < paid_amount * expense claim made from employee advance is paid	2018-03-01 10:50:45 +05:30
Zarrar	502af4dd67	display image fnd description for root BOM also (#13099 )	2018-03-01 10:44:47 +05:30
rohitwaghchaure	db9fa78ee8	Do not validate payment schedule for POS (#13115 )	2018-03-01 10:32:29 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129 ) * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
rohitwaghchaure	332a17ee86	[Fix] Test case for serial no (#13136 )	2018-03-01 10:28:04 +05:30
tundebabzy	d9fec69a70	update test case, fix bugs	2018-03-01 05:34:02 +01:00
tundebabzy	8f37926ca8	add ability to cancel, restart and refresh subscription	2018-03-01 04:57:23 +01:00
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Shreya Shah	a310cc7156	order by modified instead of item name (#13113 )	2018-02-28 18:59:55 +05:30
Ameya Shenoy	c20901443e	updated develop_version to 11 (#13133 )	2018-02-28 17:38:23 +05:30
tundebabzy	2cccad0274	more tests and quick fix	2018-02-28 12:45:09 +01:00
tundebabzy	a5bc057ad4	adds missing 'translatability'	2018-02-28 12:24:16 +01:00
tundebabzy	86ee455cbc	more tests and bug fix	2018-02-28 12:21:08 +01:00
tundebabzy	b3d5777e55	more test cases and bug fixes	2018-02-28 12:11:19 +01:00
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128 ) * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Faris Ansari	72d8509b3d	python 3 fix (#13127 )	2018-02-28 12:53:34 +05:30
tundebabzy	3aaf693abd	adds task -`process`	2018-02-28 05:12:18 +01:00
tundebabzy	95a4ca9429	update test cases	2018-02-27 18:09:06 +01:00
tundebabzy	9bf029a16e	generate new invoice only when `current_invoice_end` is past	2018-02-27 15:19:02 +01:00
Achilles Rasquinha	11a5f78d3e	Merge pull request #13070 from achillesrasquinha/py3 [FIX] sorting multiple compares	2018-02-27 19:48:25 +05:30
tundebabzy	45b6a1719f	refactor: - current_invoice _start and end should be determined by trial period or billing period - adds new functions to get billing period data	2018-02-27 15:14:19 +01:00
tundebabzy	c634ca8737	adds validation to billing_interval_count in Subscription Plan	2018-02-27 14:12:39 +01:00
Nabin Hait	3b43c0d160	Update territory and customer_group patch optimization (#13076 ) * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-27 15:57:14 +05:30
Zarrar	96002c28bd	optimize patch for faster execution (#13068 )	2018-02-27 15:57:01 +05:30
Zarrar	91fc1a8fbe	Update Territory & Customer Group across all transaction (#13004 ) * added method for update query based on changes * patch added * updated function, moved util function	2018-02-27 15:56:38 +05:30
tundebabzy	3c26a7e862	adjusts query so multiple plans can be used to create single invoice	2018-02-27 09:36:29 +01:00
tundebabzy	559d01e176	allows to rename subscription plan	2018-02-27 09:13:35 +01:00
tundebabzy	07313c281a	adds more assertions to test cases	2018-02-27 09:00:13 +01:00
Ameya Shenoy	3ee22f0137	rename valid_email to validate_email (#13103 )	2018-02-27 12:59:12 +05:30
rohitwaghchaure	f1755fb5b1	Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1 [Hotfix] POS discount issue	2018-02-27 11:58:33 +05:30
Manas Solanki	be841ccc53	Merge pull request #13096 from manassolanki/fix-fee-schedule Fixes in the Fees Schedule	2018-02-27 11:23:38 +05:30
Frappe PR Bot	c6e2d750bb	[Translation] Updated Translations (#13097 )	2018-02-27 11:00:59 +05:30
Zarrar	033eb779d4	minor fixes for member (#13101 )	2018-02-27 11:00:47 +05:30
tundebabzy	048bcbf080	more tests and code fixes	2018-02-26 22:17:06 +01:00
tundebabzy	b84e9519c2	Subscriptions doctype - subscriber should be set only once	2018-02-26 20:35:20 +01:00
tundebabzy	1ea5055967	fix another date comparison bug	2018-02-26 20:17:59 +01:00
tundebabzy	4d8175f9d9	adds test cases and fix resulting bugs	2018-02-26 18:56:05 +01:00
tundebabzy	cd700efc0b	only generate invoice `after_insert` if subscription is not in trial period	2018-02-26 16:26:36 +01:00
tundebabzy	0091c86e80	fix date comparison bug	2018-02-26 16:18:55 +01:00
tundebabzy	08a11b4d1f	sets default for `days_until_due` to 0	2018-02-26 16:13:45 +01:00
tundebabzy	d3fdcd9da5	set `after_insert` methods: - if subscription is not in trial period, generate sales invoice	2018-02-26 16:10:47 +01:00
tundebabzy	b72aac6729	adds validation: - ensure trial period dates are in order	2018-02-26 15:56:47 +01:00
tundebabzy	7a2c6df645	sets Subscription doc status in `before_save`	2018-02-26 15:55:32 +01:00
tundebabzy	3010996cc5	adds `before_insert` methods: - set current_invoice_start - set current_invoice_end	2018-02-26 15:51:32 +01:00
tundebabzy	35e92c7d29	removes start field from Subscriptions	2018-02-26 15:25:26 +01:00
Manas Solanki	51dfba749b	filter students on basis of category and button to show fees	2018-02-26 19:32:26 +05:30
tundebabzy	6e014331c5	removes end_date from Subscriptions doctype	2018-02-26 14:05:54 +01:00
tundebabzy	2b5298238e	adds prorate field to Subscription Settings	2018-02-26 13:58:29 +01:00
tundebabzy	2dee342501	Subscriptions doctype - trial start and end are set_only_once	2018-02-26 13:34:25 +01:00
Nabin Hait	3799f8bec9	Don't validate serial nos while cancelling the transaction	2018-02-26 16:39:06 +05:30
Zarrar	e53a238665	minor fix (#13095 )	2018-02-26 15:59:20 +05:30
Shreya Shah	70a57e08fd	New Report Employee Advance Summary (#13040 ) * New Report Employee Advance Summary * JSON style column definition	2018-02-26 15:58:57 +05:30
tundebabzy	cbe4f5b6b3	changes to subscription settings	2018-02-26 11:22:53 +01:00
tundebabzy	066958a794	subscription_invoice doctype changes	2018-02-26 11:22:05 +01:00
Rohit Waghchaure	3edc101957	[Fix] POS discount issue	2018-02-26 13:25:58 +05:30
tundebabzy	8457bb2c7e	change in Subscription Settings	2018-02-26 08:13:41 +01:00
Nabin Hait	127c61e930	Fixed logic in itemwise recommended reorder level	2018-02-26 12:43:17 +05:30
rohitwaghchaure	8ffd5d40e3	[Fix] UX for delivery trip (#13046 ) * [Fix] UX for delivery trip * Fixed test cases	2018-02-26 12:25:39 +05:30
tundebabzy	9360f81b94	Validity of Quotation #12858 (#13078 ) * add new setting for default valid_till date * codacy cleanup	2018-02-26 12:23:41 +05:30
Nabin Hait	e55831a89c	Projected Qty in Auto reorder email	2018-02-26 11:38:40 +05:30
tundebabzy	9016890ecf	adds Subscription Settings doctype	2018-02-26 06:15:31 +01:00
tundebabzy	988f5ca38b	hide `trial_period_end` and `invoices` if empty	2018-02-26 05:14:10 +01:00
tundebabzy	bbac07d9d2	use naming series for Subscriptions	2018-02-26 05:07:56 +01:00
tundebabzy	dda6234cab	remove subscription name and name by subscriber	2018-02-26 04:52:13 +01:00
tundebabzy	7c455ad4b6	display invoices section field only if there are invoices	2018-02-26 04:50:45 +01:00
tundebabzy	4ca5e81aa3	adds description for `billing_interval_count` in subscription plan	2018-02-26 04:47:19 +01:00
tundebabzy	4d31255d5c	customer field in Subscriber should be Link	2018-02-26 04:40:53 +01:00
tundebabzy	a07811b67f	adds new doctype - Subscriptions - encapsulates subscription - linked to a subscriber - subscription can contain many plans - contains history of generated invoices	2018-02-26 04:25:30 +01:00
Nabin Hait	2572b05b35	Update territory and customer_group patch optimization (#13076 ) * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-25 10:45:24 +05:30
tundebabzy	2581e2e5d7	New doctype - Subscription Plan: - Plan is to be linked to a Product - Plan will be used to create Invoice items - Subscriber can have multiple plans - Contains billing cycle information	2018-02-24 11:31:42 +01:00
tundebabzy	007919c03f	New doctype - Subscriber: - Encapsulates a subscriber to a service or product - Contains subscription specific information	2018-02-24 11:19:06 +01:00
Zarrar	4a0d27078e	optimize patch for faster execution (#13068 )	2018-02-23 17:41:32 +05:30
Achilles Rasquinha	a3555aa7bd	[FIX] sorting multiple compares	2018-02-23 17:22:07 +05:30
Nabin Hait	802819df9d	Merge branch 'master' into develop	2018-02-23 16:59:44 +05:30
Nabin Hait	d54953e419	bumped to version 10.1.4	2018-02-23 17:29:42 +06:00
Zarrar	339426c926	fix permission issue for stock balance report - Item Group (#13069 )	2018-02-23 16:58:55 +05:30
Nabin Hait	7570774ebe	Merge branch 'master' into develop	2018-02-23 16:49:43 +05:30
Nabin Hait	d12fb58c12	bumped to version 10.1.3	2018-02-23 17:19:40 +06:00
Ameya Shenoy	82048cf3ce	verify payment entry amount is positive (#13066 ) * verify payment entry amount is positive * Update sales_invoice.py * Update sales_invoice.py	2018-02-23 16:33:28 +05:30
rohitwaghchaure	4d76269eeb	[Fix] Item wise sales register report (#13055 )	2018-02-23 16:25:30 +05:30
Shreya Shah	70a68897cc	auto name on the basis of naming series (#13056 )	2018-02-23 16:24:59 +05:30
Shreya Shah	d5b2e39f45	improve validation (#13058 )	2018-02-23 16:23:57 +05:30
Frappe PR Bot	239c121f7d	[Translation] Updated Translations (#13059 )	2018-02-23 16:23:00 +05:30
rohitwaghchaure	dd0fc1084e	[Fix] PDC amount, PDC print layout issue (#13062 )	2018-02-23 16:20:46 +05:30
Faris Ansari	97b212e348	Patch optimization (#13060 ) * Patch fixes * fix codacy * Update item_barcode_childtable_migrate.py	2018-02-23 16:19:41 +05:30
Raghavendra Kamath	1a9388acbb	Clean inline css found in chapter and grant for loops! (#13038 ) * Clean inline css found in chapter and grant for loops! * Remove redundant css * remove unwanted ide files and append gitignore * remove unnecessary line from build.json * restore import for variable.less * remove kdev from gitignore	2018-02-23 14:34:44 +05:30
Nabin Hait	d283ee73f3	Fetch timesheet based on project	2018-02-23 12:58:39 +05:30
Nabin Hait	5b9f3b0cd3	Merge branch 'master' into develop	2018-02-22 18:18:36 +05:30
Nabin Hait	2b2cf13408	bumped to version 10.1.2	2018-02-22 18:48:34 +06:00
Nabin Hait	7f49b57aaa	Update added_extra_gst_custom_field_in_gstr2.py	2018-02-22 18:17:57 +05:30
Nabin Hait	0e3db275e5	Merge branch 'master' into develop	2018-02-22 18:10:39 +05:30
Nabin Hait	6b69fc7e5d	bumped to version 10.1.1	2018-02-22 18:40:37 +06:00
Saurabh	d8cd54dfd0	[fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047 )	2018-02-22 18:05:40 +05:30
Suraj Shetty	8a41887f68	patch exception fixes (#13037 ) * patch exception fixes * reload daily_work_summary_group_user doctype	2018-02-22 15:56:33 +05:30
tundebabzy	2949e9c5dc	Merge pull request #13036 from tundebabzy/issue-13019 Uncaught Server Exception : adjust_qty_for_expired_items #13019	2018-02-22 11:04:53 +01:00
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
Nabin Hait	9b530fb2cb	bumped to version 10.1.0	2018-02-22 15:09:37 +06:00
Nabin Hait	06bace9089	Fixed develop version	2018-02-22 14:36:26 +05:30
tundebabzy	c15978fca0	fix indentation	2018-02-22 09:50:49 +01:00
Nabin Hait	7d862276af	Cleanup and fixes on leaderboard	2018-02-22 13:59:41 +05:30
Nabin Hait	e4fe2d9603	Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard	2018-02-22 11:35:10 +05:30
rohitwaghchaure	23a2b65576	[Fix] BOM Update Tool not update grandparent's exploded BOM (#13026 )	2018-02-22 11:32:09 +05:30
tundebabzy	cad22dbe39	Cutomisable Cash Flow Reports (#12969 ) * add child doctype - Cash Flow Mapping Account * adds new doctype - Cash Flow Mapping * adds new doctype - Cash Flow Mapper * adds new doctype Cash Flow Mapping Template * adds new doctype Cash Flow Mapping Template * adds adjustments to Cash Flow Mapper: - remove fields from Cash Flow Mapping Template Details - update in Cash FLow Mapper * get cash_flow_accouts from Cash Flow Mapping * change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field * changes description from 'Net Profit/Loss' to 'Profit for the year' * set `net_profit_loss` `parent_account` properly * modify `get_account_type_based_data`: - changed signature such that `account_type` parameter is now `account_name` - where clause in query is now based on `name` * remove zero rows * de-duplicates row, summing similar accounts in the process * makes gl sum calculation use `parent_account` as a condition * add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field * adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities * add "Movement in working capital" subheader * refactor code for readability * adds new fields to `Cash Flow Mapping`: - `is_interest_paid` to allow me recognise accounts for 'Interest Paid' - `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid' * allow `Cash Flow Mapping` to be renamable * adds new field - `section_subtotal` useful for only Operating Activities * changes `Cash Flow Mapping` doctype fields: - remove `is_income_tax`_field - add `is_income_tax_liability` field to identify tax payable accounts - add `is_income_tax_expense` field to identify tax expense accounts in P or L * calculates and shows tax paid adjustment in cash flow statement * renames `is_interest_paid` to `is_finance_cost` * - adds finance costs calculation - correctly sets opening balance dates * prevents users from selecting extra options in Cash Flow Mapping * adds validation to prevent selecting multiple options * adds new fields to Cash Flow Mapping * calculate non cash p or l items (2nd pass) * separates default cash flow generation from custom * adds new setting to Accounts Settings: - allow user elect to use customised cash flow report * clean up * removes mandatory constraint from accounts field * allow rename, disallow create and delete * adds patch to add default Cash Flow Mappers * refactors custom_cashflow * add article to explain configuration * refactor * further refactor * final clean up (hopefully) * clean up for codacy * more codacy fixes * more codacy fixes * fix broken patch * rename article to .md * create default mappers after install * PEP 8 * create the tables in `after_install` call	2018-02-22 11:08:36 +05:30
tundebabzy	27d558c9ef	Optionally allow overlap on Timesheet #12893 (#13018 ) * give user option to ignore time overlap validation * move settings to new Projects Settings * clean up - remove trailing space	2018-02-22 11:05:49 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988 ) * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Zarrar	79756c44c9	Update Territory & Customer Group across all transaction (#13004 ) * added method for update query based on changes * patch added * updated function, moved util function	2018-02-22 10:57:49 +05:30
Shreya Shah	0bde9e11c7	clear log if no attachments (#13023 )	2018-02-22 10:55:40 +05:30
tundebabzy	637b242a34	Credit card default account should be debtors #12989 (#13029 ) * allow receivable account type in mode of payment * update `default_account` field description	2018-02-22 10:51:57 +05:30
vishdha	09d56754ea	[fix] Codacy issue	2018-02-21 16:10:09 +05:30
vishdha	e9166d7c19	[fix] Sales partner details get from sales Order and company currency details from selected company	2018-02-21 15:35:58 +05:30
vishdha	9a64d4371e	[fix] Codacy Issue	2018-02-21 15:35:58 +05:30
vishdha	d4491d361f	[new] Filter based on company:	2018-02-21 15:35:58 +05:30
vishdha	09acb779d7	[new] Leader board	2018-02-21 15:35:58 +05:30
Suraj Shetty	d3069fee4d	Daily work summary refactor (#12944 ) * added daily work summary setting doctype and code to support feature this will allow multiple setting for daily work summary * added daily work summary setting user doctype * made changes in daily work summary code * [minor] entry change in hr config file * deleted previous daily work summary settings (and its company) doctype * removed unwanted permission check * toggled read_only option for enabled field * removed print statements * add patch for the changes * doc changes * [minor] indentation fix * fixed tests * indentation fixes * codacy issue fix * formatting fixes * renamed doctype Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes * fixed typo * updated doc * codacy issue fix * [minor] renamed doctype name in json * Renamed old doctype * fixed indentation * codacy fix * indentation fix * renamed doctype * handled patch exception * fixed exception * Update daily_work_summary_group.py * rename patch file removed abbreviation in file name * handled exception in patch code * removed Unnecessary pass statement * [minor] indentation fix	2018-02-21 15:15:43 +05:30
Zarrar	67f74414c4	disable expand_all button for BOM (#13015 )	2018-02-21 14:46:41 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010 ) * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
Zarrar	bc5515651b	[Hotfix] Selecting create on blank field throws error (#13014 ) * selecting create on blank field error fix * error when fetching default_print_format	2018-02-21 11:13:14 +05:30
Shreya Shah	f65afac353	db_update instead of save to avoid unnecessary validations (#13009 )	2018-02-21 11:12:04 +05:30
Charles-Henri Decultot	b8c088edb7	Transaction Log for France (#12795 ) * Regional overrides for France * Addition of tests and documentation	2018-02-21 11:07:33 +05:30
Faris Ansari	7c744acc49	Changes for Rollup (#12924 ) * Changes for rollup * remove variables.less	2018-02-20 14:21:50 +05:30
rohitwaghchaure	e2558308f6	[enhance] Production Plan (#12160 ) * [enhance] Production plan * Test cases * Removed production planning tool * Documentation * Added actual qty in material request production item * Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'	2018-02-20 12:20:00 +05:30
Pawan Mehta	2fbb4923a7	item balance report (#12983 ) * item balance report * remove hard coding * Update item_balance.json * Update item_balance.json Change name to "Item Balance (Simple)" * Update item_balance.json	2018-02-20 12:17:49 +05:30
Pawan Mehta	244e235c48	Sales Payment Summary - fix for change amount (#12981 ) * [fix] #12980 * apply change amount to cash	2018-02-20 12:15:10 +05:30
Shreya Shah	f718b0c0df	Currency filter in Pricing Rule (#11776 ) * added currency filter * modified files * pull margin only if currency matches * Renamed price to rate in pricing rule * fetch rate only if currency matches * rebase with develop * rebase with develop * patch to set currency in existing docs * currency field mandatory in pricing rule * modified test cases * rebase with develop * fixed test case	2018-02-20 11:26:46 +05:30
rohitwaghchaure	554f2de23d	Code cleanup online POS (#12985 )	2018-02-20 11:18:01 +05:30
Vishal Dhayagude	a5003f8f5b	[minor] Balance Qty added in reorder level email notification (#13000 )	2018-02-20 11:14:54 +05:30
tundebabzy	6c5d7986ab	Outstanding Amount not getting updated in Payment Entry #12713 (#12975 ) * allow to `set_missing_ref_details` by force * update payment entry references during submit and cancel	2018-02-19 13:11:56 +05:30
Shreya Shah	5448318146	fix total field (#12992 )	2018-02-19 12:44:52 +05:30
Pawan Mehta	174a18399c	Added Payment Details to Sales Payment Summary Report (#12358 ) * [fix] #12357 * label changes	2018-02-19 12:39:13 +05:30
Saurabh	ec23a6f0eb	[fix] section break for raw_material_details (#12976 )	2018-02-19 11:33:11 +05:30
joezsweet	16862f9051	Better handling of auto set barcode_type issue (#12970 ) Get barcode_type options and check if value is included	2018-02-16 17:33:30 +05:30
Charles-Henri Decultot	894ab7a664	Braintree integration documentation (#12775 ) * Braintree integration documentation * Cleanup documentation	2018-02-16 15:16:47 +05:30
riyasrawther	d1134516c2	Warehouse wise Item Balance, Age and Value (#12879 ) * Create warehouse_wise_item_balanace_age_and_value.py * Create warehouse_wise_item_balance_age_and_value.js * Create warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.js * Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py * Update warehouse_wise_item_balance_age_and_value.py	2018-02-16 14:53:53 +05:30
Shreya Shah	093e7e6e98	Refactor Expense Claim (#12883 ) * patch for custom workflow * deleted field approval_status * replaced approval_status with workflow_state * updated test cases * validation to check expense approver * check if workflow_state_name already exists * fixes * modified notifications.py * removed field exp_approval and modified test cases	2018-02-16 14:49:39 +05:30
joezsweet	bd7c00c59e	[Hot Fix] barcode_type auto set to a wrong value (#12957 ) * Fix barcode_type auto set to a wrong value This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13" * codacy fix	2018-02-16 14:47:10 +05:30
Jay Parikh	33b2614377	[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966 )	2018-02-16 14:45:40 +05:30
Zarrar	441a1e1b8a	Validate Bank name in Setup wizard on the same slide (#12968 ) * validate bank name before moving on to next slide * Update setup_wizard.js	2018-02-16 14:44:42 +05:30
Nabin Hait	b95ecd7fcd	Gstr reports (#12940 ) * GSTR1 for B2B (#12296) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings * Update gstr_1.py * GSTR1 for B2B, B2CL and B2CS (#12459) * [Report] GSTR - 1 CDNR Report (#12554) * [wip] cdnr * [WIP] cdnr with optional data * [wip] Export GSTR-1 * [minor] Minor changes in export * [new] Custom field added for GST * [fix] Minor changes in GSTR1 Report * [minor] Minor changes in gstr1 * [fix] Codacy Fixed * Update setup.py * [wip] Gstr2 * [fix] Fetch correct Tax Details * [minor] ITC data append to row * [fix] CDNR negative value * Cleanup and fixes on GSTR-2 * Minor fixes in gstr reports (#12848) * [new] B2C limit fetch from GST Settings (#12905) * [new] b2c limit fetch from gst setting * [fix] Patch Added for b2c limit * Update gstr_1.py * Update utils.py * Cusotm fields related GSTR2 * minor fixes * minor fixes * some more fixes * Added duplicate patch and some tests as not required on develop	2018-02-16 13:19:04 +05:30
Nabin Hait	cc98d40ff7	Payment reco auto allocation and maintain same order of records (#12963 ) * Automatically allocate amount after selecting invoice against a payment entry * codacy fixes	2018-02-16 13:14:20 +05:30

... 13 14 15 16 17 ...

15030 Commits