2842 Commits

Author	SHA1	Message	Date
Nabin Hait	3aa205f19d	Fixes related to department tree	2018-05-29 13:08:48 +05:30
Saurabh	d3a8c9308b	[fix] add ignore validate flag (#14238)	2018-05-29 13:07:27 +05:30
Shreya Shah	ae95a8aa15	Update status in Purchase Receipt (#14257) ... * Update status on submission if per_billed = 100 * Add patch to update existing records	2018-05-28 18:24:28 +05:30
rohitwaghchaure	30c88fe1a5	Merge pull request #14247 from rohitwaghchaure/patch_fixed_for_asset_warehouse ... Fixed patch, checked warehouse available in the asset	2018-05-28 12:30:55 +05:30
Rohit Waghchaure	ad184f62e3	Fixed patch, checked warehouse available in the asset	2018-05-28 12:29:42 +05:30
Shreya Shah	e329038aaa	Total Quantity in Sales and Purchase DocTypes (#14114) ... * Add field to all sales and purchase doctypes * Add patch to update existing records * Modify taxes_and_totals.py	2018-05-28 11:49:08 +05:30
Zarrar	ea064d4c5c	module import fix in patch (#14203)	2018-05-24 15:54:48 +05:30
Nabin Hait	46600406b8	Update rename_field_max_days_allowed.py	2018-05-23 13:12:24 +05:30
Faris Ansari	26eb513274	Rename occurences of max_days_allowed to max_continuous allowed (#14180)	2018-05-23 10:31:39 +05:30
Faris Ansari	83149644e3	Merge pull request #14160 from shreyashah115/patches-fixes-travis ... Fix patches for Travis	2018-05-22 15:26:49 +05:30
Faris Ansari	7a5221bd95	Add rename_field	2018-05-22 15:26:21 +05:30
Rohit Waghchaure	8e12a59d9b	[Fix] Patch	2018-05-21 18:52:07 +05:30
rohitwaghchaure	3ec43966da	Merge pull request #14170 from codingCoffee/sal ... salary structure patch run if active employee	2018-05-21 18:39:10 +05:30
Ameya Shenoy	a7d402132f	salary structure patch run if active employee	2018-05-21 18:38:18 +05:30
rohitwaghchaure	734b874f3e	Merge pull request #14166 from rohitwaghchaure/version_11_patch_budget ... [Fix] Patch, default cost center, expense account for the item	2018-05-21 17:18:58 +05:30
Faris Ansari	d2b4ec5044	[fix] Set null values to '0' before changing column type	2018-05-21 16:55:31 +05:30
Zlash65	004bf218a0	remove changes for max_days_allowed patch	2018-05-21 16:52:08 +05:30
Rohit Waghchaure	0ca7ba3247	[Fix] Patch, default cost center, expense account for the item	2018-05-21 16:43:50 +05:30
Zlash65	41cb6cc491	patch fix - skip query if no when_then case	2018-05-21 15:10:06 +05:30
Shreya	70f9d07df8	Fix patches for Travis	2018-05-21 15:04:13 +05:30
Faris Ansari	6d2dfac44e	[fix][patch] Shopify (#14159)	2018-05-21 14:41:11 +05:30
Manas Solanki	d976c04b69	Merge pull request #14134 from manassolanki/fix-salary-patch ... [fix] patch for the salary structure assignment for old employees	2018-05-18 15:47:14 +05:30
Manas Solanki	33c1a38dc8	[fix] patch for the salary structure assignment for old employees	2018-05-18 15:46:35 +05:30
Shreya	362e0a9f6e	Fix patch	2018-05-17 15:43:03 +05:30
Manas Solanki	bbd8508783	optimize the patch	2018-05-16 13:00:56 +05:30
Manas Solanki	c760222a6c	add the item defaults in the childtable for multicompany	2018-05-16 12:44:06 +05:30
Saurabh	d60c0f2292	Refactor shopify (#13588) ... * move shopify settings to ERPNext * [fix] setup webhook for order and validate webhook request * validate webhook request * sync customer and item if not exists while syncing order from shopify * pull item from shopify and minor fixes * fix method naming, mechanisim to register and withdraw webhooks, patch * minor fix * minor fixes * [Patch][fix] use remove_from_installed_apps instead of remove app * log exceptions * add shopify logging for failed requests * minor fixes * fix test case * codecy fixes * check shared secret exists * Test Case fixes * UX fixes and patch fixes * Documentation * fixes * [fix] dump webhooks request data into doctype * Provision to resync the order if error occured in sync * [fix] set default host	2018-05-16 11:33:47 +05:30
Shreya Shah	1906cadd94	[Fix] Currency field in Pricing rule (#14004) ... * some minor changes * Set query for price list based on currency * Validate Price list with currency	2018-05-16 11:20:30 +05:30
rohitwaghchaure	e8358f33a3	Refactor party type (#13831)	2018-05-16 11:02:26 +05:30
Jamsheer	0cde6ae3c5	Clinical procedure (#13540) ... * Clinical Procesdure Template and Clinical Procedure Doctype * Consultation - Create procedure and procedure prescription * Patient Appointment - Create Procedure and Procedure appointment invoice * Physician Schedule - Validate slot overlap * Clinical Procedure Item - batch_no for Clinical Procedure not for Template * Clinical Procedure - manage item batch_no * Codacy - fixes * Yet another Codacy and travic-ci fix * Codacy - fixes * Clinical Procedure - Codacy fix * Permissions updated * fixed Qty Indicators, Minor fixes * Patient appointment for procedure prescription * Doctype Patient Service Unit to Healthcare Service Unit * Add healthcare service unit tree root * Healthcare Service Unit - Tree view script * Healthcare Service Unit - allow appointments check * Clinical Procedure - remove unused variable * Clinical Procedure - Get actual quantity from ledger - fix * Clinical Procedure - apply transilation for message * Warehouse in Healthcare Service Unit * Service Unit in Clinical Procedure * Codacy fix * Missing semicolon	2018-05-16 10:54:00 +05:30
rohitwaghchaure	c3b9eabe5e	Merge pull request #14048 from shreyashah115/exchange-rate ... [Enhancement] Buying and Selling checkboxes in Currency Exchange	2018-05-15 17:55:09 +05:30
Shreya	acc4ceceb7	Add Patch to update existing records	2018-05-15 17:54:10 +05:30
Saurabh	ac2692711b	Merge branch 'master' into develop	2018-05-15 14:59:38 +05:30
Saurabh	29160441bb	[fix] if UOM and Warehouse link is invalid then set blank values	2018-05-15 14:56:18 +05:30
Zlash65	99e72af089	skip abbr, reload doc, disable edit for root department node'	2018-05-15 13:53:40 +05:30
Saurabh	d217fbaa45	[fix] reload Leave Period and Staffing Plan doctypes	2018-05-15 08:35:25 +05:30
Saurabh	2ca83d61ea	Resolve merge conflicts from enterprise_sprint branch	2018-05-14 21:15:46 +05:30
rohitwaghchaure	7c6bef4905	Merge branch 'enterprise_sprint' into supplier-group	2018-05-14 20:39:01 +05:30
Rohit Waghchaure	d644e6da16	Code cleanup	2018-05-14 19:09:44 +05:30
Rohit Waghchaure	11679884e4	Patch to move asset fields to Asset Finance Book table	2018-05-14 19:08:57 +05:30
Rohit Waghchaure	352df95976	Patch to make location	2018-05-14 19:08:56 +05:30
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	513f13df27	patch fix	2018-05-14 16:05:16 +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
Nabin Hait	abd0325acd	Fixed merge conflict	2018-05-05 12:19:14 +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
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
Nabin Hait	3652a62b55	minor fixes	2018-04-30 19:32:29 +05:30
Nabin Hait	d39386bd55	Renamed some salary related fields	2018-04-30 16:21:37 +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
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
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
Rushabh Mehta	369afce43c	[patch] ignore validations while creating custom fields for gst via patch	2018-04-26 10:10:03 +05:30
Saurabh	1d5bbe1081	Merge branch 'master' into develop	2018-04-25 12:46:50 +05:30
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
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
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
Manas Solanki	276a92539d	Update move_leave_approvers_from_employee.py	2018-04-23 14:55:19 +05:30
Shreya Shah	828f5ab29e	Patch fixes (#13754) ... * reload doc * remove unused code	2018-04-23 13:21:35 +05:30
tundebabzy	dbdf462e56	fix conflict	2018-04-22 23:49:26 +01:00
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
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
tundebabzy	caae0f4dcc	Merge branch 'develop' into new-subscription	2018-04-17 09:34:04 +01:00
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
rohitwaghchaure	1129ac711e	[Fix] Patch (#13610)	2018-04-12 14:48:23 +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	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
Rohit Waghchaure	395d61b998	[Fix] Travis	2018-04-02 15:11:47 +05:30
Nabin Hait	c825e914d1	Added indexes for lft, rgt on nestedset doctypes (#13420)	2018-04-02 10:43:46 +05:30
Nabin Hait	4d9e104284	Merge branch 'master' into develop	2018-03-28 15:51:18 +05:30
Nabin Hait	7041a45294	Update fix_reserved_qty_for_sub_contract.py	2018-03-28 15:50:14 +05:30
Nabin Hait	6c35822a35	Merge branch 'master' into develop	2018-03-28 10:40:14 +05:30
Nabin Hait	2e203e53c6	Update fix_reserved_qty_for_sub_contract.py	2018-03-28 10:38:55 +05:30
Nabin Hait	9db28ef90d	Minor fix in patch	2018-03-27 16:00:57 +05:30
Nabin Hait	b9c82b9790	Fixed merge conflict	2018-03-27 14:25:27 +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
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
Manas Solanki	0f6c35d63f	Update update_project_in_sle.py	2018-03-21 18:24:45 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357)	2018-03-21 17:52:41 +05:30
Manas Solanki	c711445b91	add the student as party type (#13348)	2018-03-21 10:12:27 +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
Shreya	9602bf4ba3	patch fix	2018-03-19 18:17:54 +05:30
Achilles Rasquinha	d8f7de9946	fixed patch for hub	2018-03-15 12:48:32 +05:30
Nabin Hait	e01dcc170c	Merge branch 'master' into develop	2018-03-13 17:11:52 +05:30
Nabin Hait	74c817e7f9	Update update_reserved_qty_for_purchase_order.py	2018-03-13 17:10:14 +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
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +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
Nabin Hait	096c05ca6f	Fixes for regional feature of Nepal	2018-03-09 13:11:00 +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
theopen-institute	1bfa243190	fix patch that causes error on bench update (#13222)	2018-03-08 11:20:40 +05:30
Nabin Hait	c50d7446b5	Merge branch 'master' into develop	2018-03-07 13:09:07 +05:30
Saurabh	ca6e223694	[fix] use join instead of subquery	2018-03-07 12:13:32 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
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
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
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
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
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
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
Zarrar	4a0d27078e	optimize patch for faster execution (#13068)	2018-02-23 17:41:32 +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
Nabin Hait	5b9f3b0cd3	Merge branch 'master' into develop	2018-02-22 18:18:36 +05:30
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
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	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
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
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
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
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
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
Shreya Shah	394b7a2fa3	Rename Offer Letter to Job Offer (#12934)	2018-02-16 10:49:34 +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
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	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Faris Ansari	1e422f2383	Patch to enable translatable	2018-02-14 22:18:55 +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
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Faris Ansari	5a91989665	Remove total_projected_qty (#12889)	2018-02-13 16:00:52 +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
Nabin Hait	b02c109e1d	Cleanup and fixes on GSTR-2	2018-02-05 16:09:51 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +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
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Nabin Hait	7918b92d95	Invalid date value comparison, fixes for mariadb 10.2.3+	2018-01-31 15:30:03 +05:30
vishdha	df1653827f	[fix] Patch for material request to purchase order added	2018-01-31 15:11:24 +05:30
Nabin Hait	e37e5d6134	minor fix in patch for mariadb version	2018-01-31 15:00:18 +05:30
Nabin Hait	bc640fe6a6	minor fix in old patch	2018-01-30 19:26:28 +05:30
Nabin Hait	927d13fadb	Minor fix in old patch	2018-01-30 15:59:44 +05:30
vishdha	e03e4a581f	[fix] Fetch correct Tax Details	2018-01-29 22:55:23 +05:30
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
Saurabh	e1e690541c	set payment term name in payment_terms (#12693)	2018-01-29 17:39:56 +05:30
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Nabin Hait	cfa9d1adb7	Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685) ... * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group	2018-01-29 16:07:21 +05:30
Vishal Dhayagude	c463c0684d	[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	2018-01-26 11:27:22 +05:30
Shreya	1416567139	patch fix for leave-workflow	2018-01-25 17:06:14 +05:30
Shreya	61cf49dd07	workflow patch fix	2018-01-24 18:50:01 +05:30
rohitwaghchaure	8df0556af5	Merge pull request #12587 from shreyashah115/leave-workflow ... Refactor Leave Application	2018-01-24 15:04:17 +05:30
Shreya	a8a952deff	check if workflow_state_name already exists	2018-01-24 15:00:54 +05:30
Rushabh Mehta	29bc14d242	[fix] ficher_des_ecritures patch	2018-01-24 14:39:04 +05:30
Shreya	a309a871b5	Codacy fix	2018-01-24 13:56:16 +05:30
Shreya	a400e7b568	Fixed as per the review	2018-01-24 13:30:20 +05:30
Charles-Henri Decultot	90657fb566	FEC report for France (#12446) ... * FEC report for France * Codacy correction	2018-01-23 15:40:14 +05:30
Shreya	5164997db7	delete column status	2018-01-22 14:13:03 +05:30
Shreya	dd66bc03c7	fixes	2018-01-22 12:28:38 +05:30
Shreya	fc0e8e5c6a	modified patches.txt	2018-01-22 12:26:41 +05:30
Shreya	117ddac033	patch to create workflow for existing leave applications	2018-01-22 12:26:41 +05:30
Rohit Waghchaure	c987500e08	Merge branch 'master' into develop	2018-01-19 13:29:57 +05:30
Rohit Waghchaure	95adb60a8f	Fix patch	2018-01-18 15:52:52 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
Manas Solanki	bba5fd7a38	Assessment module addition (#12417) ... * add academic session details in the Assessmet Plan * add the academic session and few details in the assessment result * fix codacy	2018-01-12 16:21:09 +05:30
joezsweet	3aaed03dfb	reload item_barcode	2018-01-11 11:31:31 +01:00
joezsweet	1be684fd87	codici fix	2018-01-11 09:03:26 +01:00
joezsweet	b6fb8d2143	fix patch, reload doc	2018-01-11 08:44:59 +01:00
joezsweet	9116666288	fix patch	2018-01-10 23:11:13 +01:00
tundebabzy	76dddbf26e	Merge branch 'develop' into multi-barcode	2018-01-10 21:49:27 +01:00
Nabin Hait	687dc6a424	patch fixed	2018-01-10 14:51:19 +05:30
Nabin Hait	2f51c6900b	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:20:05 +05:30
Nabin Hait	07e5376043	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:19:59 +05:30
Nabin Hait	cab8dfc5fb	Fixed merge conflict	2018-01-05 14:15:39 +05:30
rohitwaghchaure	d45266881a	[Enhance] New print format for UAE/KSA for vat/excise (#12202) ... * [Enhance] New print format for UAE/KSA for vat/excise * Fixed spelling	2017-12-28 14:20:13 +05:30
Nabin Hait	ca674bec42	Set numeric ranges in Item tamplate if blank (#12199)	2017-12-28 12:35:11 +05:30
Fahim Ali Zain TP	5f7cedb206	Fix v8 to v10 migration issue (#12177)	2017-12-27 17:14:54 +05:30
Nabin Hait	c65279b584	Reloaded account doctype in UAE Vat patch	2017-12-25 15:02:54 +05:30
Manas Solanki	5807cd8e6f	Set the guardian role automatically. (#12136) ... * Add the guardian role for parent portal * invite guardian as user	2017-12-22 10:50:10 +05:30
Prateeksha Singh	8b0b56dda4	[Setup Wizard] Use setup stages (#12000) ... * setup working with packages imports for operations * setup stages * use setup_stages hook * remove commit from app setup	2017-12-21 11:55:58 +05:30
Nabin Hait	a5cc84f8af	Reverted gl entry splitting based on payment terms (#12117) ... * Reverted gl entry splitting based on payment terms * changed modified date	2017-12-21 11:37:18 +05:30
Nabin Hait	33c9da9ab1	Patch to update due_date in GLE, Journal Entry and Payment Entry (#12093)	2017-12-19 11:18:36 +05:30
Shreya Shah	d903bd6a70	patch fix for asset (#12079)	2017-12-18 12:31:23 +05:30
Nabin Hait	4c816a1054	Patch to set calculate_depreciation if schedule already exists (#12061)	2017-12-16 11:17:36 +05:30
rohitwaghchaure	e3b5c0f727	[fix] Regional print format showing for other countries users (#12045)	2017-12-16 10:53:53 +05:30
Faris Ansari	c7b92b73a6	fix patches for v7 sites (#12043)	2017-12-15 16:49:11 +05:30
Saurabh	65b3356dee	[fix] merge case in rename_translated_domains_in_en #11879 (#12007)	2017-12-14 16:52:50 +05:30
rohitwaghchaure	24e5265281	[enhance] Search customer using primary contact mobile number (#11998) ... * [enhance] Search customer using primary contact mobile number * Update build.json	2017-12-14 13:06:21 +05:30
Zarrar	6e0acbe4d0	Patch to copy old field data to new field (#11997) ... * patch to copy old fields data to new ones * fix for patches related to project * use rename_field function, copy if only field present	2017-12-14 12:21:00 +05:30
rohitwaghchaure	659b46832c	[fix] Patch (#11976)	2017-12-13 18:35:22 +05:30
rohitwaghchaure	4e17fae63b	[enhance] UAE/KSA VAT/Excise implementation (#11923)	2017-12-12 14:40:52 +05:30
Giovanni	dd37ceb707	patch to migrade barcodes into Item Barcode	2017-12-11 09:54:18 +01:00
Nabin Hait	bb09437d1f	Merge branch 'develop' into payroll_entry	2017-12-06 19:18:40 +05:30
Ameya Shenoy	5c62368a65	[Agriculture Domain] (#11663) ... * created Soil Analysis, Water Analysis, Weather and Fertilizer doctype * soil doctype edited and crop doctype added * minor stuff * Land Unit + Leaflet * crop cycle added * Land Unit changes + Crop cycle * autoname for plant_analysis * created Agriculture Task * minor stuff * - deleted agriculture_task - current state after the call * [Agriculture] modified fertilizer doctype to have a link to Item This was done so that the `Fertilizer` doctype could track the contents exclusive to the fertilizer, whereas the `Fertilizer Item` could be a seperate entity, so as to leverage the existing ERPNext doctypes * Added fields to `Water Analysis` doctype - Collection Datetime - Laboratory Testing Datetime - Results Datetime (default to Laboratory Testing Datetime) * Edited the doctypes `Agrivulture Task`, `Pest` and `Soil Texture` - Created `agriculture task` doctype - added fields `Common Name`, `Scientific Name`, `Treatment` and `Treatment Options` to `Pest` doctype - edited `Soil Texture` doctype to contain a soil texture ternary plot diagram made using SnapSVG. The code was put in public folder so as to be accessible by the entire agriculture module * Recursively reflect child land unit feature changes on parents * fixed feature repition bug * added legeneds to ternary plot * added stuff * changes * fix Task * reverted the Task Doctype to have naming in the form TASK.##### * fixed modifications made to TASK doctype * [dirty commit] added auto create Task from Crop on creation of Crop Cycle * Changed the Crop Cycle Doctype - Deleted the "Crop Cycly Task" doctype and its link from "Crop Cycle" - Creation of a new Project with the same name as the Crop Cycle on creation of a new Crop Cycle - Creation of all the tasks imported from Agriculture Task doctype of the Crop in the Crop Cycle * [Agriculture Module] Modifications - Created childtable doctype "Pest Detected" - Added childtable "Pest Detected" to Pest - Modified "Agriculture Task" to include "Start Day" and "End Day" of task - Modified the code in "Crop Cycle" to create a parent task with same name as Crop Cycle * [Agriculture Module] fixed Pest doctype not saving issue * [Agrcilture Module] Changes in Crop Cycle - removed the creation of a master task on creation of a new crop cycle - temporary fix to add the pest tasks from the pests added in crop cycle * land_unit_tree.js fields modified to have field objects instead of just field names * Revert "land_unit_tree.js modified" * land_unit_tree.js fields modified to have field objects instead of just field names * [Agriculture Domain] Converted Agriculture Module to a Domain - Converted into a Domain field from Select to Link field in Company doctype, linked to Domain doctype - Agriculture (alpha) is now a Domain * land_unit area aggregation enabled * land_unit.py checks feature diff for every ancestor and not just the parent * Removed unnecessary print messages * agriculture.py modified to include fixtures * fixtures added to setup.py inside agriculture module * [Agriculture Domain] UI tests added - 'materials' table renamed to 'materials_required' in 'Crop' - wrote UI test for Crop, Fertilizer, Crop Cycle, Pest, Water Analysis, Soil Texture - moved creation of tasks from client side to server side in Crop Cycle - Plant Analysis, Water Analysis, Soil Analysis, Soil Texture docs are now autonamed in the format PAnalysis.#####, WAnalysis.#####, SAnalysis.#####, STexture.##### respectively - company_name changed in domains.py from 'Schrute Farms.' to 'Schrute Farms' * [Agriculture Domain] Mostly written server side tests and moved client side code to server side - moved client side code to server side for Crop, Water Analysis, Pest, Soil Texture, - wrote server side tests for Crop, Crop Cycle, Fertilizer, Soil Texture, Pest - NOTE: none of the server side codes were tested * [Agriculture Domain] All server side tests working locally * [Agriculture Domain] Testing - added sample test for Land Unit, which needs to be modified to test multiple things - modified tests to be independant of each other * Land Units tests added and area aggregation code migrated to server side * added land_unit server side tests and on_trash added to land_unit * Changing field location for start date * [Agriculture Domain] deleted unnecessary comments * [Agriculture Domain] reverted changes * [Agriculture Domain] Modified the code to replace Pest doctype with Land Unit doctype - Deleted the Pest doctype and replaced it with the more generic Disease doctype - Deleted the Detected Pest doctype and replaced it with Detected Disease doctype * [Agriculture Domain] resolves #11654, resolves #11653 * [Agriculture] Added links to soil analysis, soil texture, plant analysis in crop cycle and land unit - not working perfectly yet - docs are fetched but not appended * [Agricuture] Crop Cycle modifed to link with relevent analysis docs, not fully functional * [Agriculture] added seperate stage for client side agriculture tests * [Agriculture] minor modification to crop_cycle.js test * [Agriculture] fixed tests * upgrade chromedriver in .travis.yml from 2.32 to 2.33 * [Agriculture] added land unit ui test * [Agriculture] added Agriculture server side test as a seperate stage in travis * tesing travis.yml * [Agriculture] Crop Cycle is able to fetch linked analysis docs * Modified travis.yml for modular server side testing * [minor fix][Agriculture] in soil_texture - fixed multiple soil_texture ternary plot creation on refresh - fixed error on soil composition change * Update .travis.yml * removed location field from linked doctypes * minor fixes and cleanup of agri * minor fix in agriculture and domain patches * permissions added to agriculture - Agriculture Manager and Agriculture User roles were added to all Agriculture doctypes * [Agriculture] - Created Agiculture Analysis Criteria and added sample records to it - All the analysis doctypes now fetch their fields inside a child table, form Agriculture Analysis Criteria - Also Fertilizer does the same This was introduced so that, new parameters could be added on demand * minor changes requested in Agriculture * minor changes * minor fix * Update desktop.py * Update .travis.yml	2017-12-06 18:36:27 +05:30
Vishal Dhayagude	b930dfa74c	[fix] fix patch failed erpnext/patches/v7_2/make_all_assessment_group.py (#11864)	2017-12-06 18:03:21 +05:30
Nabin Hait	419db49806	non-profit module cleanups	2017-12-06 12:57:53 +05:30
Vishal	474d58cecf	[fix] minor changes	2017-12-05 17:19:02 +05:30
Vishal	debc93c58a	[new] Non Profit Domain patch added	2017-12-05 16:41:09 +05:30
Vishal	7e50bf3674	[fix] Minor changes in patch set member as party type	2017-12-05 16:41:09 +05:30
Vishal	3a75a5e9b5	New Party Type Member Added	2017-12-05 16:41:09 +05:30
Shreya	f8e7bc7c5b	removed process payroll doctype	2017-12-04 16:49:44 +05:30
pawan	990277a0de	patch	2017-12-01 16:45:47 +05:30
Saurabh	d505d83cb6	[fix] merge conflicts	2017-12-01 16:23:46 +05:30
Jamsheer	f4d9af1ab9	Fix Patch - remove company from patient (#11819)	2017-12-01 16:10:39 +05:30
Saurabh	34a0e90115	[fix] merge conflicts	2017-11-30 16:45:01 +05:30
Nabin Hait	c5e0d22464	Update set_delivery_date_in_so_item.py	2017-11-30 15:52:47 +05:30
Vishal Dhayagude	8677cd1565	[patch] Patch added to rename net_weight field (#11798)	2017-11-30 13:52:30 +05:30
Zarrar	95ee7654a1	Employee tree (#11667) ... * nested set implemented * treeview for employee * patch added to assign lft rgt, update nsm_model on trash * call on_trash method of super class	2017-11-29 18:44:02 +05:30
rohitwaghchaure	c037dc775e	Refactor multi pos profile selection in the pos invoice (#11721)	2017-11-28 16:11:15 +05:30
Shreya Shah	8d9edbf133	Letterhead in user progress (#11679) ... * added letter-head to user progress slides * added letterhead action to patch * improvised * added date in patches.txt	2017-11-28 16:09:58 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
Jamsheer	b488475d92	Remove Company from Patient - Patches Added (#11716) ... * Remove Company from Patient - Patches Added * Update patient DOB field label to Date of birth * Patient marital status default null * Update patient.py	2017-11-28 10:47:06 +05:30
Shreya Shah	e3d6d21ec5	[Fix] Item name and description in production order (#11723) ... * fetch item name and description from bom * Update production_order.py * patch added * Update set_item_name_in_production_order.py	2017-11-27 12:02:13 +05:30
Nabin Hait	82ef26b327	Minor fix in patch	2017-11-23 17:57:33 +05:30
Manas Solanki	966f141f62	Rename schools to Education (#11524) ... * renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch	2017-11-23 15:22:10 +05:30
Nabin Hait	cda4d50063	Fixed reserved qty for production logic and patch for reposting (#11691)	2017-11-23 13:05:43 +05:30
Nabin Hait	036bf6de6e	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2017-11-21 20:19:13 +05:30
Nabin Hait	32a62a02df	Fixed merge conflict	2017-11-21 20:18:03 +05:30
Nabin Hait	0551f7bb00	Cleanup and fixes of payment terms feature	2017-11-21 19:58:16 +05:30
rohitwaghchaure	e8ccc0e942	[enhance] Added multi UOM feature in Material Request (#11352) ... * [enhance] Added multi UOM in Material Request * test cases * patch to update multi uom fields in material request item	2017-11-21 16:17:22 +05:30
Saurabh	5add4897a5	Merge pull request #11506 from saurabh6790/test_patches ... [travis] run patches by restoring v7 database	2017-11-21 15:56:54 +05:30
Rushabh Mehta	5171da81a1	[minor] fix-patch	2017-11-21 15:18:47 +05:30
Saurabh	00e82cdab3	[fix] patch fixes to setup patch tester on travis	2017-11-17 19:08:01 +05:30
Saurabh	a4f78211ab	Merge branch 'master' into develop	2017-11-17 14:55:24 +05:30
Saurabh	11ec2c50e0	[fix] set default language in local	2017-11-17 14:51:08 +05:30
Rushabh Mehta	30dc9a14c6	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628) ... * Shipping rule for Buying * [refactor] shipping rule	2017-11-17 14:31:09 +05:30
Saurabh	66e65dc104	[fix] merge-conflicts	2017-11-17 14:03:13 +05:30
Nabin Hait	1c4653ed97	Merge branch 'develop' into payment-terms	2017-11-17 12:41:56 +05:30
Saurabh	3499ba08df	[fix] do not translate domains while creating db record (#11616)	2017-11-17 12:29:26 +05:30
Nabin Hait	1783549e75	Minor fixes in patch	2017-11-17 12:20:07 +05:30
Rushabh Mehta	58dccf38c5	[fix] for tests	2017-11-17 12:12:53 +05:30
Vishal Dhayagude	82b200e497	[fix] Patch fail (#11623)	2017-11-17 11:01:42 +05:30
Rushabh Mehta	a5ebebd09c	[enhance] Add Issue Type and Opportunity Type masters (#11598) ... * [enhance] added & linked Issue Type & Opportunity Type with opportunity * [patch] create issue and opportunity type from the custom field if available * [minor] issue_type and opportunity type should be mandatory * [patches] removed try catch from the patch * [fix] patch * [refactor] cleanup issue/opportunity type	2017-11-16 17:03:52 +05:30
Neil Trini Lasrado	0df93d61eb	Update update_sales_cost_in_project.py (#11595) ... Will break if select sum(base_grand_total) from `tabSales Order` where project=p.name and docstatus=1 returns Null. Gives - "OperationalError: (1048, "Column 'total_sales_cost' cannot be null")" Error	2017-11-16 14:07:55 +05:30
Nabin Hait	6fd163bc55	Merge branch 'master' into develop	2017-11-15 14:08:17 +05:30
rohitwaghchaure	43edd5d03c	Employee loan fixes (#11495) ... * Employee loan fixes * Update update_employee_loan_details.py	2017-11-14 17:59:20 +05:30
Nabin Hait	50616da905	Merge branch 'master' into develop	2017-11-14 17:48:43 +05:30
Nabin Hait	42274a4591	Delete healthcare domain items (#11567)	2017-11-14 17:15:11 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Faris Ansari	4ec4e3fb29	[patch] Revert Manufacturing User role (#11514)	2017-11-10 19:15:17 +05:30
Saurabh	7b78a83592	Merge branch 'master' into develop	2017-11-10 13:15:04 +05:30
rohitwaghchaure	1ce48e7032	[fix] POS profile patch (#11501)	2017-11-10 10:53:12 +05:30
Saurabh	b97f08e0ac	[fixed] merge-conflicts	2017-11-08 15:08:38 +05:30
Saurabh	045b2877b7	[fix] remove warehouse from Stock Settings if warehouse wont exists (#11487)	2017-11-08 14:57:03 +05:30
Saurabh	d2cef208fe	[fix] catch link validation exception in POS profile and reload fees doctype	2017-11-08 14:44:43 +05:30
Nabin Hait	ff73646212	Made POS Profile mandatory and changed test order	2017-11-08 14:34:38 +05:30
Saurabh	f41b13b736	[fix] merge-conflicts	2017-11-08 12:18:41 +05:30
Achilles Rasquinha	7fd20f303f	moved from MySQLdb to pymysql (#11462)	2017-11-08 11:33:24 +05:30
Manas Solanki	40ef7e7039	patch for renaming the pos profile and setting the pos profile name	2017-11-06 13:53:52 +05:30
Faris Ansari	7095de03ef	Merge branch 'develop' into multiple-users-pos-profile	2017-10-30 15:00:55 +05:30
tunde	5ea10a77a3	Merge branch 'develop' into payment-terms	2017-10-27 17:37:15 +01:00
Saurabh	1bc8e32f94	Merge pull request #11360 from manassolanki/fix-fee-patch ... fix the fee patch	2017-10-27 17:00:11 +05:30
Manas Solanki	8637e52d4c	fix the fee patch	2017-10-27 11:55:15 +05:30
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Saurabh	d6e67ce123	[fix] check for null date fields (#11334)	2017-10-25 17:44:22 +05:30
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Manas Solanki	464289b726	copy the older total amount field and corrsp. changes in report (#11322)	2017-10-25 12:13:42 +05:30
Nabin Hait	1c1237537b	Subscription fixes (#11292) ... * Subscription fixes * Removed recurring fields, cleanup code	2017-10-25 12:10:44 +05:30
tundebabzy	cba7a11d75	Make Variant does not copy UOM properties (#10887) (#11261) ... * add `uoms` to Item Variant Settings if not already added * add new patch to patch list * change uoms field to no_copy:0	2017-10-25 11:57:10 +05:30
tunde	c8d2361b81	Merge branch 'develop' into payment-terms	2017-10-24 12:25:29 +01:00
Nabin Hait	7533101d4b	Merge branch 'master' into develop	2017-10-21 11:29:40 +05:30
Nabin Hait	c44290955e	Minor fix in patches (#11268)	2017-10-21 11:20:18 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Saurabh	3173be9b17	[minor-fix] patch fix	2017-10-18 16:14:20 +05:30
Saurabh	8227422124	[fix] remove explicit variant save	2017-10-18 16:03:40 +05:30
Saurabh	a7d5f94d4a	[fix] Do not append description to variant if description already exists (#11204)	2017-10-18 16:02:08 +05:30
Rushabh Mehta	bc4e2cd9c1	[added] hospitality domain (#11020) ... * [added] hospitality domain * [tests] wip * [tests] for restaurant * [fix] tests for new naming * [docs] added restaurant docs * [docs] added restaurant docs	2017-10-17 12:30:34 +05:30
tunde	37c2b6116c	Merge branch 'develop' into payment-terms	2017-10-09 15:42:47 +01:00
mbauskar	966b3c156a	[conflicts] resolved merge conflicts	2017-10-09 15:20:30 +05:30
tunde	e27f5dee1f	Merge branch 'develop' into payment-terms	2017-10-09 10:11:05 +01:00
rohitwaghchaure	e181dd4c24	[patch] To add healthcare domain (#11105)	2017-10-09 12:43:36 +05:30
Manas Solanki	f91ad75b5a	test, patch, docs for student admission (#11075)	2017-10-09 12:41:24 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
Nabin Hait	395cf4689b	Cleanup of schedule date functionality in Material Request	2017-10-05 18:27:37 +05:30
Saurabh	444bfff1ff	[fix] resolved merge conflicts	2017-10-03 18:03:18 +05:30
Rohit Waghchaure	445e8a2e57	[Fix] Subscription end date, cancel issue, added from and to date	2017-10-03 17:45:11 +05:30
Sunny	38647ed832	move Purchase Order patch to v9	2017-10-02 11:37:48 +08:00
Sunny	9626ed79fa	Add patch to update schedule date of submitted Purchase Orders	2017-10-02 11:35:32 +08:00
Faris Ansari	8ac56b26e0	[Enhancement] Allow Multiple users in POS Profile	2017-09-29 16:15:15 +05:30
tunde	3415ac6e9c	Merge branch 'develop' into payment-terms	2017-09-29 10:10:24 +01:00
Sunny	3ec6960478	move Material Request patch to v9	2017-09-28 15:26:20 +08:00
Sunny	bf68611567	clean code	2017-09-28 15:24:11 +08:00
Sunny	65cd9f2284	Add patch to update schedule date of submitted Purchase Orders	2017-09-28 15:23:09 +08:00
Sunny	23a4b09d43	Add Material Request schedule_date field, similar to delivery_date in Sales Order	2017-09-28 15:22:48 +08:00
Nabin Hait	c9f9e5235b	Fixed merge conflict	2017-09-28 12:31:33 +05:30
rohitwaghchaure	16645803f9	[fix] Added billing address gstin number in the sales invoice and delivery note as well in the sales gst reports (#10872)	2017-09-28 11:05:03 +05:30
Nabin Hait	fce14fdcf0	Fixed merge conflict	2017-09-27 17:21:21 +05:30
rohitwaghchaure	da8de2f0c7	Re-order patch sequence (#10936)	2017-09-27 17:11:40 +05:30
tunde	567119170e	Merge branch 'develop' into payment-terms	2017-09-26 17:28:07 +01:00
Nabin Hait	51a07d19c8	Merge branch 'master' into develop	2017-09-26 15:59:15 +05:30
Prateeksha Singh	ada8ba96b3	[setup] remove translations from action name (#10911)	2017-09-26 13:07:24 +05:30
Nabin Hait	360c1efd18	Merge branch 'master' into staging	2017-09-25 16:36:47 +05:30
Nabin Hait	0d0811ca14	reload print style	2017-09-25 16:33:45 +05:30
tunde	8a53b64ac4	Merge branch 'develop' into payment-terms	2017-09-25 10:31:42 +01:00
Nabin Hait	4ebac3380d	reload print style	2017-09-23 15:50:39 +05:30
tunde	82de375ba0	Merge branch 'develop' into payment-terms	2017-09-21 11:21:05 +01:00
Rohit Waghchaure	5b05335e89	added patch and set default fields after completion of setup wizard	2017-09-21 15:41:57 +05:30
tundebabzy	ab5b03011d	Enhance Currency Exchange Management (#10482) ... * add new settings in Accouts Settings * patch for new settings * refactor `get_exchange_rate` * adds validation * tests validation * disables conversion rate field if stale rates not allowed * more test cases more test case... test `get_exchange_rate` behaviour with stale not allowed in sett.. fix currency exchange test case do housekeeping after running accounts settings test * clean up * documentation * make use of correct api url * Fix tests failing due to wrong exchange rate from fixer.io * remove mandatory constraint from `allow_stale` * added info to documentation	2017-09-21 14:50:39 +05:30
tunde	3387d026b1	Merge branch 'develop' into payment-terms	2017-09-19 18:07:12 +01:00
Rohit Waghchaure	c15a3bd379	[fix] Subscription patch broken if reference document has been cancelled	2017-09-19 12:53:11 +05:30
Nabin Hait	bd4b80e3d8	Merge branch 'master' into develop	2017-09-19 12:05:41 +05:30
rohitwaghchaure	d02744b436	[fix] Subscription patch (#10827)	2017-09-18 17:23:00 +05:30
rohitwaghchaure	850eaa73b0	Move subscription module to accounts (#10772)	2017-09-18 17:23:00 +05:30
Utkarsh Goswami	bd0beb6c02	[fix] unknown column in production order (#10828)	2017-09-18 16:48:45 +05:30
Utkarsh Goswami	e78d5a240a	[fix] unknown column in production order (#10828)	2017-09-18 16:44:11 +05:30
tunde	9448f4b13c	codacy corrections	2017-09-18 12:08:34 +01:00
Saurabh	9c334c34a6	[fix]remove employee field from tab salary structure	2017-09-18 16:17:13 +05:30
Saurabh	2222f10720	[patch] remove employee name salary structure (#10817) ... * [patch] remove employee name salary structure * Update remove_employee_from_salary_structure_parent.py	2017-09-18 15:05:18 +05:30
Nabin Hait	bc9006ff30	Delete GST related doctypes and reports if account is from outside India (#10808)	2017-09-18 13:16:04 +05:30
mbauskar	ea832b8157	resolved merge conflicts	2017-09-14 15:32:10 +05:30
Nabin Hait	45dce89cae	Print Settings for printing taxes with zero amount (#10782) ... * Print Settings for printing taxes with zero amount * added __init__.py file to patch module v8_9	2017-09-14 15:17:38 +05:30
Rushabh Mehta	bf8e331135	[fix] unset default customer group (#10689) ... * [fix] unset default customer group * added __init__.py file for patch v8.9 directory	2017-09-14 15:03:45 +05:30
Prateeksha Singh	242218d2b7	Progress fixes (#10710) ... * [progress] sales target slide * [fix] rerun patch for sales target slide	2017-09-13 18:41:01 +05:30
tunde	1255aa0f11	Merge branch 'develop' into payment-terms	2017-09-12 11:54:52 +01:00
Nabin Hait	f8f29677fd	Merge branch 'master' into develop	2017-09-12 16:16:57 +05:30
Manas Solanki	580f39a12c	check the instructor table before querying (#10754)	2017-09-12 15:49:36 +05:30
rohitwaghchaure	38830e54d8	[fix] No module namd student_batch_name.student_batch_name error in the patch (#10745)	2017-09-12 11:25:02 +05:30
Rohit Waghchaure	4e006b0bc5	rename Is Online field to Use POS in Offline Mode in pos settings	2017-09-11 14:51:50 +05:30
tunde	199daf7ac5	Merge branch 'develop' into payment-terms	2017-09-08 09:59:13 +01:00
tunde	ad7d3a1733	Merge branch 'develop' into payment-terms	2017-09-07 13:13:59 +01:00
rohitwaghchaure	1b65575860	Merge branch 'develop' into pos-refactor	2017-09-07 17:15:58 +05:30
rohitwaghchaure	166b78f022	[Enhance] Subscription module (#10089) ... * [Enhance] Subscription module * Added view documents from the subscription form * Test cases * documentation * UI Test cases, fixes * Removed child table in the subscription * Provision to make subscription from the document, added subscription in the dashboard for the sales and buying flow * added patch to make subscription from the recurring data * Rename field subscriptio to subscription_id, added new test cases, remove recurring_document from controller * renamed subscription_id to subscription	2017-09-07 16:14:22 +05:30
tunde	353099d7ad	Merge branch 'develop' into payment-terms	2017-09-07 11:31:26 +01:00
Rushabh Mehta	6ef741554c	[fix] [patch] rename_company_sales_target_field.py	2017-09-06 10:53:26 +05:30
Faris Ansari	e4434d3200	Merge branch 'develop' into pos-refactor	2017-09-05 17:18:04 +05:30
tundebabzy	dc64f70f07	Merge branch 'develop' into payment-terms	2017-09-05 11:14:47 +01:00
tunde	7f9a462506	Merge branch 'develop' into payment-terms	2017-09-05 01:35:51 +01:00
tunde	b8ddae13ba	fix patches	2017-09-05 00:23:24 +01:00
tunde	60aecd87b1	fix bugs in patches	2017-09-04 19:40:31 +01:00
tunde	57171cdc48	patch for credit days in Supplier Type	2017-09-04 19:33:35 +01:00
tunde	95b3d7c619	patch for payment term field in Supplier Type	2017-09-04 19:32:14 +01:00
Nabin Hait	22cff25bf5	BOM rates as per selected currency and UOM	2017-09-04 18:31:45 +05:30
tunde	bc9b5d699e	fix patch	2017-09-04 13:40:54 +01:00
tunde	76bba08e45	patch to create and set default payment term in customer/supplier	2017-09-04 13:37:32 +01:00
tunde	feffca2b05	patch to add payment_terms_field	2017-09-04 13:34:31 +01:00
Prateeksha Singh	95d8fd38f5	User Progress (#10336) ... * [user-progress] first cut * [user-progress] Add users slide, remove taxes, make sample data * wip tests * [setup-wiz] UI test * [user-progress] notif test, docs trim * wip * [user-progress] Setup Progress single to update action states, fixtures * setup progress actions patch * rename sales_target field patch * [progress] wip reform slide data * [progress] remove slide data * [setup] add roles for GST doctypes, remove commit from fixtures	2017-09-04 11:14:04 +05:30
tunde	b3a6338c79	patch replace credit_days with payment terms schedule	2017-09-01 11:35:22 +01:00
tunde	f0e9dd2597	patch to add due_date to GL Entry table	2017-09-01 11:34:26 +01:00
tunde	1c2edaebc4	patch customer records ... - creates payment term and payment term template based on credit_days setting - sets payment term template for records that had credit_days	2017-08-31 22:52:06 +01:00
tunde	e5460ab1df	rename patch	2017-08-30 22:37:14 +01:00
tunde	6de18ce589	codacy fixes	2017-08-30 21:20:41 +01:00
Rohit Waghchaure	7e752c4ebf	Added patch, fixed codacy issue	2017-08-31 00:31:35 +05:30
tunde	a19ea6e2f3	Merge branch 'develop' of https://github.com/frappe/erpnext into payment-terms	2017-08-29 15:26:50 +01:00
tunde	7555a4a13e	fix patch and also patch payment entries	2017-08-29 13:40:16 +01:00
tunde	3b327ed55f	'modify patch to also adjust journal entries'	2017-08-29 10:23:19 +01:00
Aditya Hase	6ccb6562f1	Python 3 compatibility syntax error fixes (#10519) ... * Use Python 3 style print function * Use 'Exception as e' instead of 'Exception, e' * Unpack tuple arguments explicitly in instead of relying on auto unpacking * Use consistent indentation * Use 0 if stock_frozen_upto_days is None	2017-08-28 18:17:36 +05:30
mbauskar	aaec42ebc2	resolved merged conflicts	2017-08-28 11:57:56 +05:30
tunde	6b2d9e4990	patch to add due date to GL Entries for Sales/Purchase invoice	2017-08-25 15:25:18 +01:00
Rushabh Mehta	6b651d734e	[fix] status in purchase_receipt.py (#10534)	2017-08-24 15:47:49 +05:30
Nabin Hait	adbf8adfb9	Update BOM cost in all BOMs based on latest rm rate	2017-08-22 10:49:57 +05:30
mbauskar	5088ad11ee	Merge branch 'master' into staging	2017-08-21 08:58:52 +05:30
mbauskar	62f0722325	resolved merge conflicts	2017-08-21 08:58:42 +05:30
Nabin Hait	879e162cce	Additional GST related fields in Invoice and Sales/Purchase Register reort (#10405)	2017-08-21 08:28:55 +05:30
Rohit Waghchaure	df83191ea0	Set write permission to sales manger for permlevel 1 in Quotation doctype	2017-08-17 11:27:30 +05:30
ckosiegbu	1ac6bcba23	Removal of SMS Settings and SMS Parameters from ERPNext (#10033) ... * Removal of SMS Settings and SMS Parameter from ERPNext. * [DOCS]Documentation for Two Factor Authentication * [Patch]Point SMS module to frappe core * Rearrange doc help index.txt to fit * [DOCS]Update Documentation for Two Factor Authentication	2017-08-08 14:55:30 +05:30
mbauskar	4ef1e2046b	Merge branch 'master' into staging	2017-08-04 14:08:57 +05:30
mbauskar	e770824568	Merge branch 'master' into develop	2017-08-04 14:08:57 +05:30
Makarand Bauskar	b96e239cc0	[hotfix] ignore if project type is None (#10284)	2017-08-04 11:40:23 +05:30
mbauskar	cce79255fe	resolved merge conflicts	2017-08-04 11:07:49 +05:30
mbauskar	f3be738b68	resolved merge conflicts	2017-08-04 11:07:07 +05:30
Rushabh Mehta	1696294847	[fix] remove property setter for project type (#10277) ... * [fix] remove property setter for project type * [patch] project type	2017-08-04 10:50:56 +05:30
rohitwaghchaure	046e1a6e28	[Fix] Patch broken if serial no has single quote (#10262)	2017-08-03 17:38:03 +05:30
Nabin Hait	af01f5154b	Merge pull request #10251 from rohitwaghchaure/permlevel_1_write_permission ... Set write permission to sales manger for permlevel 1 in Quotation doctype	2017-08-03 10:45:17 +05:30
Nabin Hait	b554f9077c	Update set_write_permission_for_quotation_for_sales_manager.py	2017-08-03 10:44:55 +05:30
mbauskar	73dc35ddbf	resolved merge conflicts	2017-08-02 18:24:03 +05:30
Rohit Waghchaure	250e964205	Set write permission to sales manger for permlevel 1 in Quotation doctype	2017-08-02 18:23:39 +05:30
mbauskar	ee090a9a3c	Merge branch 'master' into develop	2017-08-02 18:18:14 +05:30
Nabin Hait	9b2b42dfc1	Minor fix in bom_stock_qty patch	2017-08-01 11:10:29 +05:30
Makarand Bauskar	317888211a	merged hotfix branch into staging (#10191) ... * [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148) * Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159) This reverts commit 4d2e782e42. * [Fix] Unable to save asset because of float error issue (#10157) * bumped to version 8.6.4 * [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160) * Set billing hours to 0 in timesheet #9535 (#10139) * `update_billing_hours` to use flt not cint * if not billable, reset billable hours * if not billable, reset time rates * test * [Fix] Timesheet Company Issue * Added delivery date in SO parent form. Fixes #10104 (#10155) * Added delivery date in SO parent form. Fixes #10104 * UI tests for sales order delivery date * bumped to version 8.6.5	2017-08-01 11:06:41 +05:30
mbauskar	8b6f7914b0	resolved merge conflicts	2017-07-31 12:30:53 +05:30
Nabin Hait	495ef67caa	Added delivery date in SO parent form. Fixes #10104 (#10155) ... * Added delivery date in SO parent form. Fixes #10104 * UI tests for sales order delivery date	2017-07-31 11:25:51 +05:30
Rohit Waghchaure	33977827c4	[Fix] Timesheet Company Issue	2017-07-29 14:15:50 +05:30
rohitwaghchaure	e2176b852e	[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)	2017-07-28 20:52:02 +05:30
Makarand Bauskar	20f4d7f559	Merge branch 'develop' into set_defualt_mode_payment	2017-07-28 14:41:48 +05:30
Rushabh Mehta	0fcf44e1a2	User Permissions Redesign (#10006) ... * [fixes] for user permission * [docs] updated docs for user permissions * [docs] updated docs for user permissions * [docs] updated docs for user permissions	2017-07-28 14:33:15 +05:30
Rushabh Mehta	d50da78f28	[fixes] errors caught on flake8 (#10126)	2017-07-28 11:39:01 +05:30
Rohit Waghchaure	5296e3c321	[enhance] Provision to set default mode of payment for the POS in POS profile	2017-07-27 19:17:05 +05:30
cclauss	6848708377	old style exception, raise --> new style for Python 3 (#10082) ... * old style raise --> raise() for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style raise --> raise() for Python 3 * old style raise --> raise() for Python 3 * old style exception, raise --> new style for Python 3	2017-07-27 10:38:35 +05:30
KanchanChauhan	7800bd89dc	Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929)	2017-07-26 17:55:25 +05:30
KanchanChauhan	d65b4b4238	Patch was faling, reload doc was missing (#10072)	2017-07-25 11:39:46 +05:30
bcornwellmott	96381da547	Supplier Scorecard (#9294) ... * Initial start of scorecard docs * Got basic functionality working * Fixed doc names and added key functions * Basic functional version minus Actions * Hide scorecard docs until functional * Created supplier scorecard documentation * Added default variables and standings. Added restrictions for PO + RFQ * Automatic daily scorecard creation + on save * Added warning for PO nd RFQs * Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo * Added tests, fixed codacy formatting, small improvements * Fixed test bug w/ criteria. Codacy cleanup * Fixed codacy issues. Fixed sticky criteria * Fixed bug with period search. Remove blank variable child. * Updated docs, automatically add criteria and standings, clean up period create message * Uncommented test, set docs to beta * Fix for nabinhait review * Fix codacy issue. Fix dict assignment for records	2017-07-24 22:42:30 +05:30
Makarand Bauskar	9306aff1bb	[minor] moved the patch to v8_5 and other minor fixes (#10012) ... * Quotation and Supplier Quotation Route and Permission Edits * [minor] moved the patch to v8_5 and other minor fixes	2017-07-21 15:19:47 +05:30
mbauskar	0e6933a1e8	resolved merge conflicts	2017-07-20 14:19:47 +05:30
Nabin Hait	9c42161061	Itemised tax breakup fix in docs other than invoice (#9961) ... * Itemised tax breakup fix in docs other than invoice * Set itemised tax breakup and hsn code in existing docs	2017-07-20 13:32:01 +05:30
Nabin Hait	8e0f23efc7	Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933) ... * Multiple delivery dates in Sales Order and make DN based on selected delivery dates * Test case and some other minor fixes * Updated docs for multi delivery date * removed the trailing whitespace * removed the trailing whitespace * removed trailing whitespace	2017-07-20 10:30:59 +05:30
Makarand Bauskar	5e75e3ba03	[hotfix] set_restrict_to_domain_for_module_def patch fixes (#9921)	2017-07-18 15:09:30 +05:30
Makarand Bauskar	6e30f04181	[domainify] patch to set the restrict to domain for module_def (#9912)	2017-07-18 12:30:57 +05:30
Makarand Bauskar	c446bf6117	Merge branch 'develop' into rejected_expense_claim_issue	2017-07-18 10:54:13 +05:30
Prateeksha Singh	e012e24423	Sales Goal by Company (#9723) ... * [sales goal] in company; dashboard, graph, notifs, wiz * [test] target notifications * cache past year monthly sales of every company daily, patch * [minor] query fixes * update sales goal docs	2017-07-18 10:35:12 +05:30
Rohit Waghchaure	8333b5754b	[Fix] Expense claim status issue	2017-07-17 16:38:20 +05:30
rohitwaghchaure	ea4497c8d2	Renamed the report Support Hours to Support Hours Distribution (#9874)	2017-07-17 14:55:42 +05:30
Makarand Bauskar	805a41d06c	[minor] fixed the set_portal_settings patch (#9890)	2017-07-17 13:44:56 +05:30
Nabin Hait	e06526ffff	Add indexes in some transaction doctypes (#9889)	2017-07-17 13:28:27 +05:30
mbauskar	71b5250cbd	[hotfix] fixed the state code for Uttarakhand	2017-07-16 21:28:39 +05:30
rohitwaghchaure	dcf10ee4f6	Fixed patch (#9862)	2017-07-14 13:02:38 +05:30
Saurabh	e74e4b18c7	[patch][fix] update gst_state only if company country is india	2017-07-13 14:38:43 +05:30
rohitwaghchaure	c3153655eb	Fixed patch create_warehouse_nestedset (#9833)	2017-07-13 12:17:12 +05:30
Nabin Hait	1a60931435	Added SAC codes and 2/4 digit HSN codes, regional setup can be called multiple times (#9820)	2017-07-13 12:16:04 +05:30
Nabin Hait	7312186c76	Set corrected states list in GST State field's options	2017-07-13 10:41:15 +05:30
Nabin Hait	3a200bbc44	Update create_address_doc_from_address_field_in_company.py	2017-07-11 11:34:27 +05:30
Manas Solanki	1a0536bff4	changes as per review	2017-07-11 11:16:16 +05:30
Manas Solanki	cdba021802	patch for removing the address field from company and creating address doc, fixes #9011	2017-07-11 11:16:16 +05:30
Nabin Hait	dd7a723214	minor fixes while upgrading an old instance	2017-07-10 16:41:59 +05:30
Nabin Hait	1b36336fc3	Added new option in invoice_copy, made state_number read_only (#9695) ... * Added new option in invoice_copy, made state_number read_only * removed the trailing whitespace	2017-07-07 14:05:33 +05:30
Nabin Hait	8b486b0f28	Fixed state code of WB and allowed invoice_copy to edit after submit	2017-07-07 13:14:25 +05:30
Makarand Bauskar	88a37c17a6	[hotfix] commit after every 200 production orders (#9674)	2017-07-06 19:13:09 +05:30
Rohit Waghchaure	6d03790b44	Revert sales invoice serial no issues	2017-07-06 15:58:50 +05:30
Nabin Hait	f3f0dfef2a	Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658) ... * Invoice copy, state code in gst print format, hsn code in other sales/purchase docs * Formatted Net Amount in item-tax-breakup * GST print format fixes * removed trailing whitespace * removed trailing whitespace	2017-07-06 14:49:34 +05:30
rohitwaghchaure	5d5a81f375	Fixed patch create_warehouse_nestedset (#9656)	2017-07-06 13:03:11 +05:30
Nabin Hait	949a920022	Production Order Enhancements (#9432) ... * Production Order Enhancements - Show required items child table - Source warehouse for each raw materials, in Pro Order Item and BOM Item table - Group warehouse allowed for source and wip warehouse - Patch to populate required items, to fix status and reserved qty for stopped pro order - Cleaned up existing codes - Test cases * Set available qty in source and wip warehouse * minor fix in bom query naming * Minor Fixes * Reload BOM doctypes in patch	2017-07-05 13:55:41 +05:30
Nabin Hait	852cb64e4f	GST tax invoice print format and more (#9616) ... * GST Tax Invoice print format and more. Fixes #9545 #9566 #9608 * Reload gst print format only for Indian users * Fixes as Codacy	2017-07-05 12:58:19 +05:30
rohitwaghchaure	10a4a13e5e	Remove gst reports for non indian accounts (#9553) ... * remove gst reports for non indian accounts * [Fix] GSN code auto name	2017-07-04 16:45:29 +05:30
Rohit Waghchaure	3856d14ae6	[Fix] Options must be a valid DocType for field Customs Tariff Number	2017-06-30 11:57:41 +05:30
mbauskar	0c2de6e07a	[minor] fixed the report value for deprecated report patch	2017-06-29 21:47:14 +05:30
Makarand Bauskar	5d95ebec4e	Merge pull request #9508 from rohitwaghchaure/contacts_module_error ... [Fix] Module error during patch execution	2017-06-29 10:46:17 +05:30
mbauskar	d6e8bb5452	[fixes] delete auto email report of deprecated reports and other minor fixes	2017-06-29 08:39:01 +05:30
Rohit Waghchaure	2e4b4454b3	[Fix] Module error during patch execution	2017-06-28 17:31:59 +05:30
rohitwaghchaure	69279229cc	Merge pull request #8987 from bcornwellmott/bom_convert_uom ... Added BOM UOM selection for items	2017-06-28 16:28:31 +05:30
Saurabh	be03de3ad6	Merge pull request #9502 from mbauskar/patch-fix ... [fix] delete/update desktop icon for deprecated report	2017-06-28 13:28:33 +05:30
mbauskar	6daa6e422e	[fix] delete/update desktop icon for deprecated report	2017-06-28 13:26:50 +05:30
Saurabh	07913c3ff2	[fix] delete custom field tax_id if exists in trasaction Sales Order, Sales Invoice and Delivery Note	2017-06-28 13:16:50 +05:30
mbauskar	27692670b1	[fix] handle email exception if email account is not configured	2017-06-28 10:56:50 +05:30
Saurabh	3f2dd04b10	[fix] reload gst settings doctype in patch	2017-06-28 10:50:38 +05:30
Makarand Bauskar	eef3f62ff7	Merge pull request #9488 from rmehta/gst-reminder ... [regional] ability to send gst reminders to all parties	2017-06-27 19:33:05 +05:30
Rushabh Mehta	01659271be	[minor] dont make fixtures again by patch	2017-06-27 18:05:54 +05:30
Rushabh Mehta	00ae424cac	[regional] ability to send gst reminders to all parties	2017-06-27 17:31:41 +05:30
Saurabh	c20abf6b2a	send email to system managers about gst setup	2017-06-27 13:21:57 +05:30
Makarand Bauskar	5d8803b23e	Merge pull request #9435 from rmehta/gst ... GST (India) Setup and Invoices #8711	2017-06-27 11:44:33 +05:30
Saurabh	29fa0a9a17	[fix] patch fixes	2017-06-26 13:28:45 +05:30
Rushabh Mehta	d03203966a	[minor] fix old patch	2017-06-24 10:37:19 +05:30
Rushabh Mehta	25366a22ad	[minor] cleanup	2017-06-22 22:32:08 +05:30
Rushabh Mehta	919a74ad88	[gst] adde reports + docs	2017-06-22 22:32:08 +05:30
mbauskar	66e2a510b9	[minor] deleted deprecated reprots and changed the lead.json modified time	2017-06-22 16:57:46 +05:30
Makarand Bauskar	79d36c7c43	Merge pull request #9423 from mbauskar/patch-fix ... [minor] save the system settings document	2017-06-22 12:49:35 +05:30
mbauskar	4b299ba009	[minor] save the system settings document	2017-06-22 12:46:31 +05:30
Makarand Bauskar	e995371b08	Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings ... [Enhance] Company wise perpetual inventory settings	2017-06-22 12:35:41 +05:30
Ben Cornwell-Mott	ac3ad0810a	Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom	2017-06-21 10:17:39 -07:00
Ben Cornwell-Mott	1e96b7bbe5	Added conversion_factor update in patch	2017-06-21 10:16:50 -07:00
Makarand Bauskar	0ea5d941e6	Merge branch 'develop' into bom_convert_uom	2017-06-21 21:35:38 +05:30
mbauskar	196f3b1fb8	resolved merge conflicts	2017-06-21 14:38:06 +05:30
Rohit Waghchaure	e9ff1914fc	Added is_perpetual_inventory_enabled method	2017-06-20 11:26:37 +05:30
Rohit Waghchaure	a5f40941ae	[Enhance] Companywise perpetual inventory setting	2017-06-20 10:21:33 +05:30
bcornwellmott	6561b8ade9	Merge branch 'develop' into bom_convert_uom	2017-06-16 08:29:00 -07:00
mbauskar	3c1a53c325	[minor] use reload_doc instead of reload_doctype	2017-06-16 18:31:42 +05:30
mbauskar	2ea55c7143	[minor] reload Domain doctype before executing patch	2017-06-16 14:33:59 +05:30
Makarand Bauskar	3d6697949c	[minor] fixed the child table field name (#9328) ... * [minor] exclude Other domain from Domains * [minor] fixed the child table field name	2017-06-16 14:12:28 +05:30
Sagar Vora	b1c794a4f9	[hot] fix global name args is not defined (#9326)	2017-06-16 13:50:35 +05:30
rohitwaghchaure	fb45913b3b	[fix] Patch for move account head from account to warehouse (#9325)	2017-06-16 13:12:37 +05:30
Makarand Bauskar	dd986f659e	Merge branch 'pratu16x7-domainify' into domainify (#9324) ... * bootstrap domains and set active_domain on setup * [minor] Patch for domain docs * [minor] * Update create_domain_docs.py	2017-06-16 13:02:45 +05:30
Nabin Hait	84bc5601eb	Total sales cost in Project should be updated based on base_grand_total (#9302) ... * Total sales cost in Project should be updated based on base_grand_total * Patch to update sales cost in Project in base currency	2017-06-16 12:13:51 +05:30
Ben Cornwell-Mott	840c757b12	Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom	2017-06-15 08:53:29 -07:00
Ben Cornwell-Mott	7055446508	Reload explosion and scrap items docs	2017-06-15 08:52:55 -07:00
Rushabh Mehta	e0434ad40e	Merge branch 'develop' into bom_convert_uom	2017-06-15 17:32:27 +05:30
mbauskar	5da3ac63bf	[minor] fixed merge conflicts	2017-06-15 16:09:42 +05:30
Makarand Bauskar	a4af7cb7d3	removed extra quote from query	2017-06-15 16:02:44 +05:30
Nabin Hait	5aee7d1b70	Change column length of in_words	2017-06-15 15:35:08 +05:30
Nabin Hait	6d7b0ce794	Warehouse Account Linking (#9292) ... * [enhance] Added account in the warehouse * documentation * patch to move account head from account to warehouse * fixed test cases * Fixes in warehouse-account linking * minor fix in test case	2017-06-15 11:09:27 +05:30
bcornwellmott	d53dd7f4c9	Merge branch 'develop' into bom_convert_uom	2017-06-13 08:40:24 -07:00
Saurabh	797f2030f8	Merge branch 'master' into develop	2017-06-13 15:20:13 +05:30
mbauskar	f819c93329	[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin	2017-06-13 13:22:34 +05:30
bcornwellmott	5491275b66	Merge branch 'develop' into bom_convert_uom	2017-06-07 08:42:54 -07:00
Nabin Hait	a128b21baa	Fixed merge conflict	2017-06-07 12:17:17 +05:30
rohitwaghchaure	d2be55b2e0	[Fix] Orders not creating from the POS for new customer if customer name is based on naming series (#8933) ... * [Fix] Orders not creating from the POS for new customer if customer name is based on naming series * [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile * added customer name in the search bar of the customer * search customer by phone number and email id in the POS	2017-06-07 12:04:01 +05:30
tundebabzy	99b734bfd7	Fix #4587: Status does not display "Pending" in report filter (#9104) ... * adds Material Request to `status_map` * updates eval condition for Partially Ordered in Material Request map * changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options * adds more options to `validate_status` * adds `set_status` just before saving * adds `check_for_closed_status` in `before_cancel` * adds patch to convert status to material request specific status * adds stricter status update conditions * changes `update_status` to me `set_status` * adds checker such that draft status can only change to pending * renames `check_draft_status` to `status_can_change` * adds Cancelled to Material Request map * makes `status_can_change` block any attempt to change a cancelled document * adds more test cases * updates what `set_status` checks for before adding comment * adds patch to rename the present material request status	2017-06-07 12:02:07 +05:30
Ben Cornwell-Mott	a3aa6a4449	Changed Explosion Item as well	2017-06-02 16:54:03 -07:00
Nabin Hait	02d282f347	Merge branch 'master' into develop	2017-06-01 19:09:37 +05:30
Manas Solanki	f02c82aeca	Fixes in the patch (#9027) ... * fix in the patch * new patch for student groups * changes in the merge student batch patch	2017-06-01 13:08:27 +05:30
bcornwellmott	8fa1e03367	Merge branch 'develop' into bom_convert_uom	2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott	0f0b121669	Added BOM UOM selection for items ... Added patch for BOM Item UOM Fixed scrap qty issue Added Scrap Qty update to patch Reverted test record for production order	2017-05-24 11:12:51 -07:00
Nabin Hait	c795386230	Fixed merge conflict	2017-05-24 18:39:16 +05:30
mbauskar	ff70f38eac	[minor] patch to delete the schools deprecated doctypes	2017-05-24 17:13:16 +05:30
Nabin Hait	2f0c34385b	Check if doctype exists before renaming	2017-05-24 17:12:07 +05:30
Nabin Hait	258f7da778	Paid amount + Write Off Amount can not be greater than Grand Total in return POS	2017-05-24 17:12:07 +05:30
Makarand Bauskar	3b9c2a4438	Added a reference of Sales Invoice in Serial No (#8855) ... * [enhance] added Sales Invoice reference in Serial Number * [patch] added test cases for Sales Invoice and added patch to copy sales invoice * [minor] minor fixes in validate_serial_against_delivery_note * [minor] fixes in sales invoice serial number validation	2017-05-23 18:45:34 +05:30
Manas Solanki	552f7ab678	fix in the patch for merging the student batch and student group (#8961)	2017-05-23 11:38:57 +05:30
Nabin Hait	8a27cf3785	Fix status of invoices with negative outstanding, if no return entry (#8829) ... * Move allowance field in Item to the first section to apply it for both stock and non-stock items * Fix status of invoices with negative outstanding, if no return entry * get_value included in safe_eval	2017-05-16 12:43:00 +05:30
rohitwaghchaure	73456ac81a	[fix] Payments on the invoice is showing even if IS POS option is disabled (#8802)	2017-05-16 11:29:57 +05:30
Nabin Hait	7bf810300e	Fixed #8822, active students patch	2017-05-15 11:42:37 +05:30
Makarand Bauskar	d4e15ca359	[minor] create student batch if does not exists (#8781) ... * [minor] create student batch if does not exists * [fix] minor fixes in if condition	2017-05-12 11:23:58 +05:30
Nabin Hait	62d27ab7d3	Reload doctype bewfore renaming margin fields (#8771)	2017-05-11 13:26:55 +05:30
Makarand Bauskar	0e4c5c9efb	[minor] renamed a Total Margin field to Rate With Margin (#8720) ... * [minor] renamed a Total Margin field to Rate With Margin * [minor] minor fixes in field lable	2017-05-11 11:40:02 +05:30
Manas Solanki	426b8a14fd	Merge the student group and student batch (#8663) ... * deleted student batch creation tool * Patch for deleting the doctype and config * Changes in the student attendance * Patch for renaming the student batch as student group * Changes in the student attendance * Change in the student attendance reports - Absent student report - Student Batch-wise attendance - Student monthly attendance sheet * Changes in the patch * Changes in the course schedule * Changes in the course scheduling tool * Change in the assessment plan * Changes in the assessment result tool * Cleanup * Changes in the api.py * create student group from student batch * delete student batch * add patch * remove student batch from config/schools.py * Delete the depricated doctype with patch * Changes in patch * Changes as per PR	2017-05-09 15:32:52 +05:30
Javier Wong	470535ae9b	Removed set_default_roles ... set_default_roles was removed in 7fff0908a4 It is not required anymore. It currently breaks the patch.	2017-05-03 16:44:14 +05:30
mbauskar	e94c6e7b8e	[minor] disabled the instructor role if the company domain is not Education	2017-05-01 11:40:13 +05:30
Nabin Hait	c98f37f91c	Patch for reverting manufacturers table from item	2017-04-28 09:58:41 +05:30
Nabin Hait	85622f9ccb	Update update_status_as_paid_for_completed_expense_claim.py	2017-04-25 20:43:29 +05:30
mbauskar	9cf6d630e9	[minor] fixes for expense claim status	2017-04-25 13:15:50 +05:30
Nabin Hait	825e053e66	Fixed project_copied_from patch	2017-04-20 08:50:37 +05:30
Nabin Hait	e42fb32f6f	Fixed allow_zero_valuation_rate patch	2017-04-20 08:45:18 +05:30
Nabin Hait	f382373cf4	Merge branch 'develop' into develop	2017-04-19 21:01:19 +05:30
Faris Ansari	695327a513	Duplicate dependencies when project is duplicated ... - fix frappe/erpnext#8274	2017-04-19 20:48:49 +05:30
Nabin Hait	117be7ddd5	Added a settings in Accounts Settings to disable booking depreciation entry automatically	2017-04-18 14:03:06 +05:30
Rohit Waghchaure	dc981dc546	[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue	2017-04-17 17:31:32 +05:30
Javier Wong	54d9c9eaf4	Merge branch 'develop' into develop	2017-04-14 18:33:44 +08:00
Javier Wong	9b11d9b45d	[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-14 18:24:04 +08:00
Nabin Hait	3a2727c9eb	Merge pull request #8430 from mbauskar/stock-entry-supplier-address ... [minor] fetch supplier address, address_display on supplier trigger	2017-04-13 18:45:09 +05:30
Nabin Hait	16d92e7270	Update update_supplier_address_in_stock_entry.py	2017-04-13 18:44:33 +05:30
mbauskar	3ddfce4f17	[patch] move supplier_address to address_display and set supplier_address in SE	2017-04-13 16:46:41 +05:30
Rushabh Mehta	994cef5ee3	[minor] fix imports in old patches	2017-04-13 13:14:05 +05:30
Rohit Waghchaure	87ad6d074a	[enhance] Stock qty added in purchase invoice	2017-04-11 18:29:52 +05:30
Nabin Hait	c040015bb5	Used db_update in patch to bypass validate and on_update method	2017-03-31 11:58:19 +05:30
Revant Nandgaonkar	3d5bdeb90d	[Fix] patch v7_2.contact_address_links	2017-03-30 23:14:58 +05:30
Revant Nandgaonkar	d07c041125	[Fix] Addresses linked back to Lead	2017-03-30 23:14:58 +05:30
rohitwaghchaure	afa93c624b	[fix] Reserved qty is not calculating properly in BIN for multi sales UOM (#8203)	2017-03-29 17:29:20 +05:30
Dominik Ottenbreit	6eb202ef3a	fix patch after test, fix variant based on manufacturer, add json for item_manufacturer	2017-03-24 14:49:52 +01:00
Dominik Ottenbreit	3938c61996	migrate from manufacturer to manufacturer childtable	2017-03-24 14:24:34 +01:00
Rohit Waghchaure	0bb434af3f	minor fix in patch	2017-03-06 18:52:34 +05:30
Nabin Hait	b3ffd6b282	Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles ... Changed userrole to has role, commonify role editor of the user	2017-03-06 18:44:53 +05:30
Kanchan Chauhan	5a980ac87a	UOM Conversion in Selling	2017-03-06 16:41:12 +05:30
Rohit Waghchaure	312498060f	changed doctype name userrole to has role	2017-03-06 14:24:39 +05:30
Rohit Waghchaure	d59f8b32cd	changed user_roles to roles	2017-03-06 14:24:39 +05:30
Nabin Hait	697150f339	Leave application overlap validation for half day and test cases	2017-02-24 18:53:34 +05:30
Manas Solanki	d77fac113f	Make All Assessment Group parent in assessment group tree	2017-02-24 15:30:22 +05:30
Nabin Hait	5079c9ef47	Fixed merge conflict	2017-02-22 15:31:31 +05:30
Manas Solanki	f869a679ae	Fixed Student Attendence	2017-02-21 18:49:00 +05:30
Nabin Hait	0142fdc0d7	Update rename_att_date_attendance.py	2017-02-21 16:01:21 +05:30
Kanchan Chauhan	42f55cf4b1	[Patch] Attendance Date rename field	2017-02-21 13:44:01 +05:30
Nabin Hait	6a85752ead	Merge branch 'hotfix' into remove-joining-datep-validation	2017-02-20 19:31:38 +05:30
Nabin Hait	0d66579e83	Merge branch 'develop' into develop	2017-02-20 19:22:03 +05:30
Nabin Hait	8bb69ff8bf	Fixed merge conflict	2017-02-20 19:01:04 +05:30
Nabin Hait	9f4cb0c097	Fixed merge conflict	2017-02-20 15:00:04 +05:30
mbauskar	90818080b1	[minor] Configured Auto Close days for Opportunity and Issue	2017-02-17 14:56:00 +05:30
Rohit Waghchaure	4b9d2f2733	[Fix] Cleanup supplied items if supply raw material is set as No	2017-02-16 18:53:23 +05:30
Kanchan Chauhan	1b204c8e4e	Accrual Payroll System	2017-02-16 16:30:51 +05:30
Kanchan Chauhan	5f5457085e	Joining date validation removed from Salary Structure	2017-02-06 14:50:39 +05:30
Rushabh Mehta	e92a740b53	[minor] school patch fix	2017-02-03 16:05:53 +05:30
Neil Trini Lasrado	f37d329cf5	Merge branch 'develop' into eval-group	2017-02-02 17:30:10 +05:30
Rushabh Mehta	a3d0bea375	Merge branch 'develop' into remove-party-status	2017-02-02 15:42:04 +05:30
Neil Trini Lasrado	4aabe61197	Patch for renaming evaluation criteria	2017-02-01 19:32:28 +05:30
Neil Trini Lasrado	749516c22d	Renamed Evaluation Criteria to Assessment Criteria	2017-02-01 18:47:36 +05:30
rohitwaghchaure	ea092a7b24	[Enhancement] Booking of an employee's expense claim (#7267) ... * [Enhancement] Auto book of an employee's expense claim * test cases * documentation * fixes and changes * removed payable from employee and added into the company * Added party in account, patch to update party type for customer and supplier accounts * added party type in erpnext, fix patch * fixed travis	2017-02-01 12:02:08 +05:30
Rushabh Mehta	587dd90182	[minor] removed customer status	2017-02-01 12:01:24 +05:30
Neil Trini Lasrado	ba96ce7dd5	Merge pull request #7616 from neilLasrado/assessment-validations ... Patch fix for Update Assessment Module Patch	2017-01-30 17:50:37 +05:30
Neil Trini Lasrado	fd1767d2ea	Patch fix for Update Assessment Module Patch	2017-01-30 17:50:05 +05:30
Rushabh Mehta	4500f7b4d6	[cleanup] remove unused LMS (#7612)	2017-01-30 17:04:38 +05:30
Neil Trini Lasrado	ab1ee1e6fc	Patch fix for Update Assessment Module Patch	2017-01-30 16:40:14 +05:30
Rushabh Mehta	87037bdd56	[minor] remove party status as it leads to duplicate notifications fixes #7346, also fix for #7568	2017-01-30 13:22:51 +05:30
Neil Trini Lasrado	6d0da98a78	Fixes to update student guardian name patch	2017-01-27 17:44:28 +05:30
Neil Trini Lasrado	7ff5682193	Merge branch 'develop' into guarding-name	2017-01-27 16:54:50 +05:30
Neil Trini Lasrado	f36ff488c0	Added Guardian Name to Student Master	2017-01-27 16:53:55 +05:30
Rushabh Mehta	710dc5392f	[merge]	2017-01-27 15:48:31 +05:30
Neil Trini Lasrado	15c5ae0918	Fix for update assessment modules patch	2017-01-24 10:28:49 +05:30
Kanchan Chauhan	c948a4fc92	Patch to update Salary Detail where Salary Component Abbr is null	2017-01-23 16:12:45 +05:30
Neil Trini Lasrado	d471ad2c45	Fix for update assessment modules patch	2017-01-23 14:59:19 +05:30
Nabin Hait	1f9d1bb877	Merge branch 'develop' into assessment	2017-01-20 20:09:44 +05:30
Neil Trini Lasrado	16d40cf0a3	Added ability to disable a student in student group/studnet batch	2017-01-20 19:33:09 +05:30
Nabin Hait	349d520ae2	Fixed merge conflict	2017-01-20 15:44:35 +05:30
Nabin Hait	f356e539bb	Update set_null_value_to_fields.py	2017-01-20 12:35:22 +05:30
Rohit Waghchaure	84b827efcd	[Fix] Budget not working properly	2017-01-20 12:33:50 +05:30
Rushabh Mehta	c81621d3ce	[minor] add progress bar in patch	2017-01-19 14:32:36 +05:30
Rushabh Mehta	00d3cd6d64	[fix] contact address link patch	2017-01-19 14:27:02 +05:30
Rushabh Mehta	d69fd1b8c0	[fix] update_salary_slip.py	2017-01-19 12:51:37 +05:30
Rushabh Mehta	683d98fd54	[fix] update_salary_slip.py	2017-01-19 12:48:03 +05:30
Rushabh Mehta	35e4d8b152	[fix] update_salary_slip.py	2017-01-19 12:47:27 +05:30
Rushabh Mehta	60908f4a08	[fix] update_salary_slip.py	2017-01-19 12:46:11 +05:30
Rushabh Mehta	26fdb113a8	[fix] update_salary_slip.py	2017-01-19 12:44:54 +05:30
Nabin Hait	b064cf39c2	Merge branch 'develop' into fleet-moved-to-hr	2017-01-17 11:05:39 +05:30
Kanchan Chauhan	f80c2b9606	Fleet management moved to HR	2017-01-16 14:38:24 +05:30
Neil Trini Lasrado	38bd62d82d	Merge branch 'develop' into assessment	2017-01-16 12:23:51 +05:30
Rushabh Mehta	b92087cb2d	[cleanup] move contact, address to frappe 💥	2017-01-13 18:54:47 +05:30
Nabin Hait	448acf6f46	Merge branch 'master' into develop	2017-01-13 17:30:46 +05:30
Nabin Hait	e7cb911634	Salary Slip Patch Fixed	2017-01-13 17:30:06 +05:30
Nabin Hait	26ac85be5b	Merge branch 'master' into develop	2017-01-13 17:10:52 +05:30
Nabin Hait	b166caa9fb	Patch fixed	2017-01-13 17:09:57 +05:30
Nabin Hait	b251cd4ccb	Fixed merge conflict	2017-01-13 14:34:54 +05:30
Nabin Hait	e43a94de4b	Merge branch 'hotfix' into draft_status_issue_after_amend	2017-01-13 13:14:32 +05:30
Nabin Hait	9698f1b923	Merge pull request #7473 from KanchanChauhan/salary-slip-before-june ... Patch to add Start and End Date in Salary Slips	2017-01-13 12:53:15 +05:30
Rohit Waghchaure	29458836e4	[Fix] After amend the status become cancelled even if docstatus is zero	2017-01-13 12:51:19 +05:30
Kanchan Chauhan	b6114e672f	Patch to add Start and End Date in Salary Slips	2017-01-13 12:05:03 +05:30
Neil Trini Lasrado	a56224c03a	Rename Assessment to Assessment Plan	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	233ecfdd9c	Renamed min_score to threshold in Grading Scale	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	5c87455918	Patch for assessment module redesign	2017-01-09 18:26:03 +05:30
Nabin Hait	6e9d2a3c1f	fixed conflict	2017-01-09 17:21:34 +05:30
Nabin Hait	91621639e8	Reload in_standard_filter property	2017-01-06 12:54:16 +05:30
Nabin Hait	f327a58b7f	Merge branch 'master' into develop	2016-12-29 11:04:05 +05:30
Nabin Hait	11bde0ba14	Patch fixed	2016-12-29 10:58:05 +05:30
Nabin Hait	3bcf9b5e70	Fixed merge conflict	2016-12-27 14:30:17 +05:30
Rushabh Mehta	174c3478a1	[fix] item variants not directly shown in website due to route clash	2016-12-27 12:30:30 +05:30
Nabin Hait	58291c77e9	Fixed version conflict	2016-12-23 17:43:42 +05:30
Nabin Hait	c2d66bdfb2	Merge branch 'master' into develop	2016-12-23 16:45:09 +05:30
Nabin Hait	6104fdc579	Update repost_stock_for_deleted_bins_for_merging_items.py	2016-12-22 17:49:46 +05:30
Nabin Hait	e7939fd87b	Merge branch 'master' into develop	2016-12-21 12:18:38 +05:30
Nabin Hait	b3943cb53a	Update repost_stock_for_deleted_bins_for_merging_items.py	2016-12-21 12:04:39 +05:30
Rushabh Mehta	688f2284af	[minor] [patch]	2016-12-19 13:15:52 +05:30
Nabin Hait	201af80706	Fixed merge conflict	2016-12-13 14:30:32 +05:30
Nabin Hait	346a6a5d84	Update set_sales_person_status.py	2016-12-13 11:27:46 +05:30
Kanchan Chauhan	f0b0db444d	Added Is Active to Sales Person	2016-12-12 19:12:41 +05:30
Nabin Hait	3ef63bef02	Rename and merging of Item and Warehouse and patch to fix deleted bins	2016-12-12 15:37:52 +05:30
Nabin Hait	58667ab123	Fixed merge conflict	2016-12-09 15:49:24 +05:30
Nabin Hait	43df804176	Fixed renamed fieldname	2016-12-09 15:09:11 +05:30
Viet Pham	ddb856377c	Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null	2016-12-08 20:02:39 +07:00
Nabin Hait	288a18e0cc	Fixes and patch for Currency Exchange based on date	2016-12-08 15:36:23 +05:30
Nabin Hait	32e5b7af20	Update set_budget_against_as_cost_center.py	2016-12-08 14:42:04 +05:30
Manas Solanki	482fa672c2	[Fix] Patch for budget_against	2016-12-08 12:16:29 +05:30
Nabin Hait	5c18bd9b61	Fixed merge conflict	2016-12-06 16:16:58 +05:30
Rohit Waghchaure	82fa27c36f	[Fix] Status of sales order and purchase order	2016-12-05 16:32:23 +05:30
Nabin Hait	926d72424d	Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue ... [Enhancement] Currency added in the BOM	2016-11-24 13:27:17 +05:30
Nabin Hait	a8333be6ad	Merge pull request #7023 from frappe/revert-7012-remove-count-star ... Revert "[optimize] remove count(*) from queries"	2016-11-24 13:26:38 +05:30
Rushabh Mehta	5dd12cb4f0	Merge branch 'master' into develop	2016-11-22 23:18:29 +05:30
Rohit Waghchaure	334f032780	fix patch	2016-11-22 13:30:13 +05:30
Rohit Waghchaure	b1b328865e	[Enhancement] Currency added in the BOM	2016-11-22 12:52:20 +05:30
Rushabh Mehta	9872d8cdb5	Revert "[optimize] remove count(*) from queries"	2016-11-21 21:04:47 +05:30
Nabin Hait	d855167b9b	Fixed merge conflict	2016-11-21 19:13:22 +05:30
Nabin Hait	376e8945f7	Merge pull request #7014 from rohitwaghchaure/rename_autoname_field ... patch for rename autoname field	2016-11-21 19:04:44 +05:30
Rohit Waghchaure	4810d1fa2d	patch for rename autoname field	2016-11-21 16:52:50 +05:30
Rushabh Mehta	75d455422a	[fix] [patch] rename_quality_inspection_field	2016-11-21 16:19:50 +05:30
Nabin Hait	d50d6a559c	Merge pull request #7012 from rmehta/remove-count-star ... [optimize] remove count(*) from queries	2016-11-21 15:28:01 +05:30
Rushabh Mehta	5a258cbc2d	[optimize] remove count(*) from queries	2016-11-21 14:57:36 +05:30
Nabin Hait	c2f8dd71d7	Merge pull request #6965 from manassolanki/qa_redesign ... [Fix] [Enhancement] Quality Inspection	2016-11-21 14:49:18 +05:30
Rushabh Mehta	e9fc31168d	[patch] reload desktop icon #6826	2016-11-21 14:29:31 +05:30
Rushabh Mehta	fe816c3852	[fix] [wip] daily work summary	2016-11-18 12:40:18 +05:30
Nabin Hait	46753de6d7	fixed merge conflict	2016-11-17 15:55:11 +05:30
Nabin Hait	7fc05d6432	Update update_missing_salary_component_type.py	2016-11-17 12:16:52 +05:30
Nabin Hait	8af429da1f	Cleanup and fixes in quality inspection feature	2016-11-16 17:22:38 +05:30
Nabin Hait	6d04afc19d	fixed merge conflict	2016-11-16 12:56:31 +05:30
Nabin Hait	00e841d744	update missing salary component abbr	2016-11-16 12:55:17 +05:30
Rushabh Mehta	4bfa0748cd	[merge] master	2016-11-16 11:28:23 +05:30
Rushabh Mehta	8dfbe7c748	[fix] patch missing salary component type based on existing salary slips (#6955)	2016-11-16 11:18:20 +05:30
rohitwaghchaure	b3ba7f01ef	[Fix] PO status not changed as material return created against them (#6869)	2016-11-16 11:10:10 +05:30
Rushabh Mehta	e0ab64d6cc	[minor] reload user for patch	2016-11-15 16:43:37 +05:30
Nabin Hait	95e6ccd419	Merge branch 'master' into develop	2016-11-14 12:42:26 +05:30
Nabin Hait	256a3fef95	Fixed multiple minor issues	2016-11-14 11:10:50 +05:30
Nabin Hait	fa220f93be	Merge branch 'master' into develop	2016-11-10 11:25:33 +05:30
Nabin Hait	84ecaac27d	Update set_base_amount_in_invoice_payment_table.py	2016-11-10 11:24:22 +05:30
Nabin Hait	ceca1b97c3	Fixed merge conflict	2016-11-09 14:58:36 +05:30
Rohit Waghchaure	2285f90b64	added debit and credit note status	2016-11-09 14:47:24 +05:30
Rohit Waghchaure	2f1db57fe1	Added status field in sales invoice and purchase invoice	2016-11-08 18:49:58 +05:30
Nabin Hait	31f6436f75	[patch] Set base amount in Sales Invoice Payment table	2016-11-08 17:41:14 +05:30
Nabin Hait	a469e659c5	Fixed merge conflict	2016-11-08 15:26:27 +05:30
Nabin Hait	cdc895734f	Merge pull request #6819 from rohitwaghchaure/hotfix_issues ... cleanup and fixes	2016-11-08 12:05:47 +05:30
robert schouten	d8bdaeffe3	[fix] include cancel time logs in convert and v6 to v7.1 fix (#6840)	2016-11-07 17:16:39 +05:30
robert schouten	27d45a244e	[fix]fix name definition in old patch (#6841)	2016-11-07 17:08:37 +05:30
Rohit Waghchaure	0ecad33642	cleanup and fixes	2016-11-05 08:09:21 +05:30
Nabin Hait	f4068fd6f1	Fixed merge conflict	2016-11-01 15:06:55 +05:30
Nabin Hait	c61892501c	[fix] Report GLE for Purchase Invoice with Update Stock option	2016-11-01 11:45:32 +05:30
Nabin Hait	551360ae30	Fixed merge conflict	2016-10-31 16:38:09 +05:30
Nabin Hait	f5f3ef1bae	repost gle for Purchase Invoice with update stock	2016-10-31 16:17:10 +05:30
Nabin Hait	952c9cccfc	Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item ... Default warehouse in Item master	2016-10-29 14:44:19 +05:30
Nabin Hait	5fc624b9ed	Update save_stock_settings.py	2016-10-29 14:43:58 +05:30
Kanchan Chauhan	4c22825f01	Default warehouse in Item master	2016-10-27 23:56:04 +05:30
Nabin Hait	72a1943c8e	Fixed version conflict	2016-10-26 16:41:21 +05:30
Nabin Hait	c5cbde273f	Change Logs for v7.1	2016-10-26 16:28:54 +05:30
Nabin Hait	fe86debf5d	[fix] Duplicate salary components	2016-10-24 17:47:18 +05:30
Nabin Hait	97fa119b37	Set prefered contact email in Employee	2016-10-19 18:26:01 +05:30
Nabin Hait	0702fa2fc6	Fixed version conflict	2016-10-19 16:49:36 +05:30
Rohit Waghchaure	ac9172f6df	[Fix] total projected qty	2016-10-19 15:06:30 +05:30
Faris Ansari	a0608d463a	[gantt] Gantt fixes (#6490) ... * [gantt] fix Gantt Chart link in Modules * [gantt] added field for Task dependent	2016-10-10 14:32:35 +05:30
Nabin Hait	fc2a9e64fc	Fixed version conflict	2016-10-07 17:09:28 +05:30
Nabin Hait	6aaa7d7742	Added missing file extension	2016-10-07 17:08:03 +05:30
Nabin Hait	df61513037	Fixed merge conflict	2016-10-07 17:05:00 +05:30
Nabin Hait	2f3a68b8d6	Added missing file extension	2016-10-07 17:03:37 +05:30
Nabin Hait	cd9c45f816	Fixed merge conflict	2016-10-07 16:53:07 +05:30
Nabin Hait	81754954cb	Update update_timesheet_communications	2016-10-07 16:08:44 +05:30
Nabin Hait	2907881dfb	Update update_timesheet_communications	2016-10-07 16:07:11 +05:30
Nabin Hait	0799969063	Update set_portal_settings.py	2016-10-07 14:55:17 +05:30
Nabin Hait	20e96b77bd	Update set_portal_settings.py	2016-10-07 14:54:28 +05:30
Nabin Hait	2f75b7b42e	Fixed merge conflict	2016-10-07 14:16:17 +05:30
Rohit Waghchaure	770d04e633	[Fix] sales order status showing completed, while it's status was to bill	2016-10-07 13:55:48 +05:30
Nabin Hait	1885207eca	Update and rename update_timesheet_modified_created to update_timesheet_communications	2016-10-07 12:54:04 +05:30
RobertSchouten	ef4e41380b	[fix] update timestamps and relink communication for timesheet	2016-10-07 11:01:12 +08:00
Nabin Hait	558f526a68	Fixed version conflict	2016-10-05 17:18:36 +05:30
Nabin Hait	9501b38e8b	Update remove_doctypes_and_reports.py	2016-10-05 12:35:11 +05:30
Saurabh	f24d523fc9	[fix] currency symbol for total amount in JE	2016-10-04 11:29:26 +05:30
Nabin Hait	80499bb657	Fixed merge conflict	2016-09-29 14:18:53 +05:30
Rohit Waghchaure	4b24683c27	[Fix] added account for missing change amount account in the sales invoice	2016-09-29 12:55:48 +05:30
Rohit Waghchaure	0a6529a643	Remove time log, time log batch from Doc Field.	2016-09-28 13:03:42 +05:30
Nabin Hait	706612bcd4	Fixed version conflict	2016-09-26 18:11:56 +05:30
Nabin Hait	ad3e213b41	minor patch fixes	2016-09-26 18:00:13 +05:30
Rushabh Mehta	1f53aaf093	[minor] [patch] ignore_validate in update_portal_role	2016-09-24 00:21:53 +05:30
Rushabh Mehta	63cdbf08f9	[minor] [patch] ignore_validate in update_portal_role	2016-09-24 00:07:31 +05:30
Rushabh Mehta	fc800b3f2f	[enhance] added roles for portal users frappe/frappe#2091 (#6452)	2016-09-23 21:51:51 +05:30
Nabin Hait	5f825deadd	Fixed version conflict	2016-09-23 17:25:23 +05:30
Nabin Hait	147b288d66	Update repost_gle_for_pos_sales_return.py	2016-09-23 13:11:05 +05:30
Nabin Hait	6b4eb7f77f	Fixed version conflict	2016-09-23 12:16:31 +05:30
Nabin Hait	d03087d3ab	Patch fixed for legacy migration	2016-09-23 11:08:02 +05:30
Rushabh Mehta	301c8a94b8	[fix] [patch] update_lead_source	2016-09-21 12:00:58 +05:30
Rushabh Mehta	989a4849fe	[minor] patch fix for 6-7	2016-09-21 12:00:58 +05:30
Nabin Hait	d12990ff57	Update update_home_page.py	2016-09-20 18:20:58 +05:30
Nabin Hait	5cf5019b89	minor patch fix	2016-09-20 18:19:59 +05:30
Nabin Hait	b015f1b647	Fixed version conflict	2016-09-20 16:53:02 +05:30
Rohit Waghchaure	414199a5db	[Fix] Mode of payment issue	2016-09-19 23:43:47 +05:30
Rushabh Mehta	e35dbca01b	[fix] connect customer to Quotation, Opportunity if created from lead, fixes #6051	2016-09-19 15:03:57 +05:30
Rushabh Mehta	cf7a36ac26	[fix] fix patch to clear lead customization	2016-09-16 23:01:41 +05:30
Rushabh Mehta	59dc0ece9f	[enhance] added Lead Source master, fixes #6231	2016-09-16 11:44:49 +05:30
Nabin Hait	d5ebd79ad7	Fixed version conflict	2016-09-14 15:50:22 +05:30
Rohit Waghchaure	a5de83351e	[Fix] Timesheet patch	2016-09-13 12:36:37 +05:30
Rohit Waghchaure	0568238786	rename total_billing_hours to total_billable_hours in timesheet doctype	2016-09-12 23:00:24 +05:30
Rohit Waghchaure	7b6fdb77d0	rename total_billing_amount to total_billable_amount in timesheet doctype	2016-09-12 19:06:41 +05:30
Rohit Waghchaure	c940440fbe	patch and rearrangement of fields	2016-09-12 13:27:27 +05:30
Nabin Hait	e5d13f3156	Update set_student_guardian.py	2016-09-08 17:57:55 +05:30
Rohit Waghchaure	aaa6d1f1bc	patch fix	2016-09-08 12:34:36 +05:30
Nabin Hait	1bf8e70339	Update convert_timelog_to_timesheet.py	2016-09-07 17:19:27 +05:30
Nabin Hait	7c9d981614	Update convert_timelog_to_timesheet.py	2016-09-07 17:17:47 +05:30
Nabin Hait	0a0df2e433	fixed version conflict	2016-09-07 17:01:47 +05:30
Nabin Hait	23147ff881	Patch fixed	2016-09-07 16:59:55 +05:30
Nabin Hait	b8b228ed14	Fixed version conflict	2016-09-06 17:56:32 +05:30
Neil Trini Lasrado	52891b55d2	Fixed Student Guardian patch - reload issue	2016-09-06 17:50:42 +05:30
Nabin Hait	f79d7188de	Patch fixed	2016-09-06 17:47:19 +05:30
Rohit Waghchaure	b44efef094	[Issue] Fixed, supplier quotation item uom conversion	2016-09-06 17:21:38 +05:30
Neil Trini Lasrado	6a95723a70	Fixed Student Guardian patch - permission issue	2016-09-06 17:11:13 +05:30
Neil Trini Lasrado	49da25dd57	Added patch	2016-09-06 15:45:17 +05:30
Nabin Hait	23d79b7059	fixed version conflict	2016-09-02 16:19:54 +05:30
Nabin Hait	88d7e419ad	Merge pull request #6263 from nabinhait/timesheet_fix_101 ... Migrate employee field to timesheet only if it exists in time log	2016-09-02 16:18:12 +05:30
Nabin Hait	54254cca58	Update set_party_name_in_payment_entry.py	2016-09-02 16:17:42 +05:30
Nabin Hait	142f14dd5c	Migrate employee field to timesheet only if it exists in time log	2016-09-02 14:47:14 +05:30
Nabin Hait	15b26d8b1a	Fixed merge conflicts	2016-09-02 14:29:57 +05:30
Nabin Hait	5a4ca64c4a	Party name in Payment Entry and cheque print format	2016-09-02 14:20:01 +05:30
Rohit Waghchaure	d07557eaf6	[Fix] Updated timesheet status	2016-09-02 12:24:54 +05:30
Nabin Hait	5a101ef4c6	Fixed merge conflict	2016-09-01 12:43:24 +05:30
Rohit Waghchaure	86f143863f	[Patch] Check table exist	2016-09-01 12:37:20 +05:30
Nabin Hait	2490ea0b91	Fixed merge conflict	2016-09-01 12:29:31 +05:30
Nabin Hait	bb2bceef62	Merge pull request #6229 from rohitwaghchaure/pos_payment_issue ... [POS] Fixed POS Sales Invoice when Payment Table is Empty	2016-09-01 12:25:31 +05:30
Rohit Waghchaure	7f165f19d2	[Fix] Timesheet employee is missing in patch	2016-09-01 12:07:21 +05:30
Rohit Waghchaure	774ce63b75	remove mode of payment, migrate mode of payment from v6 to v7	2016-08-31 21:21:41 +05:30
Nabin Hait	16e15283b5	Imported unicode literals	2016-08-31 12:33:22 +05:30
Rohit Waghchaure	da7fb70009	[Patch] Fixed error unknown column 'type' in 'field list'	2016-08-30 01:41:35 +05:30
Kanchan Chauhan	145f87c068	'Type' field added to Salary Component	2016-08-29 15:26:57 +05:30
Rohit Waghchaure	69aebf4db5	fixes test cases, added patch	2016-08-26 13:18:14 +05:30
Nabin Hait	0da75aede3	Fixed merge conflict	2016-08-26 12:40:02 +05:30
Rohit Waghchaure	e21e1ebae2	[Sales Return] Minor fix in patch	2016-08-26 12:31:41 +05:30
Nabin Hait	fbe1563101	Merge pull request #6168 from rohitwaghchaure/hotfix ... [POS] Fixed payment gl entry for sales return	2016-08-26 11:58:46 +05:30
Rohit Waghchaure	efb5bf2cfc	[POS] Fixed payment gl entry for sales return	2016-08-25 16:23:47 +05:30
Rohit Waghchaure	0788ee62c1	Fixed patch, 'SalesInvoice' object has no attribute 'account_for_change_amount'	2016-08-25 12:46:34 +05:30
Rushabh Mehta	b9b36a2062	[minor] update salary structure company if not set	2016-08-24 15:20:43 +05:30
Rushabh Mehta	caeb9dc025	[minor] update salary structure company if not set	2016-08-24 15:14:48 +05:30
Nabin Hait	5c9a2b39bc	Revert "Ignore validating mandatory fields on converting timelogs to timesheets"	2016-08-22 14:36:33 +05:30
Nabin Hait	1b9f8006c2	Merge pull request #6140 from nabinhait/timesheet_patch_fix ... Ignore validating mandatory fields on converting timelogs to timesheets	2016-08-22 14:36:08 +05:30
Nabin Hait	9239ed5c44	Ignore validating mandatory fields on converting timelogs to timesheets	2016-08-22 14:35:06 +05:30
Nabin Hait	6b3706aef8	Update move_employee_parent_to_child_in_salary_structure.py	2016-08-18 17:32:53 +05:30
Nabin Hait	b5951b72f3	Merge pull request #5924 from KanchanChauhan/salary-structure-changes ... Formula based Salary Structure	2016-08-18 16:39:58 +05:30
Kanchan Chauhan	bccf0fa041	[WIP] Formula based Salary Structure and multiple employees for same Salary Structure	2016-08-18 13:02:39 +05:30
Rushabh Mehta	b7bc6bd75d	[fix] better message for cost center, fixes #6109	2016-08-18 12:50:58 +05:30
Nabin Hait	4da2c81641	Merge pull request #6094 from rmehta/sales-purchase-items ... [revert] is_sales_item, is_purchase_item back	2016-08-17 11:30:37 +05:30
Nabin Hait	613ef344f3	Patch fixed for v6 to v7 migration	2016-08-16 18:31:26 +05:30
Nabin Hait	39bc4b2a4c	Ignore overlap validation while creating timesheet from existing time logs	2016-08-16 15:18:28 +05:30
Rushabh Mehta	d973c1606a	[revert] is_sales_item, is_purchase_item back	2016-08-16 11:32:08 +05:30
Rushabh Mehta	de08639d49	[minor] fixes to patches while moving from v5	2016-08-16 10:01:56 +05:30
Rushabh Mehta	36f2d4f81e	[fix] patch for schools;	2016-08-10 19:46:12 +05:30
Rushabh Mehta	4b08f9ad1f	[fix] patch	2016-08-10 18:18:14 +05:30
Rushabh Mehta	cc054a5bbc	[minor] fix reload for school migrate patch	2016-08-10 14:24:16 +05:30
Nabin Hait	f44b5152d2	Portal settings for schools	2016-08-09 17:08:13 +05:30
Nabin Hait	11d565b07c	Update migrate_schools_to_erpnext.py	2016-08-09 15:23:01 +05:30
Nabin Hait	2275cd15e6	[patch] Reload Purchase Invoice in patch	2016-08-09 14:21:29 +05:30
Nabin Hait	99d4ff4a29	Repost gle for future transactions if update stock checked in back dated purchase invoice	2016-08-08 14:12:58 +05:30
Neil Trini Lasrado	50b2278eda	Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch	2016-08-05 15:09:49 +05:30
Nabin Hait	ae921ce2c8	[patch] Set default material request type in Item based on default bom	2016-08-02 18:02:31 +05:30
Neil Trini Lasrado	5bb2f56b47	Update make_guardian.py	2016-08-02 00:01:00 +05:30
Nabin Hait	3b8109780f	[patch] reload guardian interest	2016-08-01 17:59:46 +05:30
Nabin Hait	08aec855c4	[patch] fixed reload doc and permission issue in guardian patch	2016-08-01 17:46:56 +05:30
Nabin Hait	29a8a93aa1	Run guardian patch only if student doctype exists and there is father_name column	2016-08-01 17:31:17 +05:30
Nabin Hait	c9d04ab1fc	Merge pull request #5952 from nabinhait/lcv_reference ... [patch] Update refdoc in Landed Cost Voucher	2016-08-01 16:23:33 +05:30
Nabin Hait	6f84026c24	Merge pull request #5951 from nabinhait/patch_fix_104 ... [patch] Reload RFQ and timesheet before removing customer/supplier roles	2016-08-01 16:15:47 +05:30
Nabin Hait	3c364dd5b8	[patch] Update refdoc in Landed Cost Voucher	2016-08-01 15:53:36 +05:30
Nabin Hait	5940dc1a8e	[patch] Reload RFQ and timesheet before removing customer/supplier roles	2016-08-01 15:30:44 +05:30
Neil Trini Lasrado	74dbd168c2	[new Feature] Added guardian master	2016-08-01 15:08:04 +05:30
Nabin Hait	e9674f8866	Create columns for custom fields in new table Salary Detail and Component	2016-08-01 12:13:11 +05:30
Nabin Hait	feed313a66	Delete old salary earning and deduction doctypes	2016-08-01 11:54:19 +05:30
Nabin Hait	fa97b3cac7	[fix] repost gle only if there is any stock account without warehouse	2016-07-27 17:33:32 +05:30
Nabin Hait	b4bf757a15	Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py	2016-07-27 15:19:12 +05:30
Nabin Hait	10007ab4df	[fix] reposting of gle where stock account not linked with warehouse	2016-07-27 12:43:02 +05:30
Nabin Hait	444bedcd20	Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account	2016-07-27 12:33:10 +05:30
Rohit Waghchaure	c4afd63e50	[minor] Fixes	2016-07-26 20:47:42 +05:30
Rohit Waghchaure	4d3e8da4a2	[Fix] Set warehouse to stock account and fixed gl entries against transactions.	2016-07-26 17:09:33 +05:30
Saurabh	21a5658fdf	[fix] fee component rename patch fix	2016-07-26 15:03:41 +05:30
Rohit Waghchaure	8a9daece7e	[Fix] Timesheet patch	2016-07-26 12:57:05 +05:30
Rohit Waghchaure	26cf01aaba	[mionr] fixes and cleanups	2016-07-26 00:30:25 +05:30
Neil Trini Lasrado	ce1c63f776	[rename] Renamed Fee Amount to Fee Component	2016-07-25 18:24:37 +05:30
Neil Trini Lasrado	d69d961f2a	Removed Administrator role from Doctypes	2016-07-25 11:39:23 +05:30
Rushabh Mehta	e7399dff2d	[fix] homepage patch	2016-07-22 21:01:39 +05:30
Rushabh Mehta	6207883b7c	[fix] patch #5831	2016-07-22 12:20:52 +05:30
Rushabh Mehta	04a64a7f48	[fix] patch #5831	2016-07-22 12:19:18 +05:30
Rushabh Mehta	f276b52af3	[fix] patch #5831	2016-07-22 11:31:51 +05:30
Rushabh Mehta	d4f3c6b5e7	[fix] schools patch	2016-07-21 18:22:58 +05:30
Rushabh Mehta	39671e22c9	[fix] patch	2016-07-21 17:14:27 +05:30
Rushabh Mehta	fe7d6932ee	[fix] patch	2016-07-21 17:12:47 +05:30
Neil Trini Lasrado	a537e43838	Fixed patch for migrating schools to erpnext again	2016-07-21 16:57:04 +05:30
Neil Trini Lasrado	af5e00363a	Fixed patch for migrating schools to erpnext	2016-07-21 16:41:05 +05:30
Rushabh Mehta	20038ad2c9	[fixes] setup wizard and domainify for schools;	2016-07-21 16:01:59 +05:30
Neil Trini Lasrado	3f0a581b85	Merge ERPNext Schools into ERPNext	2016-07-20 19:25:02 +05:30
Nabin Hait	9a5dc452f1	Patch fixed for expense claim type	2016-07-20 12:16:35 +05:30
Saurabh	718d835f45	[enhance] Add Accounts table in to mention expense account based on company #5777	2016-07-19 11:38:16 +05:30
Saurabh	c63f2e2993	[fix] patch fix	2016-07-14 18:24:20 +05:30
Rushabh Mehta	176b63b354	[fix] remove first row on mapping, fixes #5707	2016-07-14 17:43:48 +05:30
Rushabh Mehta	62fcaa7900	Merge pull request #5758 from saurabh6790/is_group_fixes ... [fix] alter fieldtype for is_group from select to check	2016-07-14 16:57:01 +05:30
Rohit Waghchaure	de8418efe5	[Fix] Timesheet patch	2016-07-14 14:36:47 +05:30
Saurabh	6bc7b892c4	[fix] alter fieldtype for is_group from select to check	2016-07-14 14:06:28 +05:30
Rohit Waghchaure	e3fe828ea6	[Fix] Added note in timesheet and minor fixes	2016-07-13 09:40:35 +05:30
Rohit Waghchaure	3e012b7e16	[Fix] Time sheet rename issues	2016-07-11 15:00:38 +05:30
Rohit Waghchaure	e94d18b4cd	Rename Time Sheet doctype	2016-07-06 20:38:50 +05:30
Nabin Hait	7796c2f0c0	Update rename_salary_components.py	2016-07-06 13:11:51 +05:30
Rohit Waghchaure	c8d231b26b	[Fix] Patch salary component	2016-07-06 12:33:54 +05:30
Rohit Waghchaure	a71d9d33af	Rename prevdoc field in purchase order and purchase receipt doctype	2016-07-06 12:13:29 +05:30
Nabin Hait	4647f24865	Merge pull request #5625 from KanchanChauhan/salary-component-cleanup ... Salary component cleanup	2016-07-06 12:06:05 +05:30
Kanchan Chauhan	d963b76a4b	Salary component cleanup	2016-07-06 12:04:38 +05:30
Nabin Hait	281b07cdb6	Warehouse patch fix	2016-07-04 18:17:57 +05:30
Nabin Hait	7f3938b19f	Warehouse patch fix	2016-07-04 18:12:08 +05:30
Rohit Waghchaure	240407b155	[Fixes] Time log batch patch	2016-07-04 13:21:54 +05:30
Nabin Hait	13093b4b68	Make payment entry aginst order, payment request and patch to rename advance table fields	2016-07-04 11:42:24 +05:30
Nabin Hait	28a0528ae4	Advance Payment Entry adjustment against Invoice	2016-07-04 11:42:04 +05:30
Rushabh Mehta	4177504860	[fix] [patch] reload doctype missing in patch	2016-07-04 11:41:12 +05:30
Rushabh Mehta	6703792472	Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes ... [Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI	2016-07-04 10:59:11 +05:30
Rohit Waghchaure	ad884b9fa9	[Fixes] Time sheet dependency removed from sales invoice and patch fixes	2016-07-02 22:28:29 +05:30
Rohit Waghchaure	4d8f4d76e1	[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI	2016-07-01 15:33:57 +05:30
Rushabh Mehta	5b681666a0	Merge pull request #5605 from saurabh6790/warehouse_tree_fix_1 ... while creating warehouse tree check for non company warehouse and is_group default value fix	2016-06-29 21:58:31 +05:30
Rohit Waghchaure	3fa0b51e5e	[Fixes] Time sheet fixes and changed timesheets to time_logs	2016-06-29 19:04:16 +05:30
Saurabh	028bbee317	[fix] nestedset warehouse fix	2016-06-29 19:03:40 +05:30
Saurabh	b8a57a4b4d	[fix] wareehouse nestedset fix if company not associated with warehouse	2016-06-29 19:01:49 +05:30
Rushabh Mehta	e6920f6a58	Merge pull request #5603 from KanchanChauhan/Maintenance-Module ... New Maintenance Module	2016-06-29 16:08:46 +05:30
Kanchan Chauhan	fb3eb13ca4	New Maintenance Module	2016-06-29 15:51:02 +05:30
Anand Doshi	5b9c6e7fa6	[fix] [patch] remove default activity type "Planning"	2016-06-29 15:32:36 +05:30
Rushabh Mehta	26a76fb2d9	Merge pull request #5566 from KanchanChauhan/moving-newsletter-to-frappe ... Newsletter moved to Frappe	2016-06-29 12:11:25 +05:30
Kanchan Chauhan	65c8b5a216	Newsletter moved to Frappe	2016-06-28 17:28:40 +05:30
Saurabh	ee17e2f277	[fix] patch fix	2016-06-28 15:43:02 +05:30
Saurabh	52c2affc9c	[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts	2016-06-28 14:41:48 +05:30
Saurabh	2f788a909f	[fixes] time sheet patch fix	2016-06-27 17:44:12 +05:30
Saurabh	93d68ac0c2	[fixes] change is group to check box	2016-06-27 17:16:56 +05:30
Saurabh	99892c7ce7	[fix] provision to convert group to ledger and vice versa	2016-06-27 17:16:56 +05:30
Rohit Waghchaure	d6c986da8f	[Enhancement] Time log wages and multiple active salary structure	2016-06-27 16:46:39 +05:30
Saurabh	7fecb50360	[enhance] rename warehouse account type to stock	2016-06-26 14:27:46 +05:30
Anand Doshi	f576f3b17b	implemented get_site_info for erpnext and patch to move setup complete to system settings	2016-06-25 19:52:26 +05:30
Saurabh	dc2fa86222	[fixes] rename ctype to doctype	2016-06-25 11:16:55 +05:30
Saurabh	3a0f96bd00	[patch] patch to move all warehouses under all warehouse group	2016-06-25 11:06:14 +05:30
Saurabh	4d02949814	[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account	2016-06-25 11:06:14 +05:30
Saurabh	554f6f70aa	[fixes] nested set fix for warehouse, tree for accounts and cost center	2016-06-25 11:06:13 +05:30
Saurabh	eda1afb4eb	[fixes] comnify tree view	2016-06-25 11:06:13 +05:30
Saurabh	dfbcdeb8a0	[enhancement] warehouse tree structure	2016-06-25 11:06:12 +05:30
Rushabh Mehta	994fa8dcef	Merge pull request #5530 from rmehta/website-route-fixes ... [redesign] website routing system	2016-06-24 16:37:43 +05:30
Rushabh Mehta	a334062b03	[redesign] website routing system	2016-06-24 16:18:07 +05:30
Nabin Hait	438565f678	Merge branch 'master' into develop	2016-06-24 16:12:26 +05:30
Nabin Hait	0bfd4849ca	minot fix	2016-06-24 16:04:31 +05:30
Nabin Hait	2effad33d0	Merge branch 'master' into develop	2016-06-24 12:48:24 +05:30
Nabin Hait	6dfc78b12a	Item Valuation Rate in case of negative inventory	2016-06-24 12:28:55 +05:30
Rushabh Mehta	1d1bc27a57	[minor] fix update_mins_to_first_response patch	2016-06-14 16:27:50 +05:30
Rushabh Mehta	a55fb6426c	[patch] mins_to_first_response in opporutnity and issue	2016-06-14 15:54:54 +05:30
Rushabh Mehta	277cda195c	[fix] for #5419	2016-06-01 12:29:08 +05:30
Nabin Hait	a60ceba6d4	[fix] reload gl entry doctype in patch	2016-05-27 12:44:18 +05:30
Nabin Hait	591a5aba56	Added Project in GL Entry and General Ledger report	2016-05-26 17:51:20 +05:30
Rushabh Mehta	1885645d6d	[fix] [patch]	2016-05-24 16:10:21 +05:30
Nabin Hait	d9117cb726	reload budget doctype in patch	2016-05-23 13:04:26 +05:30
Nabin Hait	ca90963d5b	Redesigned budgets	2016-05-23 13:04:26 +05:30
Anand Doshi	1d88c6a742	[fix] [patch] home page + erpnext.css	2016-05-20 10:42:04 +05:30
Anand Doshi	e13c3ad048	[fix] [patch] homepage	2016-05-18 01:46:23 +05:30
Anand Doshi	0d66260d31	[fix] [patch] update home page	2016-05-17 10:21:08 +05:30
Rushabh Mehta	02f76dc0f9	[patch] [fix]	2016-05-16 11:46:29 +05:30
Rushabh Mehta	f1bdae4496	[patch] [fix]	2016-05-16 11:41:29 +05:30
Rushabh Mehta	c8b2a9d654	[patch] [fix]	2016-05-15 10:08:52 +05:30
Rushabh Mehta	9c6c0d2836	[patch] [fix]	2016-05-13 17:50:33 +05:30
Rushabh Mehta	d774f40497	remove print in homepage	2016-05-13 16:21:37 +05:30
Rushabh Mehta	4b9238a03b	[cleanup] homepage	2016-05-12 15:23:17 +05:30
Rushabh Mehta	d42167e0e5	[cleanup] remove Features Setup	2016-05-11 16:47:14 +05:30
Nabin Hait	f3bff49799	Merge branch 'master' into develop	2016-05-02 15:19:17 +05:30
Valmik Jangla	651dc5b345	Reset Values in Tools	2016-05-02 12:00:06 +05:30
Nabin Hait	3d9c5c0c20	Fixed Asset module cleanup and fixes	2016-04-20 17:57:11 +05:30
Nabin Hait	867dfec64b	Reload bin in reserved qty reposting patch	2016-04-20 11:53:34 +05:30
Rushabh Mehta	0525387328	[enhancement] added reserved_qty_for_production in bin and updated item dashboard	2016-04-18 19:27:46 +05:30
Rushabh Mehta	a305c29b0e	[cleanup] remove is_pro_applicable	2016-04-15 15:03:16 +05:30
Umair Sayyed	72534deea2	removed Is Sales Item and Is Purchase Item	2016-04-15 12:57:00 +05:30
Rushabh Mehta	c65726bf07	[patch] hide new icons if equivalent old ones are set	2016-04-15 12:51:28 +05:30
Nabin Hait	972c25f78d	Fixed conflict	2016-04-14 18:25:53 +05:30
Rushabh Mehta	15a7f215b9	[enhancement] heatmaps on item and notifications for item	2016-04-14 17:30:53 +05:30
Nabin Hait	e1433aab30	[fix] Fixed party update status patch	2016-04-09 16:12:40 +05:30
Rushabh Mehta	f16f9c569b	[enhancement] add status in customer, supplier	2016-04-08 17:21:00 +05:30
Anand Doshi	4b207647db	[fix] sanitize html of product bundle description	2016-04-05 18:34:11 +05:30
Nabin Hait	3a15c92c5e	Fixed Asset Depreciation first commit	2016-03-29 11:54:37 +05:30
Rushabh Mehta	c20c536f28	[fix] [wip] cleanup for collaborative pm	2016-03-25 17:22:17 +05:30
Rushabh Mehta	79a6fc9a84	[fix] recurring patch for purchase	2016-03-22 11:01:31 +05:30
Nabin Hait	2646f84a30	[patch] Fix delivery and billing status of recurring orders	2016-03-21 15:22:31 +05:30
Rushabh Mehta	7364f0cf1c	[patch-fix] remove old patches for web-forms	2016-03-21 14:47:35 +05:30
Nabin Hait	9a75530c26	[fix] reload doctype for renaming project	2016-03-18 16:19:25 +05:30
Saurabh	0f063a5f46	[patch] map customer_address to shipping_address and customer_address_display to shipping_address_display	2016-03-16 16:23:30 +05:30
Nabin Hait	a61930e7a7	[fix] reload doctype forcefully to rename project field	2016-03-16 12:29:32 +05:30
Neil Trini Lasrado	6e343e23d9	Renamed project_name to project	2016-03-15 17:50:53 +05:30
Anand Doshi	f319206d22	[fix] [hot] reload doctype Holiday List	2016-03-11 19:45:28 +05:30
Anand Doshi	4284fcf2a6	[fix] additional fixes for removal of Fiscal Year form Holiday List	2016-03-11 17:16:30 +05:30
shreyas	6f8dfa4c8d	[Minor] Fix print settings for custom print format	2016-03-07 18:22:40 +05:30
Rushabh Mehta	69cfab8559	[fix] [patch] recurring	2016-03-03 10:37:45 +05:30
Rushabh Mehta	5839a8d7f0	[fixes] usability cleanup of recurring document and added explicit submit_on_creation	2016-03-02 17:51:52 +05:30
Nabin Hait	5a4c7d3b62	[patch] repost valuation rate for serialized items	2016-02-29 12:07:42 +05:30
Nabin Hait	737849a0f5	[patch] Update stopped status to close	2016-02-25 15:16:02 +05:30
Neil Trini Lasrado	f79760ce2d	Mumtiple fixes	2016-02-23 18:35:45 +05:30
Neil Trini Lasrado	abd9248ba6	Rename sales_order_no to sales_order in Material Request Item	2016-02-23 18:35:43 +05:30
Rushabh Mehta	3cdf3544fb	[enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue	2016-02-08 18:50:40 +05:30
Anand Doshi	17d4fc4fa7	[enhancement] Merge Comment and Feed into Communication 💥 ... Depends on frappe/frappe#1532	2016-02-08 13:06:56 +05:30
Anand Doshi	9c24bec654	Merge branch 'nabinhait-mc_fix_5' into develop	2016-01-29 12:16:35 +05:30
Nabin Hait	ee8f88d641	[patch] Set party account currency in existing orders	2016-01-27 16:01:31 +05:30
Anand Doshi	01de945388	[cleanup] Removed 'Is Service Item' checkbox and filters ... 'Is Service Item' checkbox only worked for filtering Items in Maintenance Schedule and Maintenance Visit, and validating that Items in a Maintenance type Order were of type 'Service'. However, it doesn't fit an actual use case where any Sales Item could be given for Maintenance, making the checkbox an unnecessary addition.	2016-01-26 16:22:51 +05:30