13656 Commits

Author	SHA1	Message	Date
rohitwaghchaure	443691aaf8	[Fix] Allow to change exchange rate in the payment entry if allow stale is enabled (#12128)	2017-12-22 10:59:01 +05:30
Ameya Shenoy	3909bd4e9f	[agri] Disease task creation on new CropCycle fix (#12131)	2017-12-22 10:58:47 +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
tunde	e3104938ff	fix typo	2017-12-21 16:25:44 +01:00
Manas Solanki	45cb791878	Merge pull request #12130 from manassolanki/leaderboard ... remove the print statements	2017-12-21 13:04:25 +05:30
Manas Solanki	1f4b530e68	remove the print statements	2017-12-21 12:57:43 +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
Umair Sayed	82035c6c7a	Update index.md (#12118)	2017-12-21 11:55:05 +05:30
Nabin Hait	e591c85f7c	Payment schedule total amount validation considering write off amount	2017-12-21 11:47:08 +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
rohitwaghchaure	174900506e	[HotFix] Validation issue for subcontract stock entry (#12127) ... * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py	2017-12-21 11:28:01 +05:30
Nabin Hait	2f9f4f9c01	Multiple fixes related to payment terms (#12115)	2017-12-20 12:24:59 +05:30
rohitwaghchaure	84da00da2f	Allow to add items in manufacturing process which are not part of bom items (#12110)	2017-12-20 12:06:09 +05:30
Manas Solanki	8413f76c19	set the mandatory field in the backend (#12102)	2017-12-20 12:03:19 +05:30
Vishal Dhayagude	c8ecfa15f3	[new] Make Timesheet UX Added (#12100)	2017-12-20 12:02:34 +05:30
Ameya Shenoy	87b7844ae8	[Agri] Item amount set on item set (#12091) ... * [Agri] Item amount set on item set - closes #12008 - fixes #12010 * used frappe.call instead of frm.call in crop * made modifications for sql query for BOM Item - done since Crop doctype in Agri module also uses 'BOM Item' child table * hide BOM no from BOM Item childtable in Crop	2017-12-20 12:00:24 +05:30
Prateeksha Singh	9a57049faa	Merge pull request #12113 from pratu16x7/leaderboard ... Add Leaderboard to desktop	2017-12-20 11:39:05 +05:30
Prateeksha Singh	04c4ce353c	Add leaderboard to desktop	2017-12-20 10:51:25 +05:30
Saurabh	6386e9a1bd	[fix] set asset owner demo data	2017-12-19 14:52:07 +05:30
tundebabzy	dbd068c44b	Sales Order With Payment Terms Not Split In Payment Entry #12051 (#12065) ... * validate schedule dates in non-invoice documents * change query for orders * take care of orders with/without payment schedule * clean up, refactor, PEP8	2017-12-19 14:36:39 +05:30
Prateeksha Singh	41d2feab35	Merge pull request #12099 from pratu16x7/user-progress-items-fix ... Create item price only if item created	2017-12-19 12:54:58 +05:30
Prateeksha Singh	3942cd353a	create item price only if item created, fixes #12041	2017-12-19 12:53:39 +05:30
tundebabzy	90076bc3b5	Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12047) ... * split journal entry according to invoice due date * fix bug where reference_due_dates options are not populated: - after making JE, add options to _onload - use __onload to add options * cater for case where no payment_schedule	2017-12-19 11:58:31 +05:30
Ameya Shenoy	6e5b8bb5d3	fixed logic for creating disease tasks (#12081)	2017-12-19 11:41:10 +05:30
tundebabzy	5825dedf7c	Payment schedule error #12057 (#12096) ... * use 12 places precision for sums * use high float precision, fix decimal place late * Update accounts_controller.py	2017-12-19 11:39:20 +05:30
Nabin Hait	f592f2c9a9	Revert "[Fix] Payment terms validation issue" (#12098) ... * Revert "test fixed (#12094)" This reverts commit dd700a550f. * Revert "[fix] Column Heading in received item to be billed report (#12083)" This reverts commit 7c57b6ecd8. * Revert "[fix] Mobile no search issue in the pos (#12090)" This reverts commit b725affe0c. * Revert "[Fix] Payment terms validation issue (#12092)" This reverts commit 9b8e1cb10e.	2017-12-19 11:31:34 +05:30
Shreya Shah	dd700a550f	test fixed (#12094)	2017-12-19 11:24:07 +05:30
Vishal Dhayagude	7c57b6ecd8	[fix] Column Heading in received item to be billed report (#12083)	2017-12-19 11:23:34 +05:30
rohitwaghchaure	b725affe0c	[fix] Mobile no search issue in the pos (#12090)	2017-12-19 11:21:00 +05:30
rohitwaghchaure	9b8e1cb10e	[Fix] Payment terms validation issue (#12092)	2017-12-19 11:20:29 +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	ec1cb79e5f	Fetch employee advance in expense claim on adding it manually (#12069) ... * added trigger on manually adding an advance * improvised the query * codacy fix * updated	2017-12-18 18:06:01 +05:30
Zarrar	0acf687e20	Land unit tree (#12072) ... * improvise tree structure * remove set intro code * remove all land units dependency * test case corrected	2017-12-18 14:01:07 +05:30
Manas Solanki	2bca5a98ae	add the data import icon in the desktop.py (#12062)	2017-12-18 13:55:30 +05:30
rohitwaghchaure	e067beda49	[fix] Promise issue, in cart against item displaying zero values (#12078)	2017-12-18 12:32:49 +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
rohitwaghchaure	938a1fee80	[minor] Tax id of supplier not fetching in purchase invoice (#12052)	2017-12-16 10:51:07 +05:30
Kenneth Sequeira	9bceb388c8	changed dead YouTube link for videos (#12053)	2017-12-16 10:50:29 +05:30
rohitwaghchaure	1bc47fa43c	[fix] Sales order tax not fetching on the sales invoice (#12055)	2017-12-16 10:49:58 +05:30
Ameya Shenoy	eb8446f01f	Agri fixes (#12033) ... * crop_cycle, moving point in geojson from js to py * crop fields are fetched into crop_cycle - fixes #12011 * area is a readonly field - fixes #11994 * [agri] land unit child geojson bug fixed * set_intro null if parent field entered, list only group nodes * minor fixes	2017-12-16 10:43:35 +05:30
Nabin Hait	2a9dc9019a	Fixed closing debit/credit in general ledger report	2017-12-15 19:41:20 +05:30
Prateeksha Singh	228c341d12	[setup-progress] Rerun letterhead slide patch	2017-12-15 18:32:27 +05:30
Nabin Hait	2afcff1852	Get outstanding invoices on payment entry	2017-12-15 17:32:03 +05:30
Nabin Hait	b9ca91a832	Update company.py	2017-12-15 17:23:11 +05:30
Faris Ansari	c7b92b73a6	fix patches for v7 sites (#12043)	2017-12-15 16:49:11 +05:30
Manas Solanki	53e47e6ba5	frappe call only if item code or serial no is ther (#12036)	2017-12-15 15:47:52 +05:30
Nabin Hait	13435dddcc	BOM: Fetch valuation rate of raw materials from Item master if not found based on SLE	2017-12-15 15:46:43 +05:30
rohitwaghchaure	78a17355be	[fix] Item search in POS (#12037)	2017-12-15 15:38:12 +05:30
Nabin Hait	6a640b78c4	Minor fixes in payroll entry and opening invoice tool	2017-12-15 15:34:14 +05:30
rohitwaghchaure	5a344576b8	[minor] Address fix (#12025)	2017-12-15 13:14:36 +05:30
Nabin Hait	9771b9376d	Merge branch 'master' into develop	2017-12-15 12:53:56 +05:30
Nabin Hait	2f22d2b307	bumped to version 9.2.23	2017-12-15 13:23:54 +06:00
rohitwaghchaure	ce8adecbad	Incoming rate fixes (#11986)	2017-12-15 12:13:50 +05:30
Jignesh Greycube	7f13283b66	Renamed Tax Breakup Label to In Words (#12016) ... Detailed Invoice Print format, Renamed "Tax Breakup" Label to "In Words"	2017-12-15 11:59:30 +05:30
tundebabzy	1d459c4327	Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12019) ... * don"t summarise due_dates query * reference_due_date to fetch outstanding based on due date * use if else so that no need to do useless checks * clear debit and credit fields before fetching outstanding * grid keeps forgetting drop down so add to options * clear debit and credit fields before fetching outstanding properly	2017-12-15 11:29:27 +05:30
Vishal Dhayagude	d377018695	[fix] Shipping charges change on qty, item_code and conversion_factor trigger (#12001) ... * [wip] shipping rule * [wip] Shipping Rule tax auto calculate * [wip] Shipping Rule * [new] Shipping charges change on different triggers * [minor] Removed unnecessary comments * [fix] Minor Changes in function calls	2017-12-14 18:06:02 +05:30
Pawan Mehta	d6cb617520	Fix 11948 - Sales Payment Summary (#11950) ... * [fix] #11948 * [fix] #11948 * [fix] #11948 * codacy issues	2017-12-14 18:04:31 +05:30
Nabin Hait	6b0d4bd01b	Minor fixes related to employee advance	2017-12-14 18:03:10 +05:30
Saurabh	65b3356dee	[fix] merge case in rename_translated_domains_in_en #11879 (#12007)	2017-12-14 16:52:50 +05:30
rohitwaghchaure	2b95a5438b	POS batch fixes (#12005)	2017-12-14 16:06:23 +05:30
Vishal Dhayagude	ee7b4f00f8	[minor] Chapter head link with Member (#12003)	2017-12-14 13:26:22 +05:30
Nabin Hait	d0249b0880	Employee advance (#11875) ... * Employee Advances against Expense Claim * added employee advance test cases and docs * Default Employee Advance Account field in company * Cleanup and fixes of employee advance	2017-12-14 13:25:57 +05:30
tundebabzy	02b4b5f526	Payroll Entry (#11936) (#11968) ... * add functions for tracking related salary slips * PEP 8 style * put buttons into Make based on context * add function to test for bank entry journal * refeactor `add_bank_entry_button` * "View Salary Slips" made a standalone secondary button * set_inner_btn_group for Make Bank Entry * refresh button after journal is submitted * edit javascript test case * codacy * fix as per review * no longer use $c	2017-12-14 13:15:28 +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
Shreya Shah	a2cfd97cd7	fetch party name (#11985)	2017-12-14 12:42:01 +05:30
Umair Sayed	4667cb2f62	Update implementation-strategy.md (#12002)	2017-12-14 12:21:47 +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	5759258dcf	[fix] Added total closing in general ledger (#11961)	2017-12-13 18:57:37 +05:30
rohitwaghchaure	40f5d8edd4	[fix] Pull subcontracted item if subassembly is not defined (#11996)	2017-12-13 18:51:05 +05:30
Ameya Shenoy	cc05c0b348	Agri fixes (#11988) ... * minor fixes in agri * updated desktop.py * [agri] fixed recreation of dotypes in setup.py * setup_wizard changes - converted agriculture from alpha to beta - rearranged the domains alphabetically * [agri] linked doctype is collapsible	2017-12-13 18:50:39 +05:30
Shreya Shah	8cad3f12a2	Salary Slip not updating when adding/removing Timesheet links (#11982) ... * timesheet on salary slip * changes * cal total wages * calculate gross_pay and net_pay * codacy fix	2017-12-13 18:43:01 +05:30
Nabin Hait	aaf378e340	Validate numeric attribute value based on range defined in template (#11981)	2017-12-13 18:40:52 +05:30
Zarrar	de8f6120f3	[Fix] Restrict domain specific roles (#11975) ... * restrict roles to its specific domain * missing hook for Non Profit	2017-12-13 18:36:08 +05:30
rohitwaghchaure	659b46832c	[fix] Patch (#11976)	2017-12-13 18:35:22 +05:30
Saurabh	aa66fa17d7	key fix in demo setup completion (#11980)	2017-12-13 18:34:43 +05:30
Manas Solanki	56f5b5f75c	Update the desktop.py (#11974) ... Remove the data import desktop icons	2017-12-13 11:28:18 +05:30
Nabin Hait	0f97eda7c9	Merge branch 'master' into develop	2017-12-12 19:17:53 +05:30
Nabin Hait	66456dae34	bumped to version 9.2.22	2017-12-12 19:47:51 +06:00
Zarrar	21ea6cdb91	batch.expiry should be sorted in ascending order too (#11960)	2017-12-12 18:54:17 +05:30
Nabin Hait	af9bdfeaa3	Fixed calculation of taxes and totals if tax is entered as Actual, for Deduction or valuation (#11965)	2017-12-12 18:50:05 +05:30
Nabin Hait	aab1182c73	Update stock_entry.js	2017-12-12 18:45:39 +05:30
Pawan Mehta	bb7fab52d1	[fix] #11880- Item wise report showing price list and stock available (#11885) ... * [fix] #11880 * review comments * codacy fixes	2017-12-12 15:05:03 +05:30
KanchanChauhan	34ed1df9ef	[Minor] Update Status based on Asset Maintenance and Asse Repair (#11886)	2017-12-12 15:03:21 +05:30
Charles-Henri Decultot	d18423d9c7	Project Margin Calculation Improvement (#11911) ... * Project Margin Calculation Improvement * Documentation modification * Change Total Planned Sales to Total Sales Amount * Change documentation screenshot	2017-12-12 14:59:59 +05:30
Maxwell Morais	d06b7049c7	Allow manufacturing order from SO with Packed Items that contains BOM's (#11947)	2017-12-12 14:46:16 +05:30
rohitwaghchaure	4e17fae63b	[enhance] UAE/KSA VAT/Excise implementation (#11923)	2017-12-12 14:40:52 +05:30
Shreya Shah	ea723e59c6	POS Profile validation message rephrased (#11934) ... * pos validation message improvised * removed unused field	2017-12-12 14:24:00 +05:30
Shreya Shah	db499dcaa4	fixed fiscal dates (#11939)	2017-12-12 14:19:35 +05:30
tundebabzy	f628184c68	Error in Opening Invoice creation Tool (#11938) (#11941) ... * add qty field * cast qty to float * PEP8 compliance	2017-12-12 14:19:07 +05:30
tundebabzy	ff1b875661	Improve Validation Message in the Payroll Entry (#11937) (#11944) ... * change error message from `create_log` * PEP 8 compliance	2017-12-12 14:18:14 +05:30
rohitwaghchaure	47749f4635	[fix] Cur_frm breaking offline pos (#11955)	2017-12-12 14:16:03 +05:30
Manas Solanki	6a415bd32d	set desktop icons (#11953)	2017-12-12 13:24:13 +05:30
Nabin Hait	de1e29bf1b	Production Order fixes (#11951) ... * Production Order from Sales Order fixes: Validate SO and set required items on save * Codacy fixes	2017-12-12 13:22:48 +05:30
Prateeksha Singh	1126a43979	[fix] hub connection, fixes #11357	2017-12-11 23:22:30 +05:30
pawan	1892454036	Add Total Row	2017-12-11 17:48:56 +05:30
KanchanChauhan	3ca00c7143	Items should not be used from Sample Retention warehouse (#11905)	2017-12-11 14:59:19 +05:30
rohitwaghchaure	d19be49889	[fix] Error opening the POS (#11929)	2017-12-11 14:57:43 +05:30
Shreya Shah	1b30642362	cal difference amount when qty 0 (#11925)	2017-12-11 14:56:57 +05:30
rohitwaghchaure	efbc0667ec	[fix] On change of payment terms template, not fetch respective schedule data (#11928)	2017-12-11 14:54:20 +05:30
rohitwaghchaure	505661b5c0	[fix] Wrong company's default tax fetch (#11927)	2017-12-11 14:52:28 +05:30
Manas Solanki	3fe59b4443	remove the unnecessery files (#11922)	2017-12-11 13:01:27 +05:30
KanchanChauhan	236ac5eb38	[Fix] Customer and Address blank if does not exist in Delivery Stops (#11895)	2017-12-11 12:38:30 +05:30
KanchanChauhan	7f8df06663	[Minor]Removed alert=true from frappe.throw (#11904)	2017-12-11 12:24:43 +05:30
Prateeksha Singh	0419e2384d	reinitialize variant attribute table, fixes #11900 (#11921)	2017-12-11 12:22:28 +05:30
Nabin Hait	d10014bdeb	minor fix in fetching payment terms template	2017-12-08 16:51:53 +05:30
Asharam Seervi	98d5878aa2	Added Column Break in Item Master (#11887) ... * Fixed: On Item form, added cb. * Fixed: On Item form, added cb.	2017-12-08 16:18:23 +05:30
Shreya Shah	6b64947f47	Route to Payment Entry instead of Journal Entry in paid Expense Claim (#11874) ... * route fixed * improvised	2017-12-08 16:14:23 +05:30
Zarrar	17fd6610dc	Fix travis (#11882) ... * fieldname wrong * bifurcated test into two - error when both were running async * minor fixes with link and route * move school domain rename up * fix async creation of operations test * edit-in-full-page is button, not link * set_route issue in production order test * minor changes * fix task tree test * more fixes * fix server side issue * improvising ui tests	2017-12-08 14:57:38 +05:30
Zarrar	2ba198ec70	improvise query (#11878)	2017-12-08 11:35:53 +05:30
Vishal Dhayagude	6d250f8789	[fix] Missing value Net Weight Added in Calculate Based On select field (#11883)	2017-12-08 11:35:18 +05:30
Shreya Shah	88dbc26a98	replace process payroll (#11873)	2017-12-07 18:24:42 +05:30
Zarrar	5ee5d43295	ontrash of nestedset wasn't ideal for employee's usecase (#11876)	2017-12-07 17:16:59 +05:30
Ameya Shenoy	396feba874	agri_docs fix links (#11870)	2017-12-07 12:53:57 +05:30
Nabin Hait	4cad7fc36c	Fixed Merge conflict	2017-12-07 12:04:19 +05:30
Nabin Hait	6674ba8bd1	bumped to version 9.2.21	2017-12-07 12:33:40 +06:00
Nabin Hait	5de499e5d5	Minor cleanups	2017-12-07 12:01:06 +05:30
pawan	271b7cd4f9	codacy issues	2017-12-07 12:01:00 +05:30
pawan	19f09b0b69	fix codacy issues	2017-12-07 12:00:06 +05:30
pawan	d8e91982ca	Fixed Merge conflict	2017-12-07 12:00:01 +05:30
Ameya Shenoy	e0d461c2eb	[Agriculture] documentaion (#11867)	2017-12-07 11:53:12 +05:30
Doridel Cahanap	9f7e109c3e	[minor] Fix Delivery Trip Error (#11868)	2017-12-07 11:52:33 +05:30
Nabin Hait	97b8a7b237	Minor fixes in payroll entry	2017-12-06 19:55:57 +05:30
Nabin Hait	bb09437d1f	Merge branch 'develop' into payroll_entry	2017-12-06 19:18:40 +05:30
Shreya Shah	b13a54ac74	Checkbox in Price list for Price not UOM dependant (#11836) ... * checkbox price not uom dependant * change price list rate on uom dependancy condition * test case * Update get_item_details.py	2017-12-06 19:17:03 +05:30
KanchanChauhan	f6aff3de96	[New Feature] Sample Retention from a Batch of item recieved (#11624)	2017-12-06 18:38:01 +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
Vishal Dhayagude	d4e439906c	[fix] Modification in Non Profit docs (#11862)	2017-12-06 18:02:31 +05:30
Zlash65	5fc8923322	fix setup-wizard leftovers	2017-12-06 17:04:03 +05:30
Nabin Hait	c84476bd27	Fixed merge conflict	2017-12-06 14:17:51 +05:30
Nabin Hait	7de5d3bb1d	bumped to version 9.2.20	2017-12-06 14:47:13 +06:00
Manas Solanki	a160879159	set the reference document in the payment entry while creating from fees (#11861) ... * set the reference document in the payment entry while creating from fees * allocate the paid amount in the reference document	2017-12-06 14:05:39 +05:30
Prateeksha Singh	7351709980	[multicheck] Select multiple domains in setup (#11709) ... * [multicheck] select multiple domains in setup * use multiple domains in make_sample_data * revert to setting in domains child table * domains slide validation * update setup wizard test	2017-12-06 13:28:06 +05:30
rohitwaghchaure	1b16bca843	[minor] Escape special characters (#11855)	2017-12-06 13:16:06 +05:30
tundebabzy	6a418f2a9b	change Purchase Taxes and Charges default to 'Total' (#11857)	2017-12-06 13:15:33 +05:30
rohitwaghchaure	d52c64ff11	[fix] Show total for opening and closing dr/cr (#11860)	2017-12-06 13:14:28 +05:30
Nabin Hait	51ce1027de	non-profit module cleanups	2017-12-06 12:58:04 +05:30
Nabin Hait	419db49806	non-profit module cleanups	2017-12-06 12:57:53 +05:30
Vishal	54f5b115a7	[new] Role added	2017-12-05 17:51:15 +05:30
Vishal	474d58cecf	[fix] minor changes	2017-12-05 17:19:02 +05:30
Vishal	5ffbd4f492	[fix] Reviewed Modification in Grant Application	2017-12-05 16:41:09 +05:30
Vishal	91236fa9d6	[fix] Reviewed modification on donor and volunteer	2017-12-05 16:41:09 +05:30
Vishal	139545a0f7	[fix] Minor changes in membership	2017-12-05 16:41:09 +05:30
Vishal	74116172b8	[fix] Reviewed Chapter Doctype Modification	2017-12-05 16:41:09 +05:30
Vishal	debc93c58a	[new] Non Profit Domain patch added	2017-12-05 16:41:09 +05:30
Vishal	5ade836713	[new] Non Profit Documentation Modified	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	55480491bf	[minor] changes added in member and membership doctype	2017-12-05 16:41:09 +05:30
Vishal	5a4611df95	[fix] fetch expiary date from membership to member doctype	2017-12-05 16:41:09 +05:30
Vishal	0dbf00a283	[fix] Minor changes in grant application	2017-12-05 16:41:09 +05:30
Vishal	344f5d9cd6	[fix] Minor changes in grant_application.html	2017-12-05 16:41:09 +05:30
Vishal	155ec4ba58	[new] Grant application doctype clean up after review	2017-12-05 16:41:09 +05:30
Vishal	74fb550a70	[new] sidebar added on chapter web page	2017-12-05 16:41:09 +05:30
Vishal	a72a3bd536	[new] Chapter Module clean up after review	2017-12-05 16:41:09 +05:30
Vishal	fe0c6c8e28	[fix] Non Profit Domain clean up after review	2017-12-05 16:41:09 +05:30
Vishal	a68234d345	[new] Fontawesome icon added	2017-12-05 16:41:09 +05:30
Vishal	fca5cfe986	[fixed] Codacy fixed	2017-12-05 16:41:09 +05:30
Vishal	397a8761f7	[new] Convert Non Profit Module into Non Profit Domain	2017-12-05 16:41:09 +05:30
Vishal	43977a1422	[fix] Minor Changes in grant_application.py	2017-12-05 16:41:09 +05:30
Vishal	fa8f762805	[fix] Grant Application Url added in message body on sendmail	2017-12-05 16:41:09 +05:30
Vishal	da05b3ce7f	[fix] Modified Grant Application Test	2017-12-05 16:41:09 +05:30
Vishal	b4a8e11edc	[new] Account table added in Grant Application	2017-12-05 16:41:09 +05:30
Vishal	1a88562ef9	[new] Assessment Manager for grant Review, web portal added	2017-12-05 16:41:09 +05:30
Vishal	7c7c3522cb	[new] Codacy fixed	2017-12-05 16:41:09 +05:30
Vishal	a6a302f8a6	[new] Grant Application Web Form Added	2017-12-05 16:41:09 +05:30
Vishal	6a4fd7d89e	[fix] UI Test	2017-12-05 16:41:09 +05:30
Vishal	788f41707e	Chapter Message Link field added	2017-12-05 16:41:09 +05:30
Vishal	5cd70bed25	[new] Test Cases Added for Non Profit	2017-12-05 16:41:09 +05:30
Vishal	86140c8659	[fix] Codacy Issue	2017-12-05 16:41:09 +05:30
Vishal	f86984c785	[fix]travis build issue	2017-12-05 16:41:09 +05:30
Vishal	d051921ff8	[fix] Codacy issue	2017-12-05 16:41:09 +05:30
Vishal	722c06e819	[fix] travis	2017-12-05 16:41:09 +05:30
Vishal	1ebdeacee3	UI Test Added for Membership Type	2017-12-05 16:41:09 +05:30
Vishal	1c5bf8e3ca	modified index.md	2017-12-05 16:41:09 +05:30
Vishal	d5d0813b2d	[new] Modified Doctypes for list view	2017-12-05 16:41:09 +05:30
Vishal	2c9ce190eb	[new] Grant Application Doctype Added	2017-12-05 16:41:09 +05:30
Vishal	18ac423c47	[new] Volunteer skills and Availability Added	2017-12-05 16:41:09 +05:30
Vishal	7525bc6f1d	[new] Doctype Donor and Volunteer Added	2017-12-05 16:41:09 +05:30
Vishal	b4d73cbda0	[fix] Imported getdate in erpnext	2017-12-05 16:41:09 +05:30
Vishal	546130c046	Documentation added for Non Profit	2017-12-05 16:41:09 +05:30
Vishal	b4cda1b4a1	[fix] Address field removed in Member	2017-12-05 16:41:09 +05:30
Vishal	10608e8c65	[fix] Removed address field in Member doctype	2017-12-05 16:41:09 +05:30
Vishal	e01846051d	Membership Type shows under memberhip section	2017-12-05 16:41:09 +05:30
Vishal	3a75a5e9b5	New Party Type Member Added	2017-12-05 16:41:09 +05:30
Vishal	5dae126f56	Membership Doctype Added	2017-12-05 16:41:09 +05:30
Vishal	cc06d291c6	link member in dynamic link table	2017-12-05 16:41:09 +05:30
Vishal	50f13e17a7	[new] Chapter Doctype Added	2017-12-05 16:41:09 +05:30
Vishal	ca61453fa3	[new] Non Profit module Added	2017-12-05 16:41:09 +05:30
rohitwaghchaure	3a5ca927e7	[Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category (#11848) ... * [Fix] Asset depreciations and balances report showing wrong accumulated depreciation amount if multiple asset against same asset category * Update asset_depreciations_and_balances.py	2017-12-04 19:29:03 +05:30
Zarrar	c47745ea83	only fetch distinct names of events (#11846)	2017-12-04 19:23:20 +05:30
Kenneth Sequeira	406cb920ae	Documentation Update (#11844) ... * Delete payment-tool.md * Update index.txt Removed Payment Tools from Index * Update index.txt removed barcode setup from index * Delete barcode-1.png removed barcode-1.png * Delete barcode-2.png * Delete bar-code.md removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master. * Delete bar-code.md removing barcode set up as functionality is deprecated. Barcode can be directly entered in Item Master. * Update index.txt remove bar-code set up link from index de (german) * Update index.txt remove bar-code set up link from index de (german)	2017-12-04 19:22:50 +05:30
Manas Solanki	e6fd07fda9	Changes in the Fee structure (#11842) ... * academic year non mandatory in the fee structure and minor changes * update the docs	2017-12-04 19:21:50 +05:30
Shreya	e570e4a049	fixed a test	2017-12-04 16:49:44 +05:30
Shreya	f8e7bc7c5b	removed process payroll doctype	2017-12-04 16:49:44 +05:30
Shreya Shah	db332f2c08	employee_details table added	2017-12-04 16:49:44 +05:30
Shreya	9956f15c80	added py test	2017-12-04 16:49:44 +05:30
Shreya	b5dff03453	added changes from process payroll	2017-12-04 16:49:44 +05:30
Shreya	d1defa5fc7	set salary components	2017-12-04 16:49:44 +05:30
Shreya	d73dd056d6	test case	2017-12-04 16:49:44 +05:30
Shreya	7b2870431e	new doctype payroll_entry	2017-12-04 16:49:44 +05:30
Shreya	eba3f39bbe	test delivery trip fix	2017-12-04 16:04:56 +05:30
Shreya	3febe0215e	test asset fix	2017-12-04 16:04:42 +05:30
Shreya Shah	8ee1ea456d	travis fix (#11841)	2017-12-04 14:28:02 +05:30
Nabin Hait	a11dcb6e59	Pull items in Stock Entry from Purchase Invoice (#11839)	2017-12-04 13:36:50 +05:30
rohitwaghchaure	148fccd45a	[Fix] Wrong value showing in the email digest (#11840)	2017-12-04 13:36:01 +05:30
Manas Solanki	3bac586ee2	fix in the assessment result tool while entering the zero marks (#11837)	2017-12-04 12:55:10 +05:30
tundebabzy	3061fc92fd	Batch Stock Items, having serial number can't be moved without inserting Serial Number (#11792) (#11813) ... * if doctype is batch, add extra information to args * automatically fetch serial numbers if possible * take advantage of changes in make_stock_entry * code clean up * PEP 8 compliance * fix bug that clears serial number	2017-12-04 11:23:21 +05:30
Zarrar	5e470f757f	[Fix] Filter on child table not working in Calendar (#11824) ... * use the new get_events method * using the common get_events method for calendar_view * using add_fetch to fill customer_name	2017-12-04 11:22:25 +05:30
Charles-Henri Decultot	8a052cb153	Translation issue (#11833)	2017-12-04 11:17:05 +05:30
vwithv1602	78d5ccf5fc	Invalid return against purchase invoice Error - Issue#11834 (#11835)	2017-12-04 11:16:34 +05:30
tundebabzy	1fb285c165	hide html example in print (#11830)	2017-12-04 11:13:36 +05:30
Shreya Shah	11938a47ec	fixed typo (#11825)	2017-12-01 17:38:26 +05:30
Saurabh	d505d83cb6	[fix] merge conflicts	2017-12-01 16:23:46 +05:30
Saurabh	a067ddbc20	bumped to version 9.2.19	2017-12-01 16:52:43 +06:00
Charles-Henri Decultot	e90a1caeb1	Portal print format correction (#11812) ... * Portal print format correction * Correction following Rushabh's comment	2017-12-01 16:19:45 +05:30
Kenneth Sequeira	9e27b347ca	Delete payment-tool.md (#11820) ... * Delete payment-tool.md * Update index.txt Removed Payment Tools from Index	2017-12-01 16:17:53 +05:30
KanchanChauhan	8380253178	On changing assign_to assign maintenance task in Asset Maintenance (#11804)	2017-12-01 16:14:05 +05:30
Jamsheer	f4d9af1ab9	Fix Patch - remove company from patient (#11819)	2017-12-01 16:10:39 +05:30
rohitwaghchaure	b1ac979ac5	[fix] Do not allow zero valuation rate for serial no and fetch previous valuation rate for serial no (#11817)	2017-12-01 16:09:02 +05:30
Nabin Hait	7a294e6ef5	Update asset_category.json	2017-11-30 18:02:22 +05:30
Nabin Hait	5e801955f1	Update asset_category.json	2017-11-30 18:01:56 +05:30
Saurabh	34a0e90115	[fix] merge conflicts	2017-11-30 16:45:01 +05:30
Saurabh	f9509a084a	bumped to version 9.2.18	2017-11-30 17:11:46 +06:00
Nabin Hait	1b89be0c66	Fixed rounding issue in subcontracting (#11802)	2017-11-30 15:59:56 +05:30
rohitwaghchaure	e34ef60e3e	[fix] Asset test cases and added make_sales_invoice (#11800) ... * [fix] Asset test cases and added make_sales_invoice * vehicle trip test cases	2017-11-30 15:59:40 +05:30
Faris Ansari	ec3be9eebf	[hotfix] Party Type name (#11797)	2017-11-30 15:53:39 +05:30
Nabin Hait	c5e0d22464	Update set_delivery_date_in_so_item.py	2017-11-30 15:52:47 +05:30
Nabin Hait	e761b9de40	Rearranged fields due to merge conflict messup	2017-11-30 14:29:10 +05:30
Vishal Dhayagude	8677cd1565	[patch] Patch added to rename net_weight field (#11798)	2017-11-30 13:52:30 +05:30
Manas Solanki	f9cc56cd62	minor fixes in the assessment result tool (#11795)	2017-11-30 11:39:06 +05:30
tundebabzy	ce63ab7602	Show Batch Selector Dialog Only If There Are Multiple Batches (#11794) ... * check if multiple batches available before showing dialog * Update point_of_sale.js	2017-11-30 11:38:53 +05:30
tundebabzy	8ae53cacc5	When Warehouse Field Is Changed, Batch Number Field Should Be Updated (#11789) (#11790) ... * reset batch_no field if no batch number returned * on warehouse change, query for batch number	2017-11-30 11:37:21 +05:30
Shreya	c0c470b56d	fixed json affected by latest merge	2017-11-29 19:31:15 +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
Rohit Waghchaure	17e03cf3fc	[minor] Removed hidden for field pos profile	2017-11-29 17:40:42 +05:30
Rushabh Mehta	0154538c06	[fix] [minor] pos.js	2017-11-29 16:42:02 +05:30
Vishal Dhayagude	855e390265	[fix] Sales Invoice json conflict (#11779)	2017-11-29 16:25:24 +05:30
rohitwaghchaure	1b344ca81e	[Fix] POS not loading if pos profile not defined (#11778)	2017-11-29 16:21:51 +05:30
Vishal Dhayagude	d42242df22	[Feature] Shipping Rule Calculation based on Net Weight (#11770) ... * [new] Calculate shipping tax based on weight * [fix] Change field name weight to weight_per_unit in SI Item * [new] Shipping Rule based tax for selling module * [new] Shipping rule based on weight added to Buying module * [fix] Conflict in jsons * [fix] Removed Redudant add_fetch * [fix] Codacy fixed * [fix] Print hide added	2017-11-29 16:09:59 +05:30
KanchanChauhan	2d1cbd0b2e	Delete old asset doctypes from Accounts module and minor changes (#11766)	2017-11-29 16:03:00 +05:30
Nabin Hait	ad2a3e4f38	Cleanup and fixes on delivery trip	2017-11-29 15:53:01 +05:30
Nabin Hait	46e285efe9	Merge branch 'add_delivery' of https://github.com/creamdory/erpnext into creamdory-add_delivery	2017-11-29 14:15:16 +05:30
rohitwaghchaure	f591a220c9	Fetch items of item groups defined in the pos profile (#11763)	2017-11-29 13:55:13 +05:30
Zarrar	c43c5cae5a	Set query sales order (#11772) ... * set_query for sales order based on production_item * codacy fix * check in packed item to fetch sales order * Update production_order.py	2017-11-29 13:54:35 +05:30
rohitwaghchaure	2fb8cc5f2c	[fix] Options must be a valid DocType for field Asset Category in row 18 (#11773) ... * [fix] Options must be a valid DocType for field Asset Category in row 18 * test cases	2017-11-29 13:50:04 +05:30
tundebabzy	2a4fefc6ff	Auto fetch batches based on quantity on POS (#11004) (#11767) ... * prevent premature escape when item has serial no and batch no * fetch actual_batch_qty for item * add available_qty to dialog * remove expired batches from drop-down * Update queries.py	2017-11-29 10:53:09 +05:30
Julian Robbins	d785e22211	Fix spelling of accessibility (#11765)	2017-11-29 10:49:12 +05:30
tunde	0d82b6979e	add missing field and value parameters	2017-11-28 23:30:03 +01:00
tundebabzy	bc7c387a0d	set read only property properly (#11761)	2017-11-28 22:40:05 +05:30
Prateeksha Singh	bf31d853e7	Merge pull request #11762 from manassolanki/fix ... fix for module in the new report	2017-11-28 19:08:52 +05:30
Manas Solanki	34a8be83ea	delete the old files	2017-11-28 18:47:56 +05:30
Manas Solanki	49ff065684	fix for the new report module	2017-11-28 18:44:06 +05:30
Manas Solanki	84e9d45055	Minor fixes for the Education domain (#11758) ... * add the new role Education Manager for education settings * minor changes in the hooks for bootinfo * Fix for amending the assessment plan	2017-11-28 18:04:08 +05:30
Nabin Hait	cf9573ab2f	Removed asset doctypes files from accounts module and patches	2017-11-28 16:56:53 +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
Kanchan Chauhan	e58a41a8a2	Added maintenance to Asset and enhanced maintenance for Asset Maintenance	2017-11-28 15:14:56 +05:30
Nabin Hait	35cd1d325f	[fix] Set GST State code based on state, even if GSTIN not mentioned (#11755)	2017-11-28 13:01:01 +05:30
Doridel Cahanap	de82fe9e8f	[minor] Set Rename for Training Program (#11740)	2017-11-28 11:26:23 +05:30
Saurabh	b750b304dd	fixed merge-conflicts	2017-11-28 11:02:28 +05:30
Saurabh	d86ace41a1	bumped to version 9.2.17	2017-11-28 11:30:17 +06:00
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
Saurabh	8eda0cc8ba	[fix] validate bom if order type is subcontracting (#11705) ... * [fix] validate bom if order type is subcontracting * [fix] moved validation to server side	2017-11-28 10:41:35 +05:30
rohitwaghchaure	a14baf4188	Merge pull request #11739 from rohitwaghchaure/payment_terms_test_case ... [fix] payment terms test case	2017-11-27 12:05:57 +05:30
Saurabh	9d0092f89a	[fix] pull source warehouse from production order child table (#11718)	2017-11-27 12:04:41 +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
Charles-Henri Decultot	22641e44ad	Allowing the creation of an Oganization as Lead (#11724) ... * Allow the creation of an organization lead * Changes following test fails * Test case correction	2017-11-27 11:58:22 +05:30
Shreya Shah	dcbc4284d3	expenses included in valuation account type in purchase taxes and charges (#11725)	2017-11-27 11:48:09 +05:30
Rohit Waghchaure	52bf56d415	[fix] payment terms test case	2017-11-27 11:43:52 +05:30
rohitwaghchaure	373b5702a9	[fix] Server test cases (#11727)	2017-11-27 11:27:28 +05:30
Saurabh	ab5e77ecf1	[fix] do not pull disabled pos profiles (#11733)	2017-11-27 11:26:13 +05:30
rohitwaghchaure	15f8fe0179	[fix] Batch selected in the sales transaction for non batch item (#11713)	2017-11-24 10:46:27 +05:30
Saurabh	41f60546a1	[fix] do not allow user to create party type (#11706)	2017-11-23 18:02:51 +05:30
Nabin Hait	82ef26b327	Minor fix in patch	2017-11-23 17:57:33 +05:30
Nabin Hait	aa5b566ea9	Merge branch 'ashish-greycube-feature_10861-1' into develop	2017-11-23 17:49:25 +05:30
Nabin Hait	68768252ce	Cleanup and fixes on bypass credit limit check on sales order	2017-11-23 17:48:59 +05:30
Rohit Waghchaure	09b39f06ea	Code cleanup	2017-11-23 16:30:10 +05:30
Nabin Hait	57952f6946	Merge branch 'develop' into feature_10861	2017-11-23 16:12:55 +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
tundebabzy	acccdb3890	Default batch number selection (#11454) ... * fetch batch_no in `get_basic_details` * PEP8 changes and docstring * only auto-fetch batch number for Sales documents: otherwise, automatic batch creation will not work properly because all new stock will be added to old batch * new function to fetch batch number using FEFO: FEFO - First Expiring First Out * fetch batch number in `get_basic_details` using FEFO * add new function - `set_batch_number` * `set_batch_number` when `qty` is triggered * `set_batch_number` when `uom` is triggered * whitelist `get_batch_no_fefo` * code clean up * move `set_batch_number` to conversion_factor instead of uom * rename `get_batch_no_fefo` to `get_batch_no` * fix test case * final cleanup * Revert "fetch batch_no in `get_basic_details`" This reverts commit dd024b1eb369eaeafab28165d523fb7a9f8ab8d3. * fix test case * update Sales Invoice manual * move changes away from `transaction.js` * query should not fetch expired batches * refactor `get_batch_no`: add new function `get_batches` * Update batch.py	2017-11-23 13:05:15 +05:30
Nabin Hait	82027ea3bf	Set print hide property for payment terms	2017-11-23 12:49:42 +05:30
Manas Solanki	30babee2ef	add courses in the program enrollment (#11694)	2017-11-23 12:19:57 +05:30
Zarrar	a90274fed9	linking issue in dashboard (#11701)	2017-11-23 12:19:40 +05:30
Jamsheer	1ce56316ea	Populate patient_name in Healthcare Doctypes (#11690) ... * On Cancel Consultation - Open Appointment - Delete Medical Record * Add Filter on Account Selection - is_group: 0 * Patient Medical Record - List view Fixes * Update consultation.py * Set Appointment Refrence in Vital Signs * Add Other in Gender Selection * Populate patient_name in Healthcare Doctypes	2017-11-23 12:18:43 +05:30
Saurabh	ed4191ec5b	[fix] merge-conflicts	2017-11-22 18:01:56 +05:30
Saurabh	4bc12b68e4	bumped to version 9.2.16	2017-11-22 18:24:18 +06:00
Nabin Hait	02ac901345	[fix] Rounding adjustment in company currency	2017-11-22 16:12:20 +05:30
rohitwaghchaure	4dc5f0efaf	[Fix] Item details not fetching if item has no default bom (#11688)	2017-11-22 15:21:47 +05:30
Nabin Hait	96abfd2ab9	[fix] In payment entry, run some events serially to avoid async issue	2017-11-22 15:13:16 +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
Zarrar	657ceef105	skipped tax_account (#11678)	2017-11-21 17:40:22 +05:30
Faris Ansari	6ca6a69070	Course Scheduling Tool (#11676) ... * [education] Fix Course Scheduling Tool * minor	2017-11-21 17:28:51 +05:30
Rushabh Mehta	476c66d699	[fix] tests.txt	2017-11-21 17:02:39 +05:30
Rushabh Mehta	26ca6afd11	[fix] test.txt for accounts	2017-11-21 16:17:58 +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
Makarand Bauskar	75443a94ee	[minor] set the pos profile name while creating demo (#11664)	2017-11-21 16:12:40 +05:30
Zarrar	f71f3af938	adding task to root node (#11666)	2017-11-21 16:12:01 +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
Saurabh	d503f12713	[fix] ui test-case path	2017-11-21 15:22:41 +05:30
Rushabh Mehta	5171da81a1	[minor] fix-patch	2017-11-21 15:18:47 +05:30
Nabin Hait	cc884578b5	Update sales_order.py	2017-11-21 12:24:03 +05:30
rohitwaghchaure	834541a7e8	[fix] Added primary action in the modal which will show on the submission in the pos (#11575)	2017-11-20 11:31:53 +05:30
Britlog	1484793055	Shopping cart addresses management (#11657)	2017-11-20 11:22:18 +05:30
rohitwaghchaure	179e0c1d8d	Added party name in accounts receivable/payable report (#11656)	2017-11-20 11:18:55 +05:30
creamdory	fd1503c6a5	[New Feature] Delivery	2017-11-20 10:28:49 +08:00
Rohit Waghchaure	77940493a8	[fix] Price list not loaded from pos profile, auto set outstanding amount in the mode of payment	2017-11-18 19:06:31 +05:30
Prateeksha Singh	e1b8629313	Fix setup wiz test (#11640) ... * increase timeout in setup wiz test * enable profile slide	2017-11-17 20:08:45 +05:30
KanchanChauhan	0fe455a991	[Minor][Bug] Fix syntax error (#11633)	2017-11-17 20:08:15 +05:30
Saurabh	00e82cdab3	[fix] patch fixes to setup patch tester on travis	2017-11-17 19:08:01 +05:30
Prateeksha Singh	241d64d8c1	Merge pull request #11634 from pratu16x7/variant-modal-fix ... [minor] fix plurals spacing	2017-11-17 15:34:34 +05:30
pratu16x7	83587c72f6	[minor] fix plurals spacing	2017-11-17 15:33:12 +05:30
Saurabh	a4f78211ab	Merge branch 'master' into develop	2017-11-17 14:55:24 +05:30
Saurabh	f773af6053	bumped to version 9.2.15	2017-11-17 15:25:23 +06:00
Saurabh	11ec2c50e0	[fix] set default language in local	2017-11-17 14:51:08 +05:30
Zarrar	1b4894c33a	make root_type null if not root (#11626)	2017-11-17 14:32:12 +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
Saurabh	05ed86a00e	bumped to version 9.2.14	2017-11-17 14:31:29 +06:00
Rohit Waghchaure	44f7b157ff	[fix] POS redirect issue	2017-11-17 13:52:11 +05:30
Nabin Hait	7fa111de45	Update sales_invoice.py	2017-11-17 12:55:08 +05:30
Nabin Hait	6b70906deb	Update purchase_invoice.py	2017-11-17 12:54:32 +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	877e1bb377	Post GL Entry based on rounded total in Sales/Purchase Invoice (#11542)	2017-11-17 12:27:43 +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
Prateeksha Singh	744ff0010b	Variant report (#11618) ... * Item Variant Details Report * remove queries from inside for loop * make attribute value map * Update item_variant_details.py	2017-11-17 12:00:29 +05:30
hiousi	d81e9f30dd	[fix] issue #11456 (#11612) ... using bench export-fixtures create a erpnext/fixtures/web_form.json file see : https://github.com/frappe/erpnext/issues/11456#issuecomment-344846063	2017-11-17 11:42:24 +05:30
Britlog	b6096057c6	Hide cart icon and badge count after logging out (#11530)	2017-11-17 11:41:35 +05:30
Britlog	2a89a502f0	[Website] Items list and stock (#11480) ... * Add stock availability in items list and a parameter to set the number of products per page * Substract reserved_qty from actual_qty for website stock	2017-11-17 11:41:07 +05:30
Vishal Dhayagude	82b200e497	[fix] Patch fail (#11623)	2017-11-17 11:01:42 +05:30
Britlog	d9978d9c4f	Check stock in shopping cart (#11529)	2017-11-16 18:38:13 +05:30
rohitwaghchaure	51a397c97f	[fix] Valuation rate in stock entry and code cleanup (#11614)	2017-11-16 18:23:16 +05:30
Manas Solanki	bb34c57603	link the address and contact with the sales partner (#11592)	2017-11-16 18:10:04 +05:30
Prateeksha Singh	8f43d2514c	Multiple variant creation dialog (#11608) ... * Multiple variant creation dialog * variant dialog codacy fixes * [multiple variants] show_alert, and other minors	2017-11-16 18:06:26 +05:30
Nabin Hait	1749b7c16b	Minor fixes related to account renaming and deletion	2017-11-16 17:49:54 +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
Nabin Hait	46be9896a9	Account number in chart of accounts (#10551) ... * Account number in chart of accounts * Include account number while renaming account * Test case fixed * Standard coa with and without numbers * Standard coa with and without numbers	2017-11-16 16:51:55 +05:30
augustinfotech	135a54ca93	Allow print before pay in POS (#11590)	2017-11-16 15:28:42 +05:30
tundebabzy	f7e6934d7c	handle None case in update_reserved_qty_for_production (#11593)	2017-11-16 14:13:49 +05:30
Manas Solanki	eb3982044b	convert html into text in the taxes description as it can break the reports (#11603)	2017-11-16 14:11:39 +05:30
Pawan Mehta	bda07c6db4	Added Warehouse, Cost Center, Owner filters to Sales Register (#11600) ... * [fix] #3668 * fix codacy space issue	2017-11-16 14:09:17 +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
rohitwaghchaure	21cbbae88f	[fix] Payment reconcillation showing linked journal entries (#11611)	2017-11-16 14:05:57 +05:30
ashish	f17ca7866a	removed names from comments	2017-11-16 11:08:14 +05:30
ashish	604eb9d689	added flag to function get_customer_outstanding and removed names in comments	2017-11-16 11:05:59 +05:30
ashish	a20c8dbd5c	instead of caller as 3rd arg added a flag	2017-11-16 11:03:39 +05:30
ashish	a1feb32891	added json for bypass credit limit checkbox	2017-11-16 11:01:43 +05:30
ashish	f67372cfb3	removed logic from delivery note for checking bypass credit limit flag	2017-11-16 10:58:25 +05:30
ashish	8146c7a3df	not required as default is set by default	2017-11-16 10:54:22 +05:30
ashish	bccdf74344	set default value of bypass_credit_limit flag removed as it is not required	2017-11-16 10:53:22 +05:30
ashish	62155fa0e5	Merge branch 'feature_10861' of https://github.com/ashish-greycube/erpnext into feature_10861	2017-11-16 10:47:44 +05:30
Rushabh Mehta	8e5dcd06fb	[fix] item.py	2017-11-15 17:53:44 +05:30
Rushabh Mehta	083dabaaf8	[fix] item.py	2017-11-15 17:08:53 +05:30
Frappe PR Bot	978cfdec2c	[Translation] Updated Translations (#11591)	2017-11-15 16:30:08 +05:30
Rushabh Mehta	d3f5d0961a	[feature] Opening Invoice Creation Tool (#11589) ... * [enhance] Opening Invoice Tool create Opening Sales/Purchase Invoices * [minor] added progress bar while creating invoice * [minor] allow bulk upload for the invoices * [minor] calculate item rate from net total * [minor] added defaults for invoices fields, create gl entries only if grand_total is greater than 0 * [minor] check mandatory values before making opening invoices * [minor] enable primary button if there is any error while creating invoices * [minor] minor fixes, set company currency as invoice currency added tests * [dashboard] added Opening Invoice Summery section in Dashboard * [minor] added total invoices count on dashboard * [minor] don't show dashboard if there are no opening invoices available * [minor] added Opening Invoice Tools to Account's Tools section * [minor] codecy fixes * [fix] refactored general ledger and buttons on charts * [fix] tests	2017-11-15 16:29:53 +05:30
Nabin Hait	78ab8235f6	Minor code cleanups in stock balance report	2017-11-15 14:43:54 +05:30
Brown-Harry Boma	b9e44217a2	[Fix]Codacy Issues	2017-11-15 14:43:54 +05:30
Brown-Harry Boma	2da8f6e89d	Add Items Variants Attributes columns to Stock Balance Report	2017-11-15 14:43:54 +05:30
Zarrar	24b8aa2e80	set field dependent on link field fix (#11580)	2017-11-15 14:27:00 +05:30
Nabin Hait	6fd163bc55	Merge branch 'master' into develop	2017-11-15 14:08:17 +05:30
Nabin Hait	429e5d57d5	bumped to version 9.2.13	2017-11-15 14:38:17 +06:00
Jamsheer	0abec034df	Healthcare hotfix (#11586) ... * On Cancel Consultation - Open Appointment - Delete Medical Record * Add Filter on Account Selection - is_group: 0 * Patient Medical Record - List view Fixes * Update consultation.py	2017-11-15 13:53:50 +05:30
Umair Sayed	3a9ca883b9	Update party.py (#11584)	2017-11-15 13:44:04 +05:30
Manas Solanki	bf59b5927f	make route from item code if item name is None (#11579)	2017-11-15 10:55:22 +05:30
ppd1990	9bd84277db	Propagate projected_qty all the way to the root warehouse to make 'check in group' actually work for more complex warehouse topologies (#10842)	2017-11-15 10:13:09 +05:30
schilgod	e418a5bdc1	Option to disable fetching last purchase details in Purchase Order (#11573) ... * add check for enable/disable last purchase details in Purchase Order * fix tabs	2017-11-15 09:49:49 +05:30
Jamsheer	bab226698f	Healthcare hotfix (#11574) ... * Patient dashboard - Vital Signs * Remove submit validation in Consultation * Physician Schedule - Add Time Slots - Fix * Patient Appointment - Client side - fixes	2017-11-15 09:47:00 +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	ea3e6b93a7	bumped to version 9.2.12	2017-11-14 18:18:42 +06:00
Nabin Hait	10823e5a25	Merge branch 'neilLasrado-develop1' into develop	2017-11-14 17:40:45 +05:30
Nabin Hait	b55e98570f	Minor fixes	2017-11-14 17:40:30 +05:30
Shreya Shah	be690ef817	Rate with margin in customer and company currency (#11437) ... * field for company margin * added base_rate_with_margin * calculate company margin * test for item price * test for delivery note * test for sales order * test for quotation * test for sales invoice	2017-11-14 17:22:41 +05:30
Nabin Hait	42274a4591	Delete healthcare domain items (#11567)	2017-11-14 17:15:11 +05:30
Nabin Hait	cd13a28417	Get items from quotation in sales invoice	2017-11-14 17:13:53 +05:30
AravindPranera	04e3518fad	Update request_for_quotation.py	2017-11-14 17:13:53 +05:30
AravindPranera	5bae488f25	Update request_for_quotation.py	2017-11-14 17:13:53 +05:30
AravindPranera	86e726158b	Getting Quotation Document in Sales Invoice	2017-11-14 17:13:53 +05:30
AravindPranera	0ebd3c373c	Getting Quotation Document in Sales Invoice	2017-11-14 17:13:53 +05:30
Rushabh Mehta	b8b8dc119f	[fix] item.py fix for _doc_before_save	2017-11-14 16:52:05 +05:30
Rushabh Mehta	cc1262c36d	Add option to clean description html in item description. (#11565) ... * [fix] add item settings * [docs] Item Settings * [fix] enqueue in item_settings.py * [refactor] move to stock settings * [refactor] move to stock settings	2017-11-14 16:36:25 +05:30
Rushabh Mehta	d5c6416d91	[new feature] Product Configurator (via Item Quick Entry) (#11535) ... * [Feature] Item Variant Creation from Quick Entry * [minor] formatted js * [minor] set 3 attribute per page instead of 5 in template * [fix] fixed codecy issue * [fix] label translation * [minor] changed trigger event of item template * [fix] moved item ui tests under stock * [UI test] added test for item attribute * [UI test] added test for creation of item variant from quick entry * [fix] item variant ui test fixes * [wip] * [cleanup] item quick entry * [remove] tests, fixtures were missing * [refactor] use set_only_once in item	2017-11-14 15:27:28 +05:30
tunde	ffa659fd2c	Merge branch 'develop' into payment-terms	2017-11-14 09:59:45 +01:00
Nabin Hait	4d99ebaeb5	Merge branch 'master' into develop	2017-11-14 13:58:37 +05:30
Nabin Hait	0590d1da05	bumped to version 9.2.11	2017-11-14 14:28:37 +06:00
Rushabh Mehta	d8bc8de6ca	[minor] remove unnecessary description in upload attendance, fixes #10603	2017-11-14 12:52:53 +05:30
Rushabh Mehta	98aa581864	[fix] default tax only on insert (#11544) ... * [fix] default tax only on insert * [fix] default tax only on insert * [fix] default tax only on insert	2017-11-14 09:32:32 +05:30
Faris Ansari	3a5dceae18	Add Github Connector (#11259) ... - Add new module ERPNext Integrations	2017-11-13 19:19:13 +05:30
Manas Solanki	e5aa9c5f2f	new report - assessment plan status (#11504) ... * new report - assessment plan status * add the report in the school dashboard * fix for the print format	2017-11-13 18:56:53 +05:30
Manas Solanki	69be5362a5	minor fixes in the assessment result (#11543)	2017-11-13 18:32:06 +05:30
Nabin Hait	ec8a0a22d7	Merge branch 'master' into develop	2017-11-13 15:10:17 +05:30
Nabin Hait	58ab203fc0	bumped to version 9.2.10	2017-11-13 15:40:16 +06:00
Nabin Hait	6605919ecd	GL Entries on sale of an asset (#11538)	2017-11-13 15:06:35 +05:30
Saurabh	feeb47dbbe	[fix] if not students in student groups then raise exception (#11537)	2017-11-13 13:52:58 +05:30
Nabin Hait	deeb1380b1	Ignore paid credit note in outstanding invoices in Payment Entry (#11534)	2017-11-13 13:52:05 +05:30
Saurabh	0f86d86e27	[fix] validate party account (#11517)	2017-11-10 19:21:09 +05:30
Faris Ansari	4ec4e3fb29	[patch] Revert Manufacturing User role (#11514)	2017-11-10 19:15:17 +05:30
Prateeksha Singh	17b7209032	remove erroneous column breaks (#11522)	2017-11-10 18:54:03 +05:30
Prateeksha Singh	731b66b788	remove erroneous column breaks (#11523)	2017-11-10 18:53:52 +05:30
Rushabh Mehta	4313326ba0	[fix] treeview for tasks (#11515) ... [fix] treeview for tasks	2017-11-10 18:52:21 +05:30
Saurabh	a5275a1ba9	Merge branch 'master' into develop	2017-11-10 15:53:44 +05:30
Saurabh	a10cd10640	bumped to version 9.2.9	2017-11-10 16:23:43 +06:00
Saurabh	44ef8654f9	Merge pull request #11510 from rohitwaghchaure/issue_11502 ... Add item directly in the cart only if serial no, batch, barcode has enter in the search field	2017-11-10 15:51:14 +05:30
Saurabh	71862f9024	Merge pull request #11509 from saurabh6790/bom_search_query_fix ... [fix] query param fixes	2017-11-10 15:50:55 +05:30
Rohit Waghchaure	a5e3c3a79f	Add item directly in the cart only if serial no, batch, barcode has enter in the search field	2017-11-10 15:29:26 +05:30
rohitwaghchaure	cc97ec9202	[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip (#11507)	2017-11-10 15:06:58 +05:30
Saurabh	022ab63a0f	[fix] query param fixes	2017-11-10 15:06:02 +05:30
Pawan Mehta	1368ba00bc	[fix] #11337 (#11339)	2017-11-10 14:59:26 +05:30
Saurabh	7b78a83592	Merge branch 'master' into develop	2017-11-10 13:15:04 +05:30
Saurabh	18c8cf965f	bumped to version 9.2.8	2017-11-10 13:45:04 +06:00
Saurabh	7ab28ec562	[fix] give preference to gateway selected on shopping cart settings (#11393)	2017-11-10 11:17:01 +05:30
KanchanChauhan	e59c9ce9f4	Checkbox has_expiry_date in Item to make suer Expiry Date is entered in Batch (#11413)	2017-11-10 11:16:29 +05:30
Alchez	1077c782a3	[Fix] Packing Slip creation if custom field does not have a value (#11423) ... * [Fix] Packing Slip creation if custom field is Column/Section Break * Used no_value_fields and sorted imports * Update packing_slip.py	2017-11-10 11:14:57 +05:30
Nabin Hait	15753074bf	Nestedset model fixes for changing parent and renaming (#11467)	2017-11-10 11:12:43 +05:30
Nabin Hait	8e3da7f70e	Update test_assessment_plan.js	2017-11-10 10:59:17 +05:30
Nabin Hait	887285ed1a	Update test_assessment_plan.js	2017-11-10 10:59:07 +05:30
Manas Solanki	aeb0026354	commits from develop merged PR's (#11491) ... * better student search queries and minor fixes in the student group * remove the print option for the tools * fixes for the chart * minor fixes in the fee module for print and permission, delete redundant doctype * set the naming series and independent dob validation	2017-11-10 10:58:43 +05:30
rohitwaghchaure	1ce48e7032	[fix] POS profile patch (#11501)	2017-11-10 10:53:12 +05:30
Faris Ansari	99e31f97b8	set default params for paging (#11500)	2017-11-10 10:50:49 +05:30
Faris Ansari	4a864c1eea	[fix] Update bom item description (#11498) ... * [fix] Update bom item description * Update item.py	2017-11-09 19:01:21 +05:30
Nabin Hait	c4de619eac	Update assessment_plan.py	2017-11-09 14:36:11 +05:30
Nabin Hait	fe72ed003e	Update test_assessment_plan.js	2017-11-09 11:47:13 +05:30
pratu16x7	40016372c6	[minor][hotfix] naming_series variable assignment	2017-11-08 16:30:15 +05:30
Saurabh	b97f08e0ac	[fixed] merge-conflicts	2017-11-08 15:08:38 +05:30
Saurabh	3894a5ed94	bumped to version 9.2.7	2017-11-08 15:37:33 +06:00
Saurabh	045b2877b7	[fix] remove warehouse from Stock Settings if warehouse wont exists (#11487)	2017-11-08 14:57:03 +05:30
Manas Solanki	a658630751	remove the print option from the tools (#11484) ... * remove the print option for the tools * better student search queries and minor fixes in the student group	2017-11-08 14:55:54 +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	eb760d6d09	Merge branch 'master' into develop	2017-11-08 12:20:46 +05:30
Saurabh	f985ae1379	bumped to version 9.2.6	2017-11-08 12:50:46 +06:00
Saurabh	98aa544f25	Merge branch 'master' into staging	2017-11-08 12:18:50 +05:30
Saurabh	f41b13b736	[fix] merge-conflicts	2017-11-08 12:18:41 +05:30
Saurabh	db781e607a	bumped to version 9.2.5	2017-11-08 12:42:37 +06:00
rohitwaghchaure	521606e433	Merge pull request #11398 from rohitwaghchaure/item_variants_donot_copy_option ... [enhance] In item variants settings added provision, do not update the variants of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:49:24 +05:30
Rohit Waghchaure	acc8995c48	[enhance] In item variants settings added provision, do not update the fields of variants from the template but will copy the value while making new variant aginst the template	2017-11-08 11:39:08 +05:30
Sushant Nadkar	72c40f0383	Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440)	2017-11-08 11:35:46 +05:30
Shreya Shah	d9e2b24535	task name in gantt view - clickable (#11459)	2017-11-08 11:35:19 +05:30
rohitwaghchaure	f688af3809	[fix] Offline pos name is not defined issue in the POS (#11469)	2017-11-08 11:33:39 +05:30
Achilles Rasquinha	7fd20f303f	moved from MySQLdb to pymysql (#11462)	2017-11-08 11:33:24 +05:30
rohitwaghchaure	9f2a27c99c	Merge pull request #11477 from rohitwaghchaure/pos_profile_test_cases ... [fix] POS Profile test cases	2017-11-07 16:35:52 +05:30
Rohit Waghchaure	35fc45eff9	[fix] POS Profile test cases	2017-11-07 10:43:16 +05:30
Rohit Waghchaure	57cc924d29	[Fix] Fast clicking on an item, showing invalid grand total and quantity in the POS cart	2017-11-06 18:42:37 +05:30
Manas Solanki	36e2fb8d58	minor fixes in the fee module for print and permission, delete redundant doctype (#11430)	2017-11-06 17:44:59 +05:30
Nabin Hait	e552a51266	Minor cleanups	2017-11-06 17:39:31 +05:30
pawan	436f7b980c	codacy issues	2017-11-06 17:39:31 +05:30
pawan	438dfc081b	fix codacy issues	2017-11-06 17:39:30 +05:30
pawan	d59225635d	remove old report	2017-11-06 17:39:30 +05:30
pawan	b699b86b76	Add Total Row	2017-11-06 17:39:30 +05:30
pawan	8d1d64aa29	[fix] #11449	2017-11-06 17:39:30 +05:30
pawan	e61a275651	[fix] #11427	2017-11-06 17:39:30 +05:30
Manas Solanki	6ba2eda04a	fixes for the chart (#11460)	2017-11-06 17:22:14 +05:30
rohitwaghchaure	bcb7854340	Merge pull request #10982 from netchampfaris/multiple-users-pos-profile ... [Enhancement] Allow Multiple users in POS Profile	2017-11-06 16:45:01 +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
Manas Solanki	b1616a0cb3	changes in thepos profile	2017-11-06 13:53:52 +05:30
Manas Solanki	3f0dfd720f	set the pos profile in the sales invoice	2017-11-06 13:53:52 +05:30
Nabin Hait	f15a8409eb	[tests] Test case fixes for task and project (#11445) ... * [tests] Test case fixes for task and project * Removed hard-coded dates from test cases * Codacy fix	2017-11-06 11:11:34 +05:30
Saurabh	e850655c1d	Merge branch 'master' into staging	2017-11-03 16:56:24 +05:30
Saurabh	0faa61009f	Merge branch 'master' into develop	2017-11-03 16:56:23 +05:30
Saurabh	56cb0aa9c1	bumped to version 9.2.4	2017-11-03 17:26:23 +06:00
Faris Ansari	cbaa0e629c	fix codacy	2017-11-03 11:35:49 +05:30
Manas Solanki	76ce074c63	return the account details if and only if there is single account of that type (#11407)	2017-11-02 18:12:47 +05:30
rohitwaghchaure	7677ff00a2	[hotfix] User not able to edit exchange rate even if Allow Stale Exchange Rates is disabled in the accounts settings (#11409)	2017-11-02 18:12:14 +05:30
Saurabh	62fd4007b0	Merge branch 'master' into staging	2017-11-02 12:14:42 +05:30
Saurabh	3be72ef187	Merge branch 'master' into develop	2017-11-02 12:14:41 +05:30
Saurabh	870ce3cfea	bumped to version 9.2.3	2017-11-02 12:44:40 +06:00
rohitwaghchaure	1473a37d8c	Merge pull request #11395 from jay-parikh/develop ... POS - Add % to the Discount Field #9749	2017-11-02 12:11:12 +05:30
Saurabh	0ad2cc3def	Merge pull request #11403 from tundebabzy/issue-11402 ... Error In Employee Loan Form (#11402)	2017-11-02 12:09:54 +05:30
Saurabh	00f6c2d61d	Merge pull request #11417 from rohitwaghchaure/issue_not_save_v9 ... [Fix] Customer is manadatory even if customer has selected in the Issue	2017-11-02 12:07:32 +05:30
Saurabh	38008f8daa	Merge pull request #11406 from rohitwaghchaure/payment_entry_differnece_amount_issue ... [Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-02 12:07:14 +05:30
Saurabh	afb63af3b6	Merge pull request #11397 from rohitwaghchaure/delivery_note_issue_from_so ... [Fix] Getting an error while making delivery note from sales order and sales order has no item code	2017-11-02 12:06:08 +05:30
Rohit Waghchaure	816ce33daf	[Fix] Customer is manadatory even if customer has selected in the Issue	2017-11-01 19:02:09 +05:30
Rohit Waghchaure	99748dbacf	[Fix] Wrong difference amount in the payment entry for the internal transfer type	2017-11-01 11:45:02 +05:30
tunde	31287b00a6	call get_employee_loan_application only when appropriate	2017-10-31 18:10:17 +01:00
Faris Ansari	3d59179205	Load default pos profile if not found	2017-10-31 21:56:16 +05:30
Manas Solanki	a941a394ba	set the naming series and independent dob validation	2017-10-31 17:34:50 +05:30
Rohit Waghchaure	5ec9f6930b	[Fix] Getting an error while making delivery note from sales order and sales order has no item code	2017-10-31 15:26:56 +05:30
Jay Parikh	96f167573b	POS - Add % to the Discount Field #9749	2017-10-31 01:07:09 -07:00
Zarrar	6d41a9a647	Converting Task to a Tree structure (#11117) ... * added support for tree view * nestedset added to handle tree based structure * treeview ui added * removed is_group dependency * added validation while editing a group-task * codacy fix * BOM like filter added * Added ui-test for treeview-task	2017-10-31 13:10:55 +05:30
Manas Solanki	160e710ebf	set bank account only if there is single bank type account (#11363) ... * set bank account only if there is single bank type account * Update journal_entry.py	2017-10-31 13:04:02 +05:30
Faris Ansari	40611e4f69	[fix] hub get_item_details (#11383)	2017-10-31 13:00:09 +05:30
KanchanChauhan	21f946f365	[Minor] Source Warehouse should be filtered by Company in Production Order (#11376)	2017-10-31 12:59:45 +05:30
Prateeksha Singh	6b26e391b8	use the new frappe charts :D (#11391)	2017-10-31 12:58:48 +05:30
Faris Ansari	895aa7b7ac	fix codacy	2017-10-30 17:12:50 +05:30
Faris Ansari	7095de03ef	Merge branch 'develop' into multiple-users-pos-profile	2017-10-30 15:00:55 +05:30
Faris Ansari	79be8f969f	Add to patches.txt	2017-10-30 14:46:09 +05:30
ci2014	e741b91f1d	Update issue.js (#11381) ... Make the close / reopen button more flexible for customized user status. For example, if the user has several status, it will now show the Close button every time the ticket is not closed! It will show Reopen only, if the ticket is closed, and not if it's on hold for example. This will make it more flexible.	2017-10-30 10:13:05 +05:30
tunde	5ea10a77a3	Merge branch 'develop' into payment-terms	2017-10-27 17:37:15 +01:00
Faris Ansari	638e3f9fa6	Merge pull request #11154 from netchampfaris/hub-item-image ... [hub] fix company page routing	2017-10-27 17:07:10 +05:30
Saurabh	1bc8e32f94	Merge pull request #11360 from manassolanki/fix-fee-patch ... fix the fee patch	2017-10-27 17:00:11 +05:30
Faris Ansari	8c1099d236	Add POS Profile User DocType	2017-10-27 16:48:07 +05:30
Manas Solanki	8637e52d4c	fix the fee patch	2017-10-27 11:55:15 +05:30
ashish	b883e4ee0d	customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set. cint function is added.	2017-10-26 20:32:08 +05:30
ashish	ca2250c440	sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice.cint function is added.	2017-10-26 20:22:34 +05:30
ashish	751b05f1e8	sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice. cint function is added.	2017-10-26 20:15:24 +05:30
ashish	9dfc0f32ab	customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. It is default to 0. Also patch is added to update value of new field to 0 after migrate. ... test_customer.js -- It is auto generated file as customer.json is modified. And it is removed.	2017-10-26 20:07:32 +05:30
tunde	bbce7b7e5d	get attribute with get method	2017-10-26 14:31:13 +01:00
tunde	6575a615b1	get attribute with get method	2017-10-26 14:30:18 +01:00
tunde	14e97ce0c8	Merge branch 'develop' into payment-terms	2017-10-26 13:35:42 +01:00
Faris Ansari	c83413134d	Merge pull request #11294 from revant/map_field_docs ... [Docs] added field for storing map	2017-10-26 17:19:46 +05:30
Nabin Hait	c799a22d55	Merge branch 'master' into staging	2017-10-26 14:35:34 +05:30
Nabin Hait	edef9811f9	Merge branch 'master' into develop	2017-10-26 14:35:34 +05:30
Nabin Hait	819c50c042	bumped to version 9.2.2	2017-10-26 15:05:33 +06:00
Faris Ansari	6887cedaea	[fix] item qty trigger (#11349)	2017-10-26 14:34:15 +05:30
Nabin Hait	aa7896f1e1	[test] Fixed physician test cases (#11347)	2017-10-26 14:33:28 +05:30
Nabin Hait	52909b73bb	[test] Fixed advance jv cancellation (#11333)	2017-10-26 11:06:07 +05:30
Saurabh	b445633e56	Merge branch 'master' into staging	2017-10-26 09:59:22 +05:30
Saurabh	0d597cef8d	Merge branch 'master' into develop	2017-10-26 09:59:22 +05:30
Saurabh	d0131762cc	bumped to version 9.2.1	2017-10-26 10:29:22 +06:00
Saurabh	92a6155bb0	[fix] translate domain	2017-10-26 09:44:51 +05:30
Faris Ansari	33d74ce6e5	Merge branch 'develop' into hub-item-image	2017-10-25 18:06:42 +05:30
Saurabh	d6e67ce123	[fix] check for null date fields (#11334)	2017-10-25 17:44:22 +05:30
Nabin Hait	6a4e230cde	[fix] Status of Item (#11326)	2017-10-25 17:06:30 +05:30
rohitwaghchaure	c65f1d7745	Search item using name instead of item code (#11327)	2017-10-25 17:04:56 +05:30
rohitwaghchaure	e02ee898e9	[Fix] Production order not displaying in the calendar view, if po has no operations (#11328)	2017-10-25 17:04:31 +05:30
rohitwaghchaure	2e6f6d6749	[minor] cleanup code (#11331)	2017-10-25 17:03:49 +05:30
ashish	8fbf10f5db	New test case files added.(a)test_sales_order_with_bypass_credit_limit_check.js -- New feature: i.e. bypass credit limit check at sales order.(b)test_sales_order_without_bypass_credit_limit_check.js --Regression test case : the existing default flow is checked i.e. credit limit check happens at sales order level	2017-10-25 16:20:50 +05:30
ashish	fb364df091	customer_credit_balance.py -- Credit limit should now reflect outstanding amount for each customer based on value of flage bypass credit limit check at sales order level. A new column is added to show the value of this flag. customer.py -- get_credit_limit function which gets called by the above customer_credit_balance report is updated to deduct the amount of sales order for which credit limit bypass flag is set	2017-10-25 16:17:55 +05:30
ashish	ff20182d03	sales_invoice.py -- Check credit limit when make delivery is done from sales invoice.We need to check the credit limit as there could be multiple partially paid sales order(note we are bypassing credit check at sales order) so we need to recheck credit balance of customer to avoid any delivery crossing credit limit from sales invoice	2017-10-25 16:11:58 +05:30
ashish	8ad4efee25	sales_order.py -- Three changes are done (a) if bypass credit limit check is enabled we should not check customer credit on submit of sales order (b.1/b.2) There is provision to make delivery note and sales invoice from sales order. Since credit limit is bypassed at sales order level we need to check credit of customer on make of (b.1)delivery note or (b.2)sales invoice	2017-10-25 16:07:21 +05:30
ashish	06e6a82d56	customer.json -- a checkbox field is added which gives user ability to bypass credit limit check at sales order level for a customer. test_customer.js : auto generated file as customer.json is modified	2017-10-25 15:56:39 +05:30
Nabin Hait	fb734976eb	Removed appintment field from Invoice, it should be a custom field and will be added from domain settings	2017-10-25 15:53:07 +05:30
Nabin Hait	8f2500083c	Merge branch 'master' into develop	2017-10-25 14:10:39 +05:30
Nabin Hait	e146143bd1	bumped to version 9.2.0	2017-10-25 14:40:38 +06:00
Nabin Hait	4d22b6db30	Fixed Merge Conflict	2017-10-25 14:09:46 +05:30
Nabin Hait	cd3dbcb2ef	Fixed Merge Conflict	2017-10-25 14:07:25 +05:30
Nabin Hait	c7bd77111e	bumped to version 9.1.8	2017-10-25 14:32:32 +06:00
rohitwaghchaure	4a60554b91	Green indicator in the cart for non stock item (#11325)	2017-10-25 13:59:29 +05:30
rohitwaghchaure	3dc21b099d	[Fix] Translation issue (#11323)	2017-10-25 12:38:17 +05:30
tundebabzy	40a02769c5	Error in the Address fetched in Sales Order.(#11129) (#11145) ... * add new function - `get_party_shipping_address` * `swap `get_default_address` with `get_party_shipping_address` * test cases * properly sets order by direction * move `get_party_shipping_address` to party.py * fix test module import	2017-10-25 12:24:34 +05:30
tundebabzy	bafcd7418a	Add Bundle Description Field To Product Bundle (#11122) ... * add description field that shows in list view * description field should be simply `description`	2017-10-25 12:22:08 +05:30
Makarand Bauskar	085b4842a1	[minor] minor fixes in get_company_details for Hub page (#11168)	2017-10-25 12:19:10 +05:30
Makarand Bauskar	e6712c129c	[hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings (#11182) ... * [hotfix] fixed Permissions Error while fetching allow_stale field value from Accounts Settings * [minor] renamed the allow_stale_rate method to stale_rate_allowed	2017-10-25 12:17:40 +05:30
Doridel Cahanap	49a7bde6e2	[minor] Label for Training Event in Training Program Dashboard (#11280)	2017-10-25 12:15:17 +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
Nabin Hait	b7483f6dfd	Update item.json	2017-10-25 11:58:02 +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
Pawan Mehta	07ab4622e8	[fix] #9824 - Calculate costing amount even if billable is unchecked (#11310) ... * [fix] #9824 * fix code	2017-10-25 11:55:49 +05:30
Narciso E. Núñez Arias	47caf51efe	[docs] Translate the Projects section of the Manual to Spanish (#11319) ... * [docs] Translate projects module. Add index page * [docs] Translate activity cost page from projects module. * [docs] Translate activity type page from projects module. * [docs] Translate the Project Costing article in project module * [docs] Translate the Project page in projects module * [docs] Translate the Task page in projects module * [docs] Translate the Time Log Batch page in projects module	2017-10-25 11:53:10 +05:30
rohitwaghchaure	2672c331af	Validation for duplicate offline pos (#11281)	2017-10-25 11:47:18 +05:30
Nabin Hait	f4283a3ebf	Moved company field to the top in BOM (#11283)	2017-10-25 11:46:47 +05:30
Nabin Hait	8a0943ead7	Unlink reference doc on Journal Cancellation only if advance (#11285)	2017-10-25 11:46:35 +05:30
Nabin Hait	82c9352d53	Update variant description based on attribute if not already there (#11302)	2017-10-25 11:46:20 +05:30
rohitwaghchaure	311823aca1	Validate stock exists against template item (#11305)	2017-10-25 11:45:51 +05:30
Charles-Henri Decultot	7862eb444f	[Hotfix] Addition of an empty tax group in the french CoA (#11306)	2017-10-25 11:44:46 +05:30
Neil Trini Lasrado	1f99bea6ce	Pass sender as contact email in Opportunity (#11308) ... Always pass sender as the contact email while creating an opportunity for a website enquiry.	2017-10-25 11:44:12 +05:30
Manas Solanki	a5eee4629f	Fix UI tests (#11309) ... * decrease the timeout * delete the duplicate test	2017-10-25 11:42:22 +05:30
Nabin Hait	6c06e700d6	[Fix] Unallocated amount considering deductions (#11314)	2017-10-25 11:42:05 +05:30
Revant Nandgaonkar	f8006b140f	[Docs] Map field renamed to Geolocation	2017-10-25 11:18:29 +05:30
tunde	c8d2361b81	Merge branch 'develop' into payment-terms	2017-10-24 12:25:29 +01:00
Revant Nandgaonkar	010f619ed3	[Docs] added field for storing map ... related PR https://github.com/frappe/frappe/pull/4327	2017-10-23 17:25:52 +05:30
vishalseshagiri	5c5a853894	Update customer_group.py (#11270) ... Minor syntactical error !	2017-10-23 11:35:49 +05:30
Doridel Cahanap	b06f155ceb	[minor] Set Quick Entry to False in Training Event (#11279)	2017-10-23 11:35:12 +05:30
Nabin Hait	7533101d4b	Merge branch 'master' into develop	2017-10-21 11:29:40 +05:30
Nabin Hait	e7eda65968	bumped to version 9.1.7	2017-10-21 11:59:39 +06:00
rohitwaghchaure	5fdd26f1e7	[fix] Discount amount not reset for new order in offline pos (#11258)	2017-10-21 11:23:45 +05:30
Nabin Hait	c44290955e	Minor fix in patches (#11268)	2017-10-21 11:20:18 +05:30
Nabin Hait	4825eccad5	UI test fixed for supplier quotation (#11260) ... * UI test fixed for supplier quotation * ui test fixes for purchase order * Fixed number of assertion in student admission test * Fixed multiple ui tests * ui tests	2017-10-21 10:44:30 +05:30
Doridel Cahanap	5a4d5bfaf2	Add Training Program DocType, Script, Path and Doc (#11181) ... * Add Training Program Doctype, Script, Config and documentation * Add Training Program to Training Event * [Test Case] Training Event in a Training Program	2017-10-20 11:31:15 +05:30
Nabin Hait	b4f5f14438	Timeout increased for setting __newname (#11252) ... * Timeout increased for setting __newname * UI test fixes * fixed ui test for PO * ui tests * ui tests * ui tests * ui tests * ui tests	2017-10-20 11:26:17 +05:30
tunde	09ce68ec19	Merge branch 'develop' into payment-terms	2017-10-19 17:47:31 +01:00
Nabin Hait	bb60a59b96	Fixed asset test cases due to tax rule (#11247) ... * Fixed asset testcases due to tax rule * Delete tax rule record after running test cases * Fixed test cases * Fixed test cases * Fixed subscription tests due to tax rule	2017-10-19 12:14:37 +05:30
Neil Trini Lasrado	eb662b5a9a	Added Test Cases	2017-10-18 18:16:47 +05:30
Neil Lasrado	7935d186f9	Auto set warehouses in Production Order if default warehouses are set in Manufacturing Settings and not mentioned in Production Order	2017-10-18 18:16:47 +05:30
Neil Lasrado	af091ac5dd	[BUG] Map Production Order with the exact Sales Order line item	2017-10-18 18:16:46 +05:30
Neil Lasrado	5afc194742	[BUG] Fixes make Production Order from Sales Order	2017-10-18 18:16:46 +05:30
Saurabh	5fa2adcca9	Merge branch 'master' into develop	2017-10-18 16:23:44 +05:30
Saurabh	47e405516b	bumped to version 9.1.6	2017-10-18 16:53:43 +06:00
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
Ranjith Kurungadam	7624e7bf85	[hot-fix] sql getting translated (#11243) ... * fix remove _ in frappe.sql * use %s replacement for sql	2017-10-18 15:48:12 +05:30
Jamsheer	dd7c1b87c5	Healthcare Doctypes - Docfield Clean up (#11065) ... * Healthcare Doctype Clean up - updated index, in_filter, no_copy and ect. * Healthcare Doctype - remove frappe import	2017-10-18 12:13:15 +05:30
Makarand Bauskar	3e4ca4219f	[hotfix] fixed 'ValueError: Unknown string format' error if the from_time value is null (#11162)	2017-10-18 11:16:47 +05:30
Helkyd	7ec7a45f05	Salary Detail Abbr (#11165) ... When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee	2017-10-18 11:16:24 +05:30
Vishal Dhayagude	3e02d80636	[fix] Travis Client Side Failure (#11198)	2017-10-18 11:10:45 +05:30
Nabin Hait	5ab6ff2470	[fix] Fetch raw material rate based on last purchase rate (#11205) ... * [fix] Fetch raw material rate based on last purchase rate * Don't fetch sub-assembly item rate from BOM if not mentioned by the user	2017-10-18 11:09:11 +05:30
Brown-Harry Boma	11e964d442	Set transaction type in pricing rule only if unavailable (#11229) ... * Set transaction type in pricing rule only if unavailable * Update pricing_rule.py	2017-10-18 11:07:09 +05:30
rohitwaghchaure	a516856c32	[Fix] Getting an error duplicate name while making an invoice in draft mode (#11230)	2017-10-18 11:05:10 +05:30
Javier Wong	84f7ba8699	[hotfix] Allow Sales User and Purchase User to Read Account Settings (#11233) ... * [hotfix] Allow Sales User and Purchase User to Read Account Settings This fixes https://discuss.erpnext.com/t/not-permitted-message-for-new-quotation-and-sales-order/29261/4. * Added back Accounts Manager Permissions	2017-10-18 11:04:15 +05:30
rohitwaghchaure	a3fe5b8528	[Fix] Disable desk access view to supplier (#11234)	2017-10-18 10:53:34 +05:30
jigneshpshah	bad5e90e46	Priority of credit limit check functionality (#11232) ... CREDIT LIMIT field is at customer, customer group and company level . Explanation given on priority of the three levels.	2017-10-18 10:53:11 +05:30
Nabin Hait	a9feddbb79	Testcase fixes (#11238) ... * Restaurant test records fixed * Fixes for test cases	2017-10-18 10:52:48 +05:30
KanchanChauhan	44734049f5	[Minor] Populate Expense Claim Description from Expense Claim Type (#11156)	2017-10-17 17:23:26 +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
Prateeksha Singh	bfb108d722	Replace c3 (#11112) ... * [charts] replace in asset.js * replace in reports	2017-10-17 12:03:02 +05:30
Nabin Hait	45a640df08	Update payment_entry_reference.json	2017-10-16 12:58:32 +05:30
Nabin Hait	53659cf0bd	Update payment_entry_reference.json	2017-10-16 12:57:51 +05:30
Makarand Bauskar	80f333950b	[minor] fixed AttributeError: 'GrossProfitGenerator' object has no attribute 'grouped_data' (#11195)	2017-10-16 11:27:22 +05:30
mbauskar	cd4202c2f7	Merge branch 'master' into develop	2017-10-15 19:10:56 +05:30
mbauskar	bbbce58884	bumped to version 9.1.5	2017-10-15 19:40:55 +06:00
rohitwaghchaure	8bf7230fcc	[Fix] New invoice showing old paid amount if POS Profile is not created (#11160)	2017-10-15 19:09:14 +05:30
rohitwaghchaure	496174bbdf	[Fix] Naming series not copy from referebce document to new document in subscription (#11196)	2017-10-15 19:08:42 +05:30
Nabin Hait	4072d71769	Delete api.py	2017-10-11 23:53:57 +05:30
Faris Ansari	7997271368	[hub] fix company page routing	2017-10-11 15:46:21 +05:30
Saurabh	5ffed60916	Merge branch 'master' into develop	2017-10-11 14:39:11 +05:30
Saurabh	15411fcf70	bumped to version 9.1.4	2017-10-11 15:09:10 +06:00
rohitwaghchaure	76a9cefc9c	Merge pull request #11151 from rohitwaghchaure/minor_fix_title ... [minor] Title not showing in payment modal	2017-10-11 12:05:29 +05:30
Rohit Waghchaure	4f7873b9df	[minor] Title not showing in payment modal	2017-10-11 12:03:49 +05:30
Saurabh	ad9afe68f3	Merge pull request #11119 from rohitwaghchaure/default_company_pos ... [enhance] Provision to select company in the POS screen if company is not defined in the global defaults	2017-10-11 12:00:56 +05:30
Saurabh	41e2b98b63	Merge pull request #11137 from mbauskar/healthcare ... [hotfix] passed localise item_group value for create_lab_test_itemsfield	2017-10-11 12:00:12 +05:30
Rohit Waghchaure	3f309e1c20	Multiple items showing for single barcode	2017-10-11 02:14:56 +05:30
Rohit Waghchaure	9bb81ee1cb	[fix] Total amount showing wrong in the payment modal if user has changed the qty after payment	2017-10-11 01:54:36 +05:30
Makarand Bauskar	4cdb9dee09	[minor] changed the modified date for the subscription doctype (#11142)	2017-10-10 18:41:00 +05:30
mbauskar	ee9da67173	[hotfix] passed localize item_group value for create_lab_test_itemsfield	2017-10-10 12:20:45 +05:30
Saurabh	9893a2d608	Merge branch 'master' into develop	2017-10-10 11:22:39 +05:30
Saurabh	47b2a5f7d1	bumped to version 9.1.3	2017-10-10 11:52:38 +06:00
tunde	37c2b6116c	Merge branch 'develop' into payment-terms	2017-10-09 15:42:47 +01:00
Faris Ansari	172f28fa06	Merge pull request #11133 from netchampfaris/fix-hub-sync ... fix Hub Sync plan	2017-10-09 19:31:08 +05:30
Faris Ansari	d635a2646b	fix Hub Sync plan	2017-10-09 19:30:11 +05:30
Saurabh	f347e23556	[fix] upload attendacne with with no_socketio param	2017-10-09 16:13:21 +05:30
mbauskar	966b3c156a	[conflicts] resolved merge conflicts	2017-10-09 15:20:30 +05:30
mbauskar	f9577652a0	bumped to version 9.1.2	2017-10-09 15:48:51 +06:00
tunde	e27f5dee1f	Merge branch 'develop' into payment-terms	2017-10-09 10:11:05 +01:00
Rohit Waghchaure	d270748eea	[Fix] Provision to select company in the POS screen if company is not defined in the global defaults	2017-10-09 12:54:26 +05:30
Doridel Cahanap	5ba39f3f83	Add has_certificate and level fields in Training Event (#11093)	2017-10-09 12:45:28 +05:30
tundebabzy	2622d370c6	deal zero division possibility (#11098)	2017-10-09 12:44:24 +05:30
rohitwaghchaure	e181dd4c24	[patch] To add healthcare domain (#11105)	2017-10-09 12:43:36 +05:30
tundebabzy	7f9d75521e	Confirmation desired before cancelling appointment (#10996) (#11106) ... * shows confirm dialog when user clicks cancel * indentation and frm as per review	2017-10-09 12:43:18 +05:30
Makarand Bauskar	eaf0abedd4	[hotfix] ignore if student email address field value is None (#11116)	2017-10-09 12:42:18 +05:30
Manas Solanki	f91ad75b5a	test, patch, docs for student admission (#11075)	2017-10-09 12:41:24 +05:30
tunde	1db7faa862	Merge branch 'develop' into payment-terms	2017-10-06 09:37:10 +01:00
Doridel Cahanap	5cb6c38a34	Add Calendar in Training Event Doctype (#11090)	2017-10-06 11:50:05 +05:30
Rohit Waghchaure	62ce218fc2	Show total instead of net total	2017-10-06 11:16:46 +05:30
Rohit Waghchaure	beeba8b37a	[Fix] Discount field not displaying in offline POS	2017-10-06 09:50:43 +05:30
Rohit Waghchaure	b870d0081b	[fix] Online print format in pos profile field not displaying	2017-10-06 09:31:40 +05:30
tunde	d82677f1e6	Merge branch 'develop' into payment-terms	2017-10-06 02:23:45 +01:00
Nabin Hait	7eaeec951d	Merge branch 'schilgod-develop' into develop	2017-10-05 19:54:17 +05:30
Nabin Hait	5a834209d0	Cleanup of PO schedule date pull requests	2017-10-05 19:51:10 +05:30
Faris Ansari	e3a5899980	[hub] Add hub category filters, fix minor issues (#11079)	2017-10-05 19:43:08 +05:30
Stavros Anastasiadis	455c3ebb27	Add as optional field link Company (#11068)	2017-10-05 18:45:37 +05:30
Stavros Anastasiadis	58b587834e	Provide a minor warning message if no stock levels are availiable (#11074) ... * Provide a minor warning message if no stock levels are availiable * Update item_dashboard.js	2017-10-05 18:44:50 +05:30
Stavros Anastasiadis	e31757b001	Show Stock Level section only to stock maintain items (#11073)	2017-10-05 18:41:51 +05:30
rohitwaghchaure	e0dfd1608e	[Fix] Auto add item in the cart if sinfle items found in the serach (#11072)	2017-10-05 18:30:51 +05:30
Nabin Hait	395cf4689b	Cleanup of schedule date functionality in Material Request	2017-10-05 18:27:37 +05:30
Prateeksha Singh	925e9776e8	[hub] rename is_hub_item to is_item_from_hub (#11069) ... * [hub] rename is_hub_item to is_item_from_hub * [rename] is_hub_item to is_item_from_hub	2017-10-05 17:17:41 +05:30
AravindPranera	9c0d30a087	Fetching Document ID also in Email Subject while clicking "Send Supplier Emails" button (#10874)	2017-10-05 17:08:32 +05:30
Utkarsh Goswami	4cb4d2f155	Tests for payment entry against purchase invoice (#10930)	2017-10-05 16:51:42 +05:30
Utkarsh Goswami	975d28307a	Payroll feature (#10900)	2017-10-05 15:59:51 +05:30
rohitwaghchaure	607b5d4985	[Fix] Negative qty issue in POS (#11070) ... * [Fix] Negative qty issue in POS * Update point_of_sale.js	2017-10-05 15:57:58 +05:30
Stavros Anastasiadis	ea390effa5	Add multirows in Attendees selection (#11067)	2017-10-05 15:31:25 +05:30
Nabin Hait	34ad2e6a60	Use format_currency only if fieldtype is currency	2017-10-05 15:28:43 +05:30
Nabin Hait	f8ad0cbe70	Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop	2017-10-05 15:02:50 +05:30