brotherton-erpnext

Author	SHA1	Message	Date
Frappe PR Bot	7db805a031	[Translation] Updated Translations (#13394 )	2018-03-27 11:21:08 +05:30
Shreya Shah	f3025f1596	operation time in grid view (#13400 )	2018-03-27 10:34:05 +05:30
Prateeksha Singh	e45f957ad9	Merge pull request #13363 from shreyashah115/timer Timer in Timesheets!	2018-03-27 10:28:50 +05:30
Sathisha Poojary	0b5fea1491	Initial changes to manually migrating bank statemet work from app to erpnext	2018-03-26 01:12:18 +05:30
Nabin Hait	061d912749	Fixed merge conflict	2018-03-23 16:20:27 +05:30
Nabin Hait	3fdda7a9b7	bumped to version 10.1.14	2018-03-23 16:35:06 +06:00
Shreya Shah	9bcadf8126	Tax Id in some reports and print formats (#13373 ) * tax-id in sales and purchase registers * tax-id in general ledger print_format * tax-id in accounts payable * tax-id in accounts receivable	2018-03-23 15:04:37 +05:30
rohitwaghchaure	492de67d7b	Added consumed material cost in project (#13365 )	2018-03-23 15:02:04 +05:30
Nabin Hait	80a9f523d5	Minor fix AR/AP summary report	2018-03-23 13:02:27 +05:30
Shreya	8bb0f05451	added task field	2018-03-23 11:46:45 +05:30
Shreya	7619cd2e14	updated docs for timesheet	2018-03-23 11:41:56 +05:30
Shreya	822ba21f38	codacy fix	2018-03-23 11:41:56 +05:30
Shreya	559011404a	removed timesheet.html, appended it as a helper function	2018-03-23 11:41:56 +05:30
Shreya	5bf24be704	minor fixes	2018-03-23 11:41:56 +05:30
Shreya	8f06266838	all fields editable	2018-03-23 11:41:55 +05:30
Shreya	5714260af4	replaced status with completed checkbox	2018-03-23 11:41:55 +05:30
Shreya	09937f3753	modified timer start button	2018-03-23 11:41:55 +05:30
Shreya	faff9d3bb2	thanks to faris for the css	2018-03-23 11:41:55 +05:30
Shreya	68ec22a90c	moved timer.js to public/js	2018-03-23 11:41:55 +05:30
Shreya	05e516efc4	Start the timer on the basis of time diff between now_time and timestamp	2018-03-23 11:41:55 +05:30
Shreya	7cc288a6db	New activity dialog removed, read only fields editable if no rows found, add a new row on timer start	2018-03-23 11:41:55 +05:30
Shreya	36040ce5f9	new field actual_end_time to record completed time	2018-03-23 11:41:55 +05:30
Shreya	dcce87d4a8	CSS modifications	2018-03-23 11:41:55 +05:30
Shreya	cd140da3ec	new dialog to create activity	2018-03-23 11:41:55 +05:30
Shreya	643528a3b8	added status field	2018-03-23 11:41:55 +05:30
Shreya	8f4e93f104	removed stop button and added a complete button	2018-03-23 11:41:55 +05:30
Shreya	eeaba29e5b	read only fields project and hours	2018-03-23 11:41:55 +05:30
Shreya	6a1bf70627	alert sound when timer exceeds the given hours	2018-03-23 11:41:55 +05:30
Shreya	1cfd28d50d	timer in timesheet	2018-03-23 11:41:55 +05:30
Faris Ansari	35397a1033	Salary Register (#13367 ) - convert date range to from_date and to_date	2018-03-22 15:26:45 +05:30
Nabin Hait	e3f0412570	Pass doc while autonaming item	2018-03-22 12:13:21 +05:30
rohitwaghchaure	6a2d073fe1	Merge pull request #13353 from PawanMeh/fixes_13352 Add total qty to offline POS	2018-03-22 11:36:32 +05:30
rohitwaghchaure	23fa8893a8	[Fix] Division by zero issue (#13362 )	2018-03-22 11:16:00 +05:30
Faris Ansari	34dd079a68	Remove unnecessary columns Analytics Reports (#13344 )	2018-03-22 11:12:02 +05:30
Manas Solanki	0f6c35d63f	Update update_project_in_sle.py	2018-03-21 18:24:45 +05:30
Faris Ansari	4fc74333bd	Fix Icons for Expense Claim and Timesheet (#13359 )	2018-03-21 17:54:09 +05:30
Kenneth Sequeira	6a92cdc358	Update cost-center.md (#13354 ) Fixed link to missing image for cost centre.	2018-03-21 17:52:52 +05:30
rohitwaghchaure	93779c21a7	[Fix] Project not set in the stock ledger entry (#13357 )	2018-03-21 17:52:41 +05:30
Manas Solanki	e010ddf65f	Student Report Card (#13346 ) * finalise the assessment report * minor fixes for button * fix the travis and codacy	2018-03-21 17:50:42 +05:30
Zarrar	969c8aaf52	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-21 11:17:49 +05:30
Manas Solanki	c711445b91	add the student as party type (#13348 )	2018-03-21 10:12:27 +05:30
rohitwaghchaure	2b88ac948e	[Fix] Special character issue (#13350 )	2018-03-21 10:04:47 +05:30
pawan	53a4d2c430	[fix] #13352	2018-03-21 09:19:36 +05:30
Faris Ansari	ce08aabc84	Add Kanban Board button in project (#13345 )	2018-03-20 19:03:32 +05:30
Zlash65	0859018c48	unindented code	2018-03-20 16:29:27 +05:30
Siddhi Sawant	c672530210	[hotfix] Added 'Paid Amount' and 'Change Amount' in POS print formats (#13316 ) * Added 'Paid Amount' and 'Change Amount' in GST POS Invoice and POS Invoice print formats * Update gst_pos_invoice.json Updated its 'disabled' property. * Update pos_invoice.json Updated its 'disabled' property. * Shows change amount only if it exists * Updated disable property of print formats	2018-03-20 14:31:14 +05:30
Britlog	e3a9b9fe49	[Website] Price in items list and sales uom management (#13335 ) * Price in items list and sales uom management * Price in product search page * Display website stock in sales uom * Add set_product_info_for_website to avoid duplicate code * Add price uom in item list and page * Update product.py	2018-03-20 14:28:44 +05:30
Zarrar	9a01baac1d	explicitely provide order_by (#13338 )	2018-03-20 14:08:44 +05:30
Achilles Rasquinha	0575b3e1c3	fixed inconsistent tab error (#13339 )	2018-03-20 14:07:25 +05:30
Charles-Henri Decultot	d0ac69704f	Chained log report doc (#13314 )	2018-03-20 13:12:28 +05:30
Zarrar	c5b061834b	doctype dropdown rectify, validate series is set (#13305 )	2018-03-20 13:06:18 +05:30
Zarrar	13ddc7e188	[ Enhance ] Production to Work Order (#12902 ) * remove occurrences of Production Order * rename from report and jsons * Change Production Order to Work Order * change occurences of production order from other files * resolve minor conflict issues and reports * patch added * codacy fix * updated patches, leftover changes * rename reports, rectify patches	2018-03-20 12:38:43 +05:30
Doridel Cahanap	c893268dea	Add Health Insurance Doctype and link to Employee (#13257 )	2018-03-20 12:37:02 +05:30
Deepak kumar	656ff36c76	[Feature] Advance Account Balance in Employee Advance (#13263 ) * added due advance amount field to show due amount * fixes codacy * made whitelisted method * Update employee_advance.js	2018-03-20 12:35:02 +05:30
Nabin Hait	d97c5a04b2	minor fix in item naming	2018-03-20 12:31:05 +05:30
Tom Price	cd525299ee	[Feature] Add default duration and color to appointment type (#13296 ) * Add default duration and color to appointment type When creating a Patient Appointment, the Duration field will be populated when the Appointment Type is set. This is preserved when checking availability and booking an appointment. `Appointment Type.color` is used in the calendar display. * Remove accidental fixed date from git * Update modified timestamp to ensure migrations. Set to the timestamp of dd506a0961437540872c01d3487b8e37806c0bb0	2018-03-20 12:08:44 +05:30
Mark Walker	f572522f25	Copy source project into Purchase Order Item (#13321 )	2018-03-20 12:06:04 +05:30
renzodemie	417dfed214	Daily Reminder (#12938 ) * for email sending * test commit for new branch * Removed test changes * test commit renzo * Email sending * Project Uo * Project Update * "My first commit" * "My second commit" * "My second commit" * Holiday is included * delete idea * first pull * first pull * "My third commit" * Delete idea * delete again * "Edit Time" * "Edit Time" * Naming series and bug fixing * "Edit current day and time" * "Proper naming series, hidden time and date" * Project and Project Update dashboard * dashboard * Remove hooks for PR * Remove hooks for PR * Remove hooks for PR * Deleted project_time.py * Corrected indention * Hook back to original * Delete project_time.py * "Modified time" * Fix indention * Sample * FRM * FRM * Time fix * Hooks original state * "Modified time" * Added permission to Project User * Added function/method to be called in order to create project update for the specific project * Naming series * this is not included * Fix minor bug * Indent again * "Reformat Code" * "Check Indent" * Indent again and again * semi colon * "Check Again Indent" * "Check again Indent" * "Check again Indent" * ind * "Check again Indent" * "Check again Indent" * Generate Project update With button in email * [] * "Erro Summary" * "Add syntax for the communcation" * "add summary code" * "Modified Summary code" * "Modified Summary code" * "Fix update ID and set localhost" * Fix time and date error in project_update Fix naming series problem in project_update * included "not updated" in project update * Bug in Number of Drafts * "add notes in summary" * Correct code * With error * Removed the method * Minor fixes * Correction for daily summary	2018-03-20 11:58:15 +05:30
Nabin Hait	8a8966ce9b	minor fix	2018-03-20 11:19:57 +05:30
Achilles Rasquinha	ecc4fdd3ef	Check Set Sales Target Item exists in User Slides	2018-03-19 22:21:45 +05:30
Achilles Rasquinha	d0786b45c3	fix issue	2018-03-19 22:17:37 +05:30
Achilles Rasquinha	60da37b502	Merge pull request #13329 from shreyashah115/travis-fix [Fix] Travis	2018-03-19 19:10:21 +05:30
Saurabh	2777fd4332	[fix] validate minimum transaction amount in Payment Request for selected payment gateway (#13328 )	2018-03-19 18:29:01 +05:30
Shreya	9602bf4ba3	patch fix	2018-03-19 18:17:54 +05:30
Shreya	5042dd32da	undefined args error	2018-03-19 17:45:39 +05:30
Shreya	4d347b1ca0	travis fix	2018-03-19 17:31:19 +05:30
Achilles Rasquinha	034834d671	Merge pull request #13326 from shreyashah115/fix-travis [Fix] Travis	2018-03-19 17:00:34 +05:30
Shreya	f7b39438d2	travis fix	2018-03-19 14:19:55 +05:30
Achilles Rasquinha	3099ea67a1	Merge pull request #13303 from achillesrasquinha/py3 unordered types None vs int	2018-03-19 11:54:24 +05:30
Achilles Rasquinha	3d85951c1f	Merge pull request #13304 from achillesrasquinha/hotfix-hub [HOTFIX] Hub Domain Change	2018-03-19 11:54:13 +05:30
Achilles Rasquinha	1e95323679	Fixed dict_keys concatenation	2018-03-18 10:08:43 +05:30
Manas Solanki	7b91042ae6	Merge pull request #13310 from manassolanki/student-report-card addition of student report card generation tool	2018-03-16 02:00:07 +05:30
Manas Solanki	633a39144d	addition of student report card generation tool	2018-03-16 01:57:45 +05:30
Achilles Rasquinha	94b41ea4f6	removed debugging	2018-03-15 12:53:22 +05:30
Achilles Rasquinha	d8f7de9946	fixed patch for hub	2018-03-15 12:48:32 +05:30
Nabin Hait	c8cd4ba6f7	Merge branch 'master' into develop	2018-03-15 12:38:43 +05:30
Nabin Hait	60200eaf0d	bumped to version 10.1.13	2018-03-15 13:08:41 +06:00
Nabin Hait	1e4cfb4bf5	Fixes in setting po nos manually in sales invoice	2018-03-15 12:27:24 +05:30
Nabin Hait	70abac0061	Get territory from sales invoice	2018-03-15 12:19:16 +05:30
Achilles Rasquinha	a4a62d5ea1	unordered types None vs int	2018-03-15 12:18:37 +05:30
Nabin Hait	bb5caf8fad	Merge branch 'master' into develop	2018-03-14 13:33:38 +05:30
Nabin Hait	6c09297bcd	bumped to version 10.1.12	2018-03-14 14:03:36 +06:00
Nabin Hait	363cedde76	Fixed minor issue	2018-03-14 13:32:14 +05:30
Nabin Hait	d21ad807b5	Merge branch 'master' into develop	2018-03-13 18:13:44 +05:30
Nabin Hait	c8c733bc54	bumped to version 10.1.11	2018-03-13 18:43:42 +06:00
Shreya Shah	7acc8cb747	fix else condition (#13295 )	2018-03-13 18:12:19 +05:30
Nabin Hait	e01dcc170c	Merge branch 'master' into develop	2018-03-13 17:11:52 +05:30
Nabin Hait	56882033bf	bumped to version 10.1.10	2018-03-13 17:41:49 +06:00
Nabin Hait	74c817e7f9	Update update_reserved_qty_for_purchase_order.py	2018-03-13 17:10:14 +05:30
Nabin Hait	3707242770	Fixed merge conflict	2018-03-13 16:15:41 +05:30
Nabin Hait	baac05955b	bumped to version 10.1.9	2018-03-13 16:44:02 +06:00
Nabin Hait	89346967da	Reverted #13259 (#13291 )	2018-03-13 16:01:11 +05:30
Nabin Hait	97e890d0b3	Fix in unallocated amount calc in payment entry (#13288 )	2018-03-13 15:57:34 +05:30
Ameya Shenoy	95763bc233	Purchase Order fixes (#13287 ) - Reason: If Item Code was changed in Item Master, it didn't used to reflect on the 'Purchase Order Item Supplied' and 'Purchase Reciept Item Supplied' - Data field in 'Production Order Item Supplied' and 'Production Reciept Item Supplied' converted to Link Field.	2018-03-13 15:51:56 +05:30
Nabin Hait	96f4b22589	Set po nos in DN and SI (#13290 )	2018-03-13 15:46:59 +05:30
Ranjith Kurungadam	369ba85499	Physician Schedule fixes (#13284 ) * move button add schedule to grid * Physician Schedule- add slots for multiple days * fix patient image view	2018-03-13 14:50:24 +05:30
Achilles Rasquinha	cbfcb3e61d	string_types from basestirng	2018-03-12 19:15:29 +05:30
Zarrar	0702f29860	Add Ends-On field in the Lead doctype (#13147 ) * add ends_on date in lead to be mapped with calendar event * set default ends_on to 1 hour from contact_time	2018-03-12 18:49:54 +05:30
tundebabzy	0125f7b130	rename to Subscription and transfer present Subscription records to Auto Repeat in frappe	2018-03-12 13:51:47 +01:00
rohitwaghchaure	13460f023d	[Fix] Batch value showing as item value while making batch (#13281 )	2018-03-12 17:20:50 +05:30
Nabin Hait	2f493731ec	Fixed merge conflict	2018-03-12 15:49:59 +05:30
Nabin Hait	04f50be306	bumped to version 10.1.8	2018-03-12 16:01:03 +06:00
Ameya Shenoy	b34ab7549a	fixed subject to task_name (#13278 )	2018-03-12 15:24:01 +05:30
Shreya Shah	aa54d934b8	make stock qty negative (#13276 )	2018-03-12 15:23:28 +05:30
Zarrar	c35665fa60	update physician patch fail (#13277 )	2018-03-12 15:21:53 +05:30
Nabin Hait	2c7a6e6b43	Reserve for subcontracting (#13195 ) * [fix] #8427 * review comments changes * Validation for reserved warhouse * code improvements * alignment * test case * message changes * default warehouse / remove validation / change sql * fix * patch * Fixed merge conflict * Fixes and cleanups of reserve qty for subcontracting * set from_warehouse only if purchase_order and purpose found (#12398) * [HotFix] Validation issue for subcontract stock entry (#12127) * [Fix] Validation issue for subcontract stock entry * Update stock_entry.py * Fixes and cleanups of reserve qty for subcontracting * patch fixed * Reload bin in patch * [fix] set source warehouse in stock entry for manufacture * [fix] #8540 * code alignment * code alignment * Move target warehouse validation to submit * validation code improvement * code changes for single stock entry * validation fix * call make_rm_stock_entry * remove old stock entry method/rewrite test case * Don't set bom_no against raw materials while trasferring items for sub-contracting * minor fix	2018-03-12 14:12:12 +05:30
Shreya Shah	58797481f0	uncheck report hide (#13256 )	2018-03-12 13:08:01 +05:30
Kenneth Sequeira	b48557fdc6	payment terms video tutorial in videos/learn (#13258 ) * payment terms video tutorial in videos/learn * Update payment-terms.md	2018-03-12 13:07:21 +05:30
Shreya Shah	ef4c3b8e2f	add has variants in standard filter (#13251 )	2018-03-12 11:20:49 +05:30
rohitwaghchaure	12aa4265ff	Don't allow to set negative quantity if transaction is not return entry (#13255 )	2018-03-12 11:20:30 +05:30
Shreya Shah	69d9f51dbb	if price list not found, set default selling/ buying price list from settings (#13259 )	2018-03-12 11:15:49 +05:30
Prateeksha Singh	9362cf37e0	[charts] update charts API	2018-03-12 09:54:56 +05:30
tundebabzy	2970630ed2	Merge branch 'develop' into new-subscription	2018-03-12 02:00:34 +01:00
Nabin Hait	fd75d554d2	Payment Terms Template added in test_ignore for Company	2018-03-09 18:52:14 +05:30
Nabin Hait	5e63c265db	Fixed merge conflict	2018-03-09 17:34:39 +05:30
Nabin Hait	096d136460	bumped to version 10.1.7	2018-03-09 17:08:50 +06:00
Nabin Hait	c3889d85a1	Update shopping_cart.js	2018-03-09 16:28:25 +05:30
Achilles Rasquinha	138a4850fe	Merge pull request #13252 from achillesrasquinha/py3 sort by name accounts for trial balance.	2018-03-09 15:23:28 +05:30
Achilles Rasquinha	dc61c6b975	sort by name accounts	2018-03-09 15:23:08 +05:30
Achilles Rasquinha	1d7665fca1	sort by name accounts	2018-03-09 15:22:20 +05:30
Nabin Hait	052333ea63	subctracting stock entry should also be considered as consumed qty	2018-03-09 14:30:32 +05:30
tundebabzy	3d26003c1f	add column breaks to Subscription	2018-03-09 09:37:06 +01:00
tundebabzy	8889b70ba1	Merge branch 'develop' into new-subscription	2018-03-09 09:10:48 +01:00
Nabin Hait	0357fbc9c1	commonfied regional function for checking delete permission	2018-03-09 13:19:52 +05:30
Nabin Hait	096c05ca6f	Fixes for regional feature of Nepal	2018-03-09 13:11:00 +05:30
theopen-institute	38cbd71352	prevent deletion of sales invoices if country is nepal	2018-03-09 12:39:40 +05:30
Achilles Rasquinha	b4de7e3d07	removed has_key, used pythonic in (#13236 ) * removed has_key, used pythonic in * Update bom.py	2018-03-09 12:35:47 +05:30
Suraj Shetty	f2d28ebd6a	Data import Tool bug fix (#13165 ) * fixes #13064 * commonified naming series checks * test fixes replaced test employee names according to naming series	2018-03-09 12:33:13 +05:30
tundebabzy	e69747ca6d	[Feature Request] Add Payment Mode field on Payment Terms Template #13117 (#13243 ) * add mode of payment field to Payment Term * add mode of payment field to Payment Terms Template Detail * add mode of payment field to Payment Schedule * add mode of payment in `get_payment_term_details`	2018-03-09 12:23:53 +05:30
Shreya Shah	aadd30d194	fetch delivery date on add-row only if item_code exists (#13250 )	2018-03-09 12:19:35 +05:30
Zarrar	3fd634783d	[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198 ) * customer code can be assigned based on customer group * improvise customer group selection * requested changes made	2018-03-09 12:10:45 +05:30
Harsh Patel	22e6f8d4c2	Fixes for #13071 (#13234 )	2018-03-08 16:23:59 +05:30
rohitwaghchaure	acd3479269	Bank POS transactions in bank reconciliation (#13225 )	2018-03-08 16:22:39 +05:30
rohitwaghchaure	a32e57ae82	[Fix] Discount in offline POS is enabled even is it's disabled in POS Profile (#13233 )	2018-03-08 16:21:13 +05:30
Ranjith Kurungadam	a3a63177a1	fix- cannot cancel consultation, remove updating age (#13226 )	2018-03-08 16:20:22 +05:30
Achilles Rasquinha	b2f7092f9e	Merge pull request #13235 from achillesrasquinha/py3 removed has_key	2018-03-08 14:22:36 +05:30
Achilles Rasquinha	87dab14576	removed has_key	2018-03-08 14:21:48 +05:30
Ameya Shenoy	d2eec91b2c	indentation fix	2018-03-08 13:27:11 +05:30
Achilles Rasquinha	9efd6e80d2	fixed tabs	2018-03-08 13:20:48 +05:30
Achilles Rasquinha	987934d8ee	fixed tabs	2018-03-08 13:16:08 +05:30
Achilles Rasquinha	abd365fd90	Merge pull request #13228 from achillesrasquinha/py3 [FIX] filter to list	2018-03-08 13:11:58 +05:30
Achilles Rasquinha	908289d40a	[FIX] filter to list	2018-03-08 13:10:51 +05:30
Jamsheer	665b48773f	Healthcare - Patient Appointment - Service unit based scheduling and booking (#13211 ) * New Document - Patient Service Unit * Physician - schedule based on patient service unit * Consultation - Remove validation on submit * Consultation - Label changed from Drug Prescription to Medication * Availability check and book appointment based on service unit, appointment invoice creation optimized * patch fixes * Patient Service Unit - field - overlap_appointments * Patient Appointment - Service Unit based scheduling and booking * Patient Appointment - issue fixed #13016 Healthcare Patient Appointment Save Button Issue - remove validation on save and enable save on book appointment * Codacy fixes on PR #13211 * Codacy fixes on PR #13211 * Fee validity test -fixes * Fee Validity - test - fixes	2018-03-08 13:08:35 +05:30
Achilles Rasquinha	11241044b2	Merge pull request #13227 from achillesrasquinha/py3 [FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:58:21 +05:30
Achilles Rasquinha	9050998e06	[FIX] use text_type instead of unicode, use cmp from past.builtins	2018-03-08 12:55:41 +05:30
theopen-institute	1bfa243190	fix patch that causes error on bench update (#13222 )	2018-03-08 11:20:40 +05:30
lasalesi	470977fa13	corrected setup wizard tax rates for Switzerland 2018 (#13220 ) (#13221 )	2018-03-08 11:19:56 +05:30
tundebabzy	1643cce479	fetch journal entry details (#13218 )	2018-03-08 11:17:17 +05:30
Manas Solanki	bb42e3b411	Merge pull request #13214 from manassolanki/assessment-report-fix minor fix for key error in assessment reports	2018-03-07 16:30:35 +05:30
Manas Solanki	586e9400b1	minor fix for key error	2018-03-07 16:28:21 +05:30
Shreya Shah	c3bf1fa009	[Fixes] Chapter DocType (#13213 ) * fetch chapter head from member doctype instead of user * add enabled in grid view and set default as 1	2018-03-07 16:27:30 +05:30
rohitwaghchaure	bbd9b71547	Provision to include exploded items while making transfer entry of raw materials for subcontrtacted item (#13043 )	2018-03-07 15:39:40 +05:30
Vishal Dhayagude	668ec25d19	Allow Item variant Rename (#13161 ) * [WIP] Item varient rename * [wip] Item Variant * [fix] Item Varient Rename * [fix] Item Attribution Rename * removed unwanted code	2018-03-07 15:31:08 +05:30
Nabin Hait	c50d7446b5	Merge branch 'master' into develop	2018-03-07 13:09:07 +05:30
Nabin Hait	36b4faab48	bumped to version 10.1.6	2018-03-07 13:39:05 +06:00
Saurabh	2b59a851c4	Merge pull request #13166 from saurabh6790/patches_fixes [fix] use join instead of subquery	2018-03-07 12:59:03 +05:30
Manas Solanki	857d4f7a0b	Merge pull request #13209 from manassolanki/guardian-fix allow renaming of the guardian	2018-03-07 12:53:40 +05:30
Manas Solanki	12d7bfb658	allow renaming of the guardian	2018-03-07 12:52:31 +05:30
Raghavendra Kamath	6193b92b70	Add new logo in splash image and optimise pngs (#13206 )	2018-03-07 12:39:38 +05:30
Saurabh	ca6e223694	[fix] use join instead of subquery	2018-03-07 12:13:32 +05:30
rohitwaghchaure	343ba85e3a	Merge pull request #13203 from saurabh6790/pe_fix [fix] setup_party_account_field on init	2018-03-07 12:11:46 +05:30
Manas Solanki	1fa992564a	fix the desktop icon for course schedule	2018-03-07 12:08:52 +05:30
Saurabh	a65b28772f	[fix] setup_party_account_field on init	2018-03-06 18:22:01 +05:30
Achilles Rasquinha	78064b7a45	Update patches.txt	2018-03-05 17:53:23 +05:30
Nabin Hait	c43c95e0aa	Fixed merge conflict	2018-03-05 14:54:44 +05:30
Nabin Hait	491ce05b8d	bumped to version 10.1.5	2018-03-05 15:17:18 +06:00
Saurabh	2cfcbf933d	Patches fixes (#13163 ) * [fix] if serialised items not found then return * [fix] unicode encoding in patch	2018-03-05 13:01:15 +05:30
Zarrar	2550180a05	remove updating territory for customers on change (#13162 )	2018-03-05 12:32:41 +05:30
Zarrar	950fff0ba1	changes according to the workflow (#13160 )	2018-03-05 11:30:53 +05:30
Manas Solanki	5fd7b3bb80	Fix status updater (#13033 ) * fix the status updater for multiple sources * patch for updating the status * patch for updating the sales order item * Update update_status_for_multiple_source_in_po.py	2018-03-05 11:28:29 +05:30
Vishal Dhayagude	35b665cb26	[new] Create multiple warehouse address and fetch address to stock entry (#13109 ) * [new] Create multiple warehouse address and fetch address to stock entry * [fix] Deleted unwanted field and added patch to link warehouse details to Address * [fix] Codacy fixed * [fix] Modified patch for warehouse address * [fix] Modified patch for warehouse address * [fix] Patch updated and removed contact details from stock entry * [fix] Patch Updated	2018-03-05 11:10:01 +05:30
Zarrar	4417cb0006	improve multiple add dialog, populate parent's depends on with child tasks (#13142 )	2018-03-05 11:08:15 +05:30
Kenneth Sequeira	89795c3f69	Doc imp (#13148 ) * added intro, item and prices video, fixed image links in item and prices * update 2: first 5 videos added * added all videos to the user manual * updated .gitignore	2018-03-05 11:06:44 +05:30
Zarrar	1e4e004667	leave application assigned by naming_series (#13158 )	2018-03-05 11:05:59 +05:30
rohitwaghchaure	a6a4e86dc8	[Fix] System only shows 20 attribute values while making variants (#13155 )	2018-03-05 11:03:59 +05:30
rohitwaghchaure	0eb8bb2511	[Fix] Wrong salary slips showing when click on view salary slips from payroll entry (#13152 )	2018-03-05 11:03:27 +05:30
rohitwaghchaure	67cfa81de2	[Fix] Stock Ageing report does not work with group warehouse (#13151 )	2018-03-05 11:00:42 +05:30
tundebabzy	458a1fe61a	codacy	2018-03-03 18:11:48 +01:00
tundebabzy	ef605d5f00	codacy	2018-03-03 18:03:04 +01:00
tundebabzy	3b1251ef47	codacy tinzz	2018-03-03 17:36:07 +01:00
tundebabzy	2379451b68	codacy tinzz	2018-03-03 17:18:47 +01:00
tundebabzy	fbdd5d30e9	more tests and bug fixes	2018-03-03 11:19:18 +01:00
tundebabzy	024c28acf7	fix proration logic to reduce possibility of rounding errors	2018-03-03 10:32:02 +01:00
tundebabzy	79a01561d5	enhancement: do nothing if `cancel_sbscription` is called for cancelled subscription	2018-03-03 07:39:44 +01:00
tundebabzy	d43422c18e	enhancement: ensure subscription is cancelled before attempting to restart	2018-03-03 07:37:59 +01:00
tundebabzy	e13570f343	codacy review	2018-03-02 12:27:12 +01:00
tundebabzy	9e863b9572	Merge branch 'develop' into new-subscription	2018-03-02 11:10:27 +01:00
tundebabzy	c15dc21b7d	clean up	2018-03-02 11:00:15 +01:00
tundebabzy	49d34df8f4	more tests	2018-03-02 10:16:57 +01:00
tundebabzy	688fd6b205	prorate invoice when cancelling subscription	2018-03-02 10:16:42 +01:00
tundebabzy	4499e5351c	add article	2018-03-02 06:51:33 +01:00
tundebabzy	16afa8765e	tiny refactor of invoice setting logic	2018-03-01 17:16:41 +01:00
tundebabzy	9df4f0bd43	fix: apply_discount_on field should be of type Select not Data	2018-03-01 17:12:43 +01:00
tundebabzy	8670c85827	make sure default `apply_discount_on` is set when creating invoice	2018-03-01 17:11:14 +01:00
tundebabzy	ca5cf35a99	fix: task should explicitly call `commit` and rollback if error	2018-03-01 17:06:39 +01:00
tundebabzy	36c18c913e	docstrings	2018-03-01 16:44:10 +01:00
tundebabzy	0ec445214c	hook to hourly scheduler	2018-03-01 11:54:32 +01:00
tundebabzy	78fb12663a	fix test	2018-03-01 11:27:48 +01:00
tundebabzy	b91ec79494	update tests and more tweaks	2018-03-01 10:47:00 +01:00
tundebabzy	7eabbd93e1	update start date alone after restarting subscription	2018-03-01 09:09:23 +01:00
tundebabzy	2a11c18383	set initial invoice period based on subscription start	2018-03-01 08:47:38 +01:00
tundebabzy	a93fa16bce	freeze screen while waiting for updates on subscription	2018-03-01 08:45:56 +01:00
rohitwaghchaure	a942722619	[Fix] Timeout issue while saving multilevel BOM (#13118 )	2018-03-01 13:15:25 +05:30
tundebabzy	328adedbc8	adds `start` field to record subscrption start date	2018-03-01 08:45:01 +01:00
Nabin Hait	c10bbd6aa7	Editable unallocated amount in pe (#13130 ) * editable unallocated amount in payment entry to handle multi currency * set unallocated amount on server side * some minor fixes * Fixes in territory patch * removed print * minor fixes	2018-03-01 13:14:14 +05:30
Rohit Waghchaure	855d843e55	[Fix] Sales invoice email prompt not working	2018-03-01 13:06:01 +05:30
Harsh Patel	5bebbbe7a9	[Feature] Supplier warehouse link field on purchase order (#13051 ) * Multiple Features: [New] Supplier warehouse link field on purchase order for sub-contracting [New] Auto select supplier warehouse while making purchase receipt from purchase order * Set default to_warehouse in stock entry as the supplier warehouse	2018-03-01 11:33:25 +05:30
rohitwaghchaure	0df95fa781	Multi-UOM for sales/purchase return (#13132 ) * Multi-UOM for sales/purchase return * Update sales_and_purchase_return.py	2018-03-01 11:31:33 +05:30
Charles-Henri Decultot	bc7a549fdb	Gocardless integration (#13008 ) * GoCardless integration * Addition of a method for determining if the email should be sent or not * Correction for Tests * Codacy fix * Documents moved to ERPNext * Codacy fix * Codacy fixes * Remove method where not necessary and replace with hasattr	2018-03-01 10:59:21 +05:30
Zarrar	6578bc11b6	wrong query formed to delete events (#13119 )	2018-03-01 10:54:55 +05:30
Nabin Hait	f68dc69078	Set auto created serial nos in incoming transactions in case of multi UOM (#13112 ) * Create user from Employee * Set auto created serial nos in incoming transactions in case of multi uom	2018-03-01 10:54:24 +05:30
tundebabzy	3fecbb98c5	Make Expense Claim from Employee Advance #13053 (#13074 ) * allow to make expense claim from employee advance * make expense claim only if claimed amount < paid_amount * expense claim made from employee advance is paid	2018-03-01 10:50:45 +05:30
Zarrar	502af4dd67	display image fnd description for root BOM also (#13099 )	2018-03-01 10:44:47 +05:30
rohitwaghchaure	db9fa78ee8	Do not validate payment schedule for POS (#13115 )	2018-03-01 10:32:29 +05:30
Nabin Hait	a645f36b2b	Get valuation rate from historical SLE even if it is zero (#13129 ) * Don't overwrite start and end date comes from payroll entry * Get valuation rate from historical SLE even if it is zero, if records exists * Valid till should be autoset if not any default value * Set status of expense claim based on is_paid check	2018-03-01 10:31:24 +05:30
rohitwaghchaure	332a17ee86	[Fix] Test case for serial no (#13136 )	2018-03-01 10:28:04 +05:30
tundebabzy	d9fec69a70	update test case, fix bugs	2018-03-01 05:34:02 +01:00
tundebabzy	8f37926ca8	add ability to cancel, restart and refresh subscription	2018-03-01 04:57:23 +01:00
Achilles Rasquinha	646522886c	self.assertEqual	2018-02-28 21:13:51 +05:30
Shreya Shah	a310cc7156	order by modified instead of item name (#13113 )	2018-02-28 18:59:55 +05:30
Ameya Shenoy	c20901443e	updated develop_version to 11 (#13133 )	2018-02-28 17:38:23 +05:30
tundebabzy	2cccad0274	more tests and quick fix	2018-02-28 12:45:09 +01:00
tundebabzy	a5bc057ad4	adds missing 'translatability'	2018-02-28 12:24:16 +01:00
tundebabzy	86ee455cbc	more tests and bug fix	2018-02-28 12:21:08 +01:00
tundebabzy	b3d5777e55	more test cases and bug fixes	2018-02-28 12:11:19 +01:00
Achilles Rasquinha	96698c9a77	Use range instead xrange (#13128 ) * Use range instead of xrange * convert float to int	2018-02-28 16:12:51 +05:30
Faris Ansari	72d8509b3d	python 3 fix (#13127 )	2018-02-28 12:53:34 +05:30
tundebabzy	3aaf693abd	adds task -`process`	2018-02-28 05:12:18 +01:00
tundebabzy	95a4ca9429	update test cases	2018-02-27 18:09:06 +01:00
tundebabzy	9bf029a16e	generate new invoice only when `current_invoice_end` is past	2018-02-27 15:19:02 +01:00
Achilles Rasquinha	11a5f78d3e	Merge pull request #13070 from achillesrasquinha/py3 [FIX] sorting multiple compares	2018-02-27 19:48:25 +05:30
tundebabzy	45b6a1719f	refactor: - current_invoice _start and end should be determined by trial period or billing period - adds new functions to get billing period data	2018-02-27 15:14:19 +01:00
tundebabzy	c634ca8737	adds validation to billing_interval_count in Subscription Plan	2018-02-27 14:12:39 +01:00
Nabin Hait	3b43c0d160	Update territory and customer_group patch optimization (#13076 ) * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-27 15:57:14 +05:30
Zarrar	96002c28bd	optimize patch for faster execution (#13068 )	2018-02-27 15:57:01 +05:30
Zarrar	91fc1a8fbe	Update Territory & Customer Group across all transaction (#13004 ) * added method for update query based on changes * patch added * updated function, moved util function	2018-02-27 15:56:38 +05:30
tundebabzy	3c26a7e862	adjusts query so multiple plans can be used to create single invoice	2018-02-27 09:36:29 +01:00
tundebabzy	559d01e176	allows to rename subscription plan	2018-02-27 09:13:35 +01:00
tundebabzy	07313c281a	adds more assertions to test cases	2018-02-27 09:00:13 +01:00
Ameya Shenoy	3ee22f0137	rename valid_email to validate_email (#13103 )	2018-02-27 12:59:12 +05:30
rohitwaghchaure	f1755fb5b1	Merge pull request #13094 from rohitwaghchaure/pos_discount_v10_1 [Hotfix] POS discount issue	2018-02-27 11:58:33 +05:30
Manas Solanki	be841ccc53	Merge pull request #13096 from manassolanki/fix-fee-schedule Fixes in the Fees Schedule	2018-02-27 11:23:38 +05:30
Frappe PR Bot	c6e2d750bb	[Translation] Updated Translations (#13097 )	2018-02-27 11:00:59 +05:30
Zarrar	033eb779d4	minor fixes for member (#13101 )	2018-02-27 11:00:47 +05:30
tundebabzy	048bcbf080	more tests and code fixes	2018-02-26 22:17:06 +01:00
tundebabzy	b84e9519c2	Subscriptions doctype - subscriber should be set only once	2018-02-26 20:35:20 +01:00
tundebabzy	1ea5055967	fix another date comparison bug	2018-02-26 20:17:59 +01:00
tundebabzy	4d8175f9d9	adds test cases and fix resulting bugs	2018-02-26 18:56:05 +01:00
tundebabzy	cd700efc0b	only generate invoice `after_insert` if subscription is not in trial period	2018-02-26 16:26:36 +01:00
tundebabzy	0091c86e80	fix date comparison bug	2018-02-26 16:18:55 +01:00
tundebabzy	08a11b4d1f	sets default for `days_until_due` to 0	2018-02-26 16:13:45 +01:00
tundebabzy	d3fdcd9da5	set `after_insert` methods: - if subscription is not in trial period, generate sales invoice	2018-02-26 16:10:47 +01:00
tundebabzy	b72aac6729	adds validation: - ensure trial period dates are in order	2018-02-26 15:56:47 +01:00
tundebabzy	7a2c6df645	sets Subscription doc status in `before_save`	2018-02-26 15:55:32 +01:00
tundebabzy	3010996cc5	adds `before_insert` methods: - set current_invoice_start - set current_invoice_end	2018-02-26 15:51:32 +01:00
tundebabzy	35e92c7d29	removes start field from Subscriptions	2018-02-26 15:25:26 +01:00
Manas Solanki	51dfba749b	filter students on basis of category and button to show fees	2018-02-26 19:32:26 +05:30
tundebabzy	6e014331c5	removes end_date from Subscriptions doctype	2018-02-26 14:05:54 +01:00
tundebabzy	2b5298238e	adds prorate field to Subscription Settings	2018-02-26 13:58:29 +01:00
tundebabzy	2dee342501	Subscriptions doctype - trial start and end are set_only_once	2018-02-26 13:34:25 +01:00
Nabin Hait	3799f8bec9	Don't validate serial nos while cancelling the transaction	2018-02-26 16:39:06 +05:30
Zarrar	e53a238665	minor fix (#13095 )	2018-02-26 15:59:20 +05:30
Shreya Shah	70a57e08fd	New Report Employee Advance Summary (#13040 ) * New Report Employee Advance Summary * JSON style column definition	2018-02-26 15:58:57 +05:30
tundebabzy	cbe4f5b6b3	changes to subscription settings	2018-02-26 11:22:53 +01:00
tundebabzy	066958a794	subscription_invoice doctype changes	2018-02-26 11:22:05 +01:00
Rohit Waghchaure	3edc101957	[Fix] POS discount issue	2018-02-26 13:25:58 +05:30
tundebabzy	8457bb2c7e	change in Subscription Settings	2018-02-26 08:13:41 +01:00
Nabin Hait	127c61e930	Fixed logic in itemwise recommended reorder level	2018-02-26 12:43:17 +05:30
rohitwaghchaure	8ffd5d40e3	[Fix] UX for delivery trip (#13046 ) * [Fix] UX for delivery trip * Fixed test cases	2018-02-26 12:25:39 +05:30
tundebabzy	9360f81b94	Validity of Quotation #12858 (#13078 ) * add new setting for default valid_till date * codacy cleanup	2018-02-26 12:23:41 +05:30
Nabin Hait	e55831a89c	Projected Qty in Auto reorder email	2018-02-26 11:38:40 +05:30
tundebabzy	9016890ecf	adds Subscription Settings doctype	2018-02-26 06:15:31 +01:00
tundebabzy	988f5ca38b	hide `trial_period_end` and `invoices` if empty	2018-02-26 05:14:10 +01:00
tundebabzy	bbac07d9d2	use naming series for Subscriptions	2018-02-26 05:07:56 +01:00
tundebabzy	dda6234cab	remove subscription name and name by subscriber	2018-02-26 04:52:13 +01:00
tundebabzy	7c455ad4b6	display invoices section field only if there are invoices	2018-02-26 04:50:45 +01:00
tundebabzy	4ca5e81aa3	adds description for `billing_interval_count` in subscription plan	2018-02-26 04:47:19 +01:00
tundebabzy	4d31255d5c	customer field in Subscriber should be Link	2018-02-26 04:40:53 +01:00
tundebabzy	a07811b67f	adds new doctype - Subscriptions - encapsulates subscription - linked to a subscriber - subscription can contain many plans - contains history of generated invoices	2018-02-26 04:25:30 +01:00
Nabin Hait	2572b05b35	Update territory and customer_group patch optimization (#13076 ) * Update territory and customer_group patch optimization * Update update_territory_and_customer_group.py	2018-02-25 10:45:24 +05:30
tundebabzy	2581e2e5d7	New doctype - Subscription Plan: - Plan is to be linked to a Product - Plan will be used to create Invoice items - Subscriber can have multiple plans - Contains billing cycle information	2018-02-24 11:31:42 +01:00
tundebabzy	007919c03f	New doctype - Subscriber: - Encapsulates a subscriber to a service or product - Contains subscription specific information	2018-02-24 11:19:06 +01:00
Zarrar	4a0d27078e	optimize patch for faster execution (#13068 )	2018-02-23 17:41:32 +05:30
Achilles Rasquinha	a3555aa7bd	[FIX] sorting multiple compares	2018-02-23 17:22:07 +05:30
Nabin Hait	802819df9d	Merge branch 'master' into develop	2018-02-23 16:59:44 +05:30
Nabin Hait	d54953e419	bumped to version 10.1.4	2018-02-23 17:29:42 +06:00
Zarrar	339426c926	fix permission issue for stock balance report - Item Group (#13069 )	2018-02-23 16:58:55 +05:30
Nabin Hait	7570774ebe	Merge branch 'master' into develop	2018-02-23 16:49:43 +05:30
Nabin Hait	d12fb58c12	bumped to version 10.1.3	2018-02-23 17:19:40 +06:00
Ameya Shenoy	82048cf3ce	verify payment entry amount is positive (#13066 ) * verify payment entry amount is positive * Update sales_invoice.py * Update sales_invoice.py	2018-02-23 16:33:28 +05:30
rohitwaghchaure	4d76269eeb	[Fix] Item wise sales register report (#13055 )	2018-02-23 16:25:30 +05:30
Shreya Shah	70a68897cc	auto name on the basis of naming series (#13056 )	2018-02-23 16:24:59 +05:30
Shreya Shah	d5b2e39f45	improve validation (#13058 )	2018-02-23 16:23:57 +05:30
Frappe PR Bot	239c121f7d	[Translation] Updated Translations (#13059 )	2018-02-23 16:23:00 +05:30
rohitwaghchaure	dd0fc1084e	[Fix] PDC amount, PDC print layout issue (#13062 )	2018-02-23 16:20:46 +05:30
Faris Ansari	97b212e348	Patch optimization (#13060 ) * Patch fixes * fix codacy * Update item_barcode_childtable_migrate.py	2018-02-23 16:19:41 +05:30
Raghavendra Kamath	1a9388acbb	Clean inline css found in chapter and grant for loops! (#13038 ) * Clean inline css found in chapter and grant for loops! * Remove redundant css * remove unwanted ide files and append gitignore * remove unnecessary line from build.json * restore import for variable.less * remove kdev from gitignore	2018-02-23 14:34:44 +05:30
Nabin Hait	d283ee73f3	Fetch timesheet based on project	2018-02-23 12:58:39 +05:30
Nabin Hait	5b9f3b0cd3	Merge branch 'master' into develop	2018-02-22 18:18:36 +05:30
Nabin Hait	2b2cf13408	bumped to version 10.1.2	2018-02-22 18:48:34 +06:00
Nabin Hait	7f49b57aaa	Update added_extra_gst_custom_field_in_gstr2.py	2018-02-22 18:17:57 +05:30
Nabin Hait	0e3db275e5	Merge branch 'master' into develop	2018-02-22 18:10:39 +05:30
Nabin Hait	6b69fc7e5d	bumped to version 10.1.1	2018-02-22 18:40:37 +06:00
Saurabh	d8cd54dfd0	[fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047 )	2018-02-22 18:05:40 +05:30
Suraj Shetty	8a41887f68	patch exception fixes (#13037 ) * patch exception fixes * reload daily_work_summary_group_user doctype	2018-02-22 15:56:33 +05:30
tundebabzy	2949e9c5dc	Merge pull request #13036 from tundebabzy/issue-13019 Uncaught Server Exception : adjust_qty_for_expired_items #13019	2018-02-22 11:04:53 +01:00
Nabin Hait	cf72d7f135	Fixed merge conflict	2018-02-22 14:47:26 +05:30
Nabin Hait	9b530fb2cb	bumped to version 10.1.0	2018-02-22 15:09:37 +06:00
Nabin Hait	06bace9089	Fixed develop version	2018-02-22 14:36:26 +05:30
tundebabzy	c15978fca0	fix indentation	2018-02-22 09:50:49 +01:00
Nabin Hait	7d862276af	Cleanup and fixes on leaderboard	2018-02-22 13:59:41 +05:30
Nabin Hait	e4fe2d9603	Merge branch 'leaderboard' of https://github.com/vishdha/erpnext into vishdha-leaderboard	2018-02-22 11:35:10 +05:30
rohitwaghchaure	23a2b65576	[Fix] BOM Update Tool not update grandparent's exploded BOM (#13026 )	2018-02-22 11:32:09 +05:30
tundebabzy	cad22dbe39	Cutomisable Cash Flow Reports (#12969 ) * add child doctype - Cash Flow Mapping Account * adds new doctype - Cash Flow Mapping * adds new doctype - Cash Flow Mapper * adds new doctype Cash Flow Mapping Template * adds new doctype Cash Flow Mapping Template * adds adjustments to Cash Flow Mapper: - remove fields from Cash Flow Mapping Template Details - update in Cash FLow Mapper * get cash_flow_accouts from Cash Flow Mapping * change `tmp` to `mappers` and make sure `mappers` is sorted by its `position` field * changes description from 'Net Profit/Loss' to 'Profit for the year' * set `net_profit_loss` `parent_account` properly * modify `get_account_type_based_data`: - changed signature such that `account_type` parameter is now `account_name` - where clause in query is now based on `name` * remove zero rows * de-duplicates row, summing similar accounts in the process * makes gl sum calculation use `parent_account` as a condition * add the `section_leader` immediately after adding net profit, sorts `accounts` by `is_working_capital` field * adds `is_working_capital` to "account_types" so that we can use this to determine when to add "Changes in working capital" for operating activities * add "Movement in working capital" subheader * refactor code for readability * adds new fields to `Cash Flow Mapping`: - `is_interest_paid` to allow me recognise accounts for 'Interest Paid' - `is_income_tax_paid` to allow me recognise accounts for 'Income Taxes Paid' * allow `Cash Flow Mapping` to be renamable * adds new field - `section_subtotal` useful for only Operating Activities * changes `Cash Flow Mapping` doctype fields: - remove `is_income_tax`_field - add `is_income_tax_liability` field to identify tax payable accounts - add `is_income_tax_expense` field to identify tax expense accounts in P or L * calculates and shows tax paid adjustment in cash flow statement * renames `is_interest_paid` to `is_finance_cost` * - adds finance costs calculation - correctly sets opening balance dates * prevents users from selecting extra options in Cash Flow Mapping * adds validation to prevent selecting multiple options * adds new fields to Cash Flow Mapping * calculate non cash p or l items (2nd pass) * separates default cash flow generation from custom * adds new setting to Accounts Settings: - allow user elect to use customised cash flow report * clean up * removes mandatory constraint from accounts field * allow rename, disallow create and delete * adds patch to add default Cash Flow Mappers * refactors custom_cashflow * add article to explain configuration * refactor * further refactor * final clean up (hopefully) * clean up for codacy * more codacy fixes * more codacy fixes * fix broken patch * rename article to .md * create default mappers after install * PEP 8 * create the tables in `after_install` call	2018-02-22 11:08:36 +05:30
tundebabzy	27d558c9ef	Optionally allow overlap on Timesheet #12893 (#13018 ) * give user option to ignore time overlap validation * move settings to new Projects Settings * clean up - remove trailing space	2018-02-22 11:05:49 +05:30
rohitwaghchaure	4e8fdf7b3f	[Enhance] Quality Inspection Template (#12988 ) * [Enhance] Quality Inspection Template * Test case and patch * Update make_quality_inspection_template.py	2018-02-22 11:03:48 +05:30
Zarrar	79756c44c9	Update Territory & Customer Group across all transaction (#13004 ) * added method for update query based on changes * patch added * updated function, moved util function	2018-02-22 10:57:49 +05:30
Shreya Shah	0bde9e11c7	clear log if no attachments (#13023 )	2018-02-22 10:55:40 +05:30
tundebabzy	637b242a34	Credit card default account should be debtors #12989 (#13029 ) * allow receivable account type in mode of payment * update `default_account` field description	2018-02-22 10:51:57 +05:30
vishdha	09d56754ea	[fix] Codacy issue	2018-02-21 16:10:09 +05:30
vishdha	e9166d7c19	[fix] Sales partner details get from sales Order and company currency details from selected company	2018-02-21 15:35:58 +05:30
vishdha	9a64d4371e	[fix] Codacy Issue	2018-02-21 15:35:58 +05:30
vishdha	d4491d361f	[new] Filter based on company:	2018-02-21 15:35:58 +05:30
vishdha	09acb779d7	[new] Leader board	2018-02-21 15:35:58 +05:30
Suraj Shetty	d3069fee4d	Daily work summary refactor (#12944 ) * added daily work summary setting doctype and code to support feature this will allow multiple setting for daily work summary * added daily work summary setting user doctype * made changes in daily work summary code * [minor] entry change in hr config file * deleted previous daily work summary settings (and its company) doctype * removed unwanted permission check * toggled read_only option for enabled field * removed print statements * add patch for the changes * doc changes * [minor] indentation fix * fixed tests * indentation fixes * codacy issue fix * formatting fixes * renamed doctype Renamed Daily Work Summary Setting to Daily Work Summary Group and did related code and doc changes * fixed typo * updated doc * codacy issue fix * [minor] renamed doctype name in json * Renamed old doctype * fixed indentation * codacy fix * indentation fix * renamed doctype * handled patch exception * fixed exception * Update daily_work_summary_group.py * rename patch file removed abbreviation in file name * handled exception in patch code * removed Unnecessary pass statement * [minor] indentation fix	2018-02-21 15:15:43 +05:30
Zarrar	67f74414c4	disable expand_all button for BOM (#13015 )	2018-02-21 14:46:41 +05:30
Shreya Shah	8a77a0e1e4	Add total row in all trends reports (#13010 ) * total in sales order trends report * total in all trends reports	2018-02-21 14:46:07 +05:30
Zarrar	bc5515651b	[Hotfix] Selecting create on blank field throws error (#13014 ) * selecting create on blank field error fix * error when fetching default_print_format	2018-02-21 11:13:14 +05:30
Shreya Shah	f65afac353	db_update instead of save to avoid unnecessary validations (#13009 )	2018-02-21 11:12:04 +05:30
Charles-Henri Decultot	b8c088edb7	Transaction Log for France (#12795 ) * Regional overrides for France * Addition of tests and documentation	2018-02-21 11:07:33 +05:30
Faris Ansari	7c744acc49	Changes for Rollup (#12924 ) * Changes for rollup * remove variables.less	2018-02-20 14:21:50 +05:30
rohitwaghchaure	e2558308f6	[enhance] Production Plan (#12160 ) * [enhance] Production plan * Test cases * Removed production planning tool * Documentation * Added actual qty in material request production item * Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'	2018-02-20 12:20:00 +05:30
Pawan Mehta	2fbb4923a7	item balance report (#12983 ) * item balance report * remove hard coding * Update item_balance.json * Update item_balance.json Change name to "Item Balance (Simple)" * Update item_balance.json	2018-02-20 12:17:49 +05:30
Pawan Mehta	244e235c48	Sales Payment Summary - fix for change amount (#12981 ) * [fix] #12980 * apply change amount to cash	2018-02-20 12:15:10 +05:30
Shreya Shah	f718b0c0df	Currency filter in Pricing Rule (#11776 ) * added currency filter * modified files * pull margin only if currency matches * Renamed price to rate in pricing rule * fetch rate only if currency matches * rebase with develop * rebase with develop * patch to set currency in existing docs * currency field mandatory in pricing rule * modified test cases * rebase with develop * fixed test case	2018-02-20 11:26:46 +05:30
rohitwaghchaure	554f2de23d	Code cleanup online POS (#12985 )	2018-02-20 11:18:01 +05:30
Vishal Dhayagude	a5003f8f5b	[minor] Balance Qty added in reorder level email notification (#13000 )	2018-02-20 11:14:54 +05:30
tundebabzy	6c5d7986ab	Outstanding Amount not getting updated in Payment Entry #12713 (#12975 ) * allow to `set_missing_ref_details` by force * update payment entry references during submit and cancel	2018-02-19 13:11:56 +05:30
Shreya Shah	5448318146	fix total field (#12992 )	2018-02-19 12:44:52 +05:30
Pawan Mehta	174a18399c	Added Payment Details to Sales Payment Summary Report (#12358 ) * [fix] #12357 * label changes	2018-02-19 12:39:13 +05:30
Saurabh	ec23a6f0eb	[fix] section break for raw_material_details (#12976 )	2018-02-19 11:33:11 +05:30
joezsweet	16862f9051	Better handling of auto set barcode_type issue (#12970 ) Get barcode_type options and check if value is included	2018-02-16 17:33:30 +05:30
Charles-Henri Decultot	894ab7a664	Braintree integration documentation (#12775 ) * Braintree integration documentation * Cleanup documentation	2018-02-16 15:16:47 +05:30
riyasrawther	d1134516c2	Warehouse wise Item Balance, Age and Value (#12879 ) * Create warehouse_wise_item_balanace_age_and_value.py * Create warehouse_wise_item_balance_age_and_value.js * Create warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.json * Update warehouse_wise_item_balance_age_and_value.js * Rename warehouse_wise_item_balanace_age_and_value.py to warehouse_wise_item_balance_age_and_value.py * Update warehouse_wise_item_balance_age_and_value.py	2018-02-16 14:53:53 +05:30
Shreya Shah	093e7e6e98	Refactor Expense Claim (#12883 ) * patch for custom workflow * deleted field approval_status * replaced approval_status with workflow_state * updated test cases * validation to check expense approver * check if workflow_state_name already exists * fixes * modified notifications.py * removed field exp_approval and modified test cases	2018-02-16 14:49:39 +05:30
joezsweet	bd7c00c59e	[Hot Fix] barcode_type auto set to a wrong value (#12957 ) * Fix barcode_type auto set to a wrong value This fix a problem that arise, for some weird reason that i can't figure out, when the barcode length == 8, 9,10 or 12,13 and barcode_type is not set; barcode_type become "ean8, ean9, ean10, ean11, ean12, ean13" * codacy fix	2018-02-16 14:47:10 +05:30
Jay Parikh	33b2614377	[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966 )	2018-02-16 14:45:40 +05:30
Zarrar	441a1e1b8a	Validate Bank name in Setup wizard on the same slide (#12968 ) * validate bank name before moving on to next slide * Update setup_wizard.js	2018-02-16 14:44:42 +05:30
Nabin Hait	b95ecd7fcd	Gstr reports (#12940 ) * GSTR1 for B2B (#12296) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings * Update gstr_1.py * GSTR1 for B2B, B2CL and B2CS (#12459) * [Report] GSTR - 1 CDNR Report (#12554) * [wip] cdnr * [WIP] cdnr with optional data * [wip] Export GSTR-1 * [minor] Minor changes in export * [new] Custom field added for GST * [fix] Minor changes in GSTR1 Report * [minor] Minor changes in gstr1 * [fix] Codacy Fixed * Update setup.py * [wip] Gstr2 * [fix] Fetch correct Tax Details * [minor] ITC data append to row * [fix] CDNR negative value * Cleanup and fixes on GSTR-2 * Minor fixes in gstr reports (#12848) * [new] B2C limit fetch from GST Settings (#12905) * [new] b2c limit fetch from gst setting * [fix] Patch Added for b2c limit * Update gstr_1.py * Update utils.py * Cusotm fields related GSTR2 * minor fixes * minor fixes * some more fixes * Added duplicate patch and some tests as not required on develop	2018-02-16 13:19:04 +05:30
Nabin Hait	cc98d40ff7	Payment reco auto allocation and maintain same order of records (#12963 ) * Automatically allocate amount after selecting invoice against a payment entry * codacy fixes	2018-02-16 13:14:20 +05:30
Vishal Dhayagude	1e0ae07bff	[fix] Validate Party in not present in Party Type (#12910 ) * [fix] Validate Party in not present in Party Type * [fix] Minor Changes * [fix] Valid Customer and Supplier fetch * [WIP] Allow and prevent for creating party * [fix] minor changes * [fix] Requested Changes * [fix] Codacy issue * Update opening_invoice_creation_tool.py	2018-02-16 13:13:37 +05:30
Shreya Shah	3a9eec2e92	Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913 ) * pass bill_date as parameter and calculate due_date on that basis * calculate payment_schedule on the basis of bill_date if present else posting_date * add bill_date as an argument to get_party_details * pass bill_date on supplier trigger in purchase invoice	2018-02-16 13:05:21 +05:30
Shreya Shah	278af1befb	remove deprecated processing payroll video links (#12947 )	2018-02-16 12:58:04 +05:30
rohitwaghchaure	103c4e9b92	[Fix] Incorrect rate in item-wise sales register (#12943 )	2018-02-16 12:57:35 +05:30
Shreya Shah	f4b271a02e	Customer and Supplier link fields in Member DocType (#12942 ) * added link fields customer and supplier * fixed a typo	2018-02-16 12:56:01 +05:30
Zarrar	5a947f38ab	avoid overlap with dropdown (#12941 )	2018-02-16 12:49:30 +05:30
Prateeksha Singh	0acb63a938	Update hub domain 💥	2018-02-16 11:07:12 +05:30
Shreya Shah	394b7a2fa3	Rename Offer Letter to Job Offer (#12934 )	2018-02-16 10:49:34 +05:30
rohitwaghchaure	5a5f73e46a	Merge pull request #12602 from PawanMeh/fixes_8540 Select multiple raw material items for Sub Contract Stock Entries	2018-02-15 18:54:29 +05:30
Nabin Hait	8a562266ad	Update set_b2c_limit.py	2018-02-15 18:40:18 +05:30
Nabin Hait	0c7ce02e54	Update set_b2c_limit.py	2018-02-15 18:12:27 +05:30
Nabin Hait	44658d44c5	Update gstr_1.py	2018-02-15 17:24:15 +05:30
saurabh-bhosale	307063e64e	[Fix] Invalid Syntax in gstr_1.py (#12946 ) * [Fix] Added missing parenthesis in gstr_1.py * Minor change	2018-02-15 17:13:35 +05:30
Saurabh	82ffdd7dc6	Merge branch 'master' into develop	2018-02-15 15:17:04 +05:30
Saurabh	ca166eaae5	bumped to version 10.0.23	2018-02-15 15:47:03 +06:00
Vishal Dhayagude	bd59a53173	[new] B2C limit fetch from GST Settings (#12905 ) * [new] b2c limit fetch from gst setting * [fix] Patch Added for b2c limit * Update gstr_1.py	2018-02-15 14:22:11 +05:30
Achilles Rasquinha	0bf19a1ac5	Merge pull request #12931 from achillesrasquinha/py3-iteritems Py3 iteritems	2018-02-15 13:49:43 +05:30
Achilles Rasquinha	c94df80d88	Merge pull request #12925 from netchampfaris/enable-translatable-patch Patch to enable translatable	2018-02-15 12:18:26 +05:30
Achilles Rasquinha	d56b00f5fd	Merge pull request #12932 from achillesrasquinha/py3-basestring Py3 basestring	2018-02-15 12:16:12 +05:30
Achilles Rasquinha	5f0c70361a	iteritems	2018-02-15 11:55:45 +05:30
Achilles Rasquinha	1697a7aa81	replaced string_types with basestring	2018-02-15 11:39:45 +05:30
Achilles Rasquinha	714c7465fb	Updated Python 3 fixes	2018-02-15 11:31:05 +05:30
Shreya Shah	8b531c1ee6	Fix parenthesis in buying controller (#12923 )	2018-02-15 11:21:49 +05:30
Prateeksha Singh	387a242232	Merge pull request #12928 from pratu16x7/hub-pages Hub pages	2018-02-15 11:05:22 +05:30
Prateeksha Singh	9889899603	[hub] cleanups	2018-02-15 10:54:23 +05:30
Prateeksha Singh	1ad072f2a9	[hub] cleanups	2018-02-15 10:47:59 +05:30
Prateeksha Singh	2073959bb8	Update entity properties	2018-02-15 10:24:16 +05:30
Prateeksha Singh	6ee035ba5b	tree parent working	2018-02-15 08:50:31 +05:30
Faris Ansari	1e422f2383	Patch to enable translatable	2018-02-14 22:18:55 +05:30
Prateeksha Singh	25d5a1d890	add company pages	2018-02-14 19:53:18 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900 ) * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Achilles Rasquinha	361366ebe6	Python 3 fixes. (#12916 ) * Fixed iteritems and exceptions * python3-fixes * fixed iteritems	2018-02-14 17:08:59 +05:30
rohitwaghchaure	a13b177908	[Fix] Not able to select delivery note in delivery trip (#12912 )	2018-02-14 17:06:21 +05:30
Prateeksha Singh	8e84fa9f9e	Merge pull request #12914 from achillesrasquinha/company-logo Added Company Logo to DocType	2018-02-14 17:04:47 +05:30
Achilles Rasquinha	1c86d18837	Added Hub Company Logo	2018-02-14 16:05:32 +05:30
PrakashH	908af53fcd	Update stock-reconciliation-for-non-serialized-item.md (#12908 )	2018-02-14 13:16:25 +05:30
PrakashH	0c4c2981c8	Update journal-entry.md (#12909 )	2018-02-14 13:15:53 +05:30
Saurabh	2735701aab	resolved merge conflicts	2018-02-14 11:51:09 +05:30
Saurabh	351dc08576	bumped to version 10.0.22	2018-02-14 12:15:31 +06:00
rohitwaghchaure	8e675ebbe2	[Fix] Price list exchange rate is not visible when base currency and price list currency is different (#12898 )	2018-02-13 17:11:06 +05:30
Faris Ansari	d53b149828	[deadlock fix] Save if not set (#12896 )	2018-02-13 16:31:00 +05:30
Faris Ansari	5a91989665	Remove total_projected_qty (#12889 )	2018-02-13 16:00:52 +05:30
Nabin Hait	bb821ec2af	Fixed test dependencies	2018-02-13 14:49:09 +05:30
rohitwaghchaure	62d6593fe7	[Fix] Allow to make disbursement entry even if payment account in not set in the employee loan (#12882 )	2018-02-13 14:43:37 +05:30
Achilles Rasquinha	56b2e12af8	Python 3 fixes [merge asap] (#12884 ) * Python 3 fixes * fixed compare	2018-02-13 14:42:40 +05:30
saurabh-bhosale	ed35a296ab	closes #12872 (#12888 )	2018-02-13 14:40:59 +05:30
Prateeksha Singh	ecc6f86c7c	Merge pull request #12885 from netchampfaris/setup-progress-deadlock-fix [deadlock fix] Save if not set	2018-02-13 13:16:37 +05:30
Faris Ansari	f0056f7338	[deadlock fix] Save if not set	2018-02-13 12:18:24 +05:30
saurabh-bhosale	99eb30242d	[Fix] Bug fix in customer_primary_address frappe call (#12880 )	2018-02-13 07:58:47 +05:30
pawan	471a018e67	remove old stock entry method/rewrite test case	2018-02-12 21:15:46 +05:30
Nabin Hait	662b23ce57	get address display in customer	2018-02-12 19:25:00 +05:30
Nabin Hait	4adcced9ae	Merge branch 'show_address_in_online_pos' of https://github.com/mntechnique/erpnext into mntechnique-show_address_in_online_pos	2018-02-12 19:14:38 +05:30
rohitwaghchaure	6a7495dbc8	Removed set only once for maintain stock field in item master (#12878 )	2018-02-12 17:25:24 +05:30
sivankar	a4ff220769	removed duplicate function and other CLI fixes (#12876 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date * Quality Review fixes	2018-02-12 17:24:26 +05:30
pawan	1b8c13b175	call make_rm_stock_entry	2018-02-12 16:59:59 +05:30
Nabin Hait	a8d10b7332	Update setup.py	2018-02-12 16:54:13 +05:30
Shreya Shah	d9a585bdad	Leave workflow patch fixes (#12823 ) * modified patch for leave application workflow * removed leave approval field from leave application doctype * fetch lwp and attendance only if workflow field exists * modified test cases * modified files with leave application * docstatus draft for rejected applications * modified leave application calendar * test fixed * run patch only if any record exists	2018-02-12 16:02:57 +05:30
Nabin Hait	e21e59614f	Fixed merge conflict	2018-02-12 15:59:55 +05:30
tundebabzy	6e90f49a35	Wrong Exchange Rate Is Fetched When Exchange Rate Is Different From Company Currency For Price Lists #12712 (#12714 ) * unconditionally fetch exchange rate * Revert "unconditionally fetch exchange rate" This reverts commit d0d404d342092b5ba4398ed3bd8d8ff8f60b5f8a. * allow for `plc_conversion_rate` field to be reset * fetch exchange rate using price list currency and company currency not form currency * clean up	2018-02-12 15:18:57 +05:30
tundebabzy	c89782502c	Report presentation currency (#12670 ) * Add new Select to filters * get the currencies from database rather than hardcoded * label report columns: - If presentation currency is available in filters, use it or - If company is available in filters, use it or - use default company currency * add new function - get_currency * tweak new function `get_currency` * add new function `convert` to convert a value to another currency * add new function `convert_to_presentation_currency` * clean up `get_currency` first pass * memoise the exchange rates * limit fetched GL entries to to_date * check if account type is p&l or not and use appropriate exchange rate based on that * change EXCHANGE RATE to a dict, use for memoisation * rename EXCHANGE_RATE * cache exchange rates and use them as needed * add docstrings * add presentation currency logic to financial statement reports * move new functions from `general_ledger.py` to new module * clean up * PEP 8 clean up * move function to util.py * PEP 8 clean up * remove presentation currency option from cashflow * adjust currency as needed * allow users to save presentation currency in Accounts Settings * add new function `get_presentation_currency_list` * refactor query_report modules with no promises * Revert "allow users to save presentation currency in Accounts Settings" This reverts commit 3b58a6296cf3f7b4d80ac55b03f9d5d4887b796b. * show print page in correct currency * Update utils.py	2018-02-12 15:04:50 +05:30
joezsweet	04338cfb4b	removed extra spaces	2018-02-12 10:12:27 +01:00
joezsweet	f9cb7ea611	removed extra spaces	2018-02-12 10:05:59 +01:00
sivankar	621740efd9	Enhancement and bug fix in batch (#12753 ) * merge shelf like and manufacturing date * setting default manufacturing date as todays date * setting default manufacturing date as todays date * fix * Improvements to batch auto naming (#12496) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test * added support for jinja template and added validation if expiry date is set or not if item has_expiry_date is set * bug fix, renamed item_code to item as in batch doctype we refer 'item code' by 'item' * added manufacturing date wise sort * added prefix to expiry date and manufacturing date	2018-02-12 14:33:40 +05:30
Fahim Ali Zain TP	277935be79	Deduct Rejected Item's Raw materials in SubContracting (#12837 ) * Deduct Rejected Item's Raw materials in SubContracting frappe/erpnext#12752 * Travis Build Fix	2018-02-12 11:59:07 +05:30
Revant Nandgaonkar	2dee8fc255	Hotels (#11907 ) * [new-module] hotels, start * Multiple Changes Hotel Settings Added Make invoice on Hotel Reservation * Hotel Room validation for overbooking * Added test fixtures and test for Hotels * Added Tests for Hotels Overbooking Pricing not set * [WIP] Documentation Hotel Room and Screenshot * Added Calendar view for Hotel Room Reservation * Added Report - Hotel Room Occupancy * Added Hotel Reservation User in Hospitality domain	2018-02-12 11:57:12 +05:30
rohitwaghchaure	6e7e70c977	Added PDC from journal entry in AR report (#12844 )	2018-02-12 11:55:07 +05:30
rohitwaghchaure	0aeeb7e02c	[Fix] Item variant details report (#12869 )	2018-02-12 11:44:39 +05:30
Shreya Shah	caccd2289d	posting-date-fix (#12849 )	2018-02-12 11:34:46 +05:30
Jamsheer	be9eae06ec	Physician - Set Details by User or Employee (#12558 )	2018-02-12 11:33:44 +05:30
Ameya Shenoy	5c33a04043	Shareholder and related doctypes (#12215 ) * Added doctypes related to shares - Shareholder doctype, the entity who does the transaction - Share doctype, a child table to kepp list of all shares - Share Transfer doctype, Logs of all made transactions * Added logic for share transfer - update shareholder automatically on share transfer/issue/purchase - purchase and transfer have method remove_share which doesn't get executed because of some bug * Added report view for share ledger * Removed share number tracking - removed share number tracking from Share Ledger child table for Shareholder doctype - new doctype Share Type created * Share Balance report added - math behind Share Balance report needs fixing * Changes in shareholder - Share numbers are not tracked in Shareholder - Share Ledger doctype deleted - Share Balance Report bug fixed * Shareholder - fixed report for share balance - remove bug from share transfer by making share type mandatory - added buttons to shareholder for direct link to report * Added tests for Share Transfer * minor codacy fixes * Added Shareholder to Party Type * rate in share ledger & balance report is currency * First attempt at modelling shares after Item * Share Manager changes - on creation of shareholder party it should check if the same combo exists - in shareholder party make report button visible iff folio no exists - create folio no on creation of share transfer iff it doesnt already exist - move reports from shareholder to shareholder party * Shareholder chages - delete share child table doctype - autoname added to folio no - modify tests for share transfer * minor changes * removed share_no child doctype * Restructured Share Transfer Logic (not tested) - Everything revolves around Share Balance child table in Shareholder Party - is_company flag still to be utilized * Tested Share Tranfer * minor fixes * started new shareholder structure * modified shareholder * renamed Shareholder Party to Shareholder * Shareholder rewrite complete * new tests for shareholder written * codacy fixes * Added documentation	2018-02-12 11:32:47 +05:30
Britlog	be9a7231d4	Fix bootstrap layout and move checkout button upper (#12063 )	2018-02-12 11:28:57 +05:30
rohitwaghchaure	45ac31ab93	[Fix] Not able to save sales order (#12851 )	2018-02-12 11:27:37 +05:30
rohitwaghchaure	7477899d2e	Formatter, code cleanup (#12852 )	2018-02-12 11:25:58 +05:30
Jamsheer	00c1cf0a5a	Healthcare Menu Fixes (#12830 )	2018-02-12 11:24:12 +05:30
Saurabh	cab73b8a02	[fix] execute update_time_and_costing and update_project only for distinct task and projects	2018-02-09 17:04:12 +05:30
Nabin Hait	b0819b528f	Minor fixes in gstr reports (#12848 )	2018-02-09 15:30:55 +05:30
Manas Solanki	c7a9e3424b	Merge pull request #12845 from manassolanki/fix-so-update don't set the ordered_qty in SO on load from BIN	2018-02-09 13:16:14 +05:30
Manas Solanki	a884bd9c6a	don't set the ordered_qty in SO on load from BIN	2018-02-09 13:12:07 +05:30
rohitwaghchaure	7e75165826	Merge branch 'develop' into fixes_12829	2018-02-09 12:01:41 +05:30
pawan	081f40c1bf	readded pos.css	2018-02-09 11:56:32 +05:30
Saurabh	0f3c4fa7a7	Codacy fix - used classmethod decorator	2018-02-09 11:30:11 +05:30
Saurabh	c29f3c70dc	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-09 10:51:49 +05:30
Saurabh	b4ab89e1da	[Mod] Code refactored to remove dependency on 'complete_address' field	2018-02-09 10:49:30 +05:30
Manas Solanki	458a4e13bd	updated the docs for education	2018-02-08 20:12:41 +05:30
pawan	1583120a54	remove pos.css	2018-02-08 20:00:12 +05:30
pawan	83b1b802d1	print hide and pos.less changes	2018-02-08 19:56:12 +05:30
pawan	33571dc567	print hide changes	2018-02-08 19:35:48 +05:30
pawan	31d37f110a	print hide changes	2018-02-08 19:25:30 +05:30
Manas Solanki	37b2aa2b11	changes in the education module (#12827 ) update the module page remove fee from beta	2018-02-08 19:00:51 +05:30
Pawan Mehta	e2bc8bb644	Update sales_invoice.json	2018-02-08 16:35:03 +05:30
pawan	735b8c6094	[fix] #12829	2018-02-08 16:20:46 +05:30
Saurabh	ab8c7e616e	resolved merge conflicts	2018-02-08 15:17:15 +05:30
Saurabh	c1f982a9bb	bumped to version 10.0.21	2018-02-08 15:34:25 +06:00
Faris Ansari	6041f5cb8c	[hotfix] Advance Total validation	2018-02-08 13:33:52 +05:30
rohitwaghchaure	144c9977a2	Merge pull request #12819 from netchampfaris/hotfix-get_party_account get_party_account only if company is set	2018-02-08 11:42:41 +05:30
Faris Ansari	f7717b9ec2	get_party_account only if company is set	2018-02-08 11:11:21 +05:30
Prateeksha Singh	152bf37e7f	Merge pull request #12813 from pratu16x7/hub-fixes Hub listing and entity page	2018-02-08 10:47:16 +05:30
pawan	5f779eb805	validation fix	2018-02-08 09:07:58 +05:30
Saurabh	1a4d77a962	Fixes #12810 for Offline POS	2018-02-08 01:32:48 +05:30
Saurabh	056c1709c6	Fixes #12810	2018-02-08 00:22:53 +05:30
Saurabh	0de0861bb4	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-08 00:10:49 +05:30
Prateeksha Singh	4413ce1be1	company page, deprecate custom page	2018-02-07 23:50:01 +05:30
pawan	2b885beaee	code changes for single stock entry	2018-02-07 19:06:18 +05:30
Bassam Ramadan	fd044a0d5e	docs-fixes (#12805 )	2018-02-07 18:59:06 +05:30
rohitwaghchaure	b553b7a69d	PDC Enhancements (#12462 )	2018-02-07 18:32:51 +05:30
Nabin Hait	ed26028a93	Minor fixes for depr based on FY	2018-02-07 18:25:45 +05:30
Nabin Hait	82a61c3bd9	Deleted restaurant order entry test cases	2018-02-07 16:56:07 +05:30
Nabin Hait	c224d34a2c	Merge branch 'master' into develop	2018-02-07 16:07:20 +05:30
Nabin Hait	67d6dc1ac6	bumped to version 10.0.20	2018-02-07 16:37:19 +06:00
Nabin Hait	33f967d97c	Account name length fixed in HUngary and Germen COA	2018-02-07 16:00:42 +05:30
Nabin Hait	4b1bd15f7e	Draft status in pos print format	2018-02-07 12:40:45 +05:30
rohitwaghchaure	9a5037193f	Removed DR/CR from balance column (#12791 ) * Removed DR/CR from balance column * Update general_ledger.html * Update general_ledger.py	2018-02-07 12:10:14 +05:30
Shreya Shah	80423de611	posting date in journal entry should not be nowdate (#12801 )	2018-02-07 12:08:08 +05:30
Manas Solanki	b4693c6957	fix for making the invoice from the timesheet (#12803 )	2018-02-07 12:07:27 +05:30
Saurabh	50f7e29814	[New] Added Draft status in POS Invoice print formats if a Draft POS Invoice is printed	2018-02-06 00:23:21 +05:30
Rohit Waghchaure	e8d22bb999	[Fix] Incorrect change amount if enabled rounded total	2018-02-05 18:13:29 +05:30
joezsweet	097a98cc10	fixed spaces to tabs	2018-02-05 13:16:00 +01:00
joezsweet	a8d5ef4891	space to tabs	2018-02-05 13:06:30 +01:00
Saurabh	e26773d91e	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-05 17:05:29 +05:30
joezsweet	5f473611bd	space to tab	2018-02-05 12:05:11 +01:00
joezsweet	2f7ab065fb	- removed barcodes from force_item_fields	2018-02-05 11:54:32 +01:00
Nabin Hait	b02c109e1d	Cleanup and fixes on GSTR-2	2018-02-05 16:09:51 +05:30
Prateeksha Singh	3eaccffbd9	[hub] items searchable via core filters	2018-02-05 12:58:30 +05:30
Prateeksha Singh	b8e9c9be08	[hub] form (info) view for items	2018-02-05 12:58:30 +05:30
Faris Ansari	9b64620bc0	[hub] hub page using BaseList	2018-02-05 12:57:49 +05:30
Vishal Dhayagude	cce29fabf4	[fix] validation between Selling Price and Valuation Rate should not be validated in the Sales Return entry (#12767 )	2018-02-05 12:25:51 +05:30
rohitwaghchaure	0f5c18ca81	[Fix] For non stock item, not able to place an order from shopping cart (#12758 )	2018-02-05 12:25:02 +05:30
rohitwaghchaure	a4c40e0fd6	[Fix] After accesing POS page, it does not work when going back from another page (#12763 )	2018-02-05 12:24:06 +05:30
Nabin Hait	2ef1f84041	Fixed merge conflict	2018-02-03 09:14:53 +05:30
Nabin Hait	9d2f04139c	bumped to version 10.0.19	2018-02-03 09:43:12 +06:00
Helkyd	5e93b02c85	Update trial_balance.py Assuming that Account_number has NUMBERs will sort.	2018-02-02 12:27:30 +00:00
Saurabh	70d972d92e	[Mod] Added descriptions to alert about reselecting the option in 'primary_address_and_contact_detail'	2018-02-02 16:18:17 +05:30
Saurabh	41c47e3ffa	Merge pull request #12677 from tundebabzy/issue-12535-1 Website Cart Should Not Show Expired Items As 'In Stock' #12535	2018-02-02 15:58:07 +05:30
rohitwaghchaure	cf6360d825	Merge pull request #12739 from jay-parikh/hotfix Enable/Disable Discount in POS using POS Profile #11748	2018-02-02 13:12:38 +05:30
Jay Parikh	2c95ab3897	Code fix for Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 22:52:58 -08:00
Jay Parikh	171e5af995	Fixed indentation issue in pull # 11748	2018-02-01 21:39:20 -08:00
tundebabzy	5df64d84a1	code review fix	2018-02-01 17:05:54 +01:00
tundebabzy	a829d5a4d5	Merge branch 'hotfix' into issue-12535-1	2018-02-01 16:56:05 +01:00
Helkyd	b258686b00	Update trial_balance.py Fix to order only if account starts with Number ... while for others not required....	2018-02-01 15:53:30 +00:00
Nabin Hait	91c5e4c429	Validate rate in PO with supplier quotation only if checking is enabled via Buying Settings (#12734 )	2018-02-01 18:58:22 +05:30
Nabin Hait	cae13bf048	Fixes in purchase register report (#12737 )	2018-02-01 18:58:14 +05:30
Nabin Hait	2aba97bff1	Fetch items from BOM in Material Request	2018-02-01 18:52:50 +05:30
Jay Parikh	d4359faa31	Enable/Disable Discount in POS using POS Profile #11748	2018-02-01 04:26:24 -08:00
Rohit Waghchaure	d85247cd7a	[Fix] Pay button not working in pos	2018-02-01 17:18:38 +05:30
rohitwaghchaure	441032d39c	Merge branch 'develop' into develop	2018-02-01 16:54:10 +05:30
Nabin Hait	b9ce104b09	Opening balance in stock ledger report (#12729 )	2018-02-01 14:58:50 +05:30
Saurabh	7c8d508e28	[Mod] Dependant on complete_address field and loads updated mobile_no,address in onload method	2018-02-01 14:40:49 +05:30
Saurabh	df8add272c	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-02-01 14:02:09 +05:30
Nabin Hait	7ba092eaf9	Fixes for making stock entry against Pro Order (#12721 )	2018-02-01 10:51:27 +05:30
Saurabh	f16d45b0a0	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos Resolved Conflicts:erpnext/selling/doctype/customer/customer.json	2018-02-01 02:05:30 +05:30
Rushabh Mehta	82fa04ce32	Update projects.py	2018-01-31 22:20:14 +05:30
Saurabh	9f5c2002ff	[Mod] Removed the Dependency on Frappe PR [Fix] Fixed a possible bug	2018-01-31 17:43:58 +05:30
rohitwaghchaure	32a5f38595	Merge pull request #12633 from vishdha/issue_12388 [fix] Sales order link to purchase order not working fixed	2018-01-31 17:30:43 +05:30
tundebabzy	4990cf7783	remove stray code	2018-01-31 11:35:56 +01:00
Saurabh	9f29f60707	Merge pull request #12581 from britlog/website-product-spinner [Website] Add number spinner for quantities in product page	2018-01-31 15:58:04 +05:30
Nabin Hait	ec2c9ec897	Merge branch 'master' into develop	2018-01-31 15:39:16 +05:30
Nabin Hait	bff1971bb2	bumped to version 10.0.18	2018-01-31 16:09:15 +06:00
Zarrar	4e05f02038	error in throw message rectify (#12719 )	2018-01-31 15:33:51 +05:30
Nabin Hait	7918b92d95	Invalid date value comparison, fixes for mariadb 10.2.3+	2018-01-31 15:30:03 +05:30
tundebabzy	29c8142678	refactor `adjust_for_expired_items` and others as per code review use get_all instead of get_list rename `adjust_for_expired_items` to `adjust_qty_for_expired_items`	2018-01-31 10:51:06 +01:00
vishdha	df1653827f	[fix] Patch for material request to purchase order added	2018-01-31 15:11:24 +05:30
Vishal	fc05cc4e70	[fix] link with supplier quotation to purchase order	2018-01-31 15:10:39 +05:30
Vishal	4dc329f5ea	[fix] Sales order link to purchase order not working fixed	2018-01-31 15:10:39 +05:30
Nabin Hait	e37e5d6134	minor fix in patch for mariadb version	2018-01-31 15:00:18 +05:30
rohitwaghchaure	2056ea6fb4	Update customer.js	2018-01-31 14:48:53 +05:30
Zarrar	dea99cc3a8	treeview not set when routed from bom form (#12707 )	2018-01-31 13:07:04 +05:30
Kenneth Sequeira	f6daf56054	Added Tutorial Videos for Education in User Manual (#12678 ) * added erpnext education tutorial videos to the manual * testing with div * Update program-enrollment.md Properly ended YouTube video. * removed group assessment criteria page	2018-01-31 12:49:58 +05:30
Achilles Rasquinha	6ceffbd2f8	Merge pull request #12710 from achillesrasquinha/12704 Python 3 Compatible Fixes.	2018-01-31 11:23:05 +05:30
Nabin Hait	bc640fe6a6	minor fix in old patch	2018-01-30 19:26:28 +05:30
saurabh-bhosale	0c9a99a953	Merge branch 'develop' into show_address_in_online_pos	2018-01-30 17:48:12 +05:30
Achilles Rasquinha	39f3d7e3aa	local import	2018-01-30 16:58:49 +05:30
Nabin Hait	dba5e7645b	Minor fix in old patch	2018-01-30 16:38:47 +05:30
Nabin Hait	927d13fadb	Minor fix in old patch	2018-01-30 15:59:44 +05:30
Nabin Hait	0f75a022f2	Minor fix in old patch	2018-01-30 15:32:17 +05:30
Nabin Hait	4eae6c985c	Fixed test records for supplier	2018-01-30 15:27:29 +05:30
Achilles Rasquinha	ac57c87bc3	Fixed spacing	2018-01-30 14:05:18 +05:30
Achilles Rasquinha	244dcae110	Fixed spacing	2018-01-30 14:03:59 +05:30
Achilles Rasquinha	ef58be1302	Fixed education string	2018-01-30 13:58:43 +05:30
tundebabzy	df50a6f828	Merge pull request #12705 from achillesrasquinha/12704 Fix for python 3 compatibility	2018-01-30 09:26:51 +01:00
system19	4e195d97c7	Minor - Healthcare Desktop UI (#12657 ) * Minor - Healthcare Desktop UI Minor - Healthcare Desktop UI * Update desktop.py	2018-01-30 13:48:24 +05:30
Achilles Rasquinha	2862e25f3e	fixed python3 error	2018-01-30 13:47:18 +05:30
vishdha	1910530e41	[fix] CDNR negative value	2018-01-30 12:19:56 +05:30
tundebabzy	2f4854ad1a	create new dialog everytime (#12696 )	2018-01-30 12:18:15 +05:30
Nabin Hait	585254456e	Check credit limit while making DN, if bypassed on SO (#12702 )	2018-01-30 12:11:22 +05:30
vishdha	109b408d11	[fix] minor changes in gst field alignment	2018-01-30 12:11:13 +05:30
vishdha	963dd1e4bc	[minor] ITC data append to row	2018-01-30 11:51:57 +05:30
rohitwaghchaure	ce5b93ca77	[Fix] Allow user to edit rate in online POS (#12701 )	2018-01-30 10:39:46 +05:30
vishdha	e03e4a581f	[fix] Fetch correct Tax Details	2018-01-29 22:55:23 +05:30
vishdha	98e33c31cd	[wip] Gstr2	2018-01-29 22:54:38 +05:30
Cesar	d8b1927e8d	Allow no ZERO Payment Allow no ZERO Payment	2018-01-29 15:39:52 +01:00
Helkyd	d6a61ad0c3	Trial Balance sort by Account Name Trial Balance order by Account Name Used Sorted under Prepare_data Function.	2018-01-29 13:47:12 +00:00
Saurabh	59c915f599	Merge branch 'master' into develop	2018-01-29 18:53:54 +05:30
Saurabh	f3d30c5bb9	bumped to version 10.0.17	2018-01-29 19:23:53 +06:00
Saurabh	8df20f6501	Merge pull request #12695 from Zlash65/fix-dn [Hotfix] Stock entry issue	2018-01-29 18:52:32 +05:30
Zlash65	f7a4d4221b	check precision with qty	2018-01-29 18:47:21 +05:30
Shreya Shah	406d449e12	fix posting date in journal entry on load (#12694 )	2018-01-29 18:01:20 +05:30
Saurabh	d581ff40ea	Merge branch 'master' into develop	2018-01-29 17:42:37 +05:30
Saurabh	373066e0ca	bumped to version 10.0.16	2018-01-29 18:12:37 +06:00
rohitwaghchaure	52beb77539	Don't validate payment terms for POS (#12692 )	2018-01-29 17:40:44 +05:30
Saurabh	e1e690541c	set payment term name in payment_terms (#12693 )	2018-01-29 17:39:56 +05:30
Ameya Shenoy	471e27559f	conflict fix	2018-01-29 17:07:57 +05:30
rohitwaghchaure	86c7ede321	Merge pull request #12690 from rohitwaghchaure/subscription_sent_email_issue [Fix] Subscription send notification issue	2018-01-29 17:01:00 +05:30
Rohit Waghchaure	7e033aae11	[Fix] Subscription send notification issue	2018-01-29 16:53:37 +05:30
Zarrar	5bf77beb83	precision while checking qty (#12688 )	2018-01-29 16:47:52 +05:30
Nabin Hait	1e1b2364ab	Optimization: don't update outstanding amount while cancelling payment entry for advance adjustment (#12689 )	2018-01-29 16:45:43 +05:30
Cesar	58c040cffb	Revert "Sort by account name" This reverts commit `5cf01d9702`.	2018-01-29 11:57:15 +01:00
Saurabh	03f6b3e588	resolved merge conflicts	2018-01-29 16:25:33 +05:30
Saurabh	05eed01eec	bumped to version 10.0.15	2018-01-29 16:54:55 +06:00
Cesar	5cf01d9702	Sort by account name Trial balance not sorted .. by adding those changes fixes the problem.	2018-01-29 11:54:12 +01:00
Nabin Hait	cfa9d1adb7	Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date (#12685 ) * Patch: Create Payment Terms based on default credit days set in company and use it while setting due_date * Payment Terms patch for credit days defined in customer group	2018-01-29 16:07:21 +05:30
rohitwaghchaure	c385017056	Merge pull request #12638 from adityaduggal/develop Resolves Issue #12630 -Added Filters to AR	2018-01-29 12:37:39 +05:30
rohitwaghchaure	d36ac27f94	Update accounts_receivable.py	2018-01-29 12:35:19 +05:30
rohitwaghchaure	62b31bf708	Update accounts_receivable.py	2018-01-29 12:34:19 +05:30
tundebabzy	c7c1defe64	after adjusting stock_qty for expired, set in_stock flag	2018-01-27 12:16:13 +01:00
tundebabzy	c14f1f145b	adjust stock_qty for expired quantities adjust based on warehouse add parameters to `get_qty_in_stock` so it can be useful in other parts of the code base	2018-01-27 12:16:13 +01:00
tundebabzy	794ecda618	corrected wrong get_diff arguments	2018-01-27 05:54:40 +01:00
Charles-Henri Decultot	241b09ee11	Addition of index.txt	2018-01-26 07:53:59 +00:00
Charles-Henri Decultot	d0c2f7b754	Doc file rename	2018-01-26 07:09:11 +00:00
Vishal Dhayagude	c463c0684d	[Report] GSTR - 1 CDNR Report (#12554 ) * [wip] cdnr * [WIP] cdnr with optional data * [wip] Export GSTR-1 * [minor] Minor changes in export * [new] Custom field added for GST * [fix] Minor changes in GSTR1 Report * [minor] Minor changes in gstr1 * [fix] Codacy Fixed * Update setup.py	2018-01-26 11:27:22 +05:30
Manas Solanki	8985077652	Assessment Module Report (#12605 ) * updated course wise assessment report * added new report Final assessment grades	2018-01-26 11:20:33 +05:30
Andy Villiger	567623654b	Resolve issue #10914 - Error when making Sales Invoice (#12656 ) * Resolve issue #10914 An exception was raised when a Sales Order has been created to a Sales Invoice and one of the items had no Item Code. * Update sales_order.py	2018-01-26 11:11:19 +05:30
tundebabzy	db4fd7f5b6	Improvements to batch auto naming (#12496 ) * refactor: add new function - batch_uses_naming_series use batch_uses_naming_series in autoname method * properly update naming series on delete: - add new functions - get_batch_prefix, get_batch_naming_series_key, get_batch_naming_series - refactor get_name_from_naming_series - add after_delete method * add documentation and rename some functions * PEP 8 compliance * test	2018-01-26 11:00:20 +05:30
rohitwaghchaure	bfa898ff9b	[Fix] System pull the valuation rate even if allow zero valuation rate is enabled (#12537 )	2018-01-26 10:59:00 +05:30
tundebabzy	0a33a359ca	Merge pull request #12659 from tundebabzy/issue-12658 set batch number only in Sales Invoice and Delivery Note - #12659	2018-01-26 06:10:13 +01:00
tundebabzy	f9b5c74871	set batch number only in Sales Invoice and Delivery Note	2018-01-25 19:21:05 +01:00
Prateeksha Singh	4c58299eb0	[fix] encode if letterhead	2018-01-25 17:29:57 +05:30
Saurabh	aaaf5c62b6	[Mod] Minor changes in 'primary_address' field's property	2018-01-25 17:28:57 +05:30
rohitwaghchaure	3574c96c8c	Update item_dashboard_list.html	2018-01-25 17:11:52 +05:30
Shreya	1416567139	patch fix for leave-workflow	2018-01-25 17:06:14 +05:30
Vinayak Jethe	5743ce2b6b	Made changes as per suggestions	2018-01-25 13:37:20 +05:30
Saurabh	6614d8aa01	Multiple changes: [Mod] Added 'primary_address_and_contact_detail' in toggle_display [Mod] Added a description for 'primary_address_and_contact_detail'	2018-01-25 12:27:00 +05:30
Saurabh	5a2354149c	Merge branch 'develop' of https://github.com/frappe/erpnext into show_address_in_online_pos	2018-01-25 11:56:36 +05:30
Shreya	5f264fa364	fixes	2018-01-24 20:39:30 +05:30
Vinayak Jethe	84f7727432	Merge branch 'hotfix' of https://github.com/frappe/erpnext into fix-to-issue-#12512	2018-01-24 19:48:24 +05:30
Vinayak Jethe	549c196beb	Fixes issue #12512	2018-01-24 19:47:59 +05:30
Shreya	61cf49dd07	workflow patch fix	2018-01-24 18:50:01 +05:30
Aditya Duggal	2136a7bded	Resolves Issue #12630 -Added Filters to AR - Added Territory Filter to AR report - Added Sales partner filter - Added Sales person filter -Terrtory filter is needed since if you need to see AR in North Inda you get with filter not with column -Similarly there was a need for Sales Partner and sales person filter in the AR report which is being fulfilled now.	2018-01-24 18:16:08 +05:30
Saurabh	cadd31cb0c	[Fix] Solves issue #12588	2018-01-24 16:38:22 +05:30
rohitwaghchaure	8df0556af5	Merge pull request #12587 from shreyashah115/leave-workflow Refactor Leave Application	2018-01-24 15:04:17 +05:30
Shreya	a8a952deff	check if workflow_state_name already exists	2018-01-24 15:00:54 +05:30
Rushabh Mehta	29bc14d242	[fix] ficher_des_ecritures patch	2018-01-24 14:39:04 +05:30
Vinayak Jethe	46c82c45e0	Revised changes for codacy	2018-01-24 14:24:58 +05:30
Shreya	a309a871b5	Codacy fix	2018-01-24 13:56:16 +05:30
Vinayak Jethe	2c8ce5a717	Fixes issue #12512	2018-01-24 13:51:26 +05:30
Shreya	a400e7b568	Fixed as per the review	2018-01-24 13:30:20 +05:30
Saurabh	fb2f97391f	resolved merge conflicts	2018-01-24 11:24:10 +05:30
Saurabh	381d452b78	bumped to version 10.0.14	2018-01-24 11:52:53 +06:00
Saurabh	6cc10104f0	[fix] enable rename for payment terms and payment term template	2018-01-24 11:15:02 +05:30
rohitwaghchaure	56a4f9205a	Merge pull request #12620 from mntechnique/draft-mode-print Print Functionality in Online POS using allow print before pay check	2018-01-24 10:54:07 +05:30
Saurabh	9c6bf08e77	Merge pull request #12547 from joshreeder/patch-1 Update dropbox-backup.md	2018-01-24 07:57:15 +05:30
Saurabh	4b9a55b0ef	[fix] If buying or selling price list not found, return empty dict	2018-01-24 07:48:56 +05:30
Saurabh	b665baec72	Used cint instead of int	2018-01-23 18:28:05 +05:30
Saurabh	c8399fd093	Merge pull request #12614 from rohitwaghchaure/removed_set_only_once_for_batch_serialno Disabled property set only once for has serial no and has batch no field in item doctype	2018-01-23 18:08:56 +05:30
Rohit Waghchaure	266e66cd1b	Disabled property set only once for has serial no and has batch no field in item doctype	2018-01-23 18:06:12 +05:30
Saurabh	a5c9fc3705	Removed commented code	2018-01-23 17:36:41 +05:30
rohitwaghchaure	f3a452850e	Merge pull request #12617 from saurabh6790/ux_fix parse value before setting it to dissable_rounded_total on Purchase Invoice	2018-01-23 17:35:16 +05:30
Saurabh	6c5f5b20cf	Merge branch 'develop' of https://github.com/frappe/erpnext into draft-mode-print	2018-01-23 17:33:21 +05:30
Charles-Henri Decultot	e31e1239ba	FEC report for France (#12446 ) * FEC report for France * Codacy correction	2018-01-23 17:23:27 +05:30
Jamsheer	58af1db0d7	Patient Appointment - Check appointment day is holiday or physician on leave (#12556 )	2018-01-23 17:23:27 +05:30
Shreya Shah	673b59b114	Updated docs for Payroll Entry (#12552 ) * updated docs for payroll entry * fixed a link in employee-advance doc	2018-01-23 17:23:27 +05:30
Shreya	543feda2fb	set posting date only if null	2018-01-23 17:23:27 +05:30
Saurabh	cbbee47625	[Fix] Resolved the type issue of 'is_saved' flag variable	2018-01-23 17:23:27 +05:30
Saurabh	a2076a1ff0	Multiple changes: [Mod] Used async-await for asynchronous save in draft mode [Fix] Fixed bug that din't allow to submit a new POS Invoice	2018-01-23 17:23:26 +05:30
Saurabh	c5a6cf3a0e	[Mod] Allows print only when the check value exists and the cart isn't empty	2018-01-23 17:23:26 +05:30
Saurabh	3a609108ae	Codacy changes	2018-01-23 17:23:26 +05:30
Saurabh	32695a938f	[Mod] Refactored the code for fetching allow_print_before_pay check value	2018-01-23 17:23:26 +05:30
deepak-mnt	d7da89bf5a	[Fix] Resolved issues suggested by Codacy	2018-01-23 17:21:44 +05:30
deepak-mnt	8f3d394485	Minor changes:Removed extra spaces in py code	2018-01-23 17:21:44 +05:30
deepak-mnt	cc813d2286	[Mod] Ensured that a single POS Sales Invoice is created even when its printed(saved) in Draft mode	2018-01-23 17:21:44 +05:30
deepak-mnt	1ccb0cfa2f	[Mod] point_of_sale.js: Allowed print before pay and saved the invoice before print [New] test_point_of_sale.js: Test Cases to check the print before pay functionality in Online POS	2018-01-23 17:21:44 +05:30
deepak-mnt	29abe291c9	Allow draft mode print in online POS	2018-01-23 17:21:44 +05:30
Saurabh	57df096725	Merge pull request #12600 from vishdha/allow_rename [new] Allow Rename and Member link with user	2018-01-23 16:49:48 +05:30
Shreya	dfae11bcee	disabled warehouse in list view	2018-01-23 16:46:24 +05:30
Rushabh Mehta	b5a3df920c	[fix] primary button color for make	2018-01-23 16:08:52 +05:30
rohitwaghchaure	d78e6e04ea	Run country fixtures if country changed in the company (#12494 )	2018-01-23 15:42:46 +05:30
Saurabh	3959aeb848	[fix] parse value before setting it to dissable_rounded_total on Purchase Invoice	2018-01-23 15:40:43 +05:30
Charles-Henri Decultot	90657fb566	FEC report for France (#12446 ) * FEC report for France * Codacy correction	2018-01-23 15:40:14 +05:30
Jamsheer	d63b7e16af	Patient Appointment - Check appointment day is holiday or physician on leave (#12556 )	2018-01-23 15:38:34 +05:30
Shreya Shah	3191951bff	Updated docs for Payroll Entry (#12552 ) * updated docs for payroll entry * fixed a link in employee-advance doc	2018-01-23 15:37:23 +05:30
rohitwaghchaure	881d32c4b8	Merge pull request #12540 from shreyashah115/posting-date [Payroll Entry] Set posting date only if null	2018-01-23 15:10:26 +05:30
rohitwaghchaure	f8a98f5eeb	Merge pull request #12609 from britlog/payment-request-translation [Stripe] Translate payment request subject	2018-01-23 14:47:55 +05:30
rohitwaghchaure	b607c6f8b2	Merge pull request #12610 from MaxMorais/patch-7 Serial No, wont relates to the warehouse	2018-01-23 14:46:46 +05:30
Frappe PR Bot	48d4a0a438	[Translation] Updated Translations (#12613 )	2018-01-23 14:35:52 +05:30
rohitwaghchaure	51293390e4	Merge pull request #12611 from shreyashah115/fetch-conversion-factor [Fix] Fetch uom conversion factor in material request	2018-01-23 12:41:01 +05:30
pawan	9b7093e4d6	validation code improvement	2018-01-23 11:39:53 +05:30
Shreya	a137fe82a1	fix error message	2018-01-23 11:00:58 +05:30
Shreya	e2b31085a7	fetch uom conversion factor in material request	2018-01-23 10:54:23 +05:30
Maxwell Morais	7cffd618ab	Serial No, wont relates to the warehouse The serial no, picker wont follow the target serial no	2018-01-22 22:33:28 -02:00
britlog	ddd2bc9aac	Translate payment request subject	2018-01-22 23:23:31 +01:00
pawan	6a8eba891e	Move target warehouse validation to submit	2018-01-23 00:57:44 +05:30
pawan	afab0a64e5	code alignment	2018-01-22 17:34:27 +05:30
pawan	4ab6ef89a1	code alignment	2018-01-22 17:31:40 +05:30
pawan	67867529c0	[fix] #8540	2018-01-22 17:08:39 +05:30
Vishal	a54815fd9d	[new] Allow Rename and Member link with user	2018-01-22 16:02:45 +05:30
Saurabh	ef31637549	Merge branch 'master' into develop	2018-01-22 15:29:15 +05:30
Saurabh	b9f678b350	bumped to version 10.0.13	2018-01-22 15:59:14 +06:00
Saurabh	fb4caff0b2	Merge pull request #12573 from rohitwaghchaure/reorder_issue [Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests	2018-01-22 16:49:54 +07:00
Saurabh	e72915847c	Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column Added currency in balance column in general ledger print	2018-01-22 16:35:37 +07:00
rohitwaghchaure	1d93bd50eb	Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue [Fix] Income account can not be group	2018-01-22 15:04:46 +05:30
rohitwaghchaure	8e998875a5	Merge pull request #12590 from shreyashah115/total-on-items-remove [Fix] Calculate taxes when shipping rule not present at removal of item	2018-01-22 15:03:11 +05:30
Shreya	5164997db7	delete column status	2018-01-22 14:13:03 +05:30
Rohit Waghchaure	c4c2bf0bfb	[Fix] Image patch showing in the item link	2018-01-22 13:47:28 +05:30
Shreya	39adc8f85f	calculate total when items are removed	2018-01-22 13:08:05 +05:30
Rohit Waghchaure	8676590cfe	[Fix] Income account can not be group	2018-01-22 12:35:36 +05:30
Shreya	dd66bc03c7	fixes	2018-01-22 12:28:38 +05:30
Shreya	fc0e8e5c6a	modified patches.txt	2018-01-22 12:26:41 +05:30
Shreya	4298bcfa40	modified leave application tests	2018-01-22 12:26:41 +05:30
Shreya	05f7e14b5a	replaced status with workflow_state	2018-01-22 12:26:41 +05:30
Shreya	117ddac033	patch to create workflow for existing leave applications	2018-01-22 12:26:41 +05:30
Josh Reeder	c8b9648c53	Changed instructions No need to copy and paste into text editor, problems with error message have to do with the form needing saved before Allow Access button is used.	2018-01-20 15:56:15 -06:00
Rohit Waghchaure	bc94914338	[Fix] Sales payment summary issue	2018-01-20 17:01:31 +05:30
Rohit Waghchaure	f83f6aae22	[Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests	2018-01-20 15:44:38 +05:30
Rohit Waghchaure	edef642794	Added currency in balance column in general ledger print	2018-01-20 12:54:25 +05:30
Saurabh	24946ee4e0	Codacy fix	2018-01-20 04:28:35 +05:30
Saurabh	b664488d98	[Fix] Clears off the read-only fields in 'Primary Address and Contact Details' Section on blank link fields	2018-01-20 03:12:45 +05:30
Saurabh	24cae1cad6	Made Primary address field searchable and is displayed in Customer Link field options	2018-01-20 02:47:19 +05:30
britlog	d13985d1d0	Add number spinner for quantity	2018-01-19 18:31:25 +01:00
Zlash65	93344dff26	group_by_account not displayed fix	2018-01-19 19:06:39 +05:30
Rohit Waghchaure	abc0632925	Merge branch 'master' into develop	2018-01-19 15:49:29 +05:30
Rohit Waghchaure	0e61b52022	bumped to version 10.0.12	2018-01-19 16:19:28 +06:00
rohitwaghchaure	0efd7934b8	Merge pull request #12530 from frappe/manassolanki-patch-2 Issue in the data import while importing the invoice	2018-01-19 15:35:23 +05:30
Rohit Waghchaure	c987500e08	Merge branch 'master' into develop	2018-01-19 13:29:57 +05:30
Rohit Waghchaure	e1815f0989	bumped to version 10.0.11	2018-01-19 13:59:56 +06:00
rohitwaghchaure	c59d52d073	Merge pull request #12550 from rohitwaghchaure/po_permission_issue [Fix] Error in PO. No Permission for Buying Settings	2018-01-19 13:00:36 +05:30
rohitwaghchaure	7b605a628e	Merge pull request #12543 from rohitwaghchaure/precision_issue_bom [Fix] Precision issue while making material requests from production planning tool	2018-01-19 13:00:16 +05:30
Rohit Waghchaure	2f3ad64bd6	[Fix] Precision issue while making material requests from production planning tool	2018-01-19 12:47:55 +05:30
Rohit Waghchaure	86cbde9057	[Fix] Error in PO. No Permission for Buying Settings	2018-01-19 12:45:53 +05:30
rohitwaghchaure	65a669c81e	Merge pull request #12534 from rohitwaghchaure/patch_fix_v7 [Fix] Timesheet patch	2018-01-19 11:37:18 +05:30
Josh Reeder	4c38e67f1a	Update dropbox-backup.md Steps for open source users were wrong and there were many work arounds. i have updated the instructions with the most streamlined process.	2018-01-18 15:38:59 -06:00
Shreya	d0b60e8254	set posting date only if null	2018-01-18 17:35:29 +05:30
Rohit Waghchaure	de420322b5	[Fix] Sales payment summary issue	2018-01-18 17:20:21 +05:30
rohitwaghchaure	c8e016522d	Merge pull request #12533 from rohitwaghchaure/pos_css_issue [Fix] POS css	2018-01-18 16:12:00 +05:30
Rohit Waghchaure	5c4f52ccf1	[Fix] POS css	2018-01-18 16:10:19 +05:30
Rohit Waghchaure	95adb60a8f	Fix patch	2018-01-18 15:52:52 +05:30
Manas Solanki	c6d5611408	Issue in the data import while importing the invoice	2018-01-18 11:20:24 +05:30
rohitwaghchaure	bd47abdc9a	[Enhance] Running Balance in GL Report (#12491 ) * Running Balance in GL Report * Supplier invoice no in GL Report/Print Format	2018-01-18 09:32:43 +05:30
Faris Ansari	00e547d319	Encode letterhead filename (#12525 )	2018-01-18 09:28:13 +05:30
Nabin Hait	f1b098e03c	payment terms filter in AR Summary report (#12529 )	2018-01-18 09:23:32 +05:30
Nabin Hait	570e29d5e7	Fixed merge conflict	2018-01-17 18:56:02 +05:30
Nabin Hait	f76fb50685	bumped to version 10.0.10	2018-01-17 19:21:20 +06:00
rohitwaghchaure	da941af687	Set due date in purchase invoice based on suppler invoice date (#12395 )	2018-01-17 16:23:04 +05:30
Nabin Hait	91fd29a963	Remove enqueuing update_total_sales method, sometimes it does not include current invoice (#12522 )	2018-01-17 16:14:31 +05:30
Kenneth Sequeira	7030817bf2	fixed image links in role based permissions and user permisissions. Fixed a spelling mistake in user permissions (#12500 )	2018-01-17 16:13:28 +05:30
Gaurav Naik	dc0db3a652	Exploded view for BOM Stock Report (#12506 ) * Multilevel BOM Stock Report prototype * Rechristened multilevel to exploded view * Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation * Used BOM Explosion item in query for exploded view * Removed trailing whitespaces for Codacy compliance	2018-01-17 16:12:55 +05:30
Umair Sayed	d8b4c8bd5b	Update index.txt (#12507 )	2018-01-17 16:12:00 +05:30
Raghavendra Kamath	2967ec3d45	Add desk icons for healthcare - fixes 11838 (#12518 ) * Add desk icons for healtcare - fixes 11838 * Remove unnecessary white spaces	2018-01-17 16:11:09 +05:30
Umair Sayed	230805b016	Update total.html (#12511 )	2018-01-17 14:41:38 +05:30
rohitwaghchaure	60febc5465	[Fix] Gross profit validation issue (#12516 )	2018-01-17 14:40:59 +05:30
Faris Ansari	4d4ce3e5cf	Rename enquiry_type to opportunity_type in MultiSelect dialog (#12517 )	2018-01-17 14:40:27 +05:30
Vishal Dhayagude	052b51ab20	[fix] Fetch UOM conversion and stock_uom from BOM into material request (#12513 ) * [fix]Fetch UOM conversion and stock_uom from BOM into material Request * Update material_request.js	2018-01-17 14:39:54 +05:30
Nabin Hait	2bfa1803e9	GL Entry on asset sale (#12514 ) * GL Entry on asset sale * Asset sale test case fixed	2018-01-17 14:39:05 +05:30
Nabin Hait	b44ef0b249	Delete employee records on deletion of company	2018-01-16 19:21:02 +05:30
frappe-pr-bot	f12dfe7b7c	[Translation] Updated Translations	2018-01-16 09:37:11 +02:00
Saurabh	4b0dd8a159	Merge branch 'master' into develop	2018-01-15 18:36:35 +05:30
Saurabh	d40bfeb7d3	bumped to version 10.0.9	2018-01-15 19:06:34 +06:00
Faris Ansari	f18cd2eaf7	[fix] is_root check	2018-01-15 18:30:01 +05:30
Nabin Hait	a2426fcc9e	Get default tax template only if tax template not selected or template is for other company (#12492 )	2018-01-15 17:45:46 +05:30
umaepoch	832453a757	Added Delay days field to Ordered Items to be Delivered report (#12439 ) * Added Delay Days to Ordered Items to be Delivered Report * Ordered Items to be Delivered	2018-01-15 15:43:16 +05:30
Faris Ansari	184491bbbe	[hotfix] Validate posting_time (#12484 )	2018-01-15 14:18:53 +05:30
Achilles Rasquinha	b6365b729e	Deleted Previous Chat Reference for Leave Application Approval (#12482 ) * deleted previous chat reference * txt to messge * removed comment	2018-01-15 14:12:41 +05:30
Vishal Dhayagude	eec0f7fd6b	[non_profit][fix] Chapter listing and join and leave chapter issue (#12463 ) * [fix] Chapter listing and Join and leave chapter issue * [minor] Changes in chapter html, chapter title to chapter name	2018-01-15 14:10:23 +05:30
Vishal Dhayagude	e04aedadcd	[fix] Add to cart issue fixed (#12474 )	2018-01-15 14:01:05 +05:30
ci2014	58dfc0782f	Update agriculture_analysis_criteria.json (#12478 )	2018-01-15 12:33:03 +05:30
Vishal Dhayagude	e88f928f0f	[fix] Image with name listing (#12479 )	2018-01-15 12:29:39 +05:30
Manas Solanki	e5e5d8271f	Update utils.py	2018-01-15 12:22:28 +05:30
rohitwaghchaure	0a2d83d40c	[Fix] gst_state field issue (#12481 )	2018-01-15 11:55:25 +05:30
Saurabh	35d8ce4fbd	resolved merge conflicts	2018-01-12 16:58:32 +05:30
Saurabh	59edc6028d	bumped to version 10.0.8	2018-01-12 17:24:26 +06:00
Saurabh	93d3020e4b	Merge pull request #12464 from Zlash65/fix-company-bom-deletion [Fix] Delete BOM only when found	2018-01-12 16:47:54 +05:30
tundebabzy	e1e38a4bb9	Autoname for Batch DocType #12302 (#12461 ) * add new fields: check: use naming series data: series prefix * refactor autoname: use new function - get_name_from_hash * add new function - get_name_from_naming_series * refactor autoname to generate name from naming series * PEP 8 compliance	2018-01-12 16:30:02 +05:30
Manas Solanki	b19fd57043	[fix] set required quantity if item in bom found (#12460 )	2018-01-12 16:28:30 +05:30
rohitwaghchaure	7b78f6bee6	Added rounded total in the POS and fix rounded issue in js side (#12457 )	2018-01-12 16:28:16 +05:30
tundebabzy	df023bff7f	add posting_date/transaction_date to list_view (#12453 )	2018-01-12 16:27:29 +05:30
rohitwaghchaure	9fbed5617f	[Fix] Wrong batch showing in the popup (#12421 )	2018-01-12 16:22:33 +05:30
Manas Solanki	bba5fd7a38	Assessment module addition (#12417 ) * add academic session details in the Assessmet Plan * add the academic session and few details in the assessment result * fix codacy	2018-01-12 16:21:09 +05:30
Zlash65	c9172e0079	delete boms only when found	2018-01-12 15:59:13 +05:30
Manas Solanki	6c3082591c	change the resolution field to the text editor (#12449 )	2018-01-12 12:00:13 +05:30
Nabin Hait	a49f720ee3	GSTR1 for B2B, B2CL and B2CS (#12459 )	2018-01-12 11:59:59 +05:30
rohitwaghchaure	3955fa5102	[Fix] Email addres unique key issue (#12450 )	2018-01-11 18:21:02 +05:30
joezsweet	3aaed03dfb	reload item_barcode	2018-01-11 11:31:31 +01:00
joezsweet	1be684fd87	codici fix	2018-01-11 09:03:26 +01:00
joezsweet	b6fb8d2143	fix patch, reload doc	2018-01-11 08:44:59 +01:00
rohitwaghchaure	02302ff009	[Fix] Incoming rate for gross profit report (#12422 )	2018-01-11 12:58:46 +05:30
Sachin Mane	24e2735e19	Add 'Shelf Life' (Item) and Manufacturing date (Batch) (#12381 ) * fix bug in batch number selector. fetch and display batch numbers only for the given item code. * remove print statement * Fix error on selecting Chattisgarh in address Fix error on selecting Chattisgarh in address because of spelling mistake * Revert "Fix error on selecting Chattisgarh in address" * Add Shelf Life (Item) and Manufacturing Date (Batch) fields * remove console.log * fix ci issues * Update batch.js	2018-01-11 12:45:50 +05:30
rohitwaghchaure	5b45bcf5f3	[Fix] Report Available Stock for Packing Items Menu not working (#12400 )	2018-01-11 12:39:09 +05:30
rohitwaghchaure	20dead5d91	[minor] UI change (#12440 ) * [minor] UI change * Update company.js	2018-01-11 12:31:14 +05:30
Charles-Henri Decultot	47ad7fb129	Multiple variant correction (#12424 )	2018-01-11 12:29:45 +05:30
rohitwaghchaure	752d21e658	Code cleanup for item price stock report and fix report was not exporting properly in excel (#12427 )	2018-01-11 12:28:48 +05:30
Vishal Dhayagude	a48f69eb83	[minor] Modified GSTR1 report to identify missing GST Account in GST Settings (#12426 ) * [minor] Modified GSTR1 report to identify missing GST Account in GST Settings * Update gstr_1.py	2018-01-11 12:26:52 +05:30
Rushabh Mehta	8be6d74655	[minor] company.js buttons should be primary!	2018-01-11 11:20:16 +05:30
tundebabzy	3732033d9b	Merge pull request #12435 from tundebabzy/packing-slip-msg Better validation message in Packing Slip	2018-01-11 00:32:26 +01:00
tundebabzy	6f75885d86	better validation message	2018-01-10 23:14:13 +01:00
joezsweet	9116666288	fix patch	2018-01-10 23:11:13 +01:00
tundebabzy	76dddbf26e	Merge branch 'develop' into multi-barcode	2018-01-10 21:49:27 +01:00
Nabin Hait	619c42b934	GSTR1 for B2B (#12296 )	2018-01-10 17:48:03 +05:30
Vishal Dhayagude	0099a09e9b	[fix] fix print hide weight details in quotation print format (#12412 )	2018-01-10 16:30:09 +05:30
Zarrar	94f9f48d70	set from_warehouse only if purchase_order and purpose found (#12398 )	2018-01-10 16:29:40 +05:30
Nabin Hait	687dc6a424	patch fixed	2018-01-10 14:51:19 +05:30
frappe-pr-bot	a20ef08ebf	[Translation] Updated Translations	2018-01-09 13:29:17 +02:00
Nabin Hait	527e6c02b3	Delete BOMs on deletion of company	2018-01-09 16:29:13 +05:30
Nabin Hait	6b89644ca7	Payment terms filter in AR report	2018-01-09 15:39:35 +05:30
Pawan Mehta	d0e7367525	[fix] #12390 (#12391 )	2018-01-09 14:33:25 +05:30
Saurabh	892a7a6980	resolved merge conflicts	2018-01-09 12:05:20 +05:30
Saurabh	0b3b63a9af	bumped to version 10.0.7	2018-01-09 12:25:38 +06:00
rohitwaghchaure	412e044e8f	[Fix] Error in stock move from batch dashboard (#12377 )	2018-01-09 11:27:35 +05:30
Zarrar	0f458b1260	show balance if permitted to view gl entry (#12385 )	2018-01-09 11:27:14 +05:30
tundebabzy	da22167741	Purchase Invoice - Due Date reverts to first time value on save #12340 (#12382 ) * add handler for due_date: if due_date is changed and payment terms template or payment schedule is set, ask user to clear them. * ui test cases * cleanup	2018-01-09 10:58:44 +05:30
Vishal Dhayagude	d2d54826ab	[minor] Minor Changes in Membership Doctype (#12384 )	2018-01-09 10:56:17 +05:30
Pawan Mehta	5b069a4e25	Added Payment Details to Sales Payment Summary Report (#12358 ) * [fix] #12357 * label changes	2018-01-09 10:53:13 +05:30
Sachin Mane	64f48db406	Batch number selector bug fix (#12346 ) * fix bug in batch number selector. fetch and display batch numbers only for the given item code. * remove print statement * Fix error on selecting Chattisgarh in address Fix error on selecting Chattisgarh in address because of spelling mistake * Revert "Fix error on selecting Chattisgarh in address"	2018-01-08 17:57:32 +05:30
Prateeksha Singh	8b94f1b553	[minor][buying] fix schedule date check (#12375 )	2018-01-08 16:46:39 +05:30
rohitwaghchaure	7fcc21bc8b	[Fix] Cart remain same even if pos profile change (#12371 )	2018-01-08 15:22:22 +05:30
rohitwaghchaure	bf4c114c58	[Enhance] Provision to show inclusive tax in print (#12345 ) * [Enhance] Provision to show inclusive tax in print * POS Print format	2018-01-08 15:20:15 +05:30
Shreya Shah	44fa9a6d9d	Last purchase rate button added back (#12135 ) * last purchase rate button added * triggers to update rate on button * updated modified column in buying settings * moved trigger to get_item_details.py * hide get_last_rate button depending on buying settings	2018-01-08 14:58:20 +05:30
Prateeksha Singh	50b6d79758	Merge pull request #12370 from Zlash65/fix-root-node-delete [Fix] Delete root node for account	2018-01-08 12:51:31 +05:30
Nabin Hait	3a972c4d85	Precision issue in stock reconciliation	2018-01-08 12:35:05 +05:30
Zlash65	745c2658eb	delete root node allow	2018-01-08 11:53:52 +05:30
Charles-Henri Decultot	57187860f8	Codacy error fixes	2018-01-06 15:32:01 +00:00
Charles-Henri Decultot	356839a54b	Codacy erro fixes	2018-01-06 15:22:40 +00:00
ci2014	5d3e486415	Fix english typo in source code Fix english typo in source code	2018-01-06 04:04:06 +01:00
Charles-Henri Decultot	34e335ba34	Prorated Asset Depreciation	2018-01-05 17:49:06 +00:00
Prateeksha Singh	620e0981cb	Merge pull request #12347 from pratu16x7/buying-fix [minor][buying] fix schedule date check	2018-01-05 21:31:58 +05:30
Prateeksha Singh	cbd06fd3c6	[minor][buying] fix schedule date check	2018-01-05 21:28:01 +05:30
Nabin Hait	2f51c6900b	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:20:05 +05:30
Nabin Hait	07e5376043	Fixes and cleanups of reserve qty for subcontracting	2018-01-05 18:19:59 +05:30
Nabin Hait	cab8dfc5fb	Fixed merge conflict	2018-01-05 14:15:39 +05:30
Nabin Hait	cb495fb33b	Merge branch 'master' into develop	2018-01-05 13:17:00 +05:30
Nabin Hait	c98cfbdab4	bumped to version 10.0.6	2018-01-05 13:46:59 +06:00
Nabin Hait	28d0230e56	Multiple small fixes	2018-01-05 13:14:25 +05:30
James Robertson	46196c4ad3	Setup Wizard Updates (#12337 ) Changes to support v10 ERPNext Setup Wizard	2018-01-05 12:50:04 +05:30
Saurabh	eac2e369cf	[fix] setup alias for ifnull condition (#12327 )	2018-01-05 12:48:08 +05:30
Doridel Cahanap	291b26ad04	Training Documentation in DE (#12309 )	2018-01-05 12:47:40 +05:30
Manas Solanki	a521efc990	fix for the non stock items for the shopping cart (#12294 )	2018-01-05 12:47:20 +05:30
tundebabzy	8f44d1c63d	Payment Terms in Delivery Note #12167 (#12293 ) * add Payment Terms Template field to delivery note: - This helps for users who create invoice from Sales Invoice - Field is hidden in print - Field is not coupled to Payment Schedule table. * do nothing in payment_terms_template trigger if doctype is Delivery Note	2018-01-05 12:46:50 +05:30
Shreya Shah	48351e0339	cancelled sales invoice totals shouldn't be reflected in leaderboard for customer (#12292 )	2018-01-05 12:45:43 +05:30
Manas Solanki	171157f1b3	Fix + Enhancement in Program Enrollment Tool (#12291 ) * Fix + Enhancement in Program Enrollment Tool * updated the docs	2018-01-05 12:42:39 +05:30
rohitwaghchaure	bc2c83ee3c	Companywise default tax template (#12290 ) * Companywise default tax template * Fix test cases	2018-01-05 12:42:02 +05:30
rohitwaghchaure	3f784a7a49	[minor] POS profile mandatory, to set as default (#12307 )	2018-01-05 12:26:33 +05:30
rohitwaghchaure	1f39feb12f	[Fix] PO -> PI non default taxes not fetched (#12313 )	2018-01-05 12:25:45 +05:30
rohitwaghchaure	c5c6f82623	[Hotfix] Tax rate not showing in the report (#12324 )	2018-01-05 12:16:16 +05:30
Nabin Hait	42688f0636	Minor fix	2018-01-04 18:12:21 +05:30
Nabin Hait	941d0af13a	Fixed organization lead error	2018-01-03 14:12:56 +05:30
Nabin Hait	76625b359e	Removed naming series from set_only_once in pos profile	2018-01-03 14:03:53 +05:30
Manas Solanki	76ea7a9227	Merge pull request #12301 from kennethsequeira/cust-report-vid Updated youtube video link for custom reports article	2018-01-02 21:53:47 +05:30
Kenneth Sequeira	82bd3302ee	updated youtube video link for custom reports article	2018-01-02 21:41:48 +05:30
Saurabh	14506d7878	Merge branch 'master' into develop	2018-01-02 12:09:25 +05:30
Saurabh	abf5fa6bbb	bumped to version 10.0.5	2018-01-02 12:39:25 +06:00
tundebabzy	650a1eeede	recalculate terms when document date changed (#12288 ) * recalculate terms when document date changed * clean up	2018-01-02 12:02:30 +05:30
Nabin Hait	96b264b314	Minor fixes	2018-01-02 11:50:29 +05:30
Kenneth Sequeira	13e5689bd9	Updated the image paths for Custom Doctype manual	2018-01-01 17:33:57 +05:30
Saurabh	2ac1835f7d	[fix] if is_root is true make parent account empty (#12255 )	2018-01-01 16:17:43 +05:30
Saurabh	15d53c7912	[fix] key error (#12257 )	2018-01-01 16:17:14 +05:30
Saurabh	9579645ae1	[fix] if item code exists then only call get_item_details (#12258 )	2018-01-01 16:17:02 +05:30
Saurabh	a6b41e855b	[fix] check if null for mode of payments (#12264 )	2018-01-01 16:16:50 +05:30
rohitwaghchaure	526b0bc4e9	[minor] Code cleanup (#12278 )	2018-01-01 16:16:16 +05:30
rohitwaghchaure	2640c7eec5	[Fix] Validation issue for online POS profile (#12276 )	2018-01-01 16:15:41 +05:30
Nabin Hait	c33788a91b	Show standard rate only in unsaved Item	2017-12-29 15:42:50 +05:30
Jamsheer	c90195de29	Patient medical record and Consulatation (#12198 ) * Patient Medical Record - Subject field reqd=0, Subject text formated * Consultation - remove patient details section * Search fields are updated for Consultation and Appointment * Translations applied on menu	2017-12-29 14:32:13 +05:30
Javier Wong	2469095a13	Check Meta before Toggling Conversion Factor (#12237 ) If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.	2017-12-29 14:06:47 +05:30
Shreya Shah	df0dd8be5f	Travis fix for client side tests (#12224 ) * salary slip test fix * attendance tool test fix * timeout after routing	2017-12-29 14:04:46 +05:30
Nabin Hait	07be33805d	bumped to version 10.0.4	2017-12-28 19:16:51 +06:00
rohitwaghchaure	a84d38999c	[Fix] Sales order erased on production order on selection of sales order (#12225 )	2017-12-28 18:45:27 +05:30
rohitwaghchaure	c9ed09440c	Re-execute uae vat patch (#12230 )	2017-12-28 18:42:22 +05:30
rohitwaghchaure	fe22686a8f	Update last purchase rate from the purchase invoice (#12189 )	2017-12-28 16:11:27 +05:30
Nabin Hait	c70a78dcf6	bumped to version 10.0.3	2017-12-28 14:52:57 +06:00
rohitwaghchaure	d45266881a	[Enhance] New print format for UAE/KSA for vat/excise (#12202 ) * [Enhance] New print format for UAE/KSA for vat/excise * Fixed spelling	2017-12-28 14:20:13 +05:30
rohitwaghchaure	dbb5ae9a9e	[fix] Closing balance showing at wrong side (#12220 )	2017-12-28 13:15:21 +05:30
Nabin Hait	ca674bec42	Set numeric ranges in Item tamplate if blank (#12199 )	2017-12-28 12:35:11 +05:30
Saurabh	28ce1c0c3a	[fix] add flag ignore mandatory (#12201 )	2017-12-28 12:34:58 +05:30
Manas Solanki	91017cba8d	Additional fields in the instructor doctype for the academics log and minor permission changes (#12204 )	2017-12-28 12:34:36 +05:30
Frappe PR Bot	878b5f7e71	[Translation] Updated Translations (#12212 )	2017-12-28 12:31:01 +05:30
Manas Solanki	e20a0f1115	[Fix] make PE unique for the combination of academic year and academic term (#12214 )	2017-12-28 12:29:11 +05:30
Fahim Ali Zain TP	5f7cedb206	Fix v8 to v10 migration issue (#12177 )	2017-12-27 17:14:54 +05:30
Nabin Hait	a47ea94ab4	bumped to version 10.0.2	2017-12-26 19:05:49 +06:00
Nabin Hait	9e16697702	Merge branch 'master' into develop	2017-12-26 18:34:16 +05:30
Nabin Hait	451af06d2f	bumped to version 10.0.1	2017-12-26 19:04:16 +06:00
Nabin Hait	123759aff7	Fixes for travis (#12161 ) * Fixes for travis * Testcase fixes for get_item_details * Testcase fixes for get_item_details * Travis fixes * Travis fixes	2017-12-26 17:50:34 +05:30
rohitwaghchaure	30e38ff7c7	[Fix] Asset make sales invoice (#12168 )	2017-12-26 16:23:06 +05:30
Vishal Dhayagude	f06c281964	[fix] allow to change doc status on get items (#12174 )	2017-12-26 16:22:40 +05:30
Manas Solanki	5e9d1246e8	remove the autoname from the supplier json	2017-12-26 15:21:03 +05:30
Nabin Hait	6211a3edf2	bumped to version 10.0.0	2017-12-25 15:54:48 +06:00
Nabin Hait	ed13b3c19a	Fixed minor issue	2017-12-25 15:11:56 +05:30
Nabin Hait	c65279b584	Reloaded account doctype in UAE Vat patch	2017-12-25 15:02:54 +05:30
Nabin Hait	92615901a7	Fixed merge conflict	2017-12-25 13:41:04 +05:30
Nabin Hait	f4c5cf5bd0	bumped to version 9.2.24	2017-12-25 14:08:05 +06:00
Nabin Hait	e9dabd5cec	Settings to show payment schedule in print (#12158 )	2017-12-25 13:30:01 +05:30
Prateeksha Singh	293c700c08	Merge pull request #12157 from pratu16x7/setup-fixes [setup] remove sample data commit, fix namespace	2017-12-25 12:31:23 +05:30
Prateeksha Singh	b61d091f4c	[setup] remove sample data commit, fix namespace	2017-12-25 12:30:35 +05:30
Nabin Hait	9da6844b52	Version 10 change log	2017-12-25 12:25:52 +05:30
rohitwaghchaure	79f8784772	Merge pull request #12156 from rohitwaghchaure/company_setup_issue [Fix] Setup wizard UAE/KSA	2017-12-25 12:12:57 +05:30
Rohit Waghchaure	cfafb21842	[Fix] Setup wizard UAE/KSA	2017-12-25 12:12:07 +05:30
tundebabzy	590bd0a8e5	trigger payment_terms_template only when needed (#12124 )	2017-12-25 11:40:19 +05:30
rohitwaghchaure	bd5e01b09b	[fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134 )	2017-12-25 11:28:07 +05:30
rohitwaghchaure	d8c6449f3a	[Fix] Bom raw materials not in order in the stock entry (#12149 )	2017-12-25 11:26:40 +05:30
rohitwaghchaure	75789b65c2	[Fix] Sales payment summary report (#12151 )	2017-12-25 11:26:15 +05:30
Zarrar	adc184c872	[Minor] Fix adding child to root task issue (#12121 ) * make parent_task none * adding multiple tasks - set project of parent	2017-12-22 11:00:19 +05:30
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
Giovanni	da40999ed8	- fix patch	2017-12-11 10:01:45 +01:00
Giovanni	dd37ceb707	patch to migrade barcodes into Item Barcode	2017-12-11 09:54:18 +01:00
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
Giovanni	43372d3333	- make barcode mandatory if child row is added - check valid barcode only if exists	2017-12-10 20:56:48 +01:00
Giovanni	ff7d73e418	- query fix	2017-12-10 20:46:46 +01:00
Giovanni	2a098ada7c	- bug fix	2017-12-10 20:33:20 +01:00
Giovanni	4c848ee14f	- codacy fix	2017-12-10 20:06:56 +01:00
Giovanni	8f8a485e07	- autoname field:barcode	2017-12-10 19:46:01 +01:00
Giovanni	ff6d0a5260	- clean code - console logs	2017-12-10 19:36:42 +01:00
Giovanni	01953135c5	- code clean	2017-12-10 18:54:19 +01:00
Giovanni	a04c756913	- validate EAN or UPC-A code - made Item Barcode Doctpye standard - added stdnum to requirements	2017-12-10 18:54:08 +01:00
Giovanni	9b7e52cafb	- added barcode validation against Item Barcode	2017-12-10 18:11:48 +01:00
Giovanni	2144e02d3c	- Added multiple barcode feature per item	2017-12-10 17:27:09 +01:00
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
pawan	990277a0de	patch	2017-12-01 16:45:47 +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
pawan	14d570ed9e	fix	2017-11-30 18:41:09 +05:30
pawan	2ff844e740	default warehouse / remove validation / change sql	2017-11-30 18:14:55 +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
pawan	e4aaff6686	message changes	2017-11-30 15:49:54 +05:30
pawan	f5bb2af92c	test case	2017-11-30 15:20:00 +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
pawan	e43cd915e8	alignment	2017-11-30 12:31:32 +05:30
pawan	abc5523405	code improvements	2017-11-30 12:23:46 +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
pawan	11398fd572	Validation for reserved warhouse	2017-11-29 21:16:02 +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
pawan	54465f5df1	review comments changes	2017-11-29 10:18:38 +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
pawan	f5279a0d67	[fix] #8427	2017-11-24 11:21:47 +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

... 21 22 23 24 25 ...

15030 Commits