brotherton-erpnext

Author	SHA1	Message	Date
Makarand Bauskar	3e2c9d00f1	[minor] Corrected field label & placed Expense Claim button in Next Step (#8828 )	2017-05-16 08:22:45 +05:30
rohitwaghchaure	d678809939	[fix] Party balance field showing wrong currency symbol (#8832 )	2017-05-16 08:06:45 +05:30
Manas Solanki	59472e5449	Changes in the student group creation tool (#8833 )	2017-05-16 08:05:14 +05:30
Manas Solanki	c5f79d2ec4	Fix for the student batch-wise attendance report (#8834 )	2017-05-16 08:00:24 +05:30
Makarand Bauskar	b0df661e81	[minor] set set_posting_time to 1 while data import (#8835 )	2017-05-16 07:59:58 +05:30
Rushabh Mehta	939db36ad4	[fix] copy item variant values on save and make non no_copy fields as not editable. fixes frappe/erpnext#4253 (#8837 )	2017-05-16 07:42:44 +05:30
Faris Ansari	4fcd8a6db3	Fix sales funnel legend position (Fixes #5073 ) (#8838 )	2017-05-16 07:40:26 +05:30
Faris Ansari	769b6bada8	[POS] Add Pay menu item in mobile view (#8801 ) (#8845 )	2017-05-16 07:31:10 +05:30
Faris Ansari	125996e21c	Increase item cart height in mobile view (Fixes #8827 ) (#8846 )	2017-05-16 07:29:15 +05:30
Nabin Hait	7bf810300e	Fixed #8822 , active students patch	2017-05-15 11:42:37 +05:30
Prateeksha Singh	edeb4dc7e0	Multiselect dialog for getting items (#8583 ) * Concatenate docnames and send to mapper * Multiselect with checkboxes * set setters as separate filters * Map filter fields to target_doc * Get items from quotation (in SO) working * [major] Set dialog setters for all forms * Add date field * Specify non-default date_fields * [minor] add test_mapper.py * [minor] remove cur_frm * [minor][fix] test * [minor] fix test with make_test_records	2017-05-15 11:32:06 +05:30
Julian Robbins	62e3e75555	Addition of Imap to description of usable mail accounts (#8806 )	2017-05-13 09:55:23 +05:30
Saurabh	82e303882e	bumped to version 8.0.26	2017-05-13 08:12:03 +06:00
Saurabh	45540569ff	[fix] rename Student Batch to Student Batch Name in activation check	2017-05-13 06:30:41 +05:30
Makarand Bauskar	d4e15ca359	[minor] create student batch if does not exists (#8781 ) * [minor] create student batch if does not exists * [fix] minor fixes in if condition	2017-05-12 11:23:58 +05:30
Makarand Bauskar	e8270fe21c	[fix] minor fix in get_context for item variants (#8791 )	2017-05-12 11:23:23 +05:30
Saurabh	62c7deee00	[fix] don't allow string values in limits to avoid sql injection (#8779 )	2017-05-11 18:03:12 +05:30
Nabin Hait	b579fd7ada	bumped to version 8.0.25	2017-05-11 17:36:56 +06:00
Nabin Hait	4f5ad50ecf	Item Rate in Sales Return must be less than or equal to reference doc (#8775 ) * Item Rate in Sales Return must be less than or equal to reference doc * Fix as rate field is not there in Packed Item	2017-05-11 16:44:19 +05:30
Nabin Hait	5ad6126832	On saving of Accounts Settings, only save enabled warehouses (#8772 )	2017-05-11 13:34:04 +05:30
Nabin Hait	62d27ab7d3	Reload doctype bewfore renaming margin fields (#8771 )	2017-05-11 13:26:55 +05:30
KanchanChauhan	f74010d379	Calculations based on working and payment days should be made if salary structure exists (#8770 )	2017-05-11 11:42:35 +05:30
Makarand Bauskar	0e4c5c9efb	[minor] renamed a Total Margin field to Rate With Margin (#8720 ) * [minor] renamed a Total Margin field to Rate With Margin * [minor] minor fixes in field lable	2017-05-11 11:40:02 +05:30
Faris Ansari	734d7795f8	Show party name in General Ledger print report (#8760 )	2017-05-11 11:38:30 +05:30
Makarand Bauskar	464f108586	[minor] added currency in Totals for Trial Balance report (#8757 ) * [minor] added currency in Totals for Trial Balance report * [minor] used erpnext.get_default_currency to fetch the company currency	2017-05-10 19:40:36 +05:30
KanchanChauhan	323e46ba5a	Added parent filter to the Salary Structure Employee since it was getting base and variable value from first found Salary Structure Employee (#8756 )	2017-05-10 17:46:32 +05:30
Makarand Bauskar	62414565b1	[minor] added the address_html field in company doctype (#8754 )	2017-05-10 14:52:03 +05:30
Manas Solanki	426b8a14fd	Merge the student group and student batch (#8663 ) * deleted student batch creation tool * Patch for deleting the doctype and config * Changes in the student attendance * Patch for renaming the student batch as student group * Changes in the student attendance * Change in the student attendance reports - Absent student report - Student Batch-wise attendance - Student monthly attendance sheet * Changes in the patch * Changes in the course schedule * Changes in the course scheduling tool * Change in the assessment plan * Changes in the assessment result tool * Cleanup * Changes in the api.py * create student group from student batch * delete student batch * add patch * remove student batch from config/schools.py * Delete the depricated doctype with patch * Changes in patch * Changes as per PR	2017-05-09 15:32:52 +05:30
Nabin Hait	70e1778712	bumped to version 8.0.24	2017-05-09 15:43:32 +06:00
Nabin Hait	4e6ff8ccd8	Ignore permission for Bin in warehouse query (#8742 )	2017-05-09 15:09:10 +05:30
Rushabh Mehta	95233a62d7	[minor] item route item_name + random string	2017-05-09 07:48:41 +05:30
Nabin Hait	226ea7db88	Filter issue on timesheet calendar view (#8730 )	2017-05-08 17:34:07 +05:30
Saurabh	9df45bbc42	[fix] Reference Document is required to create Payment Request (#8729 ) * [fix] Referene Document is required to create Payment Request * Update payment_request.py	2017-05-08 17:24:23 +05:30
Rushabh Mehta	a6bc583daf	[minor] item route is item name + code	2017-05-08 11:35:40 +05:30
Nabin Hait	b5a9822fff	bumped to version 8.0.23	2017-05-06 14:10:52 +06:00
Nabin Hait	17179ee83a	minor syntax fix	2017-05-06 13:23:12 +05:30
Ishan Loya	120ee275cc	Fix typo (#8719 )	2017-05-06 12:48:22 +05:30
Makarand Bauskar	486045e1d1	[minor] check if date of joining is available before creating Salary Slip (#8700 )	2017-05-06 12:47:42 +05:30
Nabin Hait	3257aeeb55	Price list rate fix multiple uom and validation with prev doc (#8718 )	2017-05-06 12:47:14 +05:30
Nabin Hait	7228e1af6e	Customer/Supplier Name in sales/purchase analytics (#8717 )	2017-05-06 12:45:37 +05:30
Nabin Hait	6e7407962f	Get exchange rate only if date and currency is present (#8712 ) * Get exchange rate only if date and currency is present * Update transaction.js	2017-05-06 12:45:16 +05:30
Rushabh Mehta	b7e740ff45	[minor] ignore permissions for bin on warehouse_query (#8713 )	2017-05-06 12:44:03 +05:30
Dominik Ottenbreit	51cd2df763	Fix Romanian Translation (#8706 )	2017-05-05 17:30:45 +05:30
Pawan Mehta	cac94b9bd5	[fix] #8373 (#8707 )	2017-05-05 17:29:57 +05:30
Manas Solanki	65c8466622	check for mandatory field before frappe.call (#8705 )	2017-05-05 17:28:09 +05:30
Nabin Hait	42343bbc2c	Selling price validation against last purchase rate / valuation rate (#8702 )	2017-05-05 17:23:17 +05:30
KanchanChauhan	ed56b8afd8	Website route for item based on name not item name (#8682 )	2017-05-05 11:56:55 +05:30
Makarand Bauskar	6b3bc8a8e1	[hotfix] fixed the recursion error while saving the User (#8696 )	2017-05-05 11:53:00 +05:30
Makarand Bauskar	c4ec937835	[hotfix] fixed object has no attribute 'delivered_by_supplier' (#8699 )	2017-05-05 11:52:17 +05:30
Nabin Hait	d2a966eef3	Update general_ledger.py	2017-05-05 10:41:16 +05:30
rohitwaghchaure	6324987c15	[fix] Company's abbreviation change will not update the warehouse (#8685 )	2017-05-04 16:12:29 +05:30
Nabin Hait	8470b39d4c	bumped to version 8.0.22	2017-05-04 12:50:31 +06:00
Nabin Hait	932423ecba	Balance Sheet always shows accumulated values from previous fiscal year (#8668 )	2017-05-04 12:12:29 +05:30
Faris Ansari	1c09a991f3	Change beta_version to 8.x-beta (#8673 ) * Change beta_version to 8.x-beta * change to 8.x.x-beta	2017-05-04 12:12:14 +05:30
Nabin Hait	fcc0246b38	Get mobile nos for customer contact (#8674 )	2017-05-04 12:11:48 +05:30
Nabin Hait	3ce41d6b1f	Fixed related to auto fetching batch nos and date valiation in salary structure (#8666 ) * Fixed related to auto fetching batch nos and date valiation in salary structure * Update get_item_details.py	2017-05-03 18:22:24 +05:30
Javier Wong	470535ae9b	Removed set_default_roles set_default_roles was removed in `7fff0908a4` It is not required anymore. It currently breaks the patch.	2017-05-03 16:44:14 +05:30
rohitwaghchaure	a1923574c6	Merge pull request #8657 from rohitwaghchaure/pos_email_id_issue [fix] Contact not creating if only email id has entered in the POS	2017-05-03 12:56:13 +05:30
Nabin Hait	ef027e9030	Correct args to the fmt_money function	2017-05-03 11:51:47 +05:30
Aditya Duggal	bd8c7d683b	Website related fields now consider show_variant_in_website field as well -Resolves issue #8635	2017-05-03 10:14:09 +05:30
Rohit Waghchaure	fd37516165	[fix] Contact not creating if only email id has entered in the POS	2017-05-02 18:27:09 +05:30
Nabin Hait	504eba7fb2	Test case fixed for Employee Loan Application	2017-05-02 18:19:48 +05:30
Nabin Hait	e15721df48	Caluculate total interest and payable amount in Loan Application if fixed amount per period	2017-05-02 18:19:48 +05:30
mbauskar	c482aeda1a	[fixes] added missing get_linked_material_requests method to buying utils	2017-05-02 14:05:54 +05:30
Rohit Waghchaure	61165127fc	[fix] Default pos profile's customer not working for the POS	2017-05-02 13:04:08 +05:30
Nabin Hait	fb73621db2	bumped to version 8.0.21	2017-05-02 10:28:48 +06:00
Rohit Waghchaure	3df7eef6cc	[fix] Unable to create an asset due to rounding issue	2017-05-02 09:49:02 +05:30
akshay	b674d27285	Test Cleanup	2017-05-02 09:48:51 +05:30
akshay	949fbc559e	Serial No Rename	2017-05-02 09:48:51 +05:30
Nabin Hait	1117125841	Update domainify.py	2017-05-01 11:40:13 +05:30
mbauskar	e94c6e7b8e	[minor] disabled the instructor role if the company domain is not Education	2017-05-01 11:40:13 +05:30
Nabin Hait	589927b37d	bumped to version 8.0.20	2017-04-28 16:04:58 +06:00
Nabin Hait	2afb9b96cd	pricing rule fix	2017-04-28 15:20:49 +05:30
Nabin Hait	8c9fb76854	Remove pricing rules if 'Ignore Pricing Rule' manually triggered	2017-04-28 15:20:49 +05:30
Manas Solanki	0da9bc6309	Fix for program enrollment	2017-04-28 14:37:25 +05:30
Manas Solanki	5a8a5b7d06	Fixes in Student Group	2017-04-28 14:37:25 +05:30
Manas Solanki	71373a176d	Configurable validation setting for the student group	2017-04-28 14:37:25 +05:30
mbauskar	1b6270ef40	[hotfix] error while sending the auto email report of Ordered Items To Be Delivered	2017-04-28 14:35:18 +05:30
Rohit Waghchaure	ac28ffb41e	[fix] frappe.db.exists('Series', series) is not working because tabSeries table did not have column modified	2017-04-28 14:34:11 +05:30
Rohit Waghchaure	0e6ac8b9b4	Enabled option User Cannot Search for the gl entry doctype	2017-04-28 10:03:18 +05:30
Rohit Waghchaure	07ef5f42c4	[enhance] Show notification for draft state records if doctype is submittable	2017-04-28 09:59:29 +05:30
Nabin Hait	7b04f092a6	Fixed test cases	2017-04-28 09:58:41 +05:30
Nabin Hait	c98f37f91c	Patch for reverting manufacturers table from item	2017-04-28 09:58:41 +05:30
Nabin Hait	b6a8920489	Fixed conflict	2017-04-28 09:58:41 +05:30
Nabin Hait	ecd46588ec	bumped to version 8.0.19	2017-04-26 15:15:37 +06:00
Nabin Hait	96c247c834	Pick batch autmatically only if batch found	2017-04-26 14:37:33 +05:30
Nabin Hait	db8f41ba55	Added Payment documents as Quick Links in SO/PO	2017-04-26 14:34:41 +05:30
Nabin Hait	5b73a4864a	bumped to version 8.0.18	2017-04-25 21:14:54 +06:00
Nabin Hait	85622f9ccb	Update update_status_as_paid_for_completed_expense_claim.py	2017-04-25 20:43:29 +05:30
pawan	c27d9f712b	Add Report Links	2017-04-25 20:12:55 +05:30
Umair Sayyed	175646572a	updated help pages	2017-04-25 16:27:50 +05:30
Nabin Hait	d5d8db7a3f	Cleanup on financial statement PR	2017-04-25 16:26:33 +05:30
Nabin Hait	39bcb3de4b	Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std	2017-04-25 16:13:54 +05:30
Ishan Loya	09fe8e0522	Add bank guarantee to Accounts module display screen	2017-04-25 16:08:22 +05:30
Ishan Loya	17737e4ab1	Change permissions, change account fieldname and add notes section	2017-04-25 16:08:22 +05:30
Ishan Loya	2fca72ae8e	Change owner	2017-04-25 16:08:22 +05:30
Ishan Loya	0dbe8547e7	Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique	2017-04-25 16:08:22 +05:30
Ishan Loya	e1ed5ba726	Remove commented out code	2017-04-25 16:08:22 +05:30
Ishan Loya	0fc57a7df2	Change doctype owner	2017-04-25 16:08:22 +05:30
Ishan Loya	c7a72684fd	Add bank guarantee doctype with documentation	2017-04-25 16:08:22 +05:30
Nabin Hait	020dedd00e	Cleaned up and commonified the campaign efficiency and lead owner efficiency report	2017-04-25 16:05:01 +05:30
Nabin Hait	28dad095fa	Merge branch 'fixes_8466' of https://github.com/PawanMeh/erpnext into PawanMeh-fixes_8466	2017-04-25 15:00:45 +05:30
Nabin Hait	8590d5b05d	bumped to version 8.0.17	2017-04-25 15:00:50 +06:00
sburanaw	66951e528f	Fix an import typo in get_item_details.py	2017-04-25 14:09:51 +05:30
Nabin Hait	9b20e07431	[fix] currency field precision	2017-04-25 14:09:29 +05:30
Manas Solanki	d7afa69c6f	fix	2017-04-25 14:08:43 +05:30
Manas Solanki	c61dc9c7ea	Change in the assessment tool	2017-04-25 14:08:43 +05:30
mbauskar	9cf6d630e9	[minor] fixes for expense claim status	2017-04-25 13:15:50 +05:30
Faris Ansari	5687e2da9d	[ui-fix] POS item list	2017-04-24 19:22:05 +05:30
Nabin Hait	e3c122d8c4	AR report: filter based on customer group and credit days based on field. Fixed #8214	2017-04-24 19:06:07 +05:30
Nabin Hait	4cc5e61f60	Update course_schedule.py	2017-04-24 19:00:49 +05:30
Manas Solanki	6293263095	test case fixed	2017-04-24 19:00:49 +05:30
Manas Solanki	810e483757	Changes in the student group	2017-04-24 19:00:49 +05:30
Nabin Hait	e2741e85fd	bumped to version 8.0.16	2017-04-24 19:29:01 +06:00
Rohit Waghchaure	dd70fbfdae	[fix] Letter head not showing in the report	2017-04-24 18:57:51 +05:30
Manas Solanki	6eaf281b2b	Export and import program enrollments	2017-04-24 18:44:12 +05:30
pawan	134487ab2a	Changes after review	2017-04-24 13:48:40 +05:30
pawan	7bd7df3742	Changes after review	2017-04-24 13:19:22 +05:30
Ishan Loya	56c1b2a625	Make proposed corrections	2017-04-24 10:44:36 +05:30
Ishan Loya	b12e15dcc4	Change modified by	2017-04-24 10:44:36 +05:30
Ishan Loya	e5fdd47fd8	Hide 'Qty Transferred for Manufacturing' field if skip material transfer	2017-04-24 10:44:36 +05:30
Ishan Loya	04c69fb46d	Minor fix	2017-04-24 10:44:36 +05:30
Ishan Loya	f04ef8dfe0	Update documentation for Production Order skipping material transfer entry option	2017-04-24 10:44:36 +05:30
Ishan Loya	7544904857	Add option to skip material transfer for production orders	2017-04-24 10:44:36 +05:30
Rushabh Mehta	c44910370b	[fix] is_sample_item	2017-04-24 10:28:38 +05:30
Rushabh Mehta	551406ab11	[enhance] automatic batch selection in Delivery Note and Stock Entry	2017-04-24 10:28:38 +05:30
Rushabh Mehta	e385b5b97b	[enhance] automatic batch creation, move and split	2017-04-24 10:28:38 +05:30
mbauskar	bb2670d57a	[fixes] minor fixes in bank reconciliation form and report	2017-04-24 10:23:50 +05:30
mbauskar	0b293133be	[minor] fixes for unsupported operand type(s) for +=: 'int' and 'NoneType'	2017-04-21 21:40:30 +05:30
ibi	83c1c3a171	fleet_management: replace references to fleet_management by hr in vehicle_log doctype	2017-04-21 17:57:07 +05:30
mbauskar	c3d642e5d1	[minor] allow bulk edit for doctype	2017-04-21 17:50:40 +05:30
Manas Solanki	8230ce095f	[Fix] fixed routing to the assessment result	2017-04-21 17:49:52 +05:30
Nabin Hait	557847a5ba	bumped to version 8.0.15	2017-04-21 12:19:09 +06:00
mbauskar	9bac58cdc6	[fixes] fixes in setup wizard for education domain	2017-04-21 11:38:28 +05:30
Nabin Hait	9afb53203f	bumped to version 8.0.14	2017-04-20 09:21:44 +06:00
Nabin Hait	825e053e66	Fixed project_copied_from patch	2017-04-20 08:50:37 +05:30
Nabin Hait	e42fb32f6f	Fixed allow_zero_valuation_rate patch	2017-04-20 08:45:18 +05:30
Nabin Hait	68ae9f3f88	Merge branch 'develop' into allow_on_submit_fix	2017-04-19 21:10:23 +05:30
mbauskar	8f3cc81302	[minor] minor fixes in pricing_rule and set_missing_value	2017-04-19 21:05:37 +05:30
mbauskar	9e9d242a24	[minor] fixes in test cases and added the test case for multiple uom in selling	2017-04-19 21:05:37 +05:30
mbauskar	287fe81329	[minor] calculate price list rate based on items uom	2017-04-19 21:05:37 +05:30
Nabin Hait	f382373cf4	Merge branch 'develop' into develop	2017-04-19 21:01:19 +05:30
CH	61f4a8e757	Make the address type translatable in the Address_HTML field	2017-04-19 20:58:53 +05:30
Nabin Hait	eef55185fc	Update purchase_receipt_item.json	2017-04-19 20:58:09 +05:30
Nabin Hait	8691e0777b	Update purchase_invoice_item.json	2017-04-19 20:58:09 +05:30
Nabin Hait	2de3bf7a0f	Fixed indexes on sales and purchase transactions	2017-04-19 20:58:09 +05:30
Julian Robbins	2e6f12b850	Update purchase-details.md	2017-04-19 20:55:04 +05:30
mbauskar	ba41242f1f	[fixes] fixed the pricing rule issue https://github.com/frappe/erpnext/issues/8493	2017-04-19 20:54:23 +05:30
Kanchan Chauhan	0633df5872	Item variant searchable in website products	2017-04-19 20:51:43 +05:30
Rohit Waghchaure	f4f774d1df	[fix] offline_pos_name is not defined during print from the POS	2017-04-19 20:50:35 +05:30
Faris Ansari	695327a513	Duplicate dependencies when project is duplicated - fix frappe/erpnext#8274	2017-04-19 20:48:49 +05:30
Rohit Waghchaure	019501e4a0	[fix] Balance Sheet, linking account to general ledger is not working	2017-04-19 20:46:30 +05:30
Nabin Hait	2704162f5a	Fixes allowd on submit	2017-04-19 16:25:39 +05:30
Nabin Hait	117be7ddd5	Added a settings in Accounts Settings to disable booking depreciation entry automatically	2017-04-18 14:03:06 +05:30
Nabin Hait	8a01980757	Unlink Journal Entry reference from Asset	2017-04-18 13:11:10 +05:30
mbauskar	5123a8519b	[minor] check if joining date is available before validating attandance date	2017-04-18 11:08:57 +05:30
Rohit Waghchaure	d7de3c606b	[fix] Pricing rule for pos	2017-04-17 17:32:36 +05:30
Rohit Waghchaure	dc981dc546	[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue	2017-04-17 17:31:32 +05:30
Nabin Hait	4d1cf53466	bumped to version 8.0.13	2017-04-17 16:06:58 +06:00
Nabin Hait	e2431fd5e9	minor fix	2017-04-17 15:35:36 +05:30
Nabin Hait	ad65be8250	bumped to version 8.0.12	2017-04-17 15:42:17 +06:00
Manas Solanki	ae30026005	Calender view fix for course schedule	2017-04-17 14:55:54 +05:30
Manas Solanki	54c4240d9c	Changes in the program enrollment	2017-04-17 14:55:54 +05:30
Manas Solanki	79683d0871	Added school setting	2017-04-17 14:55:54 +05:30
Manas Solanki	a6d1876958	Changes in course and program	2017-04-17 14:55:54 +05:30
Manas Solanki	346928f2bc	changes in program enrollment and tool	2017-04-17 14:55:54 +05:30
Nabin Hait	310d238d17	Merge pull request #8460 from rohitwaghchaure/client_followup_report Client followup report	2017-04-17 14:13:38 +05:30
Nabin Hait	5e25731188	Update crm_reports.md	2017-04-17 14:13:20 +05:30
Nabin Hait	83ca262e38	Merge pull request #8453 from StrellaGroup/develop [fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-17 14:00:12 +05:30
mbauskar	8a2e6f427b	[minor] if address is not found then set the address_field to '' instead of None	2017-04-17 13:58:52 +05:30
Faris Ansari	8371c1c4cd	Text overflow fix for product text in portal	2017-04-17 13:57:19 +05:30
Julian Robbins	361e7f6ddc	Remove typos and use better English	2017-04-17 13:56:53 +05:30
mbauskar	22cedeb006	[minor] POS & RFQ format_number fixes	2017-04-17 12:24:24 +05:30
pawan	83c8ed0827	”[fix]	2017-04-17 01:02:56 +05:30
Rushabh Mehta	e3c117e32c	[fix] validate preferred email if set in employee.py	2017-04-15 16:59:39 +05:30
Nabin Hait	307543f968	bumped to version 8.0.11	2017-04-14 18:02:37 +06:00
Rohit Waghchaure	6681b0d2aa	Documentation	2017-04-14 17:14:03 +05:30
Javier Wong	54d9c9eaf4	Merge branch 'develop' into develop	2017-04-14 18:33:44 +08:00
Javier Wong	9b11d9b45d	[fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-14 18:24:04 +08:00
mbauskar	cca55ddc33	[minor][hot] fixes for KeyError: from_date for stock balance report	2017-04-14 14:54:11 +05:30
Rohit Waghchaure	1c68509426	[enhance] Report for prospects engaged but not converted	2017-04-14 12:28:59 +05:30
mbauskar	1e05077b1f	[minor] sales register report fixes	2017-04-14 09:59:49 +05:30
joezsweet	b81244342f	Create en-GB.csv - added for compatibility with frappe languages	2017-04-13 19:09:06 +05:30
CH	8e92250798	Correction of issue #8354	2017-04-13 18:59:51 +05:30
CH	d20ec25c92	Removal of double brackets to setup the chart of accounts in the setup wizard	2017-04-13 18:59:06 +05:30
Nabin Hait	25bcb14c1d	Merge pull request #8440 from mbauskar/cart-fixes [minor] fides for add to card button issue	2017-04-13 18:49:22 +05:30
Nabin Hait	f6149f1507	Merge pull request #8429 from ckosiegbu/payroll_updates Statistical Components for Salary Structure	2017-04-13 18:48:47 +05:30
Nabin Hait	2f3585f949	Update salary_slip.js	2017-04-13 18:47:25 +05:30
mbauskar	ed8ad9cfee	[minor] fides for add to card button issue	2017-04-13 18:45:09 +05:30
Nabin Hait	3a2727c9eb	Merge pull request #8430 from mbauskar/stock-entry-supplier-address [minor] fetch supplier address, address_display on supplier trigger	2017-04-13 18:45:09 +05:30
Nabin Hait	16d92e7270	Update update_supplier_address_in_stock_entry.py	2017-04-13 18:44:33 +05:30
Nabin Hait	8c7eb444ef	Merge pull request #8439 from mbauskar/subsciption-fixes [minor] validate email address before get update button click	2017-04-13 18:41:49 +05:30
mbauskar	9a0efc7710	[minor] validate email address before get update button click	2017-04-13 18:18:18 +05:30
mbauskar	3ddfce4f17	[patch] move supplier_address to address_display and set supplier_address in SE	2017-04-13 16:46:41 +05:30
ckosiegbu	a236f4e586	Space to Tabs on salary_slip.py	2017-04-13 10:28:10 +01:00
Nabin Hait	0b62c6ebd4	Merge pull request #8432 from mbauskar/bom-tree-fixes [minor] fixes in bom tree view template	2017-04-13 14:36:45 +05:30
mbauskar	40ca4c3bbb	[minor] fixes in bom tree view template	2017-04-13 14:29:19 +05:30
Nabin Hait	c454dc7af5	Merge pull request #8420 from netchampfaris/pos [POS] Show stock quantity of items	2017-04-13 13:26:58 +05:30
Rushabh Mehta	994cef5ee3	[minor] fix imports in old patches	2017-04-13 13:14:05 +05:30
Faris Ansari	185762aeeb	update label	2017-04-13 12:36:08 +05:30
mbauskar	1b32d913a2	[minor] fetch supplier address, address_display on supplier trigger	2017-04-13 11:55:20 +05:30
ckosiegbu	64f29f819a	Introduce the ability to specify in a Salary Structure that a component is statistical. This allows components to be used in calculations without being added/deducted from earnings deductions.	2017-04-13 00:00:37 +01:00
Nabin Hait	2efe05c1ce	Merge pull request #8263 from frappe/revert-8126-issue8094 Revert "Add link field Package Code (fixes #8094)"	2017-04-12 19:50:43 +05:30
Nabin Hait	a220e96867	bumped to version 8.0.10	2017-04-12 19:30:52 +06:00
mbauskar	e471b02172	[minor] if packed item warehouse not found then set the parent item warehouse to packed items	2017-04-12 18:51:01 +05:30
Faris Ansari	19f90e984e	[POS] Show stock quantity of items - frappe/erpnext#8247	2017-04-12 16:06:31 +05:30
Faris Ansari	b5608f9b14	[fix] Default Print Format for Sales Invoice (#8419 ) - frappe/erpnext#8416	2017-04-12 15:31:01 +05:30
rohitwaghchaure	5adce495aa	Merge pull request #8417 from rohitwaghchaure/due_date_issue [fix] POS, Due Date cannot be before Posting Date	2017-04-12 14:43:21 +05:30
Rushabh Mehta	66272a168d	[minor] README.md + encode query parameter in search	2017-04-12 14:32:07 +05:30
Rohit Waghchaure	2192c244c0	[fix] POS, Due Date cannot be before Posting Date	2017-04-12 13:19:05 +05:30
Makarand Bauskar	141c244ece	[minor] added order by args to get_*_list methods (#8413 )	2017-04-12 13:02:28 +05:30
Nabin Hait	d1fda1ff2b	bumped to version 8.0.9	2017-04-11 19:44:12 +06:00
mbauskar	b9d0e7622a	[translation] translation updates for - erpnext on 2017-04-04	2017-04-11 18:57:48 +05:30
mbauskar	2f9703c20e	[minor] set company_currency as account_currency in general ledger if party type is employee	2017-04-11 18:56:41 +05:30
Khairil Zhafri	46b6d4ea47	Update student.json Less binary gender option for Student	2017-04-11 18:55:31 +05:30
Khairil Zhafri	417145bec5	Update employee.json Less binary gender options for Employee	2017-04-11 18:55:20 +05:30
Rohit Waghchaure	1ff1368280	[fix] Vehicle expense report not working	2017-04-11 18:54:32 +05:30
joezsweet	768a888bf2	[fix] validate supplier invoice - modified to check for the selected supplier only	2017-04-11 18:52:46 +05:30
Julian Robbins	8037a0e3d5	Update assignment.md A typo and improvement tom English	2017-04-11 18:51:34 +05:30
mbauskar	0b665ac791	[minor] don't throw error for buying transactions if price list is not selected	2017-04-11 18:51:12 +05:30
Rohit Waghchaure	87ad6d074a	[enhance] Stock qty added in purchase invoice	2017-04-11 18:29:52 +05:30
Kanchan Chauhan	95108ac80b	[Minor] Party validation for Employee	2017-04-11 18:29:27 +05:30
Dominik Ottenbreit	9b9777be3f	Fix mistranslation "Lieferantennauftrag" -> "Bestellung" There is the strange term of "Lieferantenauftrag" that has been used for "Purchase Order" which translates to "Supplier Order". This is not standard at all and should be fixed to "Bestellung". A Google search for "Bestellung" returns 97 million results, a search for "Lieferantenauftrag" returns 972 results so it should be clear what is standard.	2017-04-11 18:28:35 +05:30
Nabin Hait	075b299673	bom traversing: argument mutable issue	2017-04-11 18:27:34 +05:30
mbauskar	e0271a8331	[minor] ReferenceError:doc fixes for delivery note	2017-04-11 17:54:22 +05:30
mbauskar	236f7aac7f	[minor] track changes for transaction documents	2017-04-10 14:48:54 +05:30
Manas Solanki	29ee263093	Fix in student attendacne tool	2017-04-10 14:33:35 +05:30
Makarand Bauskar	4782e8b751	[minor] added safe_eval for status_updater and added getdate and nowdate (#8365 )	2017-04-07 17:16:16 +05:30
Rushabh Mehta	b58979fd3e	[added] frappe.safe_eval	2017-04-06 18:58:39 +05:30
Rushabh Mehta	9365641777	[added] frappe.safe_eval	2017-04-06 18:24:34 +05:30
Nabin Hait	0d230afd22	bumped to version 8.0.8	2017-04-06 17:02:03 +06:00
Makis Etzoglou	a906b3f11c	add delivery date to print format Fix #8111	2017-04-06 15:47:52 +05:30
Kanchan Chauhan	aa6f00c403	Added default 'All' option to filters to differentiate all and empty filter	2017-04-06 15:22:18 +05:30
Nabin Hait	d681c88d79	validate returned qty only if there is reference qty	2017-04-06 15:20:45 +05:30
Javier Wong	fc11fce990	[enhancement] Changed Issue Description and Resolution to Text Editor (#8346 )	2017-04-06 14:56:44 +05:30
Rohit Waghchaure	faf51d91b6	[fix] stock qty issue in purchase trends report	2017-04-05 14:53:26 +05:30
Rushabh Mehta	08a42e00ae	[fix] salary slip eval, remove access to globals, #8313	2017-04-05 14:52:22 +05:30
Nabin Hait	549a2827e5	Merge pull request #8300 from rohitwaghchaure/customer_edit_issue_v8 [fix] Customer edit issue in offline POS	2017-04-05 14:51:44 +05:30
Rushabh Mehta	9264313f0e	[fix] ordering for Edit Posting Time check	2017-04-05 12:49:01 +05:30
Nabin Hait	8013d1813a	Merge pull request #8320 from manassolanki/newsl Route to newsletter listview	2017-04-05 12:33:14 +05:30
Rushabh Mehta	ffc807cd57	[minor] check below posting date in delivery note	2017-04-05 12:27:41 +05:30
Manas Solanki	ba6559c2e9	Route to newsletter listview	2017-04-05 11:52:23 +05:30
Nabin Hait	93a990f006	bumped to version 8.0.7	2017-04-04 12:16:47 +06:00
Rohit Waghchaure	2861955632	[fix] Customer edit issue in offline POS	2017-04-04 09:59:29 +05:30
Faris Ansari	0d114b4c31	Add `image` field to fetch in Customer List	2017-04-03 21:21:50 +05:30
Nabin Hait	fcf34dc570	Merge pull request #8295 from saurabh6790/demo_fix [fix] demo script for setup data	2017-04-03 17:56:47 +05:30
Nabin Hait	6f038bc1f3	Validate total advance against grand total considering write off amount	2017-04-03 17:56:05 +05:30
Nabin Hait	9300013acc	Validate total advance against grand total considering write off amount	2017-04-03 17:35:58 +05:30
Nabin Hait	8d8cba7faa	Validate total advance against grand total considering write off amount	2017-04-03 17:26:32 +05:30
Nabin Hait	2d132e32aa	Function name changed in company	2017-04-03 17:26:32 +05:30
Saurabh	2e47654f43	[fix] demo script for setup data	2017-04-03 17:25:55 +05:30
Nabin Hait	17ddd8f389	bumped to version 8.0.6	2017-04-03 13:48:13 +06:00
Nabin Hait	c469f2c954	Get POS profile fix	2017-04-03 13:01:11 +05:30
Nabin Hait	731efe3a95	Minor fix in gross profit report	2017-04-03 12:11:36 +05:30
Nabin Hait	2c892c7e7f	Indentation fixed in gross profit report	2017-04-03 12:05:35 +05:30
Nabin Hait	31334328ed	bumped to version 8.0.5	2017-04-01 19:32:55 +06:00
Rushabh Mehta	0d6db6c42c	[fix] add user default role	2017-03-31 23:02:19 +05:30
Nabin Hait	d991c8666c	bumped to version 8.0.4	2017-03-31 18:49:57 +06:00
Nabin Hait	85d1c07519	Merge pull request #8269 from rohitwaghchaure/v8_documentation [Documentation] Added for custom roles for page and report, fixed some broken images	2017-03-31 18:04:44 +05:30
Nabin Hait	04ab7dfd2f	Update role-permisison-for-page-and-report.md	2017-03-31 18:04:15 +05:30
Faris Ansari	eae30e5642	[fix] Show project title in kanban view (#8268 ) - frappe/erpnext#8232	2017-03-31 17:46:12 +05:30
Nabin Hait	065302298f	Merge pull request #8261 from rohitwaghchaure/pull_project_from_bom_to_po [enhance] Get project from bom on production order	2017-03-31 17:40:43 +05:30
Nabin Hait	b15d999147	Merge branch 'develop' into gross_profit_issue_v_8	2017-03-31 17:39:45 +05:30
Rushabh Mehta	4b0381c820	[fix] tests	2017-03-31 17:36:48 +05:30
Rushabh Mehta	f0b4562a95	[refactor] move purchase_common.js -> public/js/controllers/buying.js	2017-03-31 17:36:48 +05:30
Rushabh Mehta	cc8b2b2fdb	[fix] [refactor] demo for v8 and remove purchase common	2017-03-31 17:36:48 +05:30
Rohit Waghchaure	67a3e65f08	[Documentation] Added for custom roles for page and report, fixed some broken images	2017-03-31 17:22:58 +05:30
Rushabh Mehta	dc89916aa9	[fix] salary component fix for abbr	2017-03-31 17:20:57 +05:30
Rushabh Mehta	9d9cb8b7b1	Revert "Add link field Package Code (fixes #8094 )"	2017-03-31 14:35:23 +05:30
Rohit Waghchaure	e7c0188732	[enhance] Get project from bom on production order	2017-03-31 13:40:06 +05:30
Rohit Waghchaure	34b1dba9aa	[fix] get_valuation_rate takes 4 arguments 3 given in gross profit report	2017-03-31 12:44:10 +05:30
Nabin Hait	c040015bb5	Used db_update in patch to bypass validate and on_update method	2017-03-31 11:58:19 +05:30
Rushabh Mehta	b66edd19ca	[minor] refactor transaction.js	2017-03-31 10:50:58 +05:30
Ricardo Johann	033e2fa8b6	changed accumulated header	2017-03-31 02:18:54 -03:00
Nabin Hait	79fddcfac1	bumped to version 8.0.3	2017-03-31 00:20:27 +06:00
Revant Nandgaonkar	3d5bdeb90d	[Fix] patch v7_2.contact_address_links	2017-03-30 23:14:58 +05:30
Revant Nandgaonkar	d07c041125	[Fix] Addresses linked back to Lead	2017-03-30 23:14:58 +05:30
Nabin Hait	b207a0542a	bumped to version 8.0.2	2017-03-30 20:22:42 +06:00
Nabin Hait	620bde7144	Updated modified date to reload sales uom	2017-03-30 19:50:45 +05:30
Nabin Hait	896fd1aca7	bumped to version 8.0.1	2017-03-30 20:05:51 +06:00
Nabin Hait	e503f68ec7	Merge pull request #8229 from rohitwaghchaure/pos_highlight_issue [fix] POS cart item's highlighted issue	2017-03-30 19:26:33 +05:30
Rohit Waghchaure	a86bb69adf	[fix] POS cart item's highlighted issue	2017-03-30 19:16:38 +05:30
Nabin Hait	3b5b081ac4	bumped to version 8.0.0	2017-03-30 18:58:20 +06:00
Nabin Hait	d00218ece3	Merge pull request #8227 from manassolanki/contact_report Addition of few more fields in student contact report	2017-03-30 17:43:33 +05:30
Nabin Hait	93c15383b8	[translations]	2017-03-30 16:57:19 +05:30
Nabin Hait	3c2be33adf	Merge pull request #8226 from mbauskar/item-varient-fix [minor] make varient fixes in item.js	2017-03-30 16:05:34 +05:30
Manas Solanki	4be52d8a20	Addition of few more fields in student contact report	2017-03-30 16:04:26 +05:30
Nabin Hait	6bd791742f	Change log for version 8	2017-03-30 16:00:43 +05:30
mbauskar	90d82be966	[minor] make varient fixes in item.js	2017-03-30 15:36:46 +05:30
Nabin Hait	eb6fa5b70c	Update attendance.py	2017-03-30 14:11:47 +05:30
Nabin Hait	1f6bd0ad37	Fixed merge conflict	2017-03-30 13:15:22 +05:30
Nabin Hait	a9bef56a94	bumped to version 7.2.32	2017-03-30 13:44:34 +06:00
Nabin Hait	a24f8dbb8f	Merge branch 'develop' into update-disbursment-date	2017-03-30 13:06:28 +05:30
Kanchan Chauhan	37d8f643cc	Read permissions to Employee on Employee Loan and Loan Type	2017-03-30 13:05:49 +05:30
Kanchan Chauhan	400c6f5aef	Disbursement Date fetched from JV - Employee Loan	2017-03-30 13:04:05 +05:30
mbauskar	07e6bdd4f2	[minor] check employee date of joining before marking the employee attendance	2017-03-30 12:52:29 +05:30
Kanchan Chauhan	b87c174898	Employee Loan Dashboard	2017-03-30 12:51:46 +05:30
CH	99752e58ec	VAT rates update for France	2017-03-30 12:45:08 +05:30
Kanchan Chauhan	5ac740b3cb	[Fix] From Date and To Date not to be auto calculated for Timesheet Salary	2017-03-30 12:44:28 +05:30
Manas Solanki	3528d08178	[Fix] Fix in program enrollment tool and report	2017-03-30 12:21:49 +05:30
Nabin Hait	f912317fae	Stock Balance: Show records based on all child item groups if filters set based on group node	2017-03-29 18:08:10 +05:30
Nabin Hait	e2fef16d78	Made join_table query optional based on item group filter	2017-03-29 17:51:05 +05:30
Javier Wong	41bf1ba7b3	[enhancement] Stock Balance Report - Added Item Group Filter	2017-03-29 17:51:05 +05:30
Ricardo Johann	3d1434afe7	Export total labels	2017-03-29 17:44:17 +05:30
addymuliady	0dd00eb418	Update accounts-settings.md	2017-03-29 17:40:01 +05:30
Nabin Hait	64e9c4abf4	Changed label of hide_tax_id field	2017-03-29 17:39:08 +05:30
Makis Etzoglou	82e6bc45e4	tax_id add to Sales Order, Delivery Note, and Sales Invoice	2017-03-29 17:39:08 +05:30
Saurabh	a5ddeb44e7	[fix] remove integraton service reference from documentation	2017-03-29 17:32:04 +05:30
Kanchan Chauhan	35b12e2ea6	Company in Leave Control Panel	2017-03-29 17:30:56 +05:30
mbauskar	de98ff6bb9	[minor] hide the stock details section if update_stock is unchecked	2017-03-29 17:29:58 +05:30
rohitwaghchaure	afa93c624b	[fix] Reserved qty is not calculating properly in BIN for multi sales UOM (#8203 )	2017-03-29 17:29:20 +05:30
Manas Solanki	8519b4bfe4	Changes in Program Enrollment and Report for Student Contact Details (#8176 ) * Added the student house name in the program enrollment * added report for the student contact details * Enabled tag in Student master and fix in student enrollment tool * [Fix] School House and Report	2017-03-29 16:07:31 +05:30
Nabin Hait	79731360ed	Merge pull request #8126 from kickapoo/issue8094 Add link field Package Code (fixes #8094)	2017-03-28 20:48:39 +05:30
Nabin Hait	fede6d8fbe	Updated modified date for production order	2017-03-28 20:42:42 +05:30
Stavros Anastasiadis	b9bbb3c3db	Add link field Package Code (fixes #8093 )	2017-03-28 16:09:52 +03:00
Neil Trini Lasrado	193c8919b9	Fixed issue with misleading error message on Stock Entry creation of Serialized Items	2017-03-28 17:43:23 +05:30
Nabin Hait	d1f6cc88f2	Required items table in Production order	2017-03-28 17:08:40 +05:30
Nabin Hait	dac525433c	Merge pull request #8178 from nabinhait/develop Patch order changed for multiple uoms in sales cycle	2017-03-28 16:55:57 +05:30
Faris Ansari	49a3d6d8f6	Update POS screenshot	2017-03-28 16:17:30 +05:30
Nabin Hait	6c3eb36c35	Merge branch 'develop' into customs_tariff_number	2017-03-28 13:51:44 +05:30
Nabin Hait	da749f716b	Merge pull request #8172 from rohitwaghchaure/credit_note_serial_no_issue [fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice	2017-03-28 13:49:32 +05:30
Nabin Hait	2cf5ca28f6	Merge pull request #8173 from nabinhait/hotfix In gross profit report, if incoming rate not found from last sle, consider average valuation rate	2017-03-28 13:49:09 +05:30
Nabin Hait	621dcc3c84	Patch order changed for multiple uoms in sales cycle	2017-03-28 13:45:56 +05:30
Nabin Hait	77b2fef41e	Fixed test cases	2017-03-28 13:39:26 +05:30
Nabin Hait	d20f8585ae	Merge branch 'manufacturer_childtable' of https://github.com/dottenbr/erpnext into dottenbr-manufacturer_childtable	2017-03-28 13:31:28 +05:30
Rohit Waghchaure	d7908f8e3a	[fix] sales order with status closed fetching on production planning tool	2017-03-28 12:30:23 +05:30
Nabin Hait	77c970549b	In gross profit report, if incoming rate not found from last sle, consider average valuation rate	2017-03-28 12:20:31 +05:30
Rohit Waghchaure	5ecbaa408b	[fix] During making credit note from sales invoice, system fetching new serial no instead of old serial no from the sales invoice	2017-03-28 12:09:07 +05:30
Nabin Hait	0329c0ffab	Test case fixed for production order	2017-03-27 19:11:45 +05:30
Nabin Hait	5b60ef2dce	Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked	2017-03-27 16:29:51 +05:30
Nabin Hait	8bf58367b8	Fixed merge conflict	2017-03-27 12:30:01 +05:30
Nabin Hait	70c3f79d12	bumped to version 7.2.31	2017-03-27 12:57:38 +06:00
Nabin Hait	9c8159be8f	Merge pull request #8129 from rohitwaghchaure/pos_v8_enhance_and_issue [fix] customer edit, numeric keypad visibility, on selection of item highlight the background issue in the pos	2017-03-27 12:25:18 +05:30
Nabin Hait	68fb20b811	Merge pull request #8131 from rohitwaghchaure/purchase_analytics_issue [fix] Purchase analytics report not loading	2017-03-27 12:24:46 +05:30
Dominik Ottenbreit	fc9ed4da24	Add Customs Tariff Number	2017-03-24 15:53:03 +01:00
Dominik Ottenbreit	ea617da277	fix translations that have to do with term 'close' which was not well translated	2017-03-24 15:24:55 +01:00
Dominik Ottenbreit	6eb202ef3a	fix patch after test, fix variant based on manufacturer, add json for item_manufacturer	2017-03-24 14:49:52 +01:00
Dominik Ottenbreit	3938c61996	migrate from manufacturer to manufacturer childtable	2017-03-24 14:24:34 +01:00
Rohit Waghchaure	f74b02140c	[fix] Purchase analytics report not loading	2017-03-24 17:37:02 +05:30
Rohit Waghchaure	b719dc53fc	[fix] customer edit and numeric keypad visibility issue in the pos	2017-03-24 17:03:50 +05:30
Nabin Hait	00b04ed61e	Merge pull request #8076 from KanchanChauhan/qty-in-shopping-cart Show qty in Shopping Cart	2017-03-24 13:14:03 +05:30
Nabin Hait	bf2a7efca4	Account name changed in standard chart of accounts	2017-03-24 13:01:35 +05:30
Nabin Hait	214ea8f2c8	Merge pull request #8119 from robulik/develop [minor] fixes of translatable strings in web pages	2017-03-24 12:59:02 +05:30
Kanchan Chauhan	a844040781	Show qty in Shopping Cart	2017-03-23 18:22:02 +05:30
Robert Kirschner	b8f5148a44	[minor] fix: translatable title, h1, button on product_search page. Address row in web view has translatable address type	2017-03-23 13:43:26 +01:00
Nabin Hait	9ba1be60b7	Merge pull request #8039 from netchampfaris/pos-ui-fix [pos] ui fix for small screens frappe/erpnext#8029	2017-03-23 17:14:39 +05:30
Nabin Hait	2aafdd622b	Merge pull request #8047 from KanchanChauhan/warehouse-for-dropship [Fix] Warehouse not required for Dropship	2017-03-23 17:06:18 +05:30
Nabin Hait	b6b97f25d0	Merge pull request #8048 from KanchanChauhan/bom-based-on-project Project filter in BOM selection in Production Order	2017-03-23 17:04:53 +05:30
Nabin Hait	4a8a62a202	Merge pull request #8053 from umairsy/video-pages updated erpnext-learn pages	2017-03-23 17:02:34 +05:30
Nabin Hait	d25e314ccb	Merge pull request #8054 from rohitwaghchaure/purchase_return_issue_invoice [fix] Quantity is not copying in the Received Qty during making of debit note from the purchase invoice	2017-03-23 17:01:58 +05:30
Nabin Hait	f44f04e33a	Merge pull request #8063 from khrlzhfr/patch-1 Update standard_chart_of_accounts.py	2017-03-23 17:01:34 +05:30
Robert Kirschner	db068ac6c4	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2017-03-23 12:29:43 +01:00
Nabin Hait	c7dc838306	Merge pull request #8068 from rohitwaghchaure/asset_depreciation_issue [fix] Precision issue during making of depreciation schedule	2017-03-23 16:59:12 +05:30
Nabin Hait	5168286ea0	Merge pull request #8072 from lb-/patch-1 Update the-champion.md - grammar	2017-03-23 16:58:19 +05:30
Nabin Hait	8373b8e50d	Merge pull request #8075 from netchampfaris/asset-image-fix [fix] asset image in image view	2017-03-23 16:58:05 +05:30
Nabin Hait	33f2b659e4	Merge pull request #8079 from robulik/develop [fix] selecting new address in cart webpage unchecks previously checked	2017-03-23 16:52:39 +05:30
Nabin Hait	8de911b5b4	Merge pull request #8086 from KanchanChauhan/read-perm-to-guest [Minor] Guest should have read permissions on Job Openings	2017-03-23 16:50:45 +05:30
Robert Kirschner	d162eb367c	[minor] fix translation strings in cart web view	2017-03-23 12:18:24 +01:00
Robert Kirschner	0af93a782d	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2017-03-23 12:10:46 +01:00
Nabin Hait	46bccb55c5	Merge pull request #8080 from rmehta/item-variants-by-mfg [feature] ability to have variants based on manufacturer	2017-03-23 16:29:41 +05:30
Nabin Hait	422ef584fa	Merge pull request #8090 from KanchanChauhan/date-span-in-salary-slip [Minor] From date, To date based on Payroll Frequency	2017-03-23 16:16:51 +05:30
Nabin Hait	b132428184	Merge pull request #8091 from mbauskar/cart-address-fixes [minor] fixed shipping and billing address issue in cart	2017-03-23 16:16:11 +05:30
Rohit Waghchaure	57f35a25a1	[fix] UnpickleError, removed _ method from the argument of the function	2017-03-23 14:55:52 +05:30
Faris Ansari	3011006ff2	Merge pull request #8097 from frappe/netchampfaris-documentation-1 Add new screenshots for Workflows documentation	2017-03-22 17:50:17 +05:30
Faris Ansari	1e7f739c84	Add new screenshots for Workflows documentation	2017-03-22 17:48:51 +05:30
Faris Ansari	7fbc1c2161	Update Workflows Add new images	2017-03-22 17:45:52 +05:30
mbauskar	67e3e32dd6	[minor] fixed shipping and billing address issue in cart	2017-03-22 16:14:43 +05:30
Kanchan Chauhan	076e9d6af8	[Minor] From date, To date based on Payroll Frequency	2017-03-22 16:07:03 +05:30
Robert Kirschner	c6b52a321e	update on cart.js pull request feedback	2017-03-22 08:10:30 +01:00
Kanchan Chauhan	730ad5a507	[Minor] Guest should have read permissions on Job Openings	2017-03-22 12:37:38 +05:30
Rushabh Mehta	43583d6497	Update item.js	2017-03-21 17:49:53 +01:00
Rushabh Mehta	a07c43fd68	[feature] ability to have variants based on manufacturer	2017-03-21 17:48:34 +01:00
Robert Kirschner	0a33d4ffc5	[fix] selecting new address in cart web page unchecks previously checked address	2017-03-21 14:52:59 +01:00
Rohit Waghchaure	6ee91ec9c6	on selection of row highlight the background in the cart	2017-03-21 15:55:09 +05:30
Faris Ansari	e1acb766ac	[fix] asset image in image view	2017-03-21 14:18:30 +05:30
LB (Ben Johnston)	71f4fbf467	Update the-champion.md - grammar	2017-03-21 12:50:17 +07:00
Rohit Waghchaure	b69d311268	[fix] precision issue during making of depreciation schedule	2017-03-20 16:30:34 +05:30
Khairil Zhafri	4d6d456a0d	Update standard_chart_of_accounts.py Minor spelling edits	2017-03-20 00:15:34 +08:00
Rohit Waghchaure	414c0ab3bb	[fix] Quantity is not copying in the Received Qty during making of debit note	2017-03-17 17:19:17 +05:30
Umair Sayyed	024896d806	updated erpnext-learn pages	2017-03-17 12:55:01 +05:30
rohitwaghchaure	2b9c95a940	Merge pull request #8043 from rohitwaghchaure/pos_issue_v8 [fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand	2017-03-16 17:56:20 +05:30
Kanchan Chauhan	7cf1a1d84b	Project filter in BOM selection in Production Order	2017-03-16 17:09:37 +05:30
Kanchan Chauhan	6f7457a1b0	[Fix] Warehouse not required for Dropship	2017-03-16 16:03:41 +05:30
Rohit Waghchaure	75177c0e35	[fix] POS, amount not updating on change of price, on zero of discount rate has not reset, pricing rule not working for brand	2017-03-16 15:47:25 +05:30
Faris Ansari	d79f239001	[pos] ui fix for small screens frappe/erpnext#8029	2017-03-16 12:18:35 +05:30
mbauskar	27efc91db0	[minor] make item code mandatory if update_stock is selected	2017-03-15 18:57:18 +05:30
Manas Solanki	ad2dc2c747	[Fix] Enrolling the student	2017-03-15 18:22:57 +05:30
Rushabh Mehta	f340e19ea7	[minor] field re-arrangements in sales invoice, purchase invoice, stock reco	2017-03-15 15:12:43 +05:30
Nabin Hait	56f650f342	Merge branch 'master' into develop	2017-03-15 11:28:07 +05:30
Nabin Hait	1157ee365b	bumped to version 7.2.30	2017-03-15 11:58:06 +06:00
Nabin Hait	ee7b4f2882	Merge pull request #8016 from rmehta/posting-date-option [feature] posting date, time is always current unless explicitly set	2017-03-15 11:22:04 +05:30
Nabin Hait	505ed25f10	Merge pull request #8017 from nabinhait/develop Field order changed for 'Qty as per Stock UOM'	2017-03-14 22:39:36 +05:30
Nabin Hait	1ba71a0b3a	Merge pull request #8018 from mbauskar/develop [minor] custom script to create issue, lead, opportunity from email	2017-03-14 22:39:26 +05:30
Nabin Hait	79bce2a71d	Merge pull request #8019 from rohitwaghchaure/pos_serial_no_issue [fix] User sales one serial number multiple time from the POS	2017-03-14 22:38:28 +05:30
Rushabh Mehta	4f3da42b75	[fixes] for tests	2017-03-14 21:29:55 +05:30
Rushabh Mehta	131866a11a	[fixes] for tests	2017-03-14 21:06:15 +05:30
Rushabh Mehta	82c258948d	[fixes] for recurring and tests	2017-03-14 19:13:39 +05:30
Rohit Waghchaure	e259a9b068	[fix] User sales one serial number multiple time from the POS	2017-03-14 19:05:21 +05:30
mbauskar	f54b1047b8	[minor] custom script to create issue, lead, opportunity from email	2017-03-14 17:57:47 +05:30
Nabin Hait	3d731df7e3	Field order changed for 'Qty as per Stock UOM'	2017-03-14 17:24:57 +05:30
Rushabh Mehta	f6dee248ee	Update company.json	2017-03-14 17:10:01 +05:30
Rushabh Mehta	6d4a52562b	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +05:30
Rushabh Mehta	6b53792aea	[fix] posting date, time is always current unless explicitly set	2017-03-14 17:06:51 +05:30
Rohit Waghchaure	faedf8274c	[fix] gross profit permission issue	2017-03-14 14:56:24 +05:30
Nabin Hait	6a053a989e	Merge pull request #8014 from rohitwaghchaure/contact_issue_for_website_generator [fix] Removed customer, supplier and added link_name from website_list_for_contact file	2017-03-14 14:46:48 +05:30
Saurabh	0d47d51407	[fix] modified payment request to cope with new payment structure (#7957 ) * [fix] modified payment request to cope with new payment structure * [fix] moved payment gateway doctype from accounts to core	2017-03-14 14:46:05 +05:30
Rohit Waghchaure	11fa7a9311	[fix] Removed customer, supplier and added link_name from website_list_for_contact file	2017-03-14 13:26:10 +05:30
Manas Solanki	2922660b34	[Fix] Student attendance tool- Handling double-click on button	2017-03-14 12:50:58 +05:30
rohitwaghchaure	27e86201fc	Merge pull request #8007 from rohitwaghchaure/pos_profile_issue [fix] Value assignment issue for country field in pos profile	2017-03-14 00:22:23 +05:30
Rohit Waghchaure	cc034a8983	[fix] Value assignment issue for country in the pos profile	2017-03-13 22:44:48 +05:30
rohitwaghchaure	0216f6e6eb	Merge pull request #7995 from saurabh6790/restrict_negative_qty_in_pr [fix] validate negative quantity while creating purchase receipt	2017-03-13 18:24:24 +05:30
Nabin Hait	26ed675240	Merge pull request #7996 from netchampfaris/ui-fixes [ui] show assignees in gantt popup frappe/erpnext#6916	2017-03-13 17:22:56 +05:30
Saurabh	4f4d0a8369	[fix] validate negative quantity while creating purchase receipt	2017-03-13 15:37:47 +05:30
Faris Ansari	df65d21225	[ui] show assignees in gantt popup frappe/erpnext#6916	2017-03-13 14:52:56 +05:30
Nabin Hait	86cb0cc010	Merge pull request #7991 from mbauskar/develop [minor] display campaign field only if source is Campaign	2017-03-13 11:19:59 +05:30
mbauskar	7f42e90832	[minor] display campaign field only if source is Campaign	2017-03-12 21:57:52 +05:30
Nabin Hait	1ed8bc4c36	Gross Profit report: Consider Sales team table only if grouped by sales person	2017-03-12 17:10:41 +05:30
Nabin Hait	b2a8482cc5	In Student Sibling table, the current student id should not appear as sibling.	2017-03-12 16:55:05 +05:30
Nabin Hait	fb4b8d926f	Company based on exising company fix	2017-03-12 16:55:05 +05:30
Nabin Hait	ae205f878a	Set default taxes and charges while creating quotation from opportunity	2017-03-12 16:55:05 +05:30
Nabin Hait	d0d22ff203	copy letter head from invoice to payment entry	2017-03-12 16:55:05 +05:30
Nabin Hait	6923397ef6	Show net total in salary slip log in Process Payroll. Fixed #7986	2017-03-12 16:55:05 +05:30
Nabin Hait	c5204f56e2	Merge pull request #7909 from KanchanChauhan/employee-loan-jv JV on submitting Employee Loan	2017-03-12 16:50:48 +05:30
Nabin Hait	132193309c	Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes Multiple Salary Fixes	2017-03-12 16:48:11 +05:30
Nabin Hait	d402829d17	Merge pull request #7980 from rohitwaghchaure/target_bounty_redesign [Enhancement] POS Redesign and new features	2017-03-12 16:47:26 +05:30
Nabin Hait	fd9b2467d6	Merge pull request #7966 from rohitwaghchaure/item_variant_issue_for_nuermic [Fix] Item variants broken when using naming series for items and vriants of numeric value	2017-03-12 16:34:40 +05:30
mbauskar	124cf14429	[minor] ignore lead addresses delete query if address against lead not found	2017-03-11 16:02:20 +05:30
Rohit Waghchaure	0169341917	[Fix] Item variants broken when using naming series for items and vriants of numeric value	2017-03-10 19:40:08 +05:30
Rohit Waghchaure	87fa59a710	[Fix] Customer delete, customer edit functionality, added country field in the pos profile	2017-03-10 19:37:02 +05:30
Faris Ansari	1fe1518398	[pos] ui cleanup	2017-03-10 17:00:43 +05:30
Rohit Waghchaure	6068aecc2e	minor fix	2017-03-10 17:00:43 +05:30
Faris Ansari	07c9f35779	ui cleanup	2017-03-10 17:00:42 +05:30
Faris Ansari	45510109b6	[pos] cleanup	2017-03-10 17:00:42 +05:30
Rohit Waghchaure	017f5005e0	fixed pos numeric keypad functionality	2017-03-10 17:00:42 +05:30
Faris Ansari	339d9c954a	minor changes	2017-03-10 17:00:42 +05:30
Rohit Waghchaure	1312fe31a9	Provision to edit customer and address details	2017-03-10 17:00:42 +05:30
Faris Ansari	adcb3c62fa	wip	2017-03-10 17:00:42 +05:30
Rohit Waghchaure	3b5a412a9c	offline email for POS	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	56a7974b58	added event on numeric keypad	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	86ab6a93b4	[Enhancement] POS, numeric keypad	2017-03-10 17:00:41 +05:30
Faris Ansari	1f261a8695	UI changes	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	b5097ec161	offline email for POS	2017-03-10 17:00:41 +05:30
Rohit Waghchaure	f0c7ba4b1f	added event on numeric keypad	2017-03-10 17:00:40 +05:30
Rohit Waghchaure	e30f83a8af	[Enhancement] POS, numeric keypad	2017-03-10 17:00:40 +05:30
Rushabh Mehta	83aa5ee3df	[messages] cleanup	2017-03-10 12:47:29 +05:30
Rushabh Mehta	db206f2d10	[minor] develop_version	2017-03-10 09:39:31 +05:30
Rushabh Mehta	868bb26e24	[sample] add help for sample tasks and make them into notifications	2017-03-09 18:11:11 +05:30
Kanchan Chauhan	37a57813fa	Multiple Salary Fixes	2017-03-09 13:00:35 +05:30
Rushabh Mehta	aea1c2a1e3	[minor] allow sales order delivery date before order date	2017-03-09 12:46:51 +05:30
Kanchan Chauhan	ffd1f112e6	JV on submitting Employee Loan	2017-03-09 12:21:37 +05:30
Nabin Hait	733855a4c3	Merge pull request #7956 from manassolanki/sibling [Fixes] School	2017-03-09 11:04:38 +05:30
Nabin Hait	d22bb682a5	Merge pull request #7960 from rohitwaghchaure/material_request_issue_for_po [Fix] Material Request to Production Order not working	2017-03-09 10:57:26 +05:30
Nabin Hait	f73a44aa8d	Update material_request.py	2017-03-09 10:57:00 +05:30
Rohit Waghchaure	02fb5880fe	[Fix] Material Request to Production Order not working	2017-03-08 18:38:12 +05:30
Kanchan Chauhan	a64f53801b	[Minor] Label change in Expense Claim	2017-03-08 16:59:49 +05:30
Manas Solanki	631fab012f	[Fix] Student attendance tool	2017-03-08 14:44:52 +05:30
Manas Solanki	d41836b386	[Fix] Student Sibling	2017-03-08 14:44:52 +05:30
Nabin Hait	52daaca885	Fixed merge conflict	2017-03-08 14:30:38 +05:30
Nabin Hait	27c4fdc2df	bumped to version 7.2.29	2017-03-08 15:00:12 +06:00
Nabin Hait	804c4fc4a7	Merge pull request #7951 from rohitwaghchaure/purchase_return_issue [Fix] Purchase return issue	2017-03-08 14:28:55 +05:30
mbauskar	02198ec8b0	removed the test_clear_blank_rows test case from JE	2017-03-08 12:34:36 +05:30
Rushabh Mehta	b9cdb05934	[minor] renamed portal hook	2017-03-08 12:34:03 +05:30
Nabin Hait	33fb6ae323	Fixed merge conflict	2017-03-08 11:18:15 +05:30
Nabin Hait	f967206523	bumped to version 7.2.28	2017-03-08 11:46:00 +06:00
Rohit Waghchaure	d05a8737f9	[Fix] Purchase return issue	2017-03-08 10:30:23 +05:30
Nabin Hait	1af471a16f	Merge pull request #7938 from netchampfaris/task-list [gantt] show task project in popup	2017-03-07 19:41:52 +05:30
Nabin Hait	f822b875ba	Merge pull request #7941 from nabinhait/v8_fixes Set new name in warehouse_name on rename of warehosue	2017-03-07 17:16:44 +05:30
Nabin Hait	961bdc3743	Set new name in warehouse_name on rename of warehosue	2017-03-07 15:02:34 +05:30
Abdulla P I	cbe035b08a	Only enabled user to be fetched	2017-03-07 13:34:08 +05:30
Faris Ansari	0e4b924f59	[gantt] show task project in popup	2017-03-07 12:01:39 +05:30
mbauskar	c03f275e7a	[minor] allowed the credit and debit amount to be 0 in JE	2017-03-07 11:59:55 +05:30
Nabin Hait	f5a9c8ecf2	Merge pull request #7936 from rohitwaghchaure/financial_statement_issue Minor fix	2017-03-07 00:27:53 +05:30
Rohit Waghchaure	9f4317e9b8	minor fix	2017-03-06 23:42:45 +05:30
Rohit Waghchaure	0bb434af3f	minor fix in patch	2017-03-06 18:52:34 +05:30
Nabin Hait	b3ffd6b282	Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles Changed userrole to has role, commonify role editor of the user	2017-03-06 18:44:53 +05:30
Nabin Hait	fe876c0805	Test case fixed for multiple uom in selling	2017-03-06 16:41:13 +05:30
Nabin Hait	e68f32cf19	UOM Conversion in selling	2017-03-06 16:41:13 +05:30
Kanchan Chauhan	5a980ac87a	UOM Conversion in Selling	2017-03-06 16:41:12 +05:30
Nabin Hait	0697d62603	Merge pull request #7931 from KanchanChauhan/job-applicant-fix [Fix] Candidate can apply to multiple jobs	2017-03-06 16:38:00 +05:30
Rohit Waghchaure	611a70a12a	changes in the report roles	2017-03-06 16:36:46 +05:30
Kanchan Chauhan	8411be7720	[Fix] Candidate can apply to multiple jobs	2017-03-06 14:40:43 +05:30
Rohit Waghchaure	e7485150a1	added roles in the report	2017-03-06 14:26:09 +05:30
Rohit Waghchaure	312498060f	changed doctype name userrole to has role	2017-03-06 14:24:39 +05:30
Rohit Waghchaure	d59f8b32cd	changed user_roles to roles	2017-03-06 14:24:39 +05:30
S. Vigneux	ff2d5d8ad9	Update batch.md The practice=> The practice	2017-03-05 12:44:03 -05:00
Nabin Hait	a07c3193cf	Merge pull request #7889 from rohitwaghchaure/sales_return_issue_for_pos [Fix] Sales Return Invoice (Is POS) doesn't show correct payment data	2017-03-04 18:32:40 +05:30
Rohit Waghchaure	a31ffbc745	[Fix] Sales Return Invoice (Is POS) doesn't show correct payment data	2017-03-03 16:28:49 +05:30
Rohit Waghchaure	f8aa6ed46b	removed fiscal year and month from the print	2017-03-02 17:51:15 +05:30
mbauskar	91c6ffde86	[minor] fixes contact field set query for opportunity	2017-03-02 17:29:16 +05:30
Nabin Hait	78a650062c	Update company.json	2017-03-02 14:48:49 +05:30
Nabin Hait	57a47a83a0	Merge pull request #7887 from rohitwaghchaure/capacity_planning [Fix] Pull operation on production order, when making from sales order	2017-03-02 14:17:09 +05:30
Nabin Hait	a0fb3e5128	Merge pull request #7888 from KanchanChauhan/payroll-fix [Fix] JV entry for Employee Loan only if Loan exists	2017-03-02 14:15:59 +05:30
Nabin Hait	42bc399f2a	Merge pull request #7890 from KanchanChauhan/hr-page [Minor] Employee Loan Management moved up in HR Page	2017-03-02 14:14:04 +05:30
Nabin Hait	bc10ea897d	Merge pull request #7893 from pratu16x7/crm-docs CRM docs update	2017-03-02 14:13:19 +05:30
Kanchan Chauhan	cfb0adff98	[Minor] Removed Paid status from Salary Slip	2017-03-02 12:59:35 +05:30
Nabin Hait	834d616c60	Merge branch 'master' into develop	2017-03-02 12:38:15 +05:30
Nabin Hait	1cc7024cb4	bumped to version 7.2.27	2017-03-02 13:08:14 +06:00
Rushabh Mehta	7067ff026a	[minor] add progress in desktop help message	2017-03-02 11:14:09 +05:30
Rushabh Mehta	e7900b24a0	[minor] add progress in desktop help message	2017-03-02 11:13:18 +05:30
Saurabh	b3134d34fa	[fix] add from date field to salary structure in setup demo data	2017-03-02 08:43:08 +05:30
Nabin Hait	258c8199fb	Merge pull request #7842 from superlack/develop Add Sales Orders to Project costing and billing section	2017-03-01 17:20:23 +05:30
pratu16x7	4e71337f3d	fix lead, customer, opportunity pages	2017-03-01 04:02:50 +05:30
Nabin Hait	18b7364a81	Merge branch 'master' into develop	2017-02-28 18:56:26 +05:30
Nabin Hait	db2aefa3a6	bumped to version 7.2.26	2017-02-28 19:26:25 +06:00
Rushabh Mehta	f8b19e07cf	[minor] activation messages only for non activated users	2017-02-28 18:54:07 +05:30
Kanchan Chauhan	639eebdae5	[Minor] Employee Loan Management moved up in HR Page	2017-02-28 18:01:07 +05:30
Kanchan Chauhan	e6254b96c4	[Fix] JV entry for Loan only if Loan exists	2017-02-28 17:42:09 +05:30
Rohit Waghchaure	2c2ce8c557	[Fix] Pull operation on production order, when making from sales order	2017-02-28 17:12:18 +05:30
Nabin Hait	6bbf141d57	Merge branch 'develop' into link_mrs	2017-02-28 15:55:35 +05:30
Nabin Hait	38c7ad2c69	Update supplier_quotation.json	2017-02-28 15:53:10 +05:30
Nabin Hait	491d2ad140	Update request_for_quotation.json	2017-02-28 15:52:43 +05:30
Nabin Hait	365ed5dea9	Update purchase_order.json	2017-02-28 15:51:00 +05:30
Nabin Hait	fd37395995	Merge pull request #7878 from netchampfaris/lead-fix fix date compare in contact_date	2017-02-28 15:37:42 +05:30
Faris Ansari	0ded707397	fix date compare in contact_date	2017-02-27 21:51:46 +05:30
superlack	62d7ba0afd	Update project.py	2017-02-27 07:00:30 -08:00
Nabin Hait	cda28ceeec	[translations]	2017-02-27 17:46:47 +05:30
Nabin Hait	409062b8a4	Merge pull request #7869 from KanchanChauhan/dependent-tasks Dependent task dates gets updated with parent dates	2017-02-27 17:34:09 +05:30
Nabin Hait	631ecad985	Merge pull request #7875 from KanchanChauhan/employee-loan-fixes [Fix] Multiple fixes in Employee Loan	2017-02-27 17:28:20 +05:30
Nabin Hait	3ddc26060a	Merge pull request #7876 from KanchanChauhan/salary-slip-fix [Fix] Update totals on salary component deletion	2017-02-27 17:26:39 +05:30
Kanchan Chauhan	c02745c826	[Fix] Update totals on salary component deletion	2017-02-27 17:21:41 +05:30
Kanchan Chauhan	a13adc0e6b	[Fix] Multiple fixes in Employee Loan	2017-02-27 16:56:00 +05:30
Nabin Hait	b9741b6ed5	Merge branch 'master' into develop	2017-02-27 15:41:44 +05:30
Nabin Hait	b99a38d6ae	bumped to version 7.2.25	2017-02-27 16:11:43 +06:00
Nabin Hait	a2afc4e11c	Update activation.py	2017-02-27 15:39:29 +05:30
Kanchan Chauhan	e76685d925	Dependent task dates gets updated with parent dates	2017-02-27 14:55:03 +05:30
Nabin Hait	c642f76a4d	Fixed merge conflict	2017-02-27 14:40:53 +05:30
Nabin Hait	e0d661f433	Merge branch 'hotfix'	2017-02-27 14:31:10 +05:30
Nabin Hait	79c5ee0a65	bumped to version 7.2.24	2017-02-27 15:01:10 +06:00
Nabin Hait	704b6a3e1f	Merge pull request #7756 from mlisb0n/master [Translation] Revised and updated all translations to meet european portuguese business/accounting terminology	2017-02-27 14:10:51 +05:30
Rohit Waghchaure	2087e574aa	[Fix] Serial nos not pulling on the delivery note, for language spanish add serial no button was not working	2017-02-27 13:43:04 +05:30
Nabin Hait	c238016aff	Merge pull request #7871 from KanchanChauhan/add-serial-no [Fix] Add Serial No fix for other langauges	2017-02-27 13:14:57 +05:30
Kanchan Chauhan	6981870a40	[Fix] Add Serial No fix for other langauges	2017-02-27 12:54:13 +05:30
robert schouten	4766562ff0	fix typo on get product bundle	2017-02-27 13:30:18 +08:00
Ben Cornwell-Mott	08c1e86b1c	Moved link button. Creates new row for unlinked quantities	2017-02-25 23:16:54 -08:00
Nabin Hait	72c7e73ce0	Merge pull request #7852 from rohitwaghchaure/production_order_issue [Fix] Production order operations scheduling issue	2017-02-25 11:03:43 +05:30
superlack	c95ebdb4e4	Update sales_order.py	2017-02-24 12:35:10 -08:00
superlack	f800892ec3	Update project.py	2017-02-24 12:33:59 -08:00
Rohit Waghchaure	94c30d81b1	[Fix] Production order operations scheduling issue	2017-02-24 19:21:40 +05:30
Nabin Hait	697150f339	Leave application overlap validation for half day and test cases	2017-02-24 18:53:34 +05:30
Manas Solanki	d77fac113f	Make All Assessment Group parent in assessment group tree	2017-02-24 15:30:22 +05:30
Nabin Hait	da73e1b806	Merge pull request #7851 from rohitwaghchaure/account_paid_to_payment_entry [Fix] Payment entry account Paid To Show receivable accounts for supplier	2017-02-24 15:18:50 +05:30
Kanchan Chauhan	26b79f108a	Leave Application Enchancement	2017-02-24 15:13:06 +05:30
Rohit Waghchaure	b983f26b98	[Fix] Payment entry account Paid To Show receivable accounts for supplier	2017-02-24 15:07:54 +05:30
Neil Trini Lasrado	c15b5db030	Added 'All Assessment Group' to fixtures	2017-02-24 13:16:46 +05:30
Neil Trini Lasrado	e4903b77b6	Added New Doctype - Assessment Code	2017-02-24 13:16:46 +05:30
Neil Trini Lasrado	15944b9ecf	Added Academic Term to Assessment Group	2017-02-24 13:16:46 +05:30
Nabin Hait	2bcacec5c6	Merge pull request #7576 from RobertSchouten/compact_dev [fix] compact print format not longer ignores format builder	2017-02-24 13:09:18 +05:30
Nabin Hait	ff5bd680c2	Merge pull request #7840 from rmehta/new-buttons [enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request	2017-02-24 12:57:13 +05:30
Nabin Hait	d9afd7e4aa	Merge pull request #7822 from rmehta/desktop-messages [enhance] desktop messages	2017-02-24 12:55:34 +05:30
Nabin Hait	9f0d64b679	Merge pull request #7841 from mbauskar/hotfix [minor] fixed assessment module icon	2017-02-24 12:50:16 +05:30
Manas Solanki	230df2c9d3	Link the sibling child table with the student doctype	2017-02-24 12:09:55 +05:30
Manas Solanki	53259fb91f	Change in student master should reflect in every linked doctype and child doctype	2017-02-24 11:25:04 +05:30
superlack	868ef7738f	Update project.json	2017-02-23 17:46:07 -08:00
superlack	23e5d40374	Update sales_order.py	2017-02-23 17:43:50 -08:00
superlack	c4587d2945	Update project.py	2017-02-23 17:39:05 -08:00
mbauskar	cea7d32b31	[minor] fixed assessment module icon	2017-02-23 20:28:47 +05:30
Rushabh Mehta	509543752c	[enhance] connect new buttons on dashboard to custom make buttons and fix text for payment request	2017-02-23 17:03:46 +05:30
Nabin Hait	5278da8901	Merge pull request #7830 from mbauskar/develop [minor] eval conditions for recurring sections and lead fields	2017-02-23 16:54:20 +05:30
Nabin Hait	8ec1b565f5	Merge pull request #7823 from KanchanChauhan/payroll-currency [Minor] Company default currency in Salary Slip and Structure	2017-02-23 16:52:23 +05:30
Nabin Hait	89f7767b51	Merge pull request #7818 from KanchanChauhan/product-bundle-fix [Fix] Disappearing Dropdown fixed	2017-02-23 16:49:49 +05:30
Kanchan Chauhan	52a5cb9ae3	[Fix] Holiday Calendar Fix	2017-02-23 16:15:12 +05:30
Nabin Hait	60db08fd7f	Merge pull request #7817 from KanchanChauhan/loan-management-fix [Minor] Field label rename	2017-02-23 16:09:11 +05:30
Kanchan Chauhan	951e31667b	[Minor] Company default currency in Salary Slip and Structure	2017-02-23 11:16:53 +05:30
Nabin Hait	97b3be6f9d	Update salary_structure_employee.json	2017-02-23 11:10:05 +05:30
KanchanChauhan	90b42c4fa2	Merge pull request #7826 from KanchanChauhan/landed-cost-voucher-test [Minor] Landed Cost Voucher test case fixed	2017-02-23 09:58:40 +05:30
Kanchan Chauhan	1d45a4312e	[Minor] Landed Cost Voucher test case fixed	2017-02-23 08:44:02 +05:30
mbauskar	ddb9f0bf78	[minor] lead hide/unhide campain_name, customer field depending on source	2017-02-22 18:54:47 +05:30
mbauskar	d6e409ea92	[minor] hide recurring section if document is in __local state	2017-02-22 18:22:14 +05:30
Kanchan Chauhan	fe61c314b7	[Minor] Landed Cost Voucher test case fixed	2017-02-22 17:25:26 +05:30
nick9822	089c5caea5	Sales analytics error after upgrade Hi Team, We were getting errors in sales analytics report after the upgrade. https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6 With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item. Please see whether its good or there is better solution for it. Thanks, Nick	2017-02-22 17:09:29 +05:30
Manas Solanki	7a61f12572	Fixes for attendance reports	2017-02-22 16:19:57 +05:30
Rushabh Mehta	05ce7ec7bb	[enhance] desktop messages	2017-02-22 16:15:43 +05:30
Kanchan Chauhan	b249a6e6f7	[Fix] Disappearing Dropdown fixed	2017-02-22 15:39:07 +05:30
Nabin Hait	5079c9ef47	Fixed merge conflict	2017-02-22 15:31:31 +05:30
Nabin Hait	633698affc	bumped to version 7.2.23	2017-02-22 15:35:27 +06:00
Kanchan Chauhan	6af7140763	[Minor] Field label rename	2017-02-22 14:58:34 +05:30
mbauskar	a8fa10d2a9	[minor] minor fixes for journal entry get_exchange_rate trigger	2017-02-22 14:51:09 +05:30
Nabin Hait	08847bd06a	minor fix	2017-02-22 13:05:46 +05:30
Nabin Hait	1e3a0b4632	Merge branch 'shishu' of https://github.com/manassolanki/erpnext into manassolanki-shishu	2017-02-22 12:12:58 +05:30
Nabin Hait	753c8dedde	Update api.py	2017-02-22 11:53:13 +05:30
Nabin Hait	2d8047837c	Merge pull request #7802 from KanchanChauhan/multiple-items-purchase [Fix] Throw error if item is added multiple time	2017-02-22 11:43:17 +05:30
Nabin Hait	1bdb6a57f2	Merge pull request #7809 from rohitwaghchaure/financial_statement_company_issue [Fix] Company fiscal year issue in financial statement	2017-02-22 11:41:16 +05:30
Kanchan Chauhan	f2803ac427	[Fix] Throw error if item is added multiple time	2017-02-22 10:40:38 +05:30
Manas Solanki	47aba953e2	Added student language doctype	2017-02-21 18:49:00 +05:30
Manas Solanki	f869a679ae	Fixed Student Attendence	2017-02-21 18:49:00 +05:30
Nabin Hait	0142fdc0d7	Update rename_att_date_attendance.py	2017-02-21 16:01:21 +05:30
Rohit Waghchaure	49523d7f80	[Fix] Company fiscal year issue in financial statement	2017-02-21 14:20:26 +05:30
Kanchan Chauhan	42f55cf4b1	[Patch] Attendance Date rename field	2017-02-21 13:44:01 +05:30
Nabin Hait	6e1a2b16a5	Company, Currency, Conversion Rate fields are mandatory in BOM	2017-02-21 13:11:02 +05:30
Nabin Hait	d5442b5544	Merge pull request #7791 from nabinhait/pro_order_stock_qty Build Qty considering quantity for which bom is created	2017-02-21 09:58:13 +05:30
Nabin Hait	7056ce54d7	Update salary_structure.py	2017-02-20 23:28:47 +05:30
Nabin Hait	391eca18c7	Fixed merge conflict	2017-02-20 19:38:22 +05:30
Nabin Hait	6fd8cca135	Merge pull request #7587 from noussh/develop updated missing navigation links in Docs - Accounts	2017-02-20 19:33:55 +05:30
Nabin Hait	6a85752ead	Merge branch 'hotfix' into remove-joining-datep-validation	2017-02-20 19:31:38 +05:30
Nabin Hait	e17519accb	Update salary_structure.py	2017-02-20 19:30:44 +05:30
Nabin Hait	0d66579e83	Merge branch 'develop' into develop	2017-02-20 19:22:03 +05:30
Nabin Hait	aa968cd12e	Merge pull request #7751 from nick9822/patch-3 Next Depreciation Date is entered as past date	2017-02-20 19:11:31 +05:30
Nabin Hait	cd837ecbac	Merge branch 'develop' into develop	2017-02-20 19:09:20 +05:30
Nabin Hait	8bb69ff8bf	Fixed merge conflict	2017-02-20 19:01:04 +05:30
Nabin Hait	e49d901907	Update process_payroll.py	2017-02-20 18:36:12 +05:30
Nabin Hait	afd8df8a20	Build Qty considering quantity for which bom is created	2017-02-20 18:06:50 +05:30
Nabin Hait	6ffd77660b	Changed module for Production Analytics	2017-02-20 17:41:44 +05:30
Nabin Hait	3cdb65f782	Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana	2017-02-20 17:25:01 +05:30
Nabin Hait	589f4656ad	Merge branch 'develop' into in_global_search	2017-02-20 15:04:52 +05:30
Nabin Hait	9f4cb0c097	Fixed merge conflict	2017-02-20 15:00:04 +05:30
Nabin Hait	66b373033a	bumped to version 7.2.22	2017-02-20 15:22:01 +06:00
Nabin Hait	e6a5d5dc64	Merge pull request #7784 from mbauskar/minor-fixes [minor] minor fixes for contact us page	2017-02-20 14:43:24 +05:30
Nabin Hait	da098222d7	Merge pull request #7780 from rohitwaghchaure/minor_fix_payment_entry [Fix] Removed employee party type from the payment entry	2017-02-20 14:43:14 +05:30
Nabin Hait	fd3ec066ce	Added fields in global search	2017-02-20 13:38:31 +05:30
Makarand Bauskar	98f9427ba1	[minor] minor fixes for contact us page	2017-02-20 12:41:48 +05:30
bcornwellmott	97ab1d2eb3	Merge pull request #7691 from bcornwellmott/stock_reports Stock reports	2017-02-19 14:36:35 -08:00
bcornwellmott	568dac3aad	Fixed Link Option for Warehouse	2017-02-19 14:04:20 -08:00
Rohit Waghchaure	f73d459c80	[Fix] Removed employee party type from the payment entry	2017-02-19 17:46:05 +05:30
Nabin Hait	02d987ed13	Minor fix for common tree view	2017-02-17 15:50:53 +05:30
Nabin Hait	64e222697c	Merge pull request #7769 from nabinhait/setup_fy_dates Set fiscal year start and end date based on country	2017-02-17 15:18:28 +05:30
Nabin Hait	e285258374	Merge pull request #7762 from mbauskar/hotfix [minor] timestamp fixes for heatmap	2017-02-17 15:18:01 +05:30
Rushabh Mehta	0c5375d0fa	[minor] item name not mandatory and item price with quick edit	2017-02-17 14:57:31 +05:30
mbauskar	90818080b1	[minor] Configured Auto Close days for Opportunity and Issue	2017-02-17 14:56:00 +05:30
mbauskar	e1e25a0c9d	[minor] auto close opportunity after 7 days	2017-02-17 14:54:50 +05:30
Rohit Waghchaure	a020e4eba4	Payment entry fields issue, added total billed hours in timesheet	2017-02-17 14:51:57 +05:30
Nabin Hait	6af7dd4e1b	Set fiscal year start and end date based on country	2017-02-17 14:47:33 +05:30
Nabin Hait	801fa80b39	Merge pull request #7764 from rohitwaghchaure/clean_supplied_items [Fix] Cleanup supplied items if supply raw material is set as No	2017-02-17 12:36:05 +05:30
Nabin Hait	9e5b3dad29	Minor fix in assesment	2017-02-17 11:03:44 +05:30
Rohit Waghchaure	4b9d2f2733	[Fix] Cleanup supplied items if supply raw material is set as No	2017-02-16 18:53:23 +05:30
Kanchan Chauhan	1b204c8e4e	Accrual Payroll System	2017-02-16 16:30:51 +05:30
nick9822	23e174c270	Validation for purchase_date Separate validation for purchase date.	2017-02-16 16:26:38 +05:30
mbauskar	e7b87ad071	[minor] timestamp fixes for heatmap	2017-02-16 16:05:46 +05:30
Nabin Hait	de45b0eddc	Merge branch 'master' into develop	2017-02-16 15:59:59 +05:30
Nabin Hait	a7d6b68bc0	bumped to version 7.2.21	2017-02-16 16:29:58 +06:00
Nabin Hait	d13d198dc8	Merge pull request #7747 from KanchanChauhan/item-name-asset [Minor] Item Name in Asset	2017-02-16 15:15:23 +05:30
Rushabh Mehta	6dd461fec4	[add] site activation level	2017-02-16 14:53:21 +05:30
Nabin Hait	92c52f4623	Merge pull request #7732 from neilLasrado/student-left Added ability to send newsletter to Student batch Guardians and Student Group Guardians	2017-02-16 14:40:14 +05:30
Nabin Hait	ea1cb68fe7	Merge branch 'master' into develop	2017-02-16 14:37:50 +05:30
Nabin Hait	7677b56f7c	bumped to version 7.2.20	2017-02-16 15:07:48 +06:00
Nabin Hait	b280398626	Merge pull request #7739 from rohitwaghchaure/payment_entry_currency_symbol_issue [Fix] Payment Entry currency symbol issue	2017-02-16 14:21:24 +05:30
Nabin Hait	99c6c79834	Update payment_entry.js	2017-02-16 14:21:04 +05:30
Nabin Hait	507e6fa46e	Merge pull request #7749 from KanchanChauhan/leave-application-cleanup Rejected leave application can be submitted	2017-02-16 14:19:11 +05:30
Neil Trini Lasrado	fa2023d3da	Added ability to send newsletter to Student batch Guardians and Student Group Guardians	2017-02-16 13:33:09 +05:30
Nabin Hait	3437a9a123	minor fix	2017-02-16 12:14:30 +05:30
pratu16x7	86415f394d	[minor] duration bar	2017-02-16 09:27:53 +05:30
mlisb0n	835a615af8	Add files via upload	2017-02-15 15:45:52 +01:00
Kanchan Chauhan	11f159193e	Rejected leave application can be submitted	2017-02-15 19:09:21 +05:30
Nabin Hait	2f7697d1bd	Merge pull request #7746 from pratu16x7/minor-search-presets Preset doctypes fields to Search	2017-02-15 18:46:03 +05:30
Nabin Hait	d9068497cb	Merge pull request #7736 from KanchanChauhan/serial-no-status-report [Fix] Serial No Status	2017-02-15 17:56:50 +05:30
Nabin Hait	b8624efe3a	Merge pull request #7750 from KanchanChauhan/territory-filter-opportunity [Minor] Is group filter removed from Territory in Opportunity	2017-02-15 17:41:31 +05:30
Nabin Hait	afef62c887	Merge pull request #7737 from KanchanChauhan/project-percentage [Fix] Project % Completed set to 0 if no tasks	2017-02-15 17:28:53 +05:30
Nabin Hait	e827104a52	Merge pull request #7738 from KanchanChauhan/appraisal-fix [Fix] Empty row in Goals of Appraisal fixed	2017-02-15 17:26:40 +05:30
nick9822	e5cb3e34fe	nowdate changed to purchase_date next depreciation date should be compared with purchase_date instead of nowdate.	2017-02-15 15:32:50 +05:30
Kanchan Chauhan	7118b5a2bd	[Minor] Is group filter removed from Territory in Opportunity	2017-02-15 14:46:08 +05:30
Kanchan Chauhan	2307f57f19	[Minor] Item Name in Asset	2017-02-15 11:52:29 +05:30
Rohit Waghchaure	ff41c82c2b	[Fix] Payment Entry currency symbol issue	2017-02-15 11:44:15 +05:30
pratu16x7	349ed568ed	Add task and item	2017-02-15 09:23:26 +05:30
pratu16x7	ca56ad0bfc	[minor] fix test	2017-02-14 18:49:26 +05:30
pratu16x7	462e89e452	[minor] margin fix	2017-02-14 17:18:10 +05:30
pratu16x7	0e94b4bec4	Mobile view fixes	2017-02-14 17:18:09 +05:30
pratu16x7	60fe77cc90	Website data from existing child tables, layout, images	2017-02-14 17:18:09 +05:30
pratu16x7	dee36e10ae	Add operations and items to website	2017-02-14 17:18:09 +05:30
pratu16x7	aad8257e20	Add template	2017-02-14 17:18:09 +05:30
Kanchan Chauhan	ecdcac1fdf	[Fix] Empty row in Goals of Appraisal fixed	2017-02-14 15:32:06 +05:30
KanchanChauhan	993358d5d7	Update install.md	2017-02-14 15:12:07 +05:30
Kanchan Chauhan	bab6c9c006	[Fix] Project perecentage set 0 if no tasks	2017-02-14 14:30:00 +05:30
Kanchan Chauhan	79cd59303a	[Fix] Serial No Status	2017-02-14 12:49:36 +05:30
mbauskar	2ecfd9be5d	[minor] fetched tickets to closed using sql instead of get_all	2017-02-14 08:41:09 +05:30
Nabin Hait	99dfa3060a	Check existing SO, PO and MR for disabling 'Is Stock Item' checkbox	2017-02-13 16:06:02 +05:30
Kanchan Chauhan	779c581a92	[Minor] List of Contacts	2017-02-13 16:01:52 +05:30
Nabin Hait	89b6c47b2e	Merge pull request #7712 from rohitwaghchaure/minor_fix_item_valuation_method [Fix] Valuation method changing issue in the item	2017-02-13 15:42:22 +05:30
Neil Trini Lasrado	1ab8554d15	Removed Nationality in Student Applicant as a link feild to Country	2017-02-12 01:29:24 +05:30
Neil Trini Lasrado	c1bf70dc75	Added Exit Section to Student master	2017-02-12 01:17:52 +05:30
suyashphadtare	34ab136b46	[fix] Remove un-necessary Whitespace	2017-02-10 19:14:43 +05:30
suyashphadtare	750a067688	[minor][fix] Show all warehouses with item actual qty in warehouse set query	2017-02-10 19:14:43 +05:30
suyashphadtare	049a88cc40	[minor] Show item quantity in warehouse set query	2017-02-10 19:14:43 +05:30
Kanchan Chauhan	1cd5e583ba	[Fix] Apply Now button redirect fixed for Job Opening	2017-02-10 17:58:41 +05:30
KanchanChauhan	cc2c7649a8	[Minor] Stock Entry Fix (#7715 )	2017-02-10 17:47:49 +05:30
Nabin Hait	bdd470a6d1	Update item.py	2017-02-10 17:12:48 +05:30
Rohit Waghchaure	2f09dc0e62	[Fix] Valuation method changing issue in the item	2017-02-10 15:29:45 +05:30
Nabin Hait	29dfb9479b	Merge pull request #7710 from joolsr/patch-1 Update customer.md	2017-02-10 13:23:06 +05:30
Ben Cornwell-Mott	67a13972fb	Added warehouse to BOM Stock Report, fixed bugs with buildable qty	2017-02-09 23:21:52 -08:00
Nabin Hait	5a69f24dfe	Merge pull request #7705 from rmehta/stock-entry-fix [minor] added make material request from Stock Entry and removed cur_frm	2017-02-10 12:51:09 +05:30
Nabin Hait	b41b10976f	Merge pull request #7644 from mbauskar/develop [docs] Feedback triggers	2017-02-10 12:13:31 +05:30
mbauskar	edaa43d9b8	[docs] manual feedback request and minor fixes	2017-02-10 11:28:45 +05:30
bcornwellmott	630882787a	Added buildable qty The field indicates how many can be built.	2017-02-09 20:41:12 -08:00
bcornwellmott	fc41bb6afd	Fixed code issues Also changed qty to Quantity left to build	2017-02-09 20:37:11 -08:00
joolsr	f9fdbe2853	Update customer.md	2017-02-09 23:10:39 +00:00
Rushabh Mehta	cf99dc0e77	[fix] for setup wizard tests and demo;	2017-02-09 18:06:11 +05:30
Rushabh Mehta	e6aa3b435a	[minor] added make material request from Stock Entry and removed cur_frm	2017-02-09 17:47:22 +05:30
mbauskar	d487bf77e1	[minor] payment entry company trigger	2017-02-09 12:57:25 +05:30
Nabin Hait	2b5fa7647a	Merge pull request #7662 from nick9822/patch-2 Sales analytics error after upgrade	2017-02-09 11:45:30 +05:30
Nabin Hait	e27a0d25bc	Merge pull request #7654 from rohitwaghchaure/lead_tax_issue [Fix] Set default tax on quotation when it's making from the lead	2017-02-09 11:43:22 +05:30
khatrijitendra	d262eb1a1c	issue in type and rate 1. there is not such field, "type" it is "margin_type" 2. there is not such field, "rate" it is "margin_rate_or_amount"	2017-02-08 14:59:59 +05:30
Nabin Hait	6ff0caa87a	Fixed merge conflict	2017-02-08 11:33:33 +05:30
Nabin Hait	57e97c06e6	bumped to version 7.2.19	2017-02-08 12:02:47 +06:00
Nabin Hait	6f93cd5bd0	Merge pull request #7692 from rohitwaghchaure/minor_fixes_v_7_2 Minor fixes	2017-02-08 11:21:54 +05:30
Nabin Hait	533d22e88b	Merge pull request #7606 from rohitwaghchaure/data_import_tool_for_cost_center [Fix] Allow data import tool for cost center	2017-02-08 11:21:25 +05:30
Rohit Waghchaure	b3489548a9	minor fix	2017-02-08 11:20:04 +05:30
Ben Cornwell-Mott	05dca985e6	Fixed stock query and corrected with suggestions from rohit	2017-02-07 09:15:33 -08:00
mbauskar	1df0b9bfed	[minor] minor fixes in feedback index.md	2017-02-07 15:20:08 +05:30
mbauskar	298acd3d1a	[docs] Feedback triggers	2017-02-07 15:20:08 +05:30
Nabin Hait	70fd8546ce	Merge pull request #7677 from KanchanChauhan/serial-no-in-return [Fix] Serial No if is_return	2017-02-07 13:28:30 +05:30
Nabin Hait	555279b6e6	Merge pull request #7680 from bcornwellmott/patch-7 Duplicate "title" field	2017-02-07 13:27:46 +05:30
Nabin Hait	ddcb514b65	Merge pull request #7685 from KanchanChauhan/employee-details-in-salary-preview [Fix] Employee Details in Salary Slip preview	2017-02-07 13:27:24 +05:30
Nabin Hait	0a6aaf4257	Get standard/historical valuation rate where missing: some minor fixes	2017-02-07 12:50:22 +05:30
mbauskar	9c0bf73d25	[minor] auto close issue using ORM (document save method)	2017-02-07 12:50:05 +05:30
Kanchan Chauhan	842ad55235	[Fix] Employee Details in Salary Slip preview	2017-02-07 12:07:55 +05:30
Kanchan Chauhan	4f3b0aa249	[Fix]Serial No if is_return	2017-02-07 11:28:34 +05:30
Ben Cornwell-Mott	02c02bc572	Fixed counting to correctly reflect all status at each month	2017-02-06 20:58:25 -08:00
Nabin Hait	ea8fab52c6	Get standard/historical valuation rate where missing, if item is not a sample item	2017-02-07 01:24:32 +05:30
bcornwellmott	92b6ceec41	Duplicate "title" field The title field was duplicated - removed first one.	2017-02-06 10:51:02 -08:00
Neil Trini Lasrado	2160638f36	Merge pull request #7679 from neilLasrado/stud-group Added validation to check if Student in a student group exists in the…	2017-02-07 00:17:24 +05:30
Neil Trini Lasrado	c28598ae8b	Merge pull request #7678 from neilLasrado/stud-att Added validations to Student Attendance	2017-02-07 00:17:14 +05:30
Neil Trini Lasrado	3ade874f9e	Added validations to Student Attendance	2017-02-06 20:07:02 +05:30
Neil Trini Lasrado	05dec9a880	Added validation to check if Studnet in a student group exists in the student batch specified	2017-02-06 20:05:16 +05:30
mbauskar	c874a82559	[minor] index out of range fixes for JE	2017-02-06 15:41:34 +05:30
Kanchan Chauhan	5f5457085e	Joining date validation removed from Salary Structure	2017-02-06 14:50:39 +05:30
Rushabh Mehta	50862039dc	[minor] fixes to schools	2017-02-06 14:28:52 +05:30
Rohit Waghchaure	ade06f940c	[Fix] Set default tax on quotation when it's making from the lead	2017-02-06 12:14:09 +05:30
Nabin Hait	259489572d	Merge pull request #7657 from rmehta/po-from-so [enhance] production order from sales order	2017-02-06 11:41:56 +05:30
Nabin Hait	101aaed643	Merge pull request #7614 from KanchanChauhan/account-filters-payroll [Fix] Account filter in Process Payroll and Salary Component	2017-02-06 11:36:48 +05:30
Nabin Hait	20d2d7548a	Update salary_component.js	2017-02-06 11:36:38 +05:30
Ben Cornwell-Mott	28945438f2	Created button to link buying items to material requests	2017-02-05 18:55:57 -08:00
Ben Cornwell-Mott	36d04fda37	Fixed filter dates and date comparisons	2017-02-05 14:00:46 -08:00
Ben Cornwell-Mott	b4a2c2f047	Got proper cumulative data working	2017-02-05 13:39:39 -08:00
Ben Cornwell-Mott	943124275d	Production Analytics	2017-02-04 14:25:53 -08:00
rohitwaghchaure	ac65e956e8	Merge pull request #7659 from saurabh6790/demo_user_perm_fix [minor][fix] demo user perm fix	2017-02-03 16:51:33 +05:30
Rushabh Mehta	e92a740b53	[minor] school patch fix	2017-02-03 16:05:53 +05:30
nick9822	acb5e9a11b	Sales analytics error after upgrade Hi Team, We were getting errors in sales analytics report after the upgrade. https://discuss.erpnext.com/t/sales-analytics-report-hangs-on-erpnext-v7/17951/6 With the efforts of @Tropicalrambler into the report we made it work by putting checkpoint for item. Please see whether its good or there is better solution for it. Thanks, Nick	2017-02-03 12:31:54 +05:30
Saurabh	9ca3f2847a	a[minor][fix] demo user perm fix	2017-02-02 19:22:36 +05:30
Rushabh Mehta	6ede4a3809	[enhance] production order from sales order	2017-02-02 17:42:01 +05:30
Neil Trini Lasrado	f37d329cf5	Merge branch 'develop' into eval-group	2017-02-02 17:30:10 +05:30
rohitwaghchaure	3f10c7f4fc	Merge pull request #7609 from rmehta/remove-party-status Remove Party Status	2017-02-02 16:10:26 +05:30
KanchanChauhan	6575a0a7e2	[Minor]ROI fix in Employee Loan (#7643 )	2017-02-02 16:01:43 +05:30
Rushabh Mehta	a3d0bea375	Merge branch 'develop' into remove-party-status	2017-02-02 15:42:04 +05:30
Kanchan Chauhan	3e2ecc3423	[Fix] Account filter in Process Payroll and Salary Component	2017-02-02 14:41:48 +05:30
Nabin Hait	6b9902627d	Merge pull request #7638 from rohitwaghchaure/gross_profit_report_issue [Fix] Buying rate in gross profit report	2017-02-02 13:41:32 +05:30
Nabin Hait	c62362f064	Merge pull request #7649 from KanchanChauhan/salary-struct-fix [Fix] Employee name fixes in Salary Structure	2017-02-02 13:30:05 +05:30
Kanchan Chauhan	a0314f19ca	[Fix] Employee name fixes in Salary Structure	2017-02-02 12:56:56 +05:30
Neil Trini Lasrado	4aabe61197	Patch for renaming evaluation criteria	2017-02-01 19:32:28 +05:30
Rohit Waghchaure	69060a8177	Minor fix	2017-02-01 19:14:53 +05:30
Neil Trini Lasrado	749516c22d	Renamed Evaluation Criteria to Assessment Criteria	2017-02-01 18:47:36 +05:30
Rushabh Mehta	3714626dd0	[minor] enhance BOM view	2017-02-01 18:35:53 +05:30
KanchanChauhan	b499fe91fa	Revert "[Fix] Rate of Interest Fix"	2017-02-01 18:16:35 +05:30
rohitwaghchaure	c13dbd408f	[Enhancement] POS Redesign (#7639 ) * item group, discount * POS Redesign * offline customer * removed offline records from modal view	2017-02-01 18:07:22 +05:30
KanchanChauhan	929c3890a4	Merge pull request #7641 from KanchanChauhan/employee-loan-fix [Fix] Rate of Interest Fix	2017-02-01 18:06:32 +05:30
KanchanChauhan	0e995adc44	Salary Structure Employee custom field can be used in Formula and Condition (#7615 )	2017-02-01 18:05:57 +05:30
Kanchan Chauhan	f01c1c2a9d	[Fix] Rate of Interest Fix	2017-02-01 18:05:26 +05:30
KanchanChauhan	3dc96cf71e	Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure [Minor] From Date validation removed from Salary Structure	2017-02-01 17:42:18 +05:30
Kanchan Chauhan	e67e2e6fee	[Minor] From Date validation removed from Salary Structure	2017-02-01 17:41:36 +05:30
Rohit Waghchaure	38f808cfae	[Fix] Buying rate in gross profit report	2017-02-01 13:34:06 +05:30
rohitwaghchaure	ea092a7b24	[Enhancement] Booking of an employee's expense claim (#7267 ) * [Enhancement] Auto book of an employee's expense claim * test cases * documentation * fixes and changes * removed payable from employee and added into the company * Added party in account, patch to update party type for customer and supplier accounts * added party type in erpnext, fix patch * fixed travis	2017-02-01 12:02:08 +05:30
Rushabh Mehta	587dd90182	[minor] removed customer status	2017-02-01 12:01:24 +05:30
Rushabh Mehta	99ce531beb	[minor] css for team updates	2017-02-01 11:46:47 +05:30
Neil Trini Lasrado	d408553b93	Merge pull request #7623 from neilLasrado/guardian Added Student table in Guardian (Only rendered for display purpose)	2017-01-31 18:18:50 +05:30
Neil Trini Lasrado	ebfb7ff027	Merge pull request #7625 from neilLasrado/student-batch Added Mark Assessment Result Button in assessment plan	2017-01-31 18:18:32 +05:30
Neil Trini Lasrado	879a2d84dc	Added Evaluation Criteria Group	2017-01-31 17:03:37 +05:30
Neil Trini Lasrado	477c88450f	UI fixes for Guardian Doctype	2017-01-31 16:49:39 +05:30
Neil Trini Lasrado	9071bcbfa8	Added Student table in Guardian (Only rendered for display purpose)	2017-01-31 16:36:29 +05:30
Rushabh Mehta	7ec4b717ed	[feature] added team updates page	2017-01-31 11:42:58 +05:30
Rohit Waghchaure	d9a265fab1	Merge branch 'develop' of github.com:frappe/erpnext into develop	2017-01-31 11:34:07 +05:30
Neil Trini Lasrado	1947aca2a8	Added Mark Assessment Result Button in assessment plan	2017-01-30 18:34:25 +05:30
Neil Trini Lasrado	ba96ce7dd5	Merge pull request #7616 from neilLasrado/assessment-validations Patch fix for Update Assessment Module Patch	2017-01-30 17:50:37 +05:30
Neil Trini Lasrado	fd1767d2ea	Patch fix for Update Assessment Module Patch	2017-01-30 17:50:05 +05:30
Rushabh Mehta	4500f7b4d6	[cleanup] remove unused LMS (#7612 )	2017-01-30 17:04:38 +05:30
Neil Trini Lasrado	ab1ee1e6fc	Patch fix for Update Assessment Module Patch	2017-01-30 16:40:14 +05:30
Neil Trini Lasrado	80ca65c166	Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score.	2017-01-30 15:28:41 +05:30
KanchanChauhan	fbaa6197f9	Employee Loan Management (#7126 ) * [WIP] Employee Loan Management * EMI calculation * Fixing PR	2017-01-30 15:15:58 +05:30
Rushabh Mehta	364f48aad2	[minor] fix patch	2017-01-30 13:23:09 +05:30
Rushabh Mehta	87037bdd56	[minor] remove party status as it leads to duplicate notifications fixes #7346 , also fix for #7568	2017-01-30 13:22:51 +05:30
Makarand Bauskar	d893efd0a9	[minor] replace object values in translations (#7602 )	2017-01-30 12:35:34 +05:30
rohitwaghchaure	3b40098738	Merge pull request #7571 from RicardoJohann/projectfilter added project filter to gl and carry project filter from P&L	2017-01-30 12:24:36 +05:30
Rohit Waghchaure	b327429db7	[Fix] Allow data import tool for cost center	2017-01-30 11:34:29 +05:30
mbauskar	16ce3623bc	[fixes] set lead to Null on delete company transaction & other minor fixes	2017-01-30 10:45:28 +05:30
mbauskar	51b1d6de48	[minor] moved the address_and_contact utils to frappe	2017-01-30 10:45:28 +05:30
mbauskar	7fa039f15c	[fixes] delete company transaction and other minor fixes	2017-01-30 10:45:28 +05:30
mbauskar	83f4780f74	[Fixes] Address and Contact fixes	2017-01-30 10:45:28 +05:30
mbauskar	8271b4c564	[minor] fixes in address filters	2017-01-30 10:45:28 +05:30
mbauskar	cbc49e2989	[WIP] Address and Contact Fixes	2017-01-30 10:45:28 +05:30
rohitwaghchaure	531b49f6c7	Merge pull request #7590 from KanchanChauhan/rename-task [Minor]Task rename now possible	2017-01-30 09:29:10 +05:30
KanchanChauhan	2dfb90a922	Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix [Fix] Permissions to view Leave Balance Report	2017-01-29 21:07:02 +05:30
Rohit Waghchaure	92c9ad8c72	Merge branch 'master' into develop	2017-01-28 14:14:33 +05:30
Rohit Waghchaure	ce4a0b20ab	bumped to version 7.2.18	2017-01-28 14:44:32 +06:00
Kanchan Chauhan	b77eaf7053	[URGENT][FIX]Stock Controller fix	2017-01-28 13:26:46 +05:30
Neil Trini Lasrado	6d0da98a78	Fixes to update student guardian name patch	2017-01-27 17:44:28 +05:30
Neil Trini Lasrado	7ff5682193	Merge branch 'develop' into guarding-name	2017-01-27 16:54:50 +05:30
Neil Trini Lasrado	f36ff488c0	Added Guardian Name to Student Master	2017-01-27 16:53:55 +05:30
Rushabh Mehta	e239d4dfe9	Merge branch 'master' into develop	2017-01-27 16:18:26 +05:30
Rushabh Mehta	098bd34f00	bumped to version 7.2.17	2017-01-27 16:48:25 +06:00
Rushabh Mehta	063e86a1bf	[fix] remove on_update in Item	2017-01-27 16:16:08 +05:30
Rushabh Mehta	b5eaf324b3	Merge branch 'master' into develop	2017-01-27 16:03:30 +05:30
Rushabh Mehta	5f0027a2d0	bumped to version 7.2.16	2017-01-27 16:33:29 +06:00
Rushabh Mehta	fd82f4b0d4	[minor] fix for item_group.py	2017-01-27 16:00:47 +05:30
Rushabh Mehta	710dc5392f	[merge]	2017-01-27 15:48:31 +05:30
Rushabh Mehta	149c033c8f	bumped to version 7.2.15	2017-01-27 16:16:07 +06:00
Neil Trini Lasrado	7326217ab5	Added 'Active' checkbox in list view for Student Batch and Student Group	2017-01-27 14:50:48 +05:30
Neil Trini Lasrado	8c3fb43d8a	Fix- Student batch strength in Batch Wise attendance report	2017-01-27 14:13:25 +05:30
Kanchan Chauhan	3dd85a0e9e	Task rename now possible	2017-01-27 12:34:06 +05:30
Kanchan Chauhan	e877ecfb7b	[Fix] Permissions to view Leave Balance Report	2017-01-27 11:53:56 +05:30
noussh	425d7adcdd	Update recurring-orders-and-invoices.md	2017-01-26 15:38:57 +04:00
noussh	0350db6a4e	added next link	2017-01-26 15:35:01 +04:00
noussh	1e86546e2c	added the link	2017-01-26 12:53:45 +04:00
noussh	6396c90956	Update multi-currency-accounting.md	2017-01-26 12:52:29 +04:00
noussh	47fbc7efa5	adde the next page link	2017-01-26 12:50:34 +04:00
noussh	8b62626cec	Wrong path updated	2017-01-25 19:44:32 +04:00
Nabin Hait	355b4110c9	Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue [Fix] Get valuation rate from item master and update stock value difference	2017-01-25 19:21:04 +05:30
Nabin Hait	cb19f52985	Update stock_controller.py	2017-01-25 19:20:35 +05:30
Rohit Waghchaure	3899d74f15	[Fix] Get valuation rate from item master and update stock value difference	2017-01-25 18:47:53 +05:30
Nabin Hait	57e4ab70be	Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots New screenshots for Calendar user manual	2017-01-25 17:35:01 +05:30
Nabin Hait	d288909310	Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr Patch to update Salary Detail where Salary Component Abbr is null	2017-01-25 17:23:43 +05:30
Kanchan Chauhan	ce116417e1	New screenshots for Calendar user manual	2017-01-25 15:38:35 +05:30
robert schouten	67eff49516	[fix] compact print format not longer ignores format builder	2017-01-25 08:20:43 +08:00
Ricardo Johann	34354237fd	added project filter to gl and carry project filter from P&L	2017-01-24 06:46:07 -03:00
vrms	1f1f56225c	Update warehouse.md (#7544 ) added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box	2017-01-24 11:29:27 +05:30
KanchanChauhan	4333ce0fd8	Merge pull request #7569 from neilLasrado/assessment Fix for update assessment modules patch	2017-01-24 10:52:50 +05:30
Neil Trini Lasrado	15c5ae0918	Fix for update assessment modules patch	2017-01-24 10:28:49 +05:30
Kanchan Chauhan	679cc23abb	[Fix] Naming series issue fix	2017-01-23 17:20:55 +05:30
Kanchan Chauhan	c948a4fc92	Patch to update Salary Detail where Salary Component Abbr is null	2017-01-23 16:12:45 +05:30
rohitwaghchaure	ab65f6d8b1	Merge pull request #7547 from mnatalia/develop Added translations to the web page and item dashboard.	2017-01-23 15:57:33 +05:30
Neil Trini Lasrado	d471ad2c45	Fix for update assessment modules patch	2017-01-23 14:59:19 +05:30
Makarand Bauskar	01eefafad5	[minor] minor fixes in opportunity form (#7549 )	2017-01-23 12:15:36 +05:30
Rushabh Mehta	397e508fc0	[fix] sales_partner.js, fixes #7553	2017-01-21 16:58:57 +05:30
Nabin Hait	1f9d1bb877	Merge branch 'develop' into assessment	2017-01-20 20:09:44 +05:30
Neil Trini Lasrado	16d40cf0a3	Added ability to disable a student in student group/studnet batch	2017-01-20 19:33:09 +05:30
Nabin Hait	349d520ae2	Fixed merge conflict	2017-01-20 15:44:35 +05:30
Nabin Hait	a1d3d84415	bumped to version 7.2.14	2017-01-20 16:10:35 +06:00
Nabin Hait	c1cc7b68c4	Merge pull request #7522 from nabinhait/hotfix Get valuation rate from Item while not found based on SLE	2017-01-20 15:39:24 +05:30
mnatalia	e09407571c	Added translations to the web page and item dashboard.	2017-01-20 12:00:25 +02:00
Nabin Hait	4c952f48f8	Some minor fixes	2017-01-20 15:15:31 +05:30
Nabin Hait	bd1a628c55	Merge pull request #7545 from rohitwaghchaure/minor_issue [Fix] Account user not able to access the report Payment Period Based On Invoice Date	2017-01-20 14:36:48 +05:30
Rohit Waghchaure	93c001455f	[Fix] Account user not able to access the report	2017-01-20 14:18:17 +05:30
Nabin Hait	548cf183ea	Merge pull request #7543 from RobertSchouten/leave_allocation_fix [fix] remove invalid parameter from leave allocation	2017-01-20 12:54:55 +05:30
Nabin Hait	153156e31a	Merge pull request #7529 from rohitwaghchaure/budget_issue [Fix] Budget not working properly	2017-01-20 12:54:29 +05:30
Nabin Hait	a0b967f2cd	Get valuation rate from Item while not found based on SLE	2017-01-20 12:50:40 +05:30
Nabin Hait	f356e539bb	Update set_null_value_to_fields.py	2017-01-20 12:35:22 +05:30
Rohit Waghchaure	84b827efcd	[Fix] Budget not working properly	2017-01-20 12:33:50 +05:30
robert schouten	e14e042f2f	[fix] remove invalid parameter from leave allocation	2017-01-20 15:02:00 +08:00
Nabin Hait	bfcacbf2ca	Merge pull request #7535 from rohitwaghchaure/landed_cost_voucher_issue [Fix] Minor issue in landed cost voucher	2017-01-20 12:12:17 +05:30
Rohit Waghchaure	a3a977d02a	[Fix] Minor issue in landed cost voucher	2017-01-19 18:38:53 +05:30
Kanchan Chauhan	03dc695c77	[Minor] Set website warehouse as default warehouse	2017-01-19 14:57:05 +05:30
Rushabh Mehta	c81621d3ce	[minor] add progress bar in patch	2017-01-19 14:32:36 +05:30
Rushabh Mehta	00d3cd6d64	[fix] contact address link patch	2017-01-19 14:27:02 +05:30
Rushabh Mehta	818af75575	[patch] add patch for contact_address_update	2017-01-19 13:08:46 +05:30
Rushabh Mehta	d69fd1b8c0	[fix] update_salary_slip.py	2017-01-19 12:51:37 +05:30
Rushabh Mehta	683d98fd54	[fix] update_salary_slip.py	2017-01-19 12:48:03 +05:30
Rushabh Mehta	35e4d8b152	[fix] update_salary_slip.py	2017-01-19 12:47:27 +05:30
Rushabh Mehta	60908f4a08	[fix] update_salary_slip.py	2017-01-19 12:46:11 +05:30
Rushabh Mehta	26fdb113a8	[fix] update_salary_slip.py	2017-01-19 12:44:54 +05:30
Kanchan Chauhan	45c14ed41c	[Minor] Date fix in Production Order	2017-01-19 12:22:04 +05:30
Nabin Hait	eb80fdef82	Merge pull request #7520 from RobertSchouten/heatmap_limit_dev [fix] accounts heatmaps now covering 366 days not 20	2017-01-19 09:15:20 +05:30
Nabin Hait	6b3670848e	Merge pull request #7477 from rmehta/custom-perms [minor] fix for custom perms	2017-01-18 17:03:58 +05:30
Rohit Waghchaure	56cc542eb7	[Fix] sales return discount issue	2017-01-18 14:50:24 +05:30
Rushabh Mehta	a0c41b70c4	[fix] tax rule test	2017-01-18 14:14:20 +05:30
Rohit Waghchaure	2b97cee32c	[Fix] POS print issue	2017-01-18 13:21:27 +05:30

... 15 16 17 18 19 ...

11647 Commits