14141 Commits

Author	SHA1	Message	Date
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
Vishal Dhayagude	1e0ae07bff	[fix] Validate Party in not present in Party Type (#12910) ... * [fix] Validate Party in not present in Party Type * [fix] Minor Changes * [fix] Valid Customer and Supplier fetch * [WIP] Allow and prevent for creating party * [fix] minor changes * [fix] Requested Changes * [fix] Codacy issue * Update opening_invoice_creation_tool.py	2018-02-16 13:13:37 +05:30
Shreya Shah	3a9eec2e92	Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913) ... * pass bill_date as parameter and calculate due_date on that basis * calculate payment_schedule on the basis of bill_date if present else posting_date * add bill_date as an argument to get_party_details * pass bill_date on supplier trigger in purchase invoice	2018-02-16 13:05:21 +05:30
Shreya Shah	278af1befb	remove deprecated processing payroll video links (#12947)	2018-02-16 12:58:04 +05:30
rohitwaghchaure	103c4e9b92	[Fix] Incorrect rate in item-wise sales register (#12943)	2018-02-16 12:57:35 +05:30
Shreya Shah	f4b271a02e	Customer and Supplier link fields in Member DocType (#12942) ... * added link fields customer and supplier * fixed a typo	2018-02-16 12:56:01 +05:30
Zarrar	5a947f38ab	avoid overlap with dropdown (#12941)	2018-02-16 12:49:30 +05:30
Prateeksha Singh	0acb63a938	Update hub domain 💥	2018-02-16 11:07:12 +05:30
Shreya Shah	394b7a2fa3	Rename Offer Letter to Job Offer (#12934)	2018-02-16 10:49:34 +05:30
rohitwaghchaure	5a5f73e46a	Merge pull request #12602 from PawanMeh/fixes_8540 ... Select multiple raw material items for Sub Contract Stock Entries	2018-02-15 18:54:29 +05:30
Nabin Hait	8a562266ad	Update set_b2c_limit.py	2018-02-15 18:40:18 +05:30
Nabin Hait	0c7ce02e54	Update set_b2c_limit.py	2018-02-15 18:12:27 +05:30
Nabin Hait	44658d44c5	Update gstr_1.py	2018-02-15 17:24:15 +05:30
saurabh-bhosale	307063e64e	[Fix] Invalid Syntax in gstr_1.py (#12946) ... * [Fix] Added missing parenthesis in gstr_1.py * Minor change	2018-02-15 17:13:35 +05:30
Saurabh	82ffdd7dc6	Merge branch 'master' into develop	2018-02-15 15:17:04 +05:30
Saurabh	ca166eaae5	bumped to version 10.0.23	2018-02-15 15:47:03 +06:00
Vishal Dhayagude	bd59a53173	[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	2018-02-15 14:22:11 +05:30
Achilles Rasquinha	0bf19a1ac5	Merge pull request #12931 from achillesrasquinha/py3-iteritems ... Py3 iteritems	2018-02-15 13:49:43 +05:30
Achilles Rasquinha	c94df80d88	Merge pull request #12925 from netchampfaris/enable-translatable-patch ... Patch to enable translatable	2018-02-15 12:18:26 +05:30
Achilles Rasquinha	d56b00f5fd	Merge pull request #12932 from achillesrasquinha/py3-basestring ... Py3 basestring	2018-02-15 12:16:12 +05:30
Achilles Rasquinha	5f0c70361a	iteritems	2018-02-15 11:55:45 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Achilles Rasquinha	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Shreya Shah	8b531c1ee6	Fix parenthesis in buying controller (#12923)	2018-02-15 11:21:49 +05:30
Prateeksha Singh	387a242232	Merge pull request #12928 from pratu16x7/hub-pages ... Hub pages	2018-02-15 11:05:22 +05:30
Prateeksha Singh	9889899603	[hub] cleanups	2018-02-15 10:54:23 +05:30
Prateeksha Singh	1ad072f2a9	[hub] cleanups	2018-02-15 10:47:59 +05:30
Prateeksha Singh	2073959bb8	Update entity properties	2018-02-15 10:24:16 +05:30
Prateeksha Singh	6ee035ba5b	tree parent working	2018-02-15 08:50:31 +05:30
Faris Ansari	1e422f2383	Patch to enable translatable	2018-02-14 22:18:55 +05:30
Prateeksha Singh	25d5a1d890	add company pages	2018-02-14 19:53:18 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900) ... * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Achilles Rasquinha	361366ebe6	Python 3 fixes. (#12916) ... * Fixed iteritems and exceptions * python3-fixes * fixed iteritems	2018-02-14 17:08:59 +05:30
rohitwaghchaure	a13b177908	[Fix] Not able to select delivery note in delivery trip (#12912)	2018-02-14 17:06:21 +05:30
Prateeksha Singh	8e84fa9f9e	Merge pull request #12914 from achillesrasquinha/company-logo ... Added Company Logo to DocType	2018-02-14 17:04:47 +05:30
Achilles Rasquinha	1c86d18837	Added Hub Company Logo	2018-02-14 16:05:32 +05:30
PrakashH	908af53fcd	Update stock-reconciliation-for-non-serialized-item.md (#12908)	2018-02-14 13:16:25 +05:30
PrakashH	0c4c2981c8	Update journal-entry.md (#12909)	2018-02-14 13:15:53 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Saurabh	351dc08576	bumped to version 10.0.22	2018-02-14 12:15:31 +06:00
rohitwaghchaure	8e675ebbe2	[Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898)	2018-02-13 17:11:06 +05:30
Faris Ansari	d53b149828	[deadlock fix] Save if not set (#12896)	2018-02-13 16:31:00 +05:30
Faris Ansari	5a91989665	Remove total_projected_qty (#12889)	2018-02-13 16:00:52 +05:30
Nabin Hait	bb821ec2af	Fixed test dependencies	2018-02-13 14:49:09 +05:30
rohitwaghchaure	62d6593fe7	[Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882)	2018-02-13 14:43:37 +05:30
Achilles Rasquinha	56b2e12af8	Python 3 fixes [merge asap] (#12884) ... * Python 3 fixes * fixed compare	2018-02-13 14:42:40 +05:30
saurabh-bhosale	ed35a296ab	closes #12872 (#12888)	2018-02-13 14:40:59 +05:30
Prateeksha Singh	ecc6f86c7c	Merge pull request #12885 from netchampfaris/setup-progress-deadlock-fix ... [deadlock fix] Save if not set	2018-02-13 13:16:37 +05:30
Faris Ansari	f0056f7338	[deadlock fix] Save if not set	2018-02-13 12:18:24 +05:30
saurabh-bhosale	99eb30242d	[Fix] Bug fix in customer_primary_address frappe call (#12880)	2018-02-13 07:58:47 +05:30
pawan	471a018e67	remove old stock entry method/rewrite test case	2018-02-12 21:15:46 +05:30
Nabin Hait	662b23ce57	get address display in customer	2018-02-12 19:25:00 +05:30
Nabin Hait	4adcced9ae	Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos	2018-02-12 19:14:38 +05:30
rohitwaghchaure	6a7495dbc8	Removed set only once for maintain stock field in item master (#12878)	2018-02-12 17:25:24 +05:30
sivankar	a4ff220769	removed duplicate function and other CLI fixes (#12876) ... * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date * Quality Review fixes	2018-02-12 17:24:26 +05:30
pawan	1b8c13b175	call make_rm_stock_entry	2018-02-12 16:59:59 +05:30
Nabin Hait	a8d10b7332	Update setup.py	2018-02-12 16:54:13 +05:30
Shreya Shah	d9a585bdad	Leave workflow patch fixes (#12823) ... * modified patch for leave application workflow * removed leave approval field from leave application doctype * fetch lwp and attendance only if workflow field exists * modified test cases * modified files with leave application * docstatus draft for rejected applications * modified leave application calendar * test fixed * run patch only if any record exists	2018-02-12 16:02:57 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
tundebabzy	6e90f49a35	Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714) ... * unconditionally fetch exchange rate * Revert "unconditionally fetch exchange rate" This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a. * allow for `plc_conversion_rate` field to be reset * fetch exchange rate using price list currency and company currency not form currency * clean up	2018-02-12 15:18:57 +05:30
tundebabzy	c89782502c	Report presentation currency (#12670) ... * Add new Select to filters * get the currencies from database rather than hardcoded * label report columns: - If presentation currency is available in filters, use it or - If company is available in filters, use it or - use default company currency * add new function - get_currency * tweak new function `get_currency` * add new function `convert` to convert a value to another currency * add new function `convert_to_presentation_currency` * clean up `get_currency` first pass * memoise the exchange rates * limit fetched GL entries to to_date * check if account type is p&l or not and use appropriate exchange rate based on that * change EXCHANGE RATE to a dict, use for memoisation * rename EXCHANGE_RATE * cache exchange rates and use them as needed * add docstrings * add presentation currency logic to financial statement reports * move new functions from `general_ledger.py` to new module * clean up * PEP 8 clean up * move function to util.py * PEP 8 clean up * remove presentation currency option from cashflow * adjust currency as needed * allow users to save presentation currency in Accounts Settings * add new function `get_presentation_currency_list` * refactor query_report modules with no promises * Revert "allow users to save presentation currency in Accounts Settings" This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b. * show print page in correct currency * Update utils.py	2018-02-12 15:04:50 +05:30
joezsweet	04338cfb4b	removed extra spaces	2018-02-12 10:12:27 +01:00
joezsweet	f9cb7ea611	removed extra spaces	2018-02-12 10:05:59 +01:00
sivankar	621740efd9	Enhancement and bug fix in batch (#12753) ... * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date	2018-02-12 14:33:40 +05:30
Fahim Ali Zain TP	277935be79	Deduct Rejected Item's Raw materials in SubContracting (#12837) ... * Deduct Rejected Item's Raw materials in SubContracting frappe/erpnext#12752 * Travis Build Fix	2018-02-12 11:59:07 +05:30
Revant Nandgaonkar	2dee8fc255	Hotels (#11907) ... * [new-module] hotels, start * Multiple Changes Hotel Settings Added Make invoice on Hotel Reservation * Hotel Room validation for overbooking * Added test fixtures and test for Hotels * Added Tests for Hotels Overbooking Pricing not set * [WIP] Documentation Hotel Room and Screenshot * Added Calendar view for Hotel Room Reservation * Added Report - Hotel Room Occupancy * Added Hotel Reservation User in Hospitality domain	2018-02-12 11:57:12 +05:30
rohitwaghchaure	6e7e70c977	Added PDC from journal entry in AR report (#12844)	2018-02-12 11:55:07 +05:30
rohitwaghchaure	0aeeb7e02c	[Fix] Item variant details report (#12869)	2018-02-12 11:44:39 +05:30
Shreya Shah	caccd2289d	posting-date-fix (#12849)	2018-02-12 11:34:46 +05:30
Jamsheer	be9eae06ec	Physician - Set Details by User or Employee (#12558)	2018-02-12 11:33:44 +05:30
Ameya Shenoy	5c33a04043	Shareholder and related doctypes (#12215) ... * Added doctypes related to shares - Shareholder doctype, the entity who does the transaction - Share doctype, a child table to kepp list of all shares - Share Transfer doctype, Logs of all made transactions * Added logic for share transfer - update shareholder automatically on share transfer/issue/purchase - purchase and transfer have method remove_share which doesn't get executed because of some bug * Added report view for share ledger * Removed share number tracking - removed share number tracking from Share Ledger child table for Shareholder doctype - new doctype Share Type created * Share Balance report added - math behind Share Balance report needs fixing * Changes in shareholder - Share numbers are not tracked in Shareholder - Share Ledger doctype deleted - Share Balance Report bug fixed * Shareholder - fixed report for share balance - remove bug from share transfer by making share type mandatory - added buttons to shareholder for direct link to report * Added tests for Share Transfer * minor codacy fixes * Added Shareholder to Party Type * rate in share ledger & balance report is currency * First attempt at modelling shares after Item * Share Manager changes - on creation of shareholder party it should check if the same combo exists - in shareholder party make report button visible iff folio no exists - create folio no on creation of share transfer iff it doesnt already exist - move reports from shareholder to shareholder party * Shareholder chages - delete share child table doctype - autoname added to folio no - modify tests for share transfer * minor changes * removed share_no child doctype * Restructured Share Transfer Logic (not tested) - Everything revolves around Share Balance child table in Shareholder Party - is_company flag still to be utilized * Tested Share Tranfer * minor fixes * started new shareholder structure * modified shareholder * renamed Shareholder Party to Shareholder * Shareholder rewrite complete * new tests for shareholder written * codacy fixes * Added documentation	2018-02-12 11:32:47 +05:30
Britlog	be9a7231d4	Fix bootstrap layout and move checkout button upper (#12063)	2018-02-12 11:28:57 +05:30
rohitwaghchaure	45ac31ab93	[Fix] Not able to save sales order (#12851)	2018-02-12 11:27:37 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852)	2018-02-12 11:25:58 +05:30
Jamsheer	00c1cf0a5a	Healthcare Menu Fixes (#12830)	2018-02-12 11:24:12 +05:30
Saurabh	cab73b8a02	[fix] execute update_time_and_costing and update_project only for distinct task and projects	2018-02-09 17:04:12 +05:30
Nabin Hait	b0819b528f	Minor fixes in gstr reports (#12848)	2018-02-09 15:30:55 +05:30
Manas Solanki	c7a9e3424b	Merge pull request #12845 from manassolanki/fix-so-update ... don't set the ordered_qty in SO on load from BIN	2018-02-09 13:16:14 +05:30
Manas Solanki	a884bd9c6a	don't set the ordered_qty in SO on load from BIN	2018-02-09 13:12:07 +05:30
rohitwaghchaure	7e75165826	Merge branch 'develop' into fixes_12829	2018-02-09 12:01:41 +05:30
pawan	081f40c1bf	readded pos.css	2018-02-09 11:56:32 +05:30
Saurabh	0f3c4fa7a7	Codacy fix - used classmethod decorator	2018-02-09 11:30:11 +05:30
Saurabh	c29f3c70dc	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-09 10:51:49 +05:30
Saurabh	b4ab89e1da	[Mod] Code refactored to remove dependency on 'complete_address' field	2018-02-09 10:49:30 +05:30
Manas Solanki	458a4e13bd	updated the docs for education	2018-02-08 20:12:41 +05:30
pawan	1583120a54	remove pos.css	2018-02-08 20:00:12 +05:30
pawan	83b1b802d1	print hide and pos.less changes	2018-02-08 19:56:12 +05:30
pawan	33571dc567	print hide changes	2018-02-08 19:35:48 +05:30
pawan	31d37f110a	print hide changes	2018-02-08 19:25:30 +05:30
Manas Solanki	37b2aa2b11	changes in the education module (#12827) ... update the module page remove fee from beta	2018-02-08 19:00:51 +05:30
Pawan Mehta	e2bc8bb644	Update sales_invoice.json	2018-02-08 16:35:03 +05:30
pawan	735b8c6094	[fix] #12829	2018-02-08 16:20:46 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Saurabh	c1f982a9bb	bumped to version 10.0.21	2018-02-08 15:34:25 +06:00
Faris Ansari	6041f5cb8c	[hotfix] Advance Total validation	2018-02-08 13:33:52 +05:30
rohitwaghchaure	144c9977a2	Merge pull request #12819 from netchampfaris/hotfix-get_party_account ... get_party_account only if company is set	2018-02-08 11:42:41 +05:30
Faris Ansari	f7717b9ec2	get_party_account only if company is set	2018-02-08 11:11:21 +05:30
Prateeksha Singh	152bf37e7f	Merge pull request #12813 from pratu16x7/hub-fixes ... Hub listing and entity page	2018-02-08 10:47:16 +05:30
pawan	5f779eb805	validation fix	2018-02-08 09:07:58 +05:30
Saurabh	1a4d77a962	Fixes #12810 for Offline POS	2018-02-08 01:32:48 +05:30
Saurabh	056c1709c6	Fixes #12810	2018-02-08 00:22:53 +05:30
Saurabh	0de0861bb4	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-08 00:10:49 +05:30
Prateeksha Singh	4413ce1be1	company page, deprecate custom page	2018-02-07 23:50:01 +05:30
pawan	2b885beaee	code changes for single stock entry	2018-02-07 19:06:18 +05:30
Bassam Ramadan	fd044a0d5e	docs-fixes (#12805)	2018-02-07 18:59:06 +05:30
rohitwaghchaure	b553b7a69d	PDC Enhancements (#12462)	2018-02-07 18:32:51 +05:30
Nabin Hait	ed26028a93	Minor fixes for depr based on FY	2018-02-07 18:25:45 +05:30
Nabin Hait	82a61c3bd9	Deleted restaurant order entry test cases	2018-02-07 16:56:07 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Nabin Hait	67d6dc1ac6	bumped to version 10.0.20	2018-02-07 16:37:19 +06:00
Nabin Hait	33f967d97c	Account name length fixed in HUngary and Germen COA	2018-02-07 16:00:42 +05:30
Nabin Hait	4b1bd15f7e	Draft status in pos print format	2018-02-07 12:40:45 +05:30
rohitwaghchaure	9a5037193f	Removed DR/CR from balance column (#12791) ... * Removed DR/CR from balance column * Update general_ledger.html * Update general_ledger.py	2018-02-07 12:10:14 +05:30
Shreya Shah	80423de611	posting date in journal entry should not be nowdate (#12801)	2018-02-07 12:08:08 +05:30
Manas Solanki	b4693c6957	fix for making the invoice from the timesheet (#12803)	2018-02-07 12:07:27 +05:30
Saurabh	50f7e29814	[New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed	2018-02-06 00:23:21 +05:30
Rohit Waghchaure	e8d22bb999	[Fix] Incorrect change amount if enabled rounded total	2018-02-05 18:13:29 +05:30
joezsweet	097a98cc10	fixed spaces to tabs	2018-02-05 13:16:00 +01:00
joezsweet	a8d5ef4891	space to tabs	2018-02-05 13:06:30 +01:00
Saurabh	e26773d91e	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-05 17:05:29 +05:30
joezsweet	5f473611bd	space to tab	2018-02-05 12:05:11 +01:00
joezsweet	2f7ab065fb	- removed barcodes from force_item_fields	2018-02-05 11:54:32 +01:00
Nabin Hait	b02c109e1d	Cleanup and fixes on GSTR-2	2018-02-05 16:09:51 +05:30
Prateeksha Singh	3eaccffbd9	[hub] items searchable via core filters	2018-02-05 12:58:30 +05:30
Prateeksha Singh	b8e9c9be08	[hub] form (info) view for items	2018-02-05 12:58:30 +05:30
Faris Ansari	9b64620bc0	[hub] hub page using BaseList	2018-02-05 12:57:49 +05:30
Vishal Dhayagude	cce29fabf4	[fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry (#12767)	2018-02-05 12:25:51 +05:30
rohitwaghchaure	0f5c18ca81	[Fix] For non stock item, not able to place an order from shopping cart (#12758)	2018-02-05 12:25:02 +05:30
rohitwaghchaure	a4c40e0fd6	[Fix] After accesing POS page, it does not work when going back from another page (#12763)	2018-02-05 12:24:06 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
Nabin Hait	9d2f04139c	bumped to version 10.0.19	2018-02-03 09:43:12 +06:00
Helkyd	5e93b02c85	Update trial_balance.py ... Assuming that Account_number has NUMBERs will sort.	2018-02-02 12:27:30 +00:00
Saurabh	70d972d92e	[Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail'	2018-02-02 16:18:17 +05:30
Saurabh	41c47e3ffa	Merge pull request #12677 from tundebabzy/issue-12535-1 ... Website Cart Should Not Show Expired Items As 'In Stock' #12535	2018-02-02 15:58:07 +05:30
rohitwaghchaure	cf6360d825	Merge pull request #12739 from jay-parikh/hotfix ... Enable/Disable Discount in POS using POS Profile #11748	2018-02-02 13:12:38 +05:30
Jay Parikh	2c95ab3897	Code fix for Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 22:52:58 -08:00
Jay Parikh	171e5af995	Fixed indentation issue in pull # 11748	2018-02-01 21:39:20 -08:00
tundebabzy	5df64d84a1	code review fix	2018-02-01 17:05:54 +01:00
tundebabzy	a829d5a4d5	Merge branch 'hotfix' into issue-12535-1	2018-02-01 16:56:05 +01:00
Helkyd	b258686b00	Update trial_balance.py ... Fix to order only if account starts with Number ... while for others not required....	2018-02-01 15:53:30 +00:00
Nabin Hait	91c5e4c429	Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings (#12734)	2018-02-01 18:58:22 +05:30
Nabin Hait	cae13bf048	Fixes in purchase register report (#12737)	2018-02-01 18:58:14 +05:30
Nabin Hait	2aba97bff1	Fetch items from BOM in Material Request	2018-02-01 18:52:50 +05:30
Jay Parikh	d4359faa31	Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 04:26:24 -08:00
Rohit Waghchaure	d85247cd7a	[Fix] Pay button not working in pos	2018-02-01 17:18:38 +05:30
rohitwaghchaure	441032d39c	Merge branch 'develop' into develop	2018-02-01 16:54:10 +05:30
Nabin Hait	b9ce104b09	Opening balance in stock ledger report (#12729)	2018-02-01 14:58:50 +05:30
Saurabh	7c8d508e28	[Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method	2018-02-01 14:40:49 +05:30
Saurabh	df8add272c	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-01 14:02:09 +05:30
Nabin Hait	7ba092eaf9	Fixes for making stock entry against Pro Order (#12721)	2018-02-01 10:51:27 +05:30
Saurabh	f16d45b0a0	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos ... Resolved Conflicts:erpnext/selling/doctype/customer/customer.json	2018-02-01 02:05:30 +05:30
Rushabh Mehta	82fa04ce32	Update projects.py	2018-01-31 22:20:14 +05:30
Saurabh	9f5c2002ff	[Mod] Removed the Dependency on Frappe PR ... [Fix] Fixed a possible bug	2018-01-31 17:43:58 +05:30
rohitwaghchaure	32a5f38595	Merge pull request #12633 from vishdha/issue_12388 ... [fix] Sales order link to purchase order not working fixed	2018-01-31 17:30:43 +05:30
tundebabzy	4990cf7783	remove stray code	2018-01-31 11:35:56 +01:00
Saurabh	9f29f60707	Merge pull request #12581 from britlog/website-product-spinner ... [Website] Add number spinner for quantities in product page	2018-01-31 15:58:04 +05:30
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Nabin Hait	bff1971bb2	bumped to version 10.0.18	2018-01-31 16:09:15 +06:00
Zarrar	4e05f02038	error in throw message rectify (#12719)	2018-01-31 15:33:51 +05:30
Nabin Hait	7918b92d95	Invalid date value comparison, fixes for mariadb 10.2.3+	2018-01-31 15:30:03 +05:30
tundebabzy	29c8142678	refactor adjust_for_expired_items and others as per code review ... use get_all instead of get_list rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`	2018-01-31 10:51:06 +01:00
vishdha	df1653827f	[fix] Patch for material request to purchase order added	2018-01-31 15:11:24 +05:30
Vishal	fc05cc4e70	[fix] link with supplier quotation to purchase order	2018-01-31 15:10:39 +05:30
Vishal	4dc329f5ea	[fix] Sales order link to purchase order not working fixed	2018-01-31 15:10:39 +05:30
Nabin Hait	e37e5d6134	minor fix in patch for mariadb version	2018-01-31 15:00:18 +05:30
rohitwaghchaure	2056ea6fb4	Update customer.js	2018-01-31 14:48:53 +05:30
Zarrar	dea99cc3a8	treeview not set when routed from bom form (#12707)	2018-01-31 13:07:04 +05:30
Kenneth Sequeira	f6daf56054	Added Tutorial Videos for Education in User Manual (#12678) ... * added erpnext education tutorial videos to the manual * testing with div * Update program-enrollment.md Properly ended YouTube video. * removed group assessment criteria page	2018-01-31 12:49:58 +05:30
Achilles Rasquinha	6ceffbd2f8	Merge pull request #12710 from achillesrasquinha/12704 ... Python 3 Compatible Fixes.	2018-01-31 11:23:05 +05:30
Nabin Hait	bc640fe6a6	minor fix in old patch	2018-01-30 19:26:28 +05:30
saurabh-bhosale	0c9a99a953	Merge branch 'develop' into show_address_in_online_pos	2018-01-30 17:48:12 +05:30
Achilles Rasquinha	39f3d7e3aa	local import	2018-01-30 16:58:49 +05:30
Nabin Hait	dba5e7645b	Minor fix in old patch	2018-01-30 16:38:47 +05:30
Nabin Hait	927d13fadb	Minor fix in old patch	2018-01-30 15:59:44 +05:30
Nabin Hait	0f75a022f2	Minor fix in old patch	2018-01-30 15:32:17 +05:30
Nabin Hait	4eae6c985c	Fixed test records for supplier	2018-01-30 15:27:29 +05:30
Achilles Rasquinha	ac57c87bc3	Fixed spacing	2018-01-30 14:05:18 +05:30
Achilles Rasquinha	244dcae110	Fixed spacing	2018-01-30 14:03:59 +05:30
Achilles Rasquinha	ef58be1302	Fixed education string	2018-01-30 13:58:43 +05:30
tundebabzy	df50a6f828	Merge pull request #12705 from achillesrasquinha/12704 ... Fix for python 3 compatibility	2018-01-30 09:26:51 +01:00
system19	4e195d97c7	Minor - Healthcare Desktop UI (#12657) ... * Minor - Healthcare Desktop UI Minor - Healthcare Desktop UI * Update desktop.py	2018-01-30 13:48:24 +05:30
Achilles Rasquinha	2862e25f3e	fixed python3 error	2018-01-30 13:47:18 +05:30
vishdha	1910530e41	[fix] CDNR negative value	2018-01-30 12:19:56 +05:30
tundebabzy	2f4854ad1a	create new dialog everytime (#12696)	2018-01-30 12:18:15 +05:30
Nabin Hait	585254456e	Check credit limit while making DN, if bypassed on SO (#12702)	2018-01-30 12:11:22 +05:30
vishdha	109b408d11	[fix] minor changes in gst field alignment	2018-01-30 12:11:13 +05:30
vishdha	963dd1e4bc	[minor] ITC data append to row	2018-01-30 11:51:57 +05:30
rohitwaghchaure	ce5b93ca77	[Fix] Allow user to edit rate in online POS (#12701)	2018-01-30 10:39:46 +05:30
vishdha	e03e4a581f	[fix] Fetch correct Tax Details	2018-01-29 22:55:23 +05:30
vishdha	98e33c31cd	[wip] Gstr2	2018-01-29 22:54:38 +05:30