10776 Commits

Author	SHA1	Message	Date
Nabin Hait	bf01958b85	Merge pull request #7510 from dalwadani/develop ... fix string translation	2017-01-17 11:12:15 +05:30
Nabin Hait	b064cf39c2	Merge branch 'develop' into fleet-moved-to-hr	2017-01-17 11:05:39 +05:30
Nabin Hait	03f82240fa	Merge pull request #7222 from neilLasrado/assessment ... Redesign Assessment Module	2017-01-17 11:04:02 +05:30
Dhaifallah Alwadani	9375d1dfeb	fix string translation	2017-01-16 04:05:40 -08:00
Stavros Anastasiadis	241e478dc0	Add Full Name as option in HR Setting Employee creation option	2017-01-16 14:02:28 +02:00
Rushabh Mehta	ffd80a6061	[fix] warehouse test cases	2017-01-16 17:23:20 +05:30
Rushabh Mehta	6695830f3f	[fix] warehouse test cases	2017-01-16 16:57:53 +05:30
Gaurav Naik	d9b4c52046	[Fix] Project: Enabled autocomplete for project users	2017-01-16 16:01:25 +05:30
Kanchan Chauhan	f80c2b9606	Fleet management moved to HR	2017-01-16 14:38:24 +05:30
Rushabh Mehta	8d39fd9790	[fix] address queries + tests	2017-01-16 13:06:15 +05:30
Nabin Hait	120461efef	Merge branch 'master' into develop	2017-01-16 13:04:54 +05:30
Nabin Hait	71a730a36f	bumped to version 7.2.12	2017-01-16 13:34:53 +06:00
KanchanChauhan	b89be1e193	[Minor] Demo fixes (#7499)	2017-01-16 12:57:14 +05:30
Neil Trini Lasrado	38bd62d82d	Merge branch 'develop' into assessment	2017-01-16 12:23:51 +05:30
Rushabh Mehta	4ad121e1a4	[minor] fixes for Contact	2017-01-16 12:19:21 +05:30
ci2014	820abd3ba4	Fix missing comma (#7495) ... Fixed missing comma after method set_contact_link	2017-01-16 11:57:34 +05:30
Nabin Hait	47bdf8b659	Merge pull request #7490 from rohitwaghchaure/pos_discount_issue ... [Fix] Discount not working in the POS	2017-01-16 11:44:50 +05:30
Rohit Waghchaure	685f89f2b7	[Fix] Discount not working in the POS	2017-01-14 20:47:56 +05:30
Rushabh Mehta	95439db53f	[fixes] address and contact	2017-01-14 00:25:22 +05:30
Rushabh Mehta	c0bfb0ba56	[fix] contact and address for demo	2017-01-13 23:05:56 +05:30
Rushabh Mehta	b92087cb2d	[cleanup] move contact, address to frappe 💥	2017-01-13 18:54:47 +05:30
Nabin Hait	448acf6f46	Merge branch 'master' into develop	2017-01-13 17:30:46 +05:30
Nabin Hait	3d26ddd790	bumped to version 7.2.11	2017-01-13 18:00:45 +06:00
Nabin Hait	e7cb911634	Salary Slip Patch Fixed	2017-01-13 17:30:06 +05:30
Nabin Hait	26ac85be5b	Merge branch 'master' into develop	2017-01-13 17:10:52 +05:30
Nabin Hait	fd7f3240b4	bumped to version 7.2.10	2017-01-13 17:40:51 +06:00
Nabin Hait	b166caa9fb	Patch fixed	2017-01-13 17:09:57 +05:30
robert schouten	7a3d418aa5	Email inbox based off of frappe email inbox pr (#7308) ... * email inbox * inbox fixes * separate email-inbox to pass tests * separate email-inbox to pass tests * fix import * add more info to contact and address	2017-01-13 14:51:09 +05:30
Rushabh Mehta	af077dc616	[minor] fix for custom perms	2017-01-13 14:47:37 +05:30
Nabin Hait	b251cd4ccb	Fixed merge conflict	2017-01-13 14:34:54 +05:30
Nabin Hait	45cad45420	bumped to version 7.2.9	2017-01-13 15:03:56 +06:00
Nabin Hait	e43a94de4b	Merge branch 'hotfix' into draft_status_issue_after_amend	2017-01-13 13:14:32 +05:30
Nabin Hait	9698f1b923	Merge pull request #7473 from KanchanChauhan/salary-slip-before-june ... Patch to add Start and End Date in Salary Slips	2017-01-13 12:53:15 +05:30
Rohit Waghchaure	29458836e4	[Fix] After amend the status become cancelled even if docstatus is zero	2017-01-13 12:51:19 +05:30
robert schouten	1a92d54dcb	[fix] profiability analasyis orderby cost center name	2017-01-13 14:52:11 +08:00
Kanchan Chauhan	b6114e672f	Patch to add Start and End Date in Salary Slips	2017-01-13 12:05:03 +05:30
Nabin Hait	4bd42146ba	Merge pull request #7462 from rohitwaghchaure/minor_pos_issue ... [Fix] POS issues	2017-01-13 11:55:52 +05:30
Nabin Hait	ba2a76cfb7	Merge pull request #7453 from KanchanChauhan/salary-register-report ... Changes to Salary Register	2017-01-13 11:51:48 +05:30
Nabin Hait	8f0c060578	Merge pull request #7447 from saurabh6790/tree_param_fix ... [fix] provision to handle custom mandatory params while creating node	2017-01-13 11:50:18 +05:30
Nabin Hait	17cd36b7d5	Merge pull request #7451 from saurabh6790/chequeprint_date_fix ... [minor][fix] show date in user format	2017-01-13 11:36:12 +05:30
Nabin Hait	90de12fea3	Merge pull request #7446 from KanchanChauhan/fieldtype-edit-desc ... [Minor] Field type of Description field changed to Text Editor	2017-01-13 11:34:51 +05:30
Nabin Hait	007c87ea63	Merge pull request #7440 from nabinhait/gle_repost_optimization ... Optimization to reduce GLE reposting time for future stock transactions	2017-01-13 11:33:42 +05:30
robert schouten	d56627f2b7	[fix] profiability analasyis orderby project name	2017-01-13 11:53:43 +08:00
Felipe Orellana	ac81440a81	[FIX] Contact form breaks on existing lead ... When an email address from the contacts form is from a existing lead utils.py tries to set new_lead(an undefined var) as the lead reference if a lead is found.	2017-01-12 12:08:20 -05:00
Kanchan Chauhan	7933eb685c	[Enhancement] Attendance Module	2017-01-12 17:24:53 +05:30
Rohit Waghchaure	8afe267813	[Fix] POS issues	2017-01-12 15:22:02 +05:30
Kanchan Chauhan	2f3ae914a6	Changes to Salary Register	2017-01-11 19:45:01 +05:30
Ben Cornwell-Mott	1cd7e54822	Adds button to find MRs linked to Supplier	2017-01-11 03:05:49 -08:00
Saurabh	056276c60e	[minor][fix] show date in user format	2017-01-11 15:50:09 +05:30
RicardoJohann	7182de7684	allowed rename salary structure	2017-01-11 06:28:59 -02:00
Saurabh	2f02101d7d	[fix] provision to handle custom mandatory params while creating node	2017-01-11 12:41:01 +05:30
Kanchan Chauhan	595cfb9f17	[Minor] Field type of Description field changed to Text Editor	2017-01-11 12:03:15 +05:30
Nabin Hait	0287d31c0f	Fetch bin details after setting warehouse based on POS Profile	2017-01-11 10:31:45 +05:30
Nabin Hait	c0eab41ec5	Fix for Budget against Project	2017-01-11 10:16:19 +05:30
Ben Cornwell-Mott	3d491f90cc	Created 2 reports for stock details	2017-01-10 14:14:18 -08:00
Neil Trini Lasrado	2a9e0f6fd8	Added assessment result tool	2017-01-10 17:32:02 +05:30
Nabin Hait	9e08ccdf39	Merge pull request #7425 from KanchanChauhan/sync-projecttask-task ... Sync Project Task and Task	2017-01-10 17:26:51 +05:30
Nabin Hait	1612fa1253	Merge pull request #7426 from nabinhait/hotfix ... Show values based on precision and filter out zero value rows	2017-01-10 17:26:27 +05:30
Nabin Hait	20aba32318	Merge pull request #7427 from KanchanChauhan/projects-manager-role ... [Minor] Added Projects Manager role	2017-01-10 17:25:16 +05:30
Kanchan Chauhan	c4aceaad7f	[Minor] Added Projects Manager role	2017-01-10 16:35:54 +05:30
Nabin Hait	5dd988207f	Show values based on precision and filter out zero value rows	2017-01-10 16:10:40 +05:30
Kanchan Chauhan	4a15fa4c86	Sync Project Task and Task	2017-01-10 16:01:38 +05:30
Rushabh Mehta	d40e661ebd	[style] better demo start page	2017-01-10 14:46:54 +05:30
Nabin Hait	51d45d8bce	Fixed merge conflict	2017-01-10 12:32:01 +05:30
Nabin Hait	4180a37773	bumped to version 7.2.8	2017-01-10 13:00:09 +06:00
Nabin Hait	a7f616564e	Merge pull request #7417 from KanchanChauhan/quick-entry-for-item ... [Minor] Valuation rate in Quick entry for Item	2017-01-10 12:23:36 +05:30
Nabin Hait	01baceb74e	Revert "proposed usage of daterange picker"	2017-01-10 12:19:48 +05:30
Kanchan Chauhan	43e07aed2c	[Minor]Valuation rate in Quick entry for Item	2017-01-10 12:06:51 +05:30
Nabin Hait	9215581345	Merge pull request #7414 from KanchanChauhan/timesheet-payroll-frequency-toggle ... [Fix] Payroll Frequency toggle fix	2017-01-10 11:58:36 +05:30
Kanchan Chauhan	2b41f9d548	[Fix] Payroll Frequency toggle fix	2017-01-09 18:43:52 +05:30
Neil Trini Lasrado	5a30467ae5	Added test case	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	a56224c03a	Rename Assessment to Assessment Plan	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	233ecfdd9c	Renamed min_score to threshold in Grading Scale	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	577cfd559f	Removed LMS code in Course master	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	5c87455918	Patch for assessment module redesign	2017-01-09 18:26:03 +05:30
Neil Trini Lasrado	06ed74dc7c	Redesign Assessment Module	2017-01-09 18:26:02 +05:30
Nabin Hait	ec793b4846	Merge branch 'hotfix' of git://github.com/frappe/erpnext into hotfix	2017-01-09 17:24:10 +05:30
Nabin Hait	6e9d2a3c1f	fixed conflict	2017-01-09 17:21:34 +05:30
Nabin Hait	a2fae844b6	Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation ... [fix] timesheet overlap validation not including modified timesheet	2017-01-09 17:15:40 +05:30
Nabin Hait	2bb9093b9a	bumped to version 7.2.7	2017-01-09 17:27:10 +06:00
Nabin Hait	f0c41b5709	Merge pull request #7412 from nabinhait/hotfix ... Allow fetching same items multiple times from source doc if all qty not processed	2017-01-09 16:00:08 +05:30
Nabin Hait	23b836dcdb	Merge pull request #7386 from arvindstutzen/patch-1 ... Update step-8-customer-names.md	2017-01-09 15:55:38 +05:30
Nabin Hait	297ae85c31	Merge pull request #7409 from RobertSchouten/daterangecontrol ... proposed usage of daterange picker	2017-01-09 15:55:17 +05:30
Nabin Hait	1839fcca11	Merge pull request #7406 from saurabh6790/terms_and_cond_fix ... [fix] if terms exists then only call render_template	2017-01-09 15:49:56 +05:30
Nabin Hait	d1eb237909	Merge pull request #7400 from rohitwaghchaure/minor_issue ... Get item default warehouse	2017-01-09 15:49:14 +05:30
Nabin Hait	a9b9edd9bc	Merge pull request #7392 from frappe/bcornwellmott-patch-2 ... Fix number of digits on report	2017-01-09 15:48:04 +05:30
Nabin Hait	802b4359b5	Fetch same items multiple times from source doc if all qty not processed	2017-01-09 15:32:20 +05:30
nick9822	6f48d4be1c	whitelisted erpnext.stock.utils.get_stock_balance (#7402) ... whitelisted erpnext.stock.utils.get_stock_balance with respect to https://github.com/frappe/erpnext/issues/7364	2017-01-09 12:12:36 +05:30
robert schouten	138c2f6b29	[fix] timesheet overlap validation not including modified timesheet	2017-01-09 12:50:35 +08:00
robert schouten	81130e848e	proposed usage of daterange picker	2017-01-09 08:38:27 +08:00
Saurabh	f65e8de5a5	[fix] if terms exists then only call render_template	2017-01-07 08:18:10 +05:30
bcornwellmott	34e34ed1e8	Trigger Restart of build checks	2017-01-06 17:21:16 -08:00
Rushabh Mehta	8b133ac087	[minor] [tests] fix, tests will fail on the 5th of a month!	2017-01-06 17:21:04 +05:30
Rohit Waghchaure	6734c4ad5c	Get item default warehouse	2017-01-06 14:39:40 +05:30
Nabin Hait	91621639e8	Reload in_standard_filter property	2017-01-06 12:54:16 +05:30
bcornwellmott	a3e7c38734	Fix number of digits on report ... Currently the cells can show many digits.	2017-01-05 09:44:18 -08:00
Nabin Hait	59a67c3586	Update supplier_quotation.py	2017-01-05 14:58:30 +05:30
Arvind Subramanian	efc9372f46	Update step-8-customer-names.md	2017-01-05 08:34:58 +05:30
bhupen	107099aac9	you can make quotation from supplier quotation	2017-01-04 17:04:12 +05:30
Nabin Hait	d08c248642	Merge pull request #7354 from Scheercuzy/enlarge-item-image-website ... Hyperlink on item image on website	2017-01-04 15:58:44 +05:30
britlog	35cefb1275	fix success_list if http status == 200 + utf-8 support + optional success message	2017-01-04 15:53:26 +05:30
Nabin Hait	8281b36a26	Merge pull request #7380 from KanchanChauhan/emailid-to-emailaddress ... Email ID renamed to Email Address	2017-01-04 15:46:48 +05:30
Nabin Hait	f45851c245	Merge pull request #7379 from KanchanChauhan/accounts-reports ... [Enhancement] Summary link on Accounts Payable and Accounts Receivable	2017-01-04 15:45:39 +05:30
Nabin Hait	0dab40f4a1	Merge pull request #7377 from KanchanChauhan/naming-series ... [Fix] Naming series issue	2017-01-04 15:44:00 +05:30
Nabin Hait	96562e3eb7	Merge pull request #7362 from rmehta/minor-fixes ... [minor] dont get warehouse in opening entry #7353	2017-01-04 15:42:23 +05:30
Nabin Hait	202bcc09d5	Merge pull request #7336 from rohitwaghchaure/pos_enhancement_and_issues ... [Enhancement] POS features	2017-01-04 15:15:32 +05:30
Nabin Hait	3051a3dd97	Fixed test case for margin	2017-01-04 15:11:58 +05:30
Kanchan Chauhan	b7cc393eb8	Email ID renamed to Email Address	2017-01-03 16:45:38 +05:30
Kanchan Chauhan	f4832cf2b9	[Enhancement] Summary link on Accounts Payable and Accounts Receivable	2017-01-03 16:29:41 +05:30
Scheercuzy	7c161cfff2	Merge remote-tracking branch 'frappe/develop' into enlarge-item-image-website	2017-01-03 16:03:43 +06:30
Kanchan Chauhan	0e8361d1de	[Fix] Naming series issue	2017-01-03 14:29:17 +05:30
Nabin Hait	1d88c65be4	Merge pull request #7374 from rohitwaghchaure/billed_report_enhancement ... [Enhancement] Consolidated billed report, changed the report type from query to script	2017-01-02 17:40:51 +05:30
Nabin Hait	ab42fc006f	Merge branch 'master' into develop	2017-01-02 17:26:55 +05:30
Nabin Hait	1ecf613c3c	bumped to version 7.2.6	2017-01-02 17:56:54 +06:00
Nabin Hait	ceea71bcfc	Merge pull request #7365 from rohitwaghchaure/terms_and_condition ... minor fix	2017-01-02 17:24:42 +05:30
Nabin Hait	b0e329b803	Merge pull request #7367 from saurabh6790/sms_log_fix ... [fix] status check fix	2017-01-02 17:24:25 +05:30
Nabin Hait	506120936a	Merge pull request #7373 from KanchanChauhan/leave-for-absent ... [Fix] Attendance validation in Leave Application	2017-01-02 17:23:45 +05:30
Nabin Hait	7fc18f359c	Currency symbol for budget amount based on company	2017-01-02 17:21:34 +05:30
Nabin Hait	92254d3930	Set serial nos in DN based on FIFO based on Stock Settings	2017-01-02 17:01:27 +05:30
Rohit Waghchaure	5a383e5cdd	[Enhancement] Consolidated billed report, changed type from query to script	2017-01-02 16:20:43 +05:30
Nabin Hait	06966e8e1d	minor fix	2017-01-02 15:10:01 +05:30
Kanchan Chauhan	5594050104	[Fix] Attendance validation in Leave Application	2017-01-02 11:14:44 +05:30
Rohit Waghchaure	cdbacf5398	minor fix	2016-12-30 17:06:01 +05:30
Saurabh	6bbed0297b	[fix] status check fix	2016-12-30 17:05:40 +05:30
KanchanChauhan	4601fdd98d	Better Salary Slip logs in Process Payroll (#7322)	2016-12-30 16:26:55 +05:30
Nabin Hait	9784d27317	Optimization to reduce GLE reposting time for future stock transactions	2016-12-30 16:21:35 +05:30
Nabin Hait	ce5f942678	Merge branch 'master' into develop	2016-12-30 15:54:32 +05:30
Nabin Hait	edb99f8750	bumped to version 7.2.5	2016-12-30 16:24:31 +06:00
Nabin Hait	4de4b56c60	Merge pull request #7363 from rohitwaghchaure/terms_and_conditions_for_company ... set default terms and condition if tc_name is available on the form	2016-12-30 15:46:57 +05:30
Rohit Waghchaure	585448b225	set default terms and condition if tc_name is available on the form	2016-12-30 15:41:55 +05:30
Rushabh Mehta	985cb8226d	[minor] dont get warehouse in opening entry #7353	2016-12-30 15:06:54 +05:30
Nabin Hait	e97d40806f	Merge branch 'master' into develop	2016-12-30 14:56:20 +05:30
Nabin Hait	5105b1e789	bumped to version 7.2.4	2016-12-30 15:26:19 +06:00
Nabin Hait	dc0a277085	Merge pull request #7355 from manassolanki/hotfix ... Fetching the item details from the reference doctype in QI	2016-12-30 14:10:21 +05:30
Nabin Hait	fa2feae314	Merge pull request #7359 from nabinhait/hotfix ... [fix] Make Journal Entry against SO	2016-12-30 12:38:56 +05:30
Kanchan Chauhan	7b29dc7208	[Fix] Monthly Salary Register Fix	2016-12-30 12:36:00 +05:30
Nabin Hait	9646be1d5d	[fix] Make Journal Entry against SO	2016-12-30 11:14:41 +05:30
Rushabh Mehta	a8326de4d0	[fix] on_update in item.py	2016-12-30 06:17:45 +05:30
Rushabh Mehta	2097ccfaea	[fix] item_group.py #7358	2016-12-30 06:09:41 +05:30
Manas Solanki	5c82e9ef8b	Fetching the item details from the reference doctype in quality inspection ... Error Report [2016-12-29]	2016-12-29 18:01:25 +05:30
Scheercuzy	f483582957	Hyperlink Item Image ... added hyperlink on item image	2016-12-29 18:56:44 +06:30
Nabin Hait	f327a58b7f	Merge branch 'master' into develop	2016-12-29 11:04:05 +05:30
Nabin Hait	3d98d23e22	bumped to version 7.2.3	2016-12-29 11:34:05 +06:00
Nabin Hait	11bde0ba14	Patch fixed	2016-12-29 10:58:05 +05:30
Nabin Hait	2469f247df	Merge pull request #7341 from StrellaGroup/develop ... Fixed spelling errors on Production Planning Tool and manual.	2016-12-28 17:12:01 +05:30
Neil Trini Lasrado	986927ca98	Added Guardian to school module	2016-12-28 16:15:35 +05:30
Muhammad Huzaifah Bin Ismail	465da8ce09	Fixed spelling errors on Production Planning Tool and manual.	2016-12-28 18:15:45 +08:00
Rohit Waghchaure	bef185c404	restrict user to edit the rate in the POS	2016-12-28 15:16:49 +05:30
Neil Trini Lasrado	0152516ba4	[Fix] Student Monthly Attendance Sheet	2016-12-28 13:01:14 +05:30
Rushabh Mehta	94c4d7014d	[fix] item_name in stock reco	2016-12-28 06:56:09 +05:30
Rohit Waghchaure	249bc6167f	fix company issue	2016-12-28 00:20:08 +05:30
Rohit Waghchaure	aa9b8603b9	added paid amount in print format	2016-12-27 17:43:23 +05:30
Rohit Waghchaure	fe7a5b305f	create customer from POS	2016-12-27 17:31:32 +05:30
Rohit Waghchaure	8c9c9cfc5f	When a new company is made, cash account should be automatically set for Mode of Payment	2016-12-27 17:31:32 +05:30
Rushabh Mehta	5cb1b6bf3f	[minor] translation fix	2016-12-27 16:30:20 +05:30
Nabin Hait	3bcf9b5e70	Fixed merge conflict	2016-12-27 14:30:17 +05:30
Nabin Hait	89c8b4d6ae	bumped to version 7.2.2	2016-12-27 14:57:19 +06:00
Rushabh Mehta	174c3478a1	[fix] item variants not directly shown in website due to route clash	2016-12-27 12:30:30 +05:30
Rushabh Mehta	512b85e040	[minor] replace autocomplete with awesomplete	2016-12-27 12:14:37 +05:30
Rushabh Mehta	e60c2c7b7a	[minor] dashboard cleanups	2016-12-27 12:14:37 +05:30
Neil Trini Lasrado	22239ac610	Improved Student Dashboard	2016-12-26 17:14:16 +05:30
Nabin Hait	88817b40df	Merge pull request #7284 from mntechnique/develop ... Report : Batch Item Expiry Status	2016-12-26 16:10:46 +05:30
Nabin Hait	4573029a5e	Merge pull request #7292 from frappe/bcornwellmott-patch-1 ... Add hours to calendar labels	2016-12-26 16:09:11 +05:30
Nabin Hait	0631d516ce	Merge pull request #7290 from netchampfaris/pos-item-area-scroll ... pos item area scrollable	2016-12-26 16:07:38 +05:30
Nabin Hait	c2690425e3	Merge pull request #7310 from bhupennewalkar1337/hotfix ... Fix #7202 unchecking pos will reflect automatically	2016-12-26 16:07:19 +05:30
Nabin Hait	488ad54bbc	Merge pull request #7280 from neilLasrado/leave ... Added mark as present to student leave application	2016-12-26 16:06:44 +05:30
Neil Trini Lasrado	df4b9ab630	Optimised code for Student Monthly Attendance Report	2016-12-26 15:40:01 +05:30
Nabin Hait	7b2177a544	[test] Fixed test cases for LCV	2016-12-26 15:31:05 +05:30
Neil Trini Lasrado	94f42ea145	Added from date and to date to student leave application	2016-12-26 12:09:27 +05:30
Neil Trini Lasrado	9a7cb6ce92	Added mark as present to student leave application	2016-12-26 12:09:27 +05:30
Nabin Hait	61a190dd69	Merge branch 'master' into develop	2016-12-24 11:01:26 +05:30
Nabin Hait	8b3e39ed27	bumped to version 7.2.1	2016-12-24 11:31:25 +06:00
Nabin Hait	1d90b41aea	[fix] Fetch serial nos on change of Warehouse	2016-12-24 10:42:23 +05:30
bhupen	bcf63a2a8f	unchecking pos will reflect automatically	2016-12-23 18:00:18 +05:30
Nabin Hait	ba95fc4fa0	Fixed version conflict	2016-12-23 17:44:05 +05:30
Nabin Hait	58291c77e9	Fixed version conflict	2016-12-23 17:43:42 +05:30
Nabin Hait	90c57e5ffd	bumped to version 7.2.0	2016-12-23 18:13:13 +06:00
Nabin Hait	aad8527ff3	Update __init__.py	2016-12-23 17:00:17 +05:30
Nabin Hait	c2d66bdfb2	Merge branch 'master' into develop	2016-12-23 16:45:09 +05:30
Nabin Hait	11c5da1d8c	bumped to version 7.1.29	2016-12-23 17:15:07 +06:00
Nabin Hait	aa2d949f61	Merge pull request #7295 from bhupennewalkar1337/lcv ... Fix#3717 entering amount in lcv is enabled	2016-12-23 15:49:07 +05:30
Nabin Hait	1e1e28b0ae	Update landed_cost_voucher.js	2016-12-23 15:48:57 +05:30
Nabin Hait	06c6628481	Merge pull request #7279 from KanchanChauhan/automate-user-creation ... Create User button in Employee if no User ID selected	2016-12-23 15:31:55 +05:30
Nabin Hait	0177c02c0f	Merge pull request #7286 from rohitwaghchaure/pos_letter_head_issue ... minor fix	2016-12-23 15:19:32 +05:30
Nabin Hait	0e9f16f59d	Merge pull request #7289 from rohitwaghchaure/enhancement_timesheet_v7_2 ... [Enhancement] Setting to maintain the work hours and bill hours same on the timesheet	2016-12-23 15:18:28 +05:30
Nabin Hait	6104fdc579	Update repost_stock_for_deleted_bins_for_merging_items.py	2016-12-22 17:49:46 +05:30
bhupen	a83de5eac1	applicabe charges field is now editable	2016-12-22 16:24:14 +05:30
bhupen	914ae77a22	Limit instead of Allowance in stock settings	2016-12-22 16:24:14 +05:30
bhupen	5bb85e7a95	partially orderd status will be shown in material request	2016-12-22 16:24:14 +05:30
bcornwellmott	e549984a42	Grabs title from SQL ... Gets a concatenated title label for the Calendar event that includes the number of hours	2016-12-21 12:36:45 -08:00
bcornwellmott	3385bd4921	Add hours to label in calendar view ... Adds a label for the number of hours to each calendar event	2016-12-21 12:33:32 -08:00
Rohit Waghchaure	1af1a43616	[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet	2016-12-21 19:19:16 +05:30
Faris Ansari	0822e41f96	pos item area scrollable	2016-12-21 18:17:00 +05:30
Revant Nandgaonkar	1c00b1fb21	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2016-12-21 18:01:35 +05:30
Rohit Waghchaure	dd58d537d5	[Fix] POS issue for serialized items	2016-12-21 17:55:40 +05:30
Rushabh Mehta	0632ee3da9	Merge branch 'v7.2.0-beta' into develop	2016-12-21 17:31:09 +05:30
Rushabh Mehta	c6bd7ade2f	[fix] inclusive tax + total bug and cleanup in stock entry get_uom, fixes #7253	2016-12-21 17:30:29 +05:30
Kanchan Chauhan	58ed0c6efa	Create User button in Employee if no User ID selected	2016-12-21 16:18:59 +05:30
Revant Nandgaonkar	00e65cb70b	Report - Batch Item Expiry Status ... Changed column name `Expiry Status` to `Expiry (In Days)` Changed column type from Data to Int	2016-12-21 14:21:53 +05:30
Rohit Waghchaure	9df946e96c	[Fix] Warehouse is mandatory for packing materials on the sales invoice	2016-12-21 13:27:54 +05:30
Rohit Waghchaure	d567e57f82	minor fix	2016-12-21 13:18:36 +05:30
Revant Nandgaonkar	c30ae28422	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2016-12-21 12:52:23 +05:30
Revant Nandgaonkar	0766d3e67e	Report : Batch Item Expiry Status ... Select From Date and To Date Lists Items about to expire or already expired Expiry Status column shows number of days in which item/batch will expire	2016-12-21 12:32:12 +05:30
Nabin Hait	e7939fd87b	Merge branch 'master' into develop	2016-12-21 12:18:38 +05:30
Nabin Hait	399e414909	bumped to version 7.1.28	2016-12-21 12:48:37 +06:00
Nabin Hait	b3943cb53a	Update repost_stock_for_deleted_bins_for_merging_items.py	2016-12-21 12:04:39 +05:30
Nabin Hait	2b8aafb08d	Merge pull request #7276 from neilLasrado/develop ... Allow Data Import for Student Guardian	2016-12-21 11:17:13 +05:30
rohitwaghchaure	34e820d02d	[Enhancement] Added letter head for the report (#7250)	2016-12-20 16:54:24 +05:30
Rushabh Mehta	17d05b4fd7	Merge branch 'v7.2.0-beta' into develop	2016-12-20 12:59:29 +05:30
Rushabh Mehta	5a3f421453	[fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474	2016-12-20 12:59:09 +05:30
Rushabh Mehta	89af62a680	Merge branch 'v7.2.0-beta' into develop	2016-12-20 12:21:03 +05:30
Rushabh Mehta	2a86c32267	[minor] [patch] remove icon if present, fixes #6949	2016-12-20 12:20:39 +05:30
Neil Trini Lasrado	8979e1c7a5	Allow Data Import for Student Guardian	2016-12-20 11:53:52 +05:30
Nabin Hait	f573d43b90	fixed version conflict	2016-12-20 11:40:15 +05:30
Nabin Hait	1cc2d7403b	bumped to version 7.1.27	2016-12-20 12:09:46 +06:00
Nabin Hait	778c1a022d	Merge pull request #7236 from rohitwaghchaure/item_variant_issue ... [Fix] Timeout error in item attribute validation	2016-12-20 11:31:50 +05:30
Rushabh Mehta	f944fb9e46	Merge branch 'v7.2.0-beta' into develop	2016-12-19 17:06:56 +05:30
Rushabh Mehta	827588adf2	[minor] fixes to job opening	2016-12-19 17:06:26 +05:30
Rushabh Mehta	4c210527b2	[fix] https for SMS gateway, now using requests fixes #5404	2016-12-19 16:22:34 +05:30
Rushabh Mehta	688f2284af	[minor] [patch]	2016-12-19 13:15:52 +05:30
Rushabh Mehta	c3d8479443	[minor] allow website user to be selected as employee	2016-12-19 12:32:11 +05:30
Rushabh Mehta	99c814b360	[fix] paging for products (support)	2016-12-19 11:55:10 +05:30
Rushabh Mehta	43d81063f8	Delete zh-tw.csv	2016-12-19 11:52:09 +05:30
Nabin Hait	7feef1f158	test case fixed	2016-12-16 16:50:03 +05:30
Nabin Hait	4d76d27dd2	translations	2016-12-16 16:18:45 +05:30
Nabin Hait	3fe99559ef	Fixed negative stock validation message for translation and fixed test cases	2016-12-16 15:30:43 +05:30
Rohit Waghchaure	6500ef404d	[Fix] Timeout error in item attribute validation	2016-12-16 13:35:50 +05:30
Rushabh Mehta	9277f3250d	[minor] partiall ordered in material request #6858	2016-12-16 12:36:50 +05:30
Rohit Waghchaure	61fb496be6	[Fix] Test case	2016-12-16 12:19:56 +05:30
Nabin Hait	43594b245c	changed version to beta	2016-12-15 19:37:53 +05:30
Nabin Hait	d25db23fdb	[translations]	2016-12-15 18:33:39 +05:30
Nabin Hait	565844cfac	Change log for v7.2.0	2016-12-15 17:49:31 +05:30
Nabin Hait	6eda07e445	Fixed merge conflict	2016-12-15 16:35:58 +05:30
Nabin Hait	8a321406b2	bumped to version 7.1.26	2016-12-15 17:05:32 +06:00
Nabin Hait	f89c96c7a3	Merge branch 'standard_filters' into develop	2016-12-15 14:57:41 +05:30
Nabin Hait	f02f1bb0c7	Added standard filters	2016-12-15 14:57:20 +05:30
Nabin Hait	8c61f343b3	Validate negative stock on delivery while missing valuation rate for booking expenses	2016-12-15 13:46:03 +05:30
Nabin Hait	0c9c6c9608	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2016-12-15 11:52:59 +05:30
Nabin Hait	f49bbe1142	Cleanup of lead and opportunity status updating logic	2016-12-15 11:51:54 +05:30
Rushabh Mehta	01fab2ae1c	[minor] fix salary slip test	2016-12-15 11:43:29 +05:30
Nabin Hait	6a1c0665bc	Merge pull request #7227 from nabinhait/country_coa ... Chart of accounts for few countries, added test cases for each country	2016-12-15 11:31:07 +05:30
Nabin Hait	a107302224	Merge pull request #7221 from bhupennewalkar1337/production ... Fix#7085 Issue Items Against Production Order	2016-12-15 11:30:31 +05:30
Rushabh Mehta	e9d9b8e6f0	[fix] demo and process payroll for demo (#7224) ... * [fix] demo and process payroll for demo * [fix] set payroll dates	2016-12-15 11:27:35 +05:30
Nabin Hait	1ae8e2c8fa	Revert "Revert "email cc test fixes for frappe/frappe#2441"" (#7232)	2016-12-15 11:27:02 +05:30
Nabin Hait	e3edfe2b12	Removed quick entry for tax rule	2016-12-14 18:44:27 +05:30
Nabin Hait	a756d64fca	Chart of accounts for some countries, added test cases for each country	2016-12-14 18:40:29 +05:30
Rushabh Mehta	9b049ee154	Revert "[Fixes]Payroll Fixes" (#7225)	2016-12-14 18:25:11 +05:30
bhupen	9e146669d3	Issue Items Against Production Order	2016-12-14 17:40:32 +05:30
Nabin Hait	42b6e37d15	Merge pull request #7216 from KanchanChauhan/salary-fixes ... [Fixes]Payroll Fixes	2016-12-14 16:20:08 +05:30
Kanchan Chauhan	c292dd7213	[Fixes]Payroll Fixes	2016-12-14 15:50:54 +05:30
Nabin Hait	a9ecc0b700	Merge branch 'master' into develop	2016-12-14 14:33:06 +05:30
Nabin Hait	673d43cc8e	bumped to version 7.1.25	2016-12-14 15:03:06 +06:00
Rohit Waghchaure	39712b5e1d	[Fix] Pricing rule issue	2016-12-14 14:12:20 +05:30
Nabin Hait	cdb38de6af	Merge pull request #7209 from bhupennewalkar1337/mendatory ... [Fix] No exception will be thrown when working hours field is kept blank in workstation #5166	2016-12-14 13:03:17 +05:30
Nabin Hait	db4cfeed0e	Merge pull request #7211 from frappe/shachiTakalkar-patch-1 ... Update adding-margin.md	2016-12-14 12:54:58 +05:30
Nabin Hait	a933713f9d	Merge pull request #7208 from OluyomiKay/cashacct_bankreconciliation_dev ... erpnext Include CashAccountType (eg. PettyCash) in BankReconciliation	2016-12-14 12:54:04 +05:30
Nabin Hait	aba470f1e6	Merge pull request #7206 from strixaluco/develop ... [docs] mention UID in LDAP instruction	2016-12-14 12:53:33 +05:30
Nabin Hait	3a8ea2a3bb	Merge pull request #7170 from rohitwaghchaure/pos_enhancement_v7_2 ... [POS] Provision to delete the offline records	2016-12-14 12:52:28 +05:30
Nabin Hait	36f5471bab	Merge pull request #6855 from neilLasrado/training ... [new Feature] Added Training Module	2016-12-14 12:51:51 +05:30
Nabin Hait	44cdbbe346	Merge pull request #7203 from KanchanChauhan/employee-permissions ... [Minor] Read permissions to Employee on Activity Type and Appraisal Template	2016-12-14 12:50:54 +05:30
Shachi Takalkar	41d4e33682	Update adding-margin.md	2016-12-14 12:41:07 +05:30
Neil Trini Lasrado	6a2fa29b4a	Fixes for training Module	2016-12-14 12:08:28 +05:30
bhupen	52b3924006	mendatory hours field	2016-12-14 11:32:23 +05:30
OluyomiKay	8f8fd39855	erpnext Include Cash Account Type (eg. Petty Cash) in Bank Reconciliation	2016-12-14 13:25:58 +08:00
Neil Trini Lasrado	fef568ecfa	Documentation for Training Module	2016-12-13 16:48:50 +05:30
Neil Trini Lasrado	984ee372e8	[new Feature] Added Training Module	2016-12-13 15:42:12 +05:30
bhupen	b42dc5a899	mendatory hours field	2016-12-13 15:25:53 +05:30
strixaluco	757d127844	[docs] mention UID in LDAP instruction	2016-12-13 17:54:41 +08:00
Nabin Hait	80cea9795e	Address naming if multiple address for same type	2016-12-13 14:50:35 +05:30
Nabin Hait	201af80706	Fixed merge conflict	2016-12-13 14:30:32 +05:30
Nabin Hait	9d56d598bf	bumped to version 7.1.24	2016-12-13 14:52:15 +06:00
Kanchan Chauhan	b79aa1d091	[Minor] Read permissions to Employee on Activity Type and Appraisal Template	2016-12-13 14:16:57 +05:30
Nabin Hait	8ecc14b7bd	Revert "email cc test fixes for frappe/frappe#2441"	2016-12-13 14:11:49 +05:30
Nabin Hait	23165ce0b4	Merge pull request #7185 from KanchanChauhan/salary-test-cases ... [Fix] Salary Slip test cases fix	2016-12-13 12:40:19 +05:30
Kanchan Chauhan	d917b66a31	[Fix] Salary Slip test cases fix	2016-12-13 12:12:49 +05:30
Nabin Hait	ee877fd631	Merge pull request #7199 from RobertSchouten/email_cc_dev ... email cc test fixes for frappe/frappe#2441	2016-12-13 11:31:06 +05:30
Nabin Hait	784f6cc31a	Merge pull request #7181 from KanchanChauhan/sales-person-status ... Added "Enabled" to Sales Person	2016-12-13 11:28:36 +05:30
Nabin Hait	346a6a5d84	Update set_sales_person_status.py	2016-12-13 11:27:46 +05:30
Nabin Hait	82ce67d49a	Merge pull request #7190 from KanchanChauhan/jinja-in-tc ... Jinja template in Terms and Conditions	2016-12-13 11:25:07 +05:30
Nabin Hait	18d6dc0459	Merge pull request #7193 from KanchanChauhan/get-project-task ... Show only Project tasks in depends on tasks	2016-12-13 11:24:11 +05:30
Nabin Hait	c5869a00df	Merge pull request #7194 from rohitwaghchaure/pricing_rule_issue_v7_1 ... [Fix] Ignore pricing rule not removed the discount percentage	2016-12-13 11:22:49 +05:30
Nabin Hait	9a1a4cd0ac	Fixed test cases for item / warehouse renaming	2016-12-13 10:46:50 +05:30
Rohit Waghchaure	2976e56d23	[Fix] Ignore pricing rule not removed the discount percentage	2016-12-13 10:28:27 +05:30
robert schouten	3d22eb1d59	email cc test fixes for frappe/frappe#2441	2016-12-13 11:32:09 +08:00
Kanchan Chauhan	f0b0db444d	Added Is Active to Sales Person	2016-12-12 19:12:41 +05:30
Kanchan Chauhan	a72841e5e5	Show only Project tasks in depends on tasks	2016-12-12 18:33:46 +05:30
Nabin Hait	da3a9e255d	Changed fieldtype of opening stock from Int to Float	2016-12-12 18:22:15 +05:30
Kanchan Chauhan	b642625ed2	Jinja template in Terms and Conditions	2016-12-12 17:34:30 +05:30
Nabin Hait	f67799197d	Merge pull request #7189 from nabinhait/fix_10111 ... Rename and merging of Item and Warehouse	2016-12-12 17:27:38 +05:30
Nabin Hait	f09c6679c7	Merge pull request #7187 from rohitwaghchaure/budget_report_issue ... [Fix] Budget variance report based on cost center/project	2016-12-12 17:25:44 +05:30
Nabin Hait	37104b6bb1	Merge pull request #7184 from rohitwaghchaure/dropship_po_issue ... [Fix] Unable to purchase item in the company warehouse if dropship has enabled	2016-12-12 17:24:48 +05:30
Rohit Waghchaure	9f2cc382a8	[POS] Provision to delete the offline records	2016-12-12 17:15:47 +05:30
Nabin Hait	fb1fb83b8c	[tests] Test cases for Item and Warehouse renaming and merging	2016-12-12 17:01:24 +05:30
Rohit Waghchaure	f4074c2029	[Fix] Budget variance report	2016-12-12 16:48:14 +05:30
Nabin Hait	3ef63bef02	Rename and merging of Item and Warehouse and patch to fix deleted bins	2016-12-12 15:37:52 +05:30
Nabin Hait	142aab79bf	Fieldtype of payment url should be Small Text	2016-12-12 15:37:52 +05:30
Nabin Hait	0fa0af18cc	Merge pull request #7175 from neilLasrado/develop ... Student Attendance Tool	2016-12-12 15:03:59 +05:30
Rohit Waghchaure	c858d52ce7	[Fix] Unable to purchase item in the company warehouse if dropship has enabled	2016-12-12 13:06:06 +05:30
Rohit Waghchaure	5664f8553e	[Fix] Item group missing in the POS profile	2016-12-12 12:28:07 +05:30
Neil Trini Lasrado	eccbf43235	Renamed Student Batch Attendance Tool to Student Attendance Tool ... Merged code for Student Attendance against Course Schedule and Student Batch Student Attendance Tool now shows marked student attendance as well. Fixed validation login in Student Attendance for duplicate Student Attendance Record validation"	2016-12-09 17:41:09 +05:30
Saurabh	940084ed59	[minor][fix] show tax rate if account type is tax	2016-12-09 17:38:36 +05:30
Rushabh Mehta	81af229466	[minor] google analytics id in docs and minor fixes to web forms	2016-12-09 17:29:36 +05:30
Nabin Hait	58667ab123	Fixed merge conflict	2016-12-09 15:49:24 +05:30
Nabin Hait	10de98c0be	bumped to version 7.1.23	2016-12-09 16:15:45 +06:00
Nabin Hait	00ae31bd1c	Merge pull request #7172 from nabinhait/hotfix ... Issue fixed in Quality Inspection, P&L period and purchase register	2016-12-09 15:44:05 +05:30
Nabin Hait	6bfdd63ec8	Merge pull request #7171 from rohitwaghchaure/payment_entry_issue ... [Fix] Payment entry showing wrong invoice amount	2016-12-09 15:11:38 +05:30
Nabin Hait	b00df641e0	Fixed period end date if year starts in the middle of the month	2016-12-09 15:09:11 +05:30
Nabin Hait	76a8508d2b	Unlink Quality Inspection from PR while cancelling QI	2016-12-09 15:09:11 +05:30
Nabin Hait	43df804176	Fixed renamed fieldname	2016-12-09 15:09:11 +05:30
Rohit Waghchaure	e505067887	[Fix] Payment entry showing wrong invoice amount	2016-12-09 12:55:29 +05:30
Nabin Hait	abd5a92bcc	Merge pull request #7162 from nabinhait/manqala-exchange_rate_modifications1 ... Exchange rate base on date	2016-12-09 12:34:15 +05:30
Nabin Hait	a0fc404eb8	Merge pull request #7164 from KanchanChauhan/quoted-item-comparison-report-fix ... [Fix] Quoted Item Comparison	2016-12-09 12:18:06 +05:30
Nabin Hait	8e885163a3	Update quoted_item_comparison.py	2016-12-09 12:17:45 +05:30
Nabin Hait	ad4f1c7fd1	date is optional in get_exchange_rate	2016-12-09 12:14:47 +05:30
Nabin Hait	d249c76ce0	Merge pull request #7165 from KanchanChauhan/salary-component-type-in-new-signups ... [Minor]Added type to Salary Components	2016-12-09 11:50:43 +05:30
Viet Pham	ddb856377c	Fix patch update_status_of_po_so.py caused error: Column 'per_billed' cannot be null	2016-12-08 20:02:39 +07:00
Kanchan Chauhan	13f19993c5	[Minor]Added type to Salary Components	2016-12-08 17:50:15 +05:30
Kanchan Chauhan	5c031a3512	[Fix] Quoted Item Comparison	2016-12-08 17:29:04 +05:30
Kanchan Chauhan	0ece9e0e2e	[Fix] Salary Slip Test cases fix	2016-12-08 17:02:36 +05:30
Nabin Hait	352d95344e	Set exchange rate on change of date for Journal/Payment Entry	2016-12-08 16:06:47 +05:30
Nabin Hait	aa0d174d3d	Replaced spaces with tabs	2016-12-08 15:44:16 +05:30
Nabin Hait	3113f00c46	Replaced spaces with tabs	2016-12-08 15:42:44 +05:30
Nabin Hait	288a18e0cc	Fixes and patch for Currency Exchange based on date	2016-12-08 15:36:23 +05:30
Nabin Hait	b267a6c90e	Merge branch 'develop' of https://github.com/frappe/erpnext into manqala-exchange_rate_modifications1	2016-12-08 14:45:12 +05:30
Nabin Hait	87d70279c6	get exchange rate on change of date	2016-12-08 14:43:11 +05:30
Nabin Hait	32e5b7af20	Update set_budget_against_as_cost_center.py	2016-12-08 14:42:04 +05:30
Nabin Hait	1cc55fbbcb	Fixed merge conflict	2016-12-08 14:09:23 +05:30
Nabin Hait	72c5aec68b	Merge pull request #7094 from manassolanki/budget ... [Enhancement] Budget Against Project #7036	2016-12-08 13:52:33 +05:30
Nabin Hait	f5460e9e6f	Merge pull request #6846 from KanchanChauhan/payroll-updates ... Weekly, Fortnightly, Bimonthly and Monthly payroll frequency	2016-12-08 13:51:55 +05:30
Nabin Hait	ded059b253	[fix][tests] Fetching serial nos via get item details	2016-12-08 13:20:43 +05:30
Nabin Hait	1b9caf90dd	Merge branch 'master' into develop	2016-12-08 12:33:54 +05:30
Nabin Hait	7b513891e3	bumped to version 7.1.22	2016-12-08 13:03:53 +06:00
Kanchan Chauhan	f7b25cbb6b	[WIP] Payroll Updates	2016-12-08 12:20:20 +05:30
Manas Solanki	482fa672c2	[Fix] Patch for budget_against	2016-12-08 12:16:29 +05:30
Rohit Waghchaure	86ed030b5c	minor issue	2016-12-07 19:17:01 +05:30
Rohit Waghchaure	0327b35b5e	[fix] timesheet datetime issue	2016-12-07 18:32:36 +05:30
Manas Solanki	2e0fbdeebe	[Fix] Test Case ... - Previous test case fixed - Additional test case for project against budget	2016-12-07 18:17:26 +05:30
Manas Solanki	17faa794bf	[Fix] More optimized code	2016-12-07 18:17:26 +05:30
Manas Solanki	5bd4d8a932	[Fix] Budget against Projects ... - Test case fixed - Either cost center or project is mandatory	2016-12-07 18:17:26 +05:30
Manas Solanki	1fa1fd7482	[Enhancement] Budget against Project	2016-12-07 18:17:26 +05:30
Rushabh Mehta	b78fc37ce9	[minor] Add button to add help article from Issue #7132 (#7154)	2016-12-07 14:41:23 +05:30
James Robertson	e4b9473f83	Fixes erpnext issue 6891 (#7128) ... * Fixes erpnext issue 6891 Updated all 4 items listed on the issue. Removed old out of date image files and created new ones. Fixed broken links. * Update to Pull Request #7128 Changes to images to comply with guidelines.	2016-12-07 12:14:51 +05:30
Rushabh Mehta	2167ff589c	[minor] update font awesome icons	2016-12-07 11:09:02 +05:30
Nabin Hait	5c18bd9b61	Fixed merge conflict	2016-12-06 16:16:58 +05:30
Nabin Hait	bc2deafcf9	bumped to version 7.1.21	2016-12-06 16:44:44 +06:00
Nabin Hait	45fda8a257	Merge pull request #7149 from KanchanChauhan/salary-slip-validation-in-leave ... [Minor] Validation fixes in Leave Application and Monthly Salary Register Fix for other laguages	2016-12-06 16:01:38 +05:30
Nabin Hait	67d226f491	Merge pull request #7127 from KanchanChauhan/salary-slip-fix ... [Fix] lwp issue fixed for salary slip without salary structure	2016-12-06 15:48:47 +05:30
Nabin Hait	cb3f44716a	Merge pull request #7139 from rohitwaghchaure/customer_billing_amount_issue ... [Fix] Currecny symbol for customer's total annual billing, total unpaid amount	2016-12-06 15:42:37 +05:30
Nabin Hait	9313a7408c	Merge pull request #7144 from rohitwaghchaure/report_builder_total_row_issue ... [Enhancement] Total row added for report builder	2016-12-06 15:42:19 +05:30
Nabin Hait	e644ca8992	Merge pull request #7146 from RobertSchouten/digest_cache_dev ... [fix] email digest cache by frequency	2016-12-06 15:41:33 +05:30
Nabin Hait	cacfb6839f	Merge pull request #7138 from rohitwaghchaure/so_po_status_issue ... [Fix] Status of sales order and purchase order	2016-12-06 15:40:57 +05:30
Kanchan Chauhan	dc80b35104	[Minor] Apply Salary Slip validation only if it is submitted	2016-12-06 15:37:24 +05:30
robert schouten	7f72cd0f97	[fix] email digest cache by frequency	2016-12-06 08:51:40 +08:00
Rohit Waghchaure	6f6a533d66	[fix] salary slip working days	2016-12-05 23:33:02 +05:30
Rohit Waghchaure	36a01d3464	[Enhancement] Total row added for report builder	2016-12-05 18:59:59 +05:30
Rohit Waghchaure	bcc6ea450a	[fix] test cases for customer credit	2016-12-05 18:32:57 +05:30
Neil Trini Lasrado	f5c2cf4b5c	Updated schools.py in Config	2016-12-05 17:53:41 +05:30
Rohit Waghchaure	c857f37f3a	[fix] currecny symbol for customer's total annual billing, total unpaid amount	2016-12-05 17:44:06 +05:30
Neil Trini Lasrado	9e7ad6a630	Updated schools.py in Config	2016-12-05 17:28:07 +05:30
Nabin Hait	3f1c50a483	Merge pull request #6920 from KanchanChauhan/delivery-note-serial-no-fifo ... [Fix] Fetch Serial No by default for Delivery Note Item	2016-12-05 16:51:42 +05:30
Nabin Hait	4306cc80d0	removed print	2016-12-05 16:51:30 +05:30
Rohit Waghchaure	82fa27c36f	[Fix] Status of sales order and purchase order	2016-12-05 16:32:23 +05:30
Rushabh Mehta	86f8ab95f6	[minor] font-awesome fixes	2016-12-05 15:02:24 +05:30
Nabin Hait	12a396ef25	Merge pull request #7107 from RobertSchouten/timesheetdates ... calc timesheet dates on validate not just submit	2016-12-05 14:23:21 +05:30
Rushabh Mehta	323c06ebbf	[minor] rename icons as per FontAwesome 4 (#7136)	2016-12-05 14:17:26 +05:30
Kanchan Chauhan	4a888b4c91	[Fix] lwp issue fixed for salary slip without salary structure	2016-12-04 13:42:30 +05:30
Kanchan Chauhan	af0d6378f1	[Fix] Fetch Serial No by default for Delivery Note Item	2016-12-02 18:18:04 +05:30
Neil Trini Lasrado	6841b3198b	Added Roll Number to Student Batch Attendance Tool and Optimised code to mark attendance	2016-12-01 18:40:49 +05:30
Neil Trini Lasrado	305166b111	Fixes for Student Batch Wise attendance tool	2016-12-01 18:40:49 +05:30
Nabin Hait	14a4c729b3	Merge pull request #7038 from KanchanChauhan/pricing-rule-in-shopping-cart ... Apply Pricing Rule in Shopping Cart	2016-12-01 18:09:34 +05:30
Nabin Hait	6c44d259ca	Merge pull request #7106 from pratu16x7/doc-fixes ... CRM: Customer page fixes	2016-12-01 18:09:02 +05:30
Nabin Hait	1ab446a810	Merge pull request #7086 from frappe/netchampfaris-documentation ... Update quotation.md	2016-12-01 18:08:36 +05:30
Nabin Hait	cd43d3aa20	Merge pull request #7088 from rohitwaghchaure/documentation_november ... [fix] Documentation	2016-12-01 18:08:05 +05:30
Nabin Hait	ee9d1b4520	Merge pull request #7099 from ishanloya/patch-1 ... Update merging-documents.md	2016-12-01 18:07:49 +05:30
Nabin Hait	feec1abb6e	Merge pull request #7103 from bhupennewalkar1337/delivery-note-fix ... [Fix] Disallow same items to be fetched multiple times in sales invoice	2016-12-01 18:07:28 +05:30
Nabin Hait	d97ec828b5	Merge pull request #7113 from rohitwaghchaure/edit_serial_no ... Allow user to edit serial no for credit note, debit note	2016-12-01 18:06:58 +05:30
Neil Trini Lasrado	71aaeae91c	Fixes for Student Batch-Wise Attendance report and Absent Student Report	2016-12-01 16:48:27 +05:30
Nabin Hait	1f1ffd79e2	Merge pull request #7109 from RobertSchouten/project_wise ... [fix] Project wise Stock Tracking is script report	2016-12-01 16:12:46 +05:30
Nabin Hait	c92e2f9044	Update project_wise_stock_tracking.json	2016-12-01 16:12:35 +05:30
Rohit Waghchaure	2e8a94458d	allow user to edit serial no for credit note, debit note	2016-12-01 16:04:41 +05:30
Neil Trini Lasrado	e6fb25cce8	Fixes for Student Batch-Wise Attendance report	2016-12-01 16:02:11 +05:30
Kanchan Chauhan	faa525e4f1	[Fix] Fixed condition and formula issue in Salary Slip	2016-12-01 15:31:38 +05:30
Neil Trini Lasrado	19e8bd2221	renamed 'active' in Student Batch to 'enabled'	2016-12-01 14:30:47 +05:30
Neil Trini Lasrado	c6e74680ee	Added Instructor as a Role	2016-12-01 13:00:14 +05:30
Neil Trini Lasrado	2607898cde	Added Student Batch-Wise Attendance report	2016-12-01 12:53:40 +05:30
robert schouten	81a5467c8f	[fix] Project wise Stock Tracking is script report	2016-12-01 09:02:17 +08:00
robert schouten	0beb5bdea6	calc timesheet dates on validate not just submit	2016-12-01 08:51:03 +08:00
pratu16x7	9dd34427ef	Change alt text and German page image link	2016-11-30 15:48:14 +05:30
pratu16x7	d849093dff	CRM: Customer page fixes	2016-11-30 15:41:30 +05:30
bhupen	3c7e70ffb3	[Fix] Disallow same items to be fetched multiple times in sales invoice	2016-11-30 14:32:11 +05:30
Ishan Loya	a40cefeaeb	Update merging-documents.md ... Fixed some typos	2016-11-29 16:07:33 +05:30
Faris Ansari	a2ea2ca990	Update sales-order.md	2016-11-29 11:32:11 +05:30
Faris Ansari	8da43fe074	add selling-flow	2016-11-29 11:22:57 +05:30
Faris Ansari	d0654912c4	Update quotation.md	2016-11-29 11:21:40 +05:30
Neil Trini Lasrado	87edfef0bb	Added ability to mark student batch in-active	2016-11-28 18:09:50 +05:30
Neil Trini Lasrado	331361d03b	Added Absent Student Report	2016-11-28 16:57:30 +05:30
Neil Trini Lasrado	14b27c5b42	New Doctype - Student Leave Application	2016-11-28 16:57:30 +05:30
Neil Trini Lasrado	d3a410b0f3	Added Student Monthly Attendence Sheet Report	2016-11-28 16:57:30 +05:30
Rohit Waghchaure	59844a12aa	[fix] documentation	2016-11-28 15:51:05 +05:30
Nabin Hait	7f3da5dbb1	Fixed merge conflict	2016-11-28 14:23:51 +05:30
Nabin Hait	edfca16931	bumped to version 7.1.20	2016-11-28 14:52:54 +06:00
Faris Ansari	834a3c990e	fix image link	2016-11-28 13:16:57 +05:30
Faris Ansari	64d1c95afe	add taxes gif	2016-11-28 13:15:29 +05:30
Faris Ansari	a9b34edef0	Update quotation.md	2016-11-28 13:08:49 +05:30
Nabin Hait	ac3ad62164	Merge pull request #7052 from saurabh6790/integration_service_document ... [documentaion] Documentaion for setting up Integration Service	2016-11-28 12:43:21 +05:30
Nabin Hait	50a240e758	Merge pull request #7061 from rohitwaghchaure/cost_center_issue ... [Fix] Cost center group not showing data in the P&L report	2016-11-28 12:42:48 +05:30
Nabin Hait	b6c7420a34	Merge pull request #7068 from frappe/MaxMorais-patch-1 ... Bug due Translation support in Support Analytics	2016-11-28 12:41:52 +05:30
Nabin Hait	8020b5ceb7	Merge pull request #7063 from umairsy/conf ... [Fixed] Documentation #6892	2016-11-28 12:40:55 +05:30
Nabin Hait	fe10780878	Merge pull request #7076 from yashodhank/manual-fixes ... [Docs] Fixed type and renamed file	2016-11-28 12:39:57 +05:30
Nabin Hait	96be3dd4f4	Merge pull request #7082 from rohitwaghchaure/pos_qty_issues ... [Fix] Wrong actual qty showing in POS	2016-11-28 12:39:09 +05:30
Nabin Hait	a78c463e97	Multiple minor fixes	2016-11-27 16:32:41 +05:30
Rohit Waghchaure	80f5bb6a6c	[Fix] Wrong actual qty showing in POS	2016-11-27 12:04:12 +05:30
Yashodhan K	7b090312d5	[Docs] Fixed type and renamed file ... Fixed typo and renamed file to correct url link.	2016-11-26 20:08:02 +05:30
Kanchan Chauhan	50593317d9	Added account types to Add Child option of COA	2016-11-26 18:49:32 +05:30
Nabin Hait	d0839799c1	Update workstation.py	2016-11-26 09:54:00 +05:30
Rohit Waghchaure	bca0d73e1c	[Fix] Cost center group not showing data in the P&L report	2016-11-25 14:54:34 +05:30
Rohit Waghchaure	9a36083095	[fix] Barcode and special character issue in the search box of the POS	2016-11-25 11:17:48 +05:30
Nabin Hait	672ffc0ff4	Update patches.txt	2016-11-25 11:15:20 +05:30
Maxwell Morais	2f948530cb	Bug due Translation support in Support Analytics ... I think no one that don't speak english use this! But today talking about this report, I discovered that it dont work! For my surprise, it don't work have 2 years, if you aren't a english speaker!	2016-11-24 20:36:40 -06:00
Umair Sayyed	829e00c2e6	[Fixed] Documentation #6892	2016-11-24 17:41:29 +05:30
Nabin Hait	3247db4827	Merge pull request #7050 from nabinhait/coa_based_on_existing_company ... Create Chart of Accounts based on existing company	2016-11-24 13:28:11 +05:30
Nabin Hait	926d72424d	Merge pull request #6699 from rohitwaghchaure/bom_price_list_issue ... [Enhancement] Currency added in the BOM	2016-11-24 13:27:17 +05:30
Nabin Hait	a8333be6ad	Merge pull request #7023 from frappe/revert-7012-remove-count-star ... Revert "[optimize] remove count(*) from queries"	2016-11-24 13:26:38 +05:30
Saurabh	8cd1918a3c	[documentaion] Documentaion for setting up Integration Service	2016-11-23 19:09:43 +05:30
Rohit Waghchaure	8c4e45ab3d	cleanup timesheet	2016-11-23 17:54:47 +05:30
Nabin Hait	e0089184e6	Create Chart of Accounts based on existing company	2016-11-23 17:34:16 +05:30
bhupen	c097a4fe68	Changes in company doctype for chart of accounts	2016-11-23 17:34:16 +05:30
Nabin Hait	f89f17cdde	Merge branch 'master' into develop	2016-11-23 16:00:22 +05:30
Nabin Hait	580534a22a	bumped to version 7.1.19	2016-11-23 16:30:22 +06:00
Nabin Hait	297d74a997	Unlink payment entries on cancellation of invoice	2016-11-23 15:59:00 +05:30
Nabin Hait	d194cce35c	fixed merge conflict	2016-11-23 14:55:23 +05:30
Nabin Hait	7f540af7a6	bumped to version 7.1.18	2016-11-23 15:23:42 +06:00
Nabin Hait	b18ad55e2b	minor fixes	2016-11-23 14:51:30 +05:30
Nabin Hait	cf895c220c	Update account_tree.js	2016-11-23 14:44:07 +05:30
Saurabh	9342f650e0	[fix] remove root type selection while created new node and hooks call to initialize payment gateway	2016-11-23 14:06:14 +05:30
Nabin Hait	ae8df2b01c	Merge pull request #7033 from strixaluco/develop ... [docs] URL fixes	2016-11-23 13:27:01 +05:30
Nabin Hait	4059fb3961	delivery note dashboard fix for quality inspection	2016-11-23 11:45:19 +05:30
robert schouten	085706bcbf	[fix] naming series only show non disabled role doctypes	2016-11-23 13:57:21 +08:00
Rushabh Mehta	5dd12cb4f0	Merge branch 'master' into develop	2016-11-22 23:18:29 +05:30
Rushabh Mehta	6557e37d5c	bumped to version 7.1.17	2016-11-22 23:48:28 +06:00
Rushabh Mehta	698c040d21	[hot] fix quotation (#7039)	2016-11-22 23:16:40 +05:30
Kanchan Chauhan	2c1f399479	Apply Pricing Rule in Shopping Cart	2016-11-22 22:23:31 +05:30
Rushabh Mehta	4e61564f73	[minor] fixes to daily work summary formatting	2016-11-22 21:59:20 +05:30
strixaluco	fc6a3aa42c	[docs] URL fixes	2016-11-22 16:25:20 +08:00
Rohit Waghchaure	334f032780	fix patch	2016-11-22 13:30:13 +05:30
Rohit Waghchaure	b1b328865e	[Enhancement] Currency added in the BOM	2016-11-22 12:52:20 +05:30
Nabin Hait	ee874a2a36	Update student_admission.py	2016-11-22 12:42:24 +05:30
Rushabh Mehta	9872d8cdb5	Revert "[optimize] remove count(*) from queries"	2016-11-21 21:04:47 +05:30
Nabin Hait	d3344ebcd1	Merge pull request #7021 from neilLasrado/develop ... Added Instructors table to Student Batch	2016-11-21 19:36:11 +05:30
Nabin Hait	d855167b9b	Fixed merge conflict	2016-11-21 19:13:22 +05:30
Neil Trini Lasrado	fb35b484a5	Added Instructors table to Student Batch	2016-11-21 19:10:13 +05:30
Nabin Hait	d75d3a927d	bumped to version 7.1.16	2016-11-21 19:40:05 +06:00
Nabin Hait	4374ef5adc	Merge pull request #6995 from neilLasrado/develop ... Added Student Batch Name & Batch Creation Tool in Schools Module.	2016-11-21 19:08:15 +05:30
Nabin Hait	651d8e996b	Merge pull request #7020 from nabinhait/balance_sheet_fix ... Provisional Loss related fix in Balance Sheet. Fixed #6918	2016-11-21 19:06:42 +05:30
Nabin Hait	d01d74cafd	Merge pull request #7019 from nabinhait/fix_10014 ... Default warehouse is mandatory only for stock item in POS. Fixed #6893	2016-11-21 19:06:30 +05:30
Nabin Hait	9789b50ae5	Merge pull request #7018 from nabinhait/fix_10013 ... Set project from Sales Order while creating Material Request from PPT, fixed #6731	2016-11-21 19:06:14 +05:30
Nabin Hait	5224a04628	Merge pull request #7016 from nabinhait/fix_10012 ... Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636	2016-11-21 19:05:50 +05:30
Nabin Hait	bdab3103e3	Merge pull request #7015 from nabinhait/fix_10011 ... Multiple fixes	2016-11-21 19:05:34 +05:30
Nabin Hait	09f7a7a977	Merge pull request #7013 from rmehta/remove-features-setup-docs ... [fix] remove feature setup docs	2016-11-21 19:05:04 +05:30
Nabin Hait	376e8945f7	Merge pull request #7014 from rohitwaghchaure/rename_autoname_field ... patch for rename autoname field	2016-11-21 19:04:44 +05:30
Nabin Hait	3d5ef804b2	Provisional Loss related fix in Balance Sheet. Fixed #6918	2016-11-21 18:53:05 +05:30
Rushabh Mehta	0d5d4aefe5	[docs] added style	2016-11-21 18:47:00 +05:30
Neil Trini Lasrado	f89ffdb57a	Fixes for student Attendance	2016-11-21 18:32:40 +05:30
Nabin Hait	977eff911f	Default warehouse is mandatory only for stock item in POS. Fixed #6893	2016-11-21 18:29:16 +05:30
Nabin Hait	9b797974b5	Set project from Sales Order while creating Material Request from PPT, fixed #6731	2016-11-21 18:15:50 +05:30
Nabin Hait	075e33245e	Set WIP warehouse in Pro Order based on Manufacturing Settings. Fixed #6636	2016-11-21 18:09:55 +05:30
Neil Trini Lasrado	b444d5d81b	Rename Scheduling Tool to Course scheduling Tool, Batch Name to Student Batch Name and Batch Creation tool to Student Batch Creation tool	2016-11-21 17:04:23 +05:30
Nabin Hait	fd23fa7c0b	Prifitability report link added to accounts module page	2016-11-21 16:59:03 +05:30
Nabin Hait	542bf8f7d4	Party filter and total row for opening and closing in trial balance for party report	2016-11-21 16:58:50 +05:30
Rohit Waghchaure	4810d1fa2d	patch for rename autoname field	2016-11-21 16:52:50 +05:30
Rushabh Mehta	1df70cedc1	[fix] remove feature setup docs	2016-11-21 16:38:13 +05:30
Neil Trini Lasrado	6566431fc5	Rearranged scheduling Tool	2016-11-21 16:21:25 +05:30
Neil Trini Lasrado	defdd784f4	Added Student Batch Name & Batch Creation Tool in Schools Module.	2016-11-21 16:21:25 +05:30
Rushabh Mehta	75d455422a	[fix] [patch] rename_quality_inspection_field	2016-11-21 16:19:50 +05:30
Nabin Hait	8d161ef2e1	Merge pull request #6899 from shreyasp/docs-update ... Updated Docs for Purchase Order and Supplier Quotation	2016-11-21 15:28:27 +05:30
Nabin Hait	d50d6a559c	Merge pull request #7012 from rmehta/remove-count-star ... [optimize] remove count(*) from queries	2016-11-21 15:28:01 +05:30
Nabin Hait	e60d51b74c	Merge pull request #6969 from rohitwaghchaure/pos_syncing_issue_and_enhancement ... User can able to add multiple item group, customer group in the POS profile.	2016-11-21 15:27:41 +05:30
Rushabh Mehta	5a258cbc2d	[optimize] remove count(*) from queries	2016-11-21 14:57:36 +05:30
Nabin Hait	5f166c11fc	Merge pull request #6971 from ShraddhaRanjane/patch-2 ... Update naming-series.md	2016-11-21 14:52:22 +05:30
Nabin Hait	2d5b48c4f2	Update naming-series.md	2016-11-21 14:52:10 +05:30
Nabin Hait	b30e184f6b	Merge pull request #7003 from KanchanChauhan/workstation-fix ... [Fix]Workstation holiday list	2016-11-21 14:51:24 +05:30
Nabin Hait	d7faefc739	Merge pull request #7004 from KanchanChauhan/bom-error-fix ... [Fix] Better error message if default BOM not found	2016-11-21 14:51:03 +05:30
Nabin Hait	0900407c18	Merge pull request #7010 from rmehta/duplicate-icon-patch-fix ... [patch] reload desktop icon #6826	2016-11-21 14:50:36 +05:30
Nabin Hait	c2f8dd71d7	Merge pull request #6965 from manassolanki/qa_redesign ... [Fix] [Enhancement] Quality Inspection	2016-11-21 14:49:18 +05:30
Rushabh Mehta	e9fc31168d	[patch] reload desktop icon #6826	2016-11-21 14:29:31 +05:30
Rushabh Mehta	8042aa4b52	[minor] fixes to docs	2016-11-21 13:53:02 +05:30
Rushabh Mehta	557e7f787b	[minor] UX fixes for Daily Work Summary	2016-11-21 12:10:44 +05:30
Kanchan Chauhan	fdcfe180ad	[Fix] Better error message if default BOM not found	2016-11-21 11:29:18 +05:30
Kanchan Chauhan	d33c44e3a5	[Fix]Workstation holiday list	2016-11-21 11:23:01 +05:30
Rohit Waghchaure	a27c417e48	fix master data sync performance issue	2016-11-20 23:41:13 +05:30
Nabin Hait	cbd26e3b2c	Manual Depreciation Schedule for Asset	2016-11-18 17:19:45 +05:30
Rohit Waghchaure	2a81960e0b	test cases	2016-11-18 15:33:11 +05:30
Rohit Waghchaure	801029e055	Added item groups, customer groups in the POS profile.	2016-11-18 15:32:48 +05:30
Manas Solanki	60db98aaff	[Minor] Variable assignment before reference ... Variable = 'inspection_required_fieldname'	2016-11-18 14:52:13 +05:30
Nabin Hait	5f453e7779	Merge pull request #6992 from rmehta/daily-work-summary ... [Feature] Daily Work Summary	2016-11-18 14:00:08 +05:30
KanchanChauhan	49a50fef63	Group same item in SO print (#6959)	2016-11-18 13:57:53 +05:30
KanchanChauhan	dc2195c52a	[Documentation] Shopping Cart (#6911)	2016-11-18 13:56:06 +05:30
Nabin Hait	8704dd3134	Merge pull request #6970 from komsel2228/develop ... fix bugs uom and conversion factor on stock entry	2016-11-18 12:56:41 +05:30
Manas Solanki	99dac07a56	[Fix] Minor fix for field rename	2016-11-18 12:52:34 +05:30
Nabin Hait	c29c5210f9	Merge pull request #6972 from RobertSchouten/bankstatement ... [fix] update bank recon statement printing for payment entries	2016-11-18 12:50:40 +05:30
Nabin Hait	a3a59ea895	Merge pull request #6973 from RobertSchouten/bankrecon ... [fix] layout for bank reconciliation	2016-11-18 12:49:16 +05:30
Nabin Hait	684d44385f	Merge pull request #6991 from rohitwaghchaure/delivery_note_issue ... [Fix] Delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item	2016-11-18 12:45:31 +05:30
Nabin Hait	eae077e05d	Merge pull request #6989 from RobertSchouten/financialprint ... [fix] financial printing and add to profitability	2016-11-18 12:44:50 +05:30
Rushabh Mehta	9dd58d42df	[fix] test cases and final wiring for daily work summary	2016-11-18 12:40:18 +05:30
Rushabh Mehta	c10d2a0025	[wip] daily work summary	2016-11-18 12:40:18 +05:30
Rushabh Mehta	fe816c3852	[fix] [wip] daily work summary	2016-11-18 12:40:18 +05:30
Rohit Waghchaure	e887e92dd4	Minor fix in delivery note, show paking items in order, show serial no of the respective item in the dropdown of packing item	2016-11-18 12:16:22 +05:30
robert schouten	0a1f3e4058	[fix] financial printing and add to profitability	2016-11-18 10:54:01 +08:00
Rohit Waghchaure	2ef7c7ae5c	[Fix] Onload pull pos profile data for IS POS invoice	2016-11-17 17:29:10 +05:30
Nabin Hait	52f101d776	Merge pull request #6981 from neilLasrado/develop ... Added ability to mark attendance against a Student Batch	2016-11-17 17:10:05 +05:30
Nabin Hait	652743b26e	Merge branch 'master' into develop	2016-11-17 16:41:52 +05:30
Nabin Hait	f83302836c	bumped to version 7.1.15	2016-11-17 17:11:51 +06:00
Nabin Hait	bd99a7cb5d	Merge pull request #6980 from shreyasp/setup-wizard-domain ... [Fix] Updated 'FR' translation to prevent setup wizard failure	2016-11-17 16:07:43 +05:30
Nabin Hait	46753de6d7	fixed merge conflict	2016-11-17 15:55:11 +05:30
Nabin Hait	f2b7ec919a	bumped to version 7.1.14	2016-11-17 16:24:07 +06:00
Nabin Hait	f76aab6021	Merge pull request #6976 from saurabh6790/advance_payment_entry_cancellation_fix ... [fix] on advance payment entry cancellation delink invoice and pyamen…	2016-11-17 15:41:31 +05:30
Neil Trini Lasrado	d9bc5598b6	Added ability to mark attendance against a Student Batch	2016-11-17 15:36:14 +05:30
robert schouten	2b63e14089	dh drop guest from student attendance so disabling acedemic user disables all school doctypes (#6974)	2016-11-17 15:23:38 +05:30
Saurabh	1d210968de	[fix] on advance payment entry cancellation delink invoice and pyament entry references	2016-11-17 15:21:46 +05:30
Nabin Hait	d4e8b297cd	Merge pull request #6784 from RobertSchouten/calendar_fix ... [fix] calendar range fixes	2016-11-17 14:45:59 +05:30
shreyas	0c93445be0	[Fix] Updated 'FR' translation to prevent setup wizard failure	2016-11-17 14:31:32 +05:30
Nabin Hait	7fc05d6432	Update update_missing_salary_component_type.py	2016-11-17 12:16:52 +05:30
robert schouten	a943535520	[fix] update bank recon statement printing for payment entries	2016-11-17 14:33:28 +08:00
robert schouten	60fb1b8643	[fix] layout for bank reconciliation	2016-11-17 14:30:47 +08:00
ShraddhaRanjane	045bfe641e	Update naming-series.md	2016-11-17 11:22:58 +05:30
Ignatius Cuknoris	6471057df4	fix bugs uom and conversion factor on stock entry	2016-11-17 10:31:19 +07:00
Nabin Hait	aa68058910	Updated modified_datetime in production planning tool	2016-11-16 17:41:08 +05:30
Nabin Hait	8dd859920f	Merge pull request #6960 from KanchanChauhan/thumbnail-in-shoppingcart ... [Fix]Product thumbnail in Shopping Cart	2016-11-16 17:34:17 +05:30
Nabin Hait	7f6b99aca4	Merge pull request #6962 from KanchanChauhan/payroll-fixes ... [Fix] Filters to get employee in Payroll	2016-11-16 17:34:00 +05:30
Nabin Hait	8af429da1f	Cleanup and fixes in quality inspection feature	2016-11-16 17:22:38 +05:30
Manas Solanki	55756d71b6	[Fix] Change of module of quality inspection	2016-11-16 17:22:38 +05:30
Manas Solanki	dbc2511a39	[Fix] Delivery Note fixed	2016-11-16 17:22:38 +05:30
Manas Solanki	34feab1b25	[Fix] Redesign of quality inspection doctype	2016-11-16 17:22:38 +05:30
Manas Solanki	a8d1bc7ff4	[Fix] Quality Inspection in Purchase Invoice fixed	2016-11-16 17:22:38 +05:30
Manas Solanki	c2cd3fd2c6	Function in parent transaction.js and call from corresponding files	2016-11-16 17:22:38 +05:30
Manas Solanki	cc90241fa5	Quality Inspection Issue ... 1. validate_inspection() function defination in stock_controller.py 2. function call in purchase_receipt.py, purchase_invoice.py and delivery_note.py 3. added functality in quality_inspection.py file for linking to purchase_receipt_no and delivery_note_no	2016-11-16 17:22:38 +05:30
mbauskar	e9747a8a6e	[minor] fixes in validate selling price	2016-11-16 17:19:47 +05:30
Kanchan Chauhan	7652b857c8	[Fix] Filters to get employee in Payroll	2016-11-16 15:29:01 +05:30
Kanchan Chauhan	98f499a43e	[Fix]Product thumbnail in Shopping Cart	2016-11-16 15:17:55 +05:30
Nabin Hait	535462fc20	Merge pull request #6947 from saurabh6790/delink_jv_from_advance ... [fix] delink jv from advance table	2016-11-16 14:22:03 +05:30
Nabin Hait	e346a499c7	Merge pull request #6956 from rohitwaghchaure/payment_entry_issue ... [Fix] Payment entry, exchange rate is not set properly	2016-11-16 14:15:52 +05:30
Saurabh	8adbfa8a09	[test-case] test cases for delinking advance payments	2016-11-16 13:43:01 +05:30
Saurabh	866c295989	[fix] on jv cancel remove linkings from advance table of Sales/Purchase Invoice	2016-11-16 13:43:01 +05:30
Nabin Hait	6d04afc19d	fixed merge conflict	2016-11-16 12:56:31 +05:30
Nabin Hait	38bfcaa203	bumped to version 7.1.13	2016-11-16 13:25:59 +06:00
Nabin Hait	00e841d744	update missing salary component abbr	2016-11-16 12:55:17 +05:30
Rohit Waghchaure	9b18ed4ffe	[Fix] Payment entry, exchange rate is not set properly	2016-11-16 12:24:40 +05:30
Rushabh Mehta	4bfa0748cd	[merge] master	2016-11-16 11:28:23 +05:30
Rushabh Mehta	a78bac61cc	bumped to version 7.1.12	2016-11-16 11:56:42 +06:00
rohitwaghchaure	48cb3d89b6	[Fix] Opening balance calculation issue for balance sheet (#6945)	2016-11-16 11:18:49 +05:30
Rushabh Mehta	8dfbe7c748	[fix] patch missing salary component type based on existing salary slips (#6955)	2016-11-16 11:18:20 +05:30
Shreyas Patil	99a3593a0d	[Fix] Make from_date and to_date for stock balance query report as mandatory fields (#6948)	2016-11-16 11:16:44 +05:30
rohitwaghchaure	7be942db54	[Fix] Status updater for sales order in purchase order (#6944)	2016-11-16 11:14:32 +05:30
Rushabh Mehta	24f658d633	[fix] [minor] accounts receivable not translated (#6943)	2016-11-16 11:13:46 +05:30
Rushabh Mehta	d51e1587d5	[fix] contact us page should create a opportunity by default (#6939)	2016-11-16 11:13:31 +05:30
rohitwaghchaure	b3ba7f01ef	[Fix] PO status not changed as material return created against them (#6869)	2016-11-16 11:10:10 +05:30
Rushabh Mehta	e0ab64d6cc	[minor] reload user for patch	2016-11-15 16:43:37 +05:30
Nabin Hait	952b1cb9a7	Merge pull request #6933 from rohitwaghchaure/remove_no_copy ... disable no copy for po number, po date on sales order	2016-11-14 17:47:57 +05:30
Rohit Waghchaure	6f27f580e1	disable no copy for po number, po date on sales order	2016-11-14 16:08:18 +05:30
Rushabh Mehta	440650d4a2	[fix] view shopping cart dropdown (#6928)	2016-11-14 13:13:53 +05:30
Nabin Hait	95e6ccd419	Merge branch 'master' into develop	2016-11-14 12:42:26 +05:30
Nabin Hait	d209f21e76	bumped to version 7.1.11	2016-11-14 13:12:25 +06:00
Nabin Hait	a5a733630f	[fix] Opportunity loading issue	2016-11-14 12:32:16 +05:30
Nabin Hait	0075c7e659	Purchase Order and Receipt links in Purchase Invoice dashboard	2016-11-14 12:32:16 +05:30
Nabin Hait	7017dc029a	Editable grid columns for payment entry	2016-11-14 12:32:16 +05:30
Nabin Hait	f98835036b	Merge pull request #6900 from rohitwaghchaure/account_receivable_summary_report_issue ... [Report] Company not found in the filter for making auto email report	2016-11-14 12:00:48 +05:30
Nabin Hait	47c8d5fd56	Merge pull request #6924 from nabinhait/hotfix ... Fixed multiple minor issues	2016-11-14 11:59:46 +05:30
Nabin Hait	6209f2f75b	Merge pull request #6925 from rmehta/setup-wizard-fix ... [fix] ignore duplicate names for program, academic term, academic year, course, instructor	2016-11-14 11:59:26 +05:30
Rushabh Mehta	463808ef9e	[fix] ignore duplicate names for program, academic term, academic year, course, instructor	2016-11-14 11:21:11 +05:30
Nabin Hait	256a3fef95	Fixed multiple minor issues	2016-11-14 11:10:50 +05:30
Rohit Waghchaure	387c2846aa	[Report] Company not found in the filter for making auto email report	2016-11-10 19:13:20 +05:30
shreyas	2cb294c8b4	[Docs] Updated docs for supplier quotation and purchase order	2016-11-10 18:14:33 +05:30
Nabin Hait	598a0c918d	[fix] fixed student dashboard issue (#6897)	2016-11-10 17:25:37 +05:30
Nabin Hait	fa220f93be	Merge branch 'master' into develop	2016-11-10 11:25:33 +05:30
Nabin Hait	27c1f85836	bumped to version 7.1.10	2016-11-10 11:55:33 +06:00
Nabin Hait	84ecaac27d	Update set_base_amount_in_invoice_payment_table.py	2016-11-10 11:24:22 +05:30
Saurabh	7fbc00c9d6	[fix] repost qty only for bin items	2016-11-09 16:10:42 +05:30
Nabin Hait	ceca1b97c3	Fixed merge conflict	2016-11-09 14:58:36 +05:30
Nabin Hait	549de70fa2	bumped to version 7.1.9	2016-11-09 15:25:29 +06:00
Rohit Waghchaure	2285f90b64	added debit and credit note status	2016-11-09 14:47:24 +05:30
Nabin Hait	bac447137a	Merge pull request #6833 from KanchanChauhan/jv-documentation ... Credit Note, Debit Note, Excise Entry info added	2016-11-09 11:42:27 +05:30
Nabin Hait	5ccead5df0	Merge pull request #6850 from nabinhait/clear_jv_table ... Clear rows from Journal Entry if no debit/credit	2016-11-09 11:40:42 +05:30
Nabin Hait	d4e59aa54f	Update journal_entry.py	2016-11-09 11:38:39 +05:30
Nabin Hait	a3daf58423	Merge pull request #6873 from saurabh6790/integration_broker_fix ... [fix] added hook call to create payment gateway account record	2016-11-09 11:32:35 +05:30
Nabin Hait	82d1b23dcb	Merge pull request #6861 from rmehta/item-dashboard-enhancements ... [minor] enhancements to item dashboard, filter by item group and show item name fixes #6459	2016-11-09 11:21:22 +05:30
Nabin Hait	a0a8cc58ae	Merge pull request #6865 from frappe/typo-fix ... [fix] minor typo	2016-11-09 11:20:34 +05:30
Saurabh	94c666ae46	[fix] added hook call to create payment gateway account record	2016-11-08 20:35:50 +05:30
Rohit Waghchaure	2f1db57fe1	Added status field in sales invoice and purchase invoice	2016-11-08 18:49:58 +05:30
Nabin Hait	31f6436f75	[patch] Set base amount in Sales Invoice Payment table	2016-11-08 17:41:14 +05:30
Nabin Hait	a469e659c5	Fixed merge conflict	2016-11-08 15:26:27 +05:30
Nabin Hait	436d82e60b	bumped to version 7.1.8	2016-11-08 15:52:54 +06:00
Valmik	38cc16a806	[fix] minor typo	2016-11-08 14:11:12 +05:30
Nabin Hait	be06cde5f5	Update gl_entry.py	2016-11-08 13:13:57 +05:30
Rushabh Mehta	057db06216	[minor] enhancements to item dashboard, filter by item group and show item name fixes #6459	2016-11-08 12:40:10 +05:30
Nabin Hait	cdc895734f	Merge pull request #6819 from rohitwaghchaure/hotfix_issues ... cleanup and fixes	2016-11-08 12:05:47 +05:30
Nabin Hait	d2cf4eb1d2	Merge pull request #6851 from rohitwaghchaure/pricing_rule_discount_issue ... [POS] Pricing rule discount issue	2016-11-08 12:02:51 +05:30
strixaluco	c8bfc87b58	[typo] desription → description in zh-tw.csv	2016-11-08 10:57:45 +08:00
strixaluco	06e9de82a6	[typo] desription → description in es-PE.csv	2016-11-08 10:57:16 +08:00
strixaluco	2ef9232707	[typo] desription → description in bom.json	2016-11-08 10:56:36 +08:00
Kanchan Chauhan	b5574d3571	Credit Note, Debit Note, Excise Entry info added	2016-11-07 23:10:20 +05:30
Rohit Waghchaure	619c40b04a	[POS] Pricing rule discount issue	2016-11-07 19:41:10 +05:30
KanchanChauhan	6d5fcdec5a	Item Inspection before Delivery (#6823)	2016-11-07 17:49:37 +05:30
Rushabh Mehta	13fc52d713	[minor] added default standard filters (#6854)	2016-11-07 17:19:19 +05:30
pratu16x7	84228402e6	Update erpnext manual link (#6853) ... * Update erpnext manual link * Update README.md * Update conf.js	2016-11-07 17:18:15 +05:30
robert schouten	8672f29c6f	[minor] add rate to stock entry detail grid (#6843)	2016-11-07 17:17:12 +05:30
robert schouten	d8bdaeffe3	[fix] include cancel time logs in convert and v6 to v7.1 fix (#6840)	2016-11-07 17:16:39 +05:30
Faris Ansari	5049296f8d	[ui] fix student image not visible (#6825)	2016-11-07 17:10:10 +05:30
Nagarajan	7b7b5bd340	Update getting-started-with-erpnext.md (#6832)	2016-11-07 17:09:41 +05:30
KanchanChauhan	dd01bcc485	Get employee details in Salary Slip (#6837)	2016-11-07 17:09:07 +05:30
robert schouten	27d45a244e	[fix]fix name definition in old patch (#6841)	2016-11-07 17:08:37 +05:30
Nabin Hait	43eeddfaf6	Clear rows from Journal Entry if no debit/credit	2016-11-07 15:25:40 +05:30
Manas Solanki	546ca31a4e	Notification Count Issue #5987 ... Add notification count for Payment Entry in Accounts module page	2016-11-05 11:47:24 +05:30
pratu16x7	a43639edb4	[fix] role fix for schools setup (#6824)	2016-11-05 10:09:53 +05:30
Rohit Waghchaure	0ecad33642	cleanup and fixes	2016-11-05 08:09:21 +05:30
Nabin Hait	f5d8dd3b18	Fixed merge conflict	2016-11-04 16:54:53 +05:30
Nabin Hait	a28c2d37f7	bumped to version 7.1.7	2016-11-04 17:23:17 +06:00
Nabin Hait	81f7a265bc	Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value ... Remember last selected value for link field	2016-11-04 16:13:49 +05:30
Nabin Hait	bd2d4762d9	Merge pull request #6817 from nabinhait/hotfix ... [fix] float division by zero	2016-11-04 16:06:27 +05:30
Nabin Hait	4c46c3e94a	Merge pull request #6774 from KanchanChauhan/salarystruct-process-payroll ... [Fix] Error in pulling in Salary Structure fixed	2016-11-04 15:58:44 +05:30
Kanchan Chauhan	63dda84862	[Fix] Error in pulling in Salary Structure fixed	2016-11-04 12:58:05 +05:30
nagarajannxweb	a420c20bf9	Update salary-and-payroll.md	2016-11-04 12:30:14 +05:30
nagarajannxweb	4d100ac08b	Update salary-and-payroll.md	2016-11-04 12:17:21 +05:30
Nabin Hait	e593f170a3	[fix] Patch order changed	2016-11-04 11:43:58 +05:30
Nabin Hait	43d2fec78e	[fix] float division by zero	2016-11-04 10:58:30 +05:30
Rohit Waghchaure	0d2f7e62c0	set remember last selected value as true for company field	2016-11-03 16:19:34 +05:30
Nabin Hait	eab38cd4eb	Merge branch 'master' into develop	2016-11-03 15:17:39 +05:30
Nabin Hait	bb2ede8fab	bumped to version 7.1.6	2016-11-03 15:47:38 +06:00
Nabin Hait	a3f393918d	Merge pull request #6807 from nabinhait/hotfix ... [fix] Get data in opportunity dashboard	2016-11-03 15:13:03 +05:30
Nabin Hait	9f5f534900	set item rate on first selection of item	2016-11-03 14:54:06 +05:30
Rohit Waghchaure	3844d2cc01	Remember last selected value for link field	2016-11-03 14:49:27 +05:30
Nabin Hait	1ac67b873c	[fix] Get data in opportunity dashboard	2016-11-03 11:00:09 +05:30
Nabin Hait	ceca7fbc87	Merge pull request #6780 from rohitwaghchaure/float_issue ... Change fieldtype from float to currency	2016-11-03 10:49:05 +05:30
Nabin Hait	57f51f648e	Merge pull request #6795 from manassolanki/report ... Report: Bin - Item Shortage Report -- Should have Item Name and descr…	2016-11-03 10:48:37 +05:30
Nabin Hait	4c5bd43ec0	Merge pull request #6794 from neilLasrado/hotfix ... Documentation Cleanup	2016-11-03 10:41:23 +05:30
robert schouten	e32e2126f4	gantt fix	2016-11-03 08:10:30 +08:00
robert schouten	e8c1777c5f	gantt fix	2016-11-03 08:10:03 +08:00
Rushabh Mehta	f87b7b0c4e	[fix] typo	2016-11-02 10:53:53 +05:30
Rushabh Mehta	e855f53f08	[minor] fix ellipsis style	2016-11-02 07:34:17 +05:30
Rushabh Mehta	1aac956306	[minor] [fixes] can rename program and disable role on domainify	2016-11-02 07:33:18 +05:30
Rushabh Mehta	bdc8a88b4d	[minor] fix date comparisons	2016-11-02 07:32:09 +05:30
Neil Trini Lasrado	f905ee9f0f	Updated documentation for warehouse	2016-11-01 18:58:29 +05:30
Neil Trini Lasrado	8b99a06477	Projected qty image cleanup in documentation	2016-11-01 18:48:52 +05:30
Manas Solanki	5bc4784bad	Report: Bin - Item Shortage Report -- Should have Item Name and description #4946 ... New report is build including two new column Item name and item description	2016-11-01 18:07:12 +05:30
Rohit Waghchaure	c84072b16f	[Fix] jinja syntax issue	2016-11-01 17:58:10 +05:30
Nabin Hait	df01b5770b	Merge branch 'master' into develop	2016-11-01 17:44:43 +05:30
Nabin Hait	74874d5785	bumped to version 7.1.5	2016-11-01 18:14:43 +06:00
Nabin Hait	06fe0c7c9d	Merge pull request #6790 from neilLasrado/hotfix ... Hotfixes for demo	2016-11-01 17:40:03 +05:30
Nabin Hait	8015d60e97	Merge pull request #6772 from frappe/bcornwellmott-patch-3 ... [fix] Change communication to Linked	2016-11-01 17:31:38 +05:30
Nabin Hait	c3b29f6a5b	Merge pull request #6738 from KanchanChauhan/name-on-check ... Different name on Check	2016-11-01 17:29:04 +05:30
Nabin Hait	6dc30c97bc	Merge pull request #6788 from rohitwaghchaure/documentation ... Article for adjust withhold amount using payment entry	2016-11-01 17:27:18 +05:30
Nabin Hait	dec9f2558e	Update purchase_receipt.py	2016-11-01 17:24:46 +05:30
Neil Trini Lasrado	6da2b08cea	Fixes for demo	2016-11-01 17:05:53 +05:30
Neil Trini Lasrado	9dde085144	Fixes to demo	2016-11-01 17:05:43 +05:30
Neil Trini Lasrado	1569cf8eb3	Fix user for demo	2016-11-01 17:05:35 +05:30
Rohit Waghchaure	60e5e4ac2d	change fieldtype from float to currency	2016-11-01 16:32:33 +05:30
Saurabh	0cf7f7aee0	[fix] set default value as empty frappe dict	2016-11-01 16:19:33 +05:30
Rohit Waghchaure	2647c9a6ea	article for adjust withhold amount using payment entry	2016-11-01 16:04:00 +05:30
Nabin Hait	2fa227314e	Merge pull request #6782 from KanchanChauhan/customerreport-from-crm ... [Fix] Customer Addresses and Contacts report fixed for CRM module	2016-11-01 15:23:10 +05:30
Nabin Hait	f4068fd6f1	Fixed merge conflict	2016-11-01 15:06:55 +05:30
Nabin Hait	c538a55a5a	bumped to version 7.1.4	2016-11-01 15:35:53 +06:00
robert schouten	bb79fc5b0c	[fix] calendar range fixes	2016-11-01 17:14:51 +08:00
Kanchan Chauhan	283b8c98f8	[Fix] Customer Addresses and Contacts report fixed for CRM module	2016-11-01 14:38:06 +05:30
Rohit Waghchaure	53bb687009	hotfix issues	2016-11-01 13:21:43 +05:30
Nabin Hait	22161566ed	Update index.md	2016-11-01 12:36:03 +05:30
Nabin Hait	c61892501c	[fix] Report GLE for Purchase Invoice with Update Stock option	2016-11-01 11:45:32 +05:30
Nabin Hait	eb2a98faca	Merge pull request #6776 from shreyasp/coa-docs ... [Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report	2016-11-01 11:07:39 +05:30
shreyas	9cffdba940	[Documentation] Updated Chart of acccounts page to show new reports instead of financial analytics report	2016-10-31 23:25:10 +05:30
bcornwellmott	3af67fb2c3	Fix syntax	2016-10-31 08:53:37 -07:00
bcornwellmott	8d083f0d10	[fix] Change communication to Linked ... Currently, the Request for Quotation emails are not linked to the RFQ document. This resolves that issue. https://discuss.erpnext.com/t/open-communications-for-rfq/17184	2016-10-31 06:54:01 -07:00
Kanchan Chauhan	6b162386ca	Different name on Check	2016-10-31 17:36:43 +05:30
Nabin Hait	0acfd518a8	Merge pull request #6770 from neilLasrado/develop ... Fixes for demo	2016-10-31 17:29:01 +05:30
Neil Trini Lasrado	ebe0b6557c	Fixes for demo	2016-10-31 17:13:30 +05:30
Nabin Hait	b9f708663c	Update item.py	2016-10-31 16:52:17 +05:30
Nabin Hait	551360ae30	Fixed merge conflict	2016-10-31 16:38:09 +05:30
Nabin Hait	60aa3898c7	bumped to version 7.1.3	2016-10-31 17:07:29 +06:00
Nabin Hait	fd3aefd73d	Merge pull request #6763 from rohitwaghchaure/documentation ... [Fix] Documentation	2016-10-31 16:35:54 +05:30
Nabin Hait	c851d24b2c	Merge pull request #6765 from KanchanChauhan/broken-creation-document-link ... [Fix] Serial No report fixed for Creation No link	2016-10-31 16:26:41 +05:30
Nabin Hait	f5f3ef1bae	repost gle for Purchase Invoice with update stock	2016-10-31 16:17:10 +05:30
Kanchan Chauhan	9100322462	[Fix] Serial No report fixed for Creation No link	2016-10-31 16:01:09 +05:30
Rohit Waghchaure	4fe4f267f4	[Fix] Documentation	2016-10-31 15:40:59 +05:30
Nabin Hait	d9b994de91	Merge branch 'master' into develop	2016-10-31 15:04:31 +05:30
Nabin Hait	1e45ec9237	Merge branch 'hotfix'	2016-10-31 15:04:31 +05:30
Nabin Hait	9a8be357e6	bumped to version 7.1.2	2016-10-31 15:34:31 +06:00
Nabin Hait	d08ced14ca	Merge pull request #6751 from neilLasrado/develop ... Fixes to demo	2016-10-31 13:15:36 +05:30
Nabin Hait	eb1a55bbba	Update purchase_receipt.py	2016-10-29 14:49:33 +05:30
Nabin Hait	952c9cccfc	Merge pull request #6734 from KanchanChauhan/default-warehouse-in-item ... Default warehouse in Item master	2016-10-29 14:44:19 +05:30
Nabin Hait	5fc624b9ed	Update save_stock_settings.py	2016-10-29 14:43:58 +05:30
Nabin Hait	44281b7a01	Merge pull request #6719 from frappe/bcornwellmott-patch-1 ... Fix calendar view for Timesheet	2016-10-29 14:41:42 +05:30
Nabin Hait	7d3012d0b8	Merge pull request #6722 from mbauskar/develop ... [minor] link formatter fixes for Item and Employee	2016-10-29 14:41:00 +05:30
Nabin Hait	358492fbde	Merge pull request #6745 from frappe/nabinhait-patch-2 ... Update ae_uae_chart_template_standard.json	2016-10-29 14:39:15 +05:30
Faris Ansari	8dbcbcf0f4	[documentation] Update Sales Invoice #6507 (#6748) ... * [documentation] Update Sales Invoice * add screenshot * delete screenshot * add correct screenshot	2016-10-29 14:38:03 +05:30
Neil Trini Lasrado	71e3746a05	Fixes to demo	2016-10-28 18:59:33 +05:30
Rohit Waghchaure	7488cf1ce1	[Fix] country wise tax, country name issue	2016-10-28 18:01:43 +05:30
Neil Trini Lasrado	29cae17e87	Fix user for demo	2016-10-28 16:39:45 +05:30
Nabin Hait	bb5e333c1a	Update ae_uae_chart_template_standard.json	2016-10-28 15:20:31 +05:30
Kanchan Chauhan	4c22825f01	Default warehouse in Item master	2016-10-27 23:56:04 +05:30
Nabin Hait	a330d330c8	Merge branch 'master' into develop	2016-10-27 19:14:55 +05:30
Nabin Hait	9dcb778f17	bumped to version 7.1.1	2016-10-27 19:44:54 +06:00
Nabin Hait	8042ba3be3	Merge pull request #6728 from neilLasrado/develop ... Added naming series to Course Schedule	2016-10-27 15:37:59 +05:30
Neil Trini Lasrado	5f041e9665	Added naming series to Course Schedule	2016-10-27 15:37:03 +05:30
Saurabh	468e41f24f	[enhance] introduce ignore_fields param for _tree and get_query	2016-10-27 15:23:19 +05:30
Nabin Hait	622c05cc60	Merge pull request #6724 from rohitwaghchaure/bank_clearance_report_issue ... [Fix] No permission to read report Bank Clearance Summary for account user	2016-10-27 13:48:19 +05:30
Rohit Waghchaure	53a28eb39d	[Fix] No permission to read report Bank Clearance Summary for account user	2016-10-27 11:46:10 +05:30
mbauskar	be81442c82	[minor] link formatter fixes for Item and Employee	2016-10-27 09:49:22 +05:30
bcornwellmott	7ef2c0fc34	Fix calendar view for Timesheet ... All the calendar events for Timesheets show up on one date. This is because there was a change to the timesheet_calendar.js file when the Gantt chart was added, but the get_events for the calendar wasn't fixed at the same time. Just fixing the reference to the start and end times.	2016-10-26 11:02:48 -07:00
Nabin Hait	62616a03b3	bumped to version 7.1.0	2016-10-26 18:26:16 +06:00
Nabin Hait	6d1eda812d	Update __init__.py	2016-10-26 17:54:47 +05:30
Nabin Hait	72cee33b3a	[translations]	2016-10-26 17:45:06 +05:30
Nabin Hait	72a1943c8e	Fixed version conflict	2016-10-26 16:41:21 +05:30
Nabin Hait	f3882d2699	bumped to version 7.0.63	2016-10-26 17:10:44 +06:00
Nabin Hait	2e12a76d18	Merge pull request #6716 from nabinhait/develop ... Change Logs for v7.1	2016-10-26 16:37:10 +05:30
Nabin Hait	7f19a24e5e	Merge pull request #6705 from KanchanChauhan/get-serial-no ... Fetch serial no by default	2016-10-26 16:31:11 +05:30
Nabin Hait	c5cbde273f	Change Logs for v7.1	2016-10-26 16:28:54 +05:30
Kanchan Chauhan	0a3f2c818a	Fetch serial no by default	2016-10-26 14:59:43 +05:30
Nabin Hait	683c4798b5	Merge pull request #6714 from KanchanChauhan/balance-sheet-error ... [Fix] Error in Balance Sheet Report	2016-10-26 14:27:33 +05:30
Nabin Hait	a3c24385cf	Merge pull request #6710 from frappe/bcornwellmott-patch-1 ... [Minor] Add details to MRs from PPT	2016-10-26 13:06:22 +05:30
Nabin Hait	e0aaea20af	Merge pull request #6701 from shreyasp/modify-submit-docs ... [Fix] Make purchase order item reqd_date modifiable after submit	2016-10-26 13:05:11 +05:30
Kanchan Chauhan	dc3198a11c	[Fix] Error in Balance Sheet Report	2016-10-26 13:05:08 +05:30
Shreyas Patil	6c7d6e095b	Update purchase_order_item.json	2016-10-26 12:47:35 +05:30
shreyas	fd04d62c2e	[Minor] Added expected_delivery_date to purchase order item doctype	2016-10-26 12:38:31 +05:30
Nabin Hait	821331b3c0	Merge pull request #6712 from neilLasrado/develop ... Allow rename of student doctype	2016-10-26 12:32:20 +05:30
Neil Trini Lasrado	a3f2a47020	Allow rename of student doctype	2016-10-26 12:24:27 +05:30
Revant Nandgaonkar	0bb92ab7a0	[docs] Email and Phone validation on Custom Fields (#6703)	2016-10-26 11:05:12 +05:30
bcornwellmott	30df3cd3dc	Add description, stock UOM and Min Order Qty to MRs ... The material requests currently do not include descriptions, stock UOM and Min Order Quantities. This fix adds them. This is especially critical in the CSV export, which currently is missing all this info.	2016-10-25 14:21:26 -07:00
shreyas	99e063f831	[Fix] Make purchase order item reqd_date modifiable after submit	2016-10-25 12:44:27 +05:30
Nabin Hait	ffd2fc5101	[fix] Validate if warehouse is not linked to any account	2016-10-24 18:54:07 +05:30
Nabin Hait	d662502f3c	[fix] Validate if warehouse is not linked to any account	2016-10-24 18:17:57 +05:30
Nabin Hait	c00b17a6e0	Update project.json	2016-10-24 17:53:06 +05:30
Nabin Hait	fe86debf5d	[fix] Duplicate salary components	2016-10-24 17:47:18 +05:30
Nabin Hait	0f9d60099d	Merge pull request #6692 from neilLasrado/develop ... Typo fix	2016-10-24 16:46:27 +05:30
Nabin Hait	a02fb1541a	Merge pull request #6553 from saurabh6790/scrap_management ... Scrap management	2016-10-24 16:46:13 +05:30
Nabin Hait	1f3771cdf1	Merge pull request #6687 from KanchanChauhan/lead-changes ... Contact by and contact date validations	2016-10-24 16:44:08 +05:30
Rohit Waghchaure	43b508089e	[Fix] Pricing rule discount issue	2016-10-24 16:16:24 +05:30
Neil Trini Lasrado	5ddd7acdbd	Typo fix	2016-10-24 15:25:47 +05:30
Saurabh	8c3764a6ef	test case for scrap item	2016-10-24 13:55:36 +05:30
Saurabh	4ae4eb0eb9	added get_scrap_items param to get_bom_items_as_dict	2016-10-24 13:55:36 +05:30
Saurabh	5a2fa8aac7	[enhance] scrap management	2016-10-24 13:55:36 +05:30
Saurabh	464c27e189	[feature] scrap management	2016-10-24 13:55:36 +05:30
Kanchan Chauhan	a1cedbc7b2	Contact by and contact date validations	2016-10-24 13:51:13 +05:30
Umair Sayed	a56775ce9a	Update domainify.py	2016-10-24 13:00:17 +05:30
Nabin Hait	f430d73daf	Merge pull request #6662 from PawanMeh/fixes_6363 ... [fix] #6363	2016-10-24 11:56:43 +05:30
Nabin Hait	00b3443b61	Merge pull request #6653 from shreyasp/cust-credit-limit ... [Minor] Do not allow change in credit limit	2016-10-24 11:55:24 +05:30
Nabin Hait	a221f7ec5d	Update test_customer.py	2016-10-24 11:27:56 +05:30
Pawan Mehta	297e725727	Update project.json	2016-10-24 11:24:38 +05:30
Nabin Hait	df366a6e9c	Merge pull request #6683 from KanchanChauhan/multiple-active-salary-slio ... Warning if there are mutliple active salary structures	2016-10-24 11:23:57 +05:30
Mainul Islam	a964db7821	Add multiple emoloyee in salary structure (#6621) ... * Add multiple emoloyee in salary structure * Added in Menu * Remove Default Value from Company field * Change Section Label * Added Button in Salary Structure and set route_options * Remove Single Doctype * Add Dialog for Employee Add * View Employee and Check or Uncheck * Complete Multiple Employee Add in Employee Table and Neve Entry in Duplicate in Employees * Employees View Section in Dialog Added Employe Name and set Employee Id as Title * Delete SIngle Doctype * Chagne to * Remove checkbox * Remove add button and set primary button	2016-10-24 11:22:00 +05:30
Nabin Hait	1db35ce79a	Merge pull request #6651 from shreyasp/del-company-txn ... Delete Communications while Deleting Company Transactions	2016-10-24 11:20:29 +05:30
Nabin Hait	6ef8ede280	Merge pull request #6675 from KanchanChauhan/holiday-in-lwp-salaryslip ... include_holiday being taken into consideration while calculating lwp	2016-10-24 11:19:43 +05:30
Nabin Hait	5ced4dfe34	Merge pull request #6673 from KanchanChauhan/max-leave-days-in-leave-application-hotfix ... [Fix] leave application days should be less than max days leave allowed	2016-10-24 11:18:44 +05:30
pawan	03a77b1b65	[fix] 6363	2016-10-24 11:18:29 +05:30
pawan	46ead70be8	[fix] fixes_6363	2016-10-24 11:18:29 +05:30
pawan	9a43a2a97b	[fix] #6363	2016-10-24 11:18:29 +05:30
pawan	28ad58905d	[fix] #6363	2016-10-24 11:18:29 +05:30
pawan	8d187def12	[fix] #6363	2016-10-24 11:18:29 +05:30
Nabin Hait	8918dcf54e	Merge pull request #6678 from KanchanChauhan/total-leave-days-updated ... Total leave days gets updated on date change	2016-10-24 11:13:31 +05:30
Nabin Hait	988f850fe2	Merge pull request #6682 from KanchanChauhan/makebankentry-button-fix ... [Fix] Make Bank Entry button depends_on fixed	2016-10-24 11:12:17 +05:30
shreyas	f09929ea92	[Fix] Updated test cases to handle negative or zero outstanding amount against customer	2016-10-24 10:35:30 +05:30
shreyas	17f43da2a6	[Test] Added test cases to evaluate customer credit limit	2016-10-24 10:21:05 +05:30
shreyas	e05656963a	[Minor] Do not allow change in credit limit	2016-10-24 10:21:04 +05:30
shreyas	c48eb45410	[Fix] Use company_fieldname as parameter to the query	2016-10-24 10:18:28 +05:30
shreyas	0f4cb55c3c	[Fix] Delete communications before deleting the docs	2016-10-24 10:04:26 +05:30
shreyas	54d8590064	[Fix] Delete communications when user deletes company transactions	2016-10-24 10:04:26 +05:30
Kanchan Chauhan	55106ab66b	Warehouse based on selected Company	2016-10-22 21:42:28 +05:30
Kanchan Chauhan	29ce0aab28	Warning if there are mutliple active salary structures	2016-10-22 20:48:44 +05:30
Kanchan Chauhan	c4c966691f	[Fix] Make Bank Entry button depends_on fixed	2016-10-22 18:04:48 +05:30
Kanchan Chauhan	a084405bca	Total leave days gets updated on date change	2016-10-22 11:55:51 +05:30
Kanchan Chauhan	a1006c0549	include_holiday being taken into consideration while calculating lwp	2016-10-21 17:53:15 +05:30
Kanchan Chauhan	24d580206a	[Fix] leave application days should be less than max days leave allowed	2016-10-21 13:01:33 +05:30
Nabin Hait	db88bd66b0	Merge branch 'develop' of https://github.com/DigiThinkIT/erpnext into DigiThinkIT-develop	2016-10-20 16:59:40 +05:30
Nabin Hait	376449ff41	Merge pull request #6659 from shreyasp/selling-price-validation ... [Minor] Validate purchase price against selling price	2016-10-20 16:46:35 +05:30
Nabin Hait	9f26bc16b7	Update selling_controller.py	2016-10-20 16:45:53 +05:30
Rohit Waghchaure	69be01aa1b	[Stock Entry] Show total amount for purpose Material Issue/Receipt/Transfer	2016-10-20 16:38:30 +05:30
Nabin Hait	725b547641	Merge pull request #6657 from rohitwaghchaure/invoice_unlink_feature ... [Feature] Provision to allow unlink the payment against the invoice	2016-10-20 16:36:57 +05:30
Rohit Waghchaure	18fa0d8691	patch to set default value as 1	2016-10-20 16:16:28 +05:30
Nabin Hait	938c858720	Merge pull request #6513 from KanchanChauhan/group-similar-item-in-po ... Group similar items in PO	2016-10-20 16:11:24 +05:30
Rohit Waghchaure	7917ff6936	Test cases	2016-10-20 16:11:22 +05:30
Rohit Waghchaure	8055bd39ba	[Feature] Provision to allow unlink the payment against the invoice	2016-10-20 16:11:22 +05:30
Nabin Hait	05245d6328	Merge pull request #6661 from KanchanChauhan/demo-fixed-processpayroll-ss ... Demo fixed for Process Payroll and Salary Structure	2016-10-20 16:05:08 +05:30
Kanchan Chauhan	1c1e2e9cbe	Demo fixed for Process Payroll and Salary Structure	2016-10-20 16:04:09 +05:30
shreyas	e8aaa92816	[Minor] Some more fixes to the code	2016-10-20 15:57:45 +05:30
shreyas	edcba51c8b	[Fix] Added check to validate selling price against valuation rate	2016-10-20 15:57:45 +05:30
shreyas	1cfe2d7b45	[Minor] Validate purchase price against selling price	2016-10-20 15:57:45 +05:30
Nabin Hait	6fb7b162e8	Create tax template based on country	2016-10-20 15:56:07 +05:30
Rohit Waghchaure	d23835be84	[Feature] Countrywise sales tax template	2016-10-20 15:56:07 +05:30
Kanchan Chauhan	cce16b29b0	Group similar items in PO	2016-10-20 14:31:34 +05:30
Saurabh	bc0783b527	[fix] duplicate columns in monthly salary report #6623	2016-10-20 12:55:23 +05:30
Kanchan Chauhan	025fbd8f14	Customer group added to Gross Profit report	2016-10-20 12:54:06 +05:30
Nabin Hait	97fa119b37	Set prefered contact email in Employee	2016-10-19 18:26:01 +05:30
Nabin Hait	0702fa2fc6	Fixed version conflict	2016-10-19 16:49:36 +05:30
Nabin Hait	13a07c2029	bumped to version 7.0.62	2016-10-19 17:18:04 +06:00
Rohit Waghchaure	aa8abfa5b3	Test cases added in sales order to check total projected qty	2016-10-19 15:26:10 +05:30
Rohit Waghchaure	ac9172f6df	[Fix] total projected qty	2016-10-19 15:06:30 +05:30
Nabin Hait	44b4e5eef3	Merge pull request #6648 from saurabh6790/hotfix ... [fix] calculate variance only for submitted budgets	2016-10-19 15:05:11 +05:30
Nabin Hait	ff183eedb9	Fixes for testcases	2016-10-19 14:23:02 +05:30
Saurabh	afceac620c	[fix] calculate variance only for submitted budgets	2016-10-19 12:49:48 +05:30
Faris Ansari	2acbb11923	[fix] print format image size	2016-10-19 12:08:00 +05:30
Nabin Hait	2b03d8f696	Merge pull request #6641 from JayVora-SerpentCS/develop ... Pythonic corrections	2016-10-19 10:47:01 +05:30
Nabin Hait	a7a3a497d5	Fixed version conflict	2016-10-18 18:35:42 +05:30
Nabin Hait	8872842edf	bumped to version 7.0.61	2016-10-18 19:05:18 +06:00
Rushabh Mehta	7791ed845f	[hot] [fix] student_dashboard.py	2016-10-18 18:33:19 +05:30
Nabin Hait	a943ec8ff5	Merge pull request #6642 from neilLasrado/develop ... Fixes to Schools Module	2016-10-18 18:16:29 +05:30
Neil Trini Lasrado	377da58378	Set Student Name in Program Enrollment	2016-10-18 18:11:52 +05:30
Serpent Consulting Services Pvt Ltd	8b231f7256	Pythonic corrections	2016-10-18 17:30:24 +05:30
Nabin Hait	6cb44133c3	Fixed version conflict	2016-10-18 16:18:34 +05:30
Nabin Hait	170b0cc83c	bumped to version 7.0.60	2016-10-18 16:48:17 +06:00
Nabin Hait	d5c4a5c802	Hotfix	2016-10-18 16:17:37 +05:30
Nabin Hait	fa1cdd5bf0	Fixed merge conflict	2016-10-18 15:37:33 +05:30
Nabin Hait	7b9e8368ea	bumped to version 7.0.59	2016-10-18 15:55:31 +06:00
Nabin Hait	f32547a414	Merge pull request #6637 from nabinhait/cost_center_fix ... Set cost center while creating invoice from SO/PO	2016-10-18 15:18:16 +05:30
Rushabh Mehta	17f6874450	[minor] [fix] doctype_dasboard.py files, move data to get_data	2016-10-18 14:54:39 +05:30
Nabin Hait	55a8797919	Set cost center while creating invoice from SO/PO	2016-10-18 14:54:17 +05:30
Neil Trini Lasrado	8b3dd8fdf2	Changed nationality in student master from link to data field	2016-10-18 12:55:38 +05:30
Kanchan Chauhan	dc86964e91	Patch fixed for Employee	2016-10-18 11:29:41 +05:30
Nabin Hait	b3b1219109	Fixed merge conflict	2016-10-17 17:42:53 +05:30
Nabin Hait	fcd10f2e08	Merge pull request #6335 from RobertSchouten/stock_entry ... [fix] warning for creating stock entry after sales invoice (causing missing gl entries)	2016-10-17 17:39:57 +05:30
Nabin Hait	e5eed00aa5	Update stock_entry.py	2016-10-17 17:37:35 +05:30
Pawan Mehta	1a96cc1e8d	Fixes 6171 (#6417) ... * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171 * [fix] #6171	2016-10-17 17:02:12 +05:30
KanchanChauhan	81581c669f	No Leave allocation for Leave Type for which Leave Without Pay is checked (#6626)	2016-10-17 17:01:29 +05:30
Nabin Hait	437b32d32c	Added filter to show unclosed fiscal year's P&L balances in trail balance	2016-10-17 16:57:52 +05:30
Nabin Hait	425bdee0ec	Merge branch 'unclosed_finance' of https://github.com/RobertSchouten/erpnext into RobertSchouten-unclosed_finance1	2016-10-17 16:46:54 +05:30
Nabin Hait	395d757c5a	Fixed merge conflict	2016-10-17 16:42:49 +05:30
KanchanChauhan	9cb69ca0e3	Posting Date cannot be future date (#6628)	2016-10-17 16:40:16 +05:30
Saurabh	048ee48475	[fix] #6573 Material Request Required Date auto set (#6627)	2016-10-17 16:24:20 +05:30
Faris Ansari	e1416c3dda	Update sales-invoice.md frappe/erpnext#6507 (#6629) ... * Update sales-invoice.md * add pos-invoice screenshot	2016-10-17 16:22:43 +05:30
Nabin Hait	401be3f49b	Merge pull request #6577 from PawanMeh/fixes_6566 ... [fix #6566]	2016-10-16 14:28:26 +05:30
Nabin Hait	a9ce406c48	Merge pull request #6579 from PawanMeh/fixes_6567 ... [fix] #6567	2016-10-16 14:28:00 +05:30
Nabin Hait	e040510545	Always calculate additional discount amount if percentage is mentioned	2016-10-13 12:14:47 +05:30
Rushabh Mehta	b62ed7a603	[fix] install issue	2016-10-13 11:00:00 +05:30
Rushabh Mehta	257bbbe588	[refactor] has_website_permission parameters	2016-10-12 10:53:34 +05:30
RobertSchouten	bb7308bbc1	[fix] email digest date range starting with opening balance of day one not closing (#6524) ... ie monthly currently get's balance at the end of 1st of september to the 30th of september instead of the beginning of the 1st aka the end of the 31st fo august	2016-10-10 17:17:39 +05:30
Saurabh	afa14fc402	[fix][minor] (#6449)	2016-10-10 17:17:17 +05:30
Nabin Hait	1765259043	Merge pull request #6591 from vrms/patch-4 ... Update managing-fixed-assets.md	2016-10-10 17:12:58 +05:30
Rushabh Mehta	2757d8ef03	[minor] [perm] allow owner to read student applicant	2016-10-10 16:46:24 +05:30
Rohit Waghchaure	8e881cc7b9	[Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order	2016-10-10 14:58:33 +05:30
Faris Ansari	a0608d463a	[gantt] Gantt fixes (#6490) ... * [gantt] fix Gantt Chart link in Modules * [gantt] added field for Task dependent	2016-10-10 14:32:35 +05:30
vrms	e4e8bfae9f	Update managing-fixed-assets.md ... Sale an asset > Sell and Asset	2016-10-10 15:33:27 +08:00
Nabin Hait	fc90758932	Merge pull request #6589 from rohitwaghchaure/purchase_invoice_validation_issue ... [Fix] Purchase invoice validation issue	2016-10-10 11:51:00 +05:30
Rohit Waghchaure	3485d2467a	[Fix] Purchase invoice validation issue	2016-10-09 18:05:17 +05:30
Rohit Waghchaure	6f33dfbc56	[Fix] wildcard search for pos not working	2016-10-09 15:32:56 +05:30
Rushabh Mehta	ac5b193100	[minor] direct student admission to the list page	2016-10-09 15:19:23 +05:30
Pawan Mehta	8d62af627a	Update fiscal-year.md	2016-10-09 09:20:12 +05:30
pawan	1c0ecede06	[fix] #6567	2016-10-09 09:06:49 +05:30
pawan	896c731a46	[fix] #6566	2016-10-09 08:44:40 +05:30
pawan	05790d1b38	[fix] #6566	2016-10-09 08:30:29 +05:30
pawan	5655ce936b	[fix] #6567	2016-10-08 08:02:08 +05:30
pawan	361739ffb6	[fix #6566]	2016-10-07 19:00:30 +05:30
Nabin Hait	fc2a9e64fc	Fixed version conflict	2016-10-07 17:09:28 +05:30
Nabin Hait	89326b366d	bumped to version 7.0.58	2016-10-07 17:38:57 +06:00
Nabin Hait	6aaa7d7742	Added missing file extension	2016-10-07 17:08:03 +05:30
Nabin Hait	df61513037	Fixed merge conflict	2016-10-07 17:05:00 +05:30