12388 Commits

Author	SHA1	Message	Date
Nabin Hait	f5dee777dd	minor fix in applying pricing rule	2017-08-02 19:08:39 +05:30
tunde	3b8b3fe766	Merge branch 'hotfix' into issue-10215	2017-08-02 14:27:56 +01:00
tunde	85adbd7eae	show message if there's no submitted salary slip	2017-08-02 14:20:24 +01:00
tunde	c697526382	except in python 3 compatible style	2017-08-02 14:20:23 +01:00
mbauskar	2dd57acdef	removed merge conflicts	2017-08-02 18:39:04 +05:30
mbauskar	478ffb9ae3	bumped to version 8.7.0	2017-08-02 19:05:51 +06:00
mbauskar	73dc35ddbf	resolved merge conflicts	2017-08-02 18:24:03 +05:30
Rohit Waghchaure	250e964205	Set write permission to sales manger for permlevel 1 in Quotation doctype	2017-08-02 18:23:39 +05:30
mbauskar	ee090a9a3c	Merge branch 'master' into develop	2017-08-02 18:18:14 +05:30
mbauskar	4d49a7f6d1	bumped to version 8.6.6	2017-08-02 18:48:14 +06:00
Makarand Bauskar	ce436b7698	[minor] set description to '' if template description is not available (#10244)	2017-08-02 18:16:53 +05:30
rohitwaghchaure	ec9430dae7	[Fix] Default selling settings not fetched on customer quick entry form (#10243)	2017-08-02 18:16:13 +05:30
Faris Ansari	578624db1f	Fix column width in GST Tax Breakup (#10230)	2017-08-02 17:44:32 +05:30
Vishal Dhayagude	ed0b107a9f	[UI Test] UI test added for Pricing Rule (#10237) ... * [UI Test] UI test added for Pricing Rule * [mod]minor chages in pricing rule test * [fix] codacy fixed	2017-08-02 17:31:20 +05:30
Vishal Dhayagude	f9e4893d9d	[UI Test] Test added for Shipping Rule (#10229) ... * [UI Test] Test added for Shipping Rule * [fix]Travis Failed	2017-08-02 17:16:46 +05:30
Vishal Dhayagude	f1f1b60a62	[UI Test ] Sales Order with tax and discount (#10225) ... * [new] UI Test for Sales Order * [fix] Codacy fixed * Update test_sales_order_with_discount_on_grand_total.js * Update test_sales_order_with_taxes_and_charges.js	2017-08-02 17:15:47 +05:30
Zarrar	78c6e34106	[ui test] student applicant and various actions that can be taken (#10221) ... * msgprint error fixed * student applicant, various actions and its dependencies	2017-08-02 11:25:49 +05:30
Nabin Hait	9641d5b1f4	Make payment entry button in expense claim and some minor cleanup	2017-08-01 17:38:48 +05:30
Nabin Hait	edba79e8f0	Update utils.py	2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott	38d4be8325	Update manuals. Fix codacy issues	2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott	118ceda46f	Add Payment Entry for Expenses	2017-08-01 17:35:50 +05:30
Vishal Dhayagude	316477b422	[UI Tests] All sales order test in tests folders (#10211) ... * [new] Sales order with_discount, multi_uom, delivery_date added * [fix] All sales order test in tests folder	2017-08-01 17:16:21 +05:30
Nabin Hait	564e8b74dc	Minor fixing in setting cumulative tax amount	2017-08-01 16:35:22 +05:30
Nabin Hait	4ada637b17	Update taxes_and_totals.js	2017-08-01 16:20:59 +05:30
Kanchan Chauhan	d0c5b3eb07	[URGENT] this is me	2017-08-01 16:02:01 +05:30
Nabin Hait	9b2b42dfc1	Minor fix in bom_stock_qty patch	2017-08-01 11:10:29 +05:30
Makarand Bauskar	317888211a	merged hotfix branch into staging (#10191) ... * [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148) * Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159) This reverts commit 4d2e782e42. * [Fix] Unable to save asset because of float error issue (#10157) * bumped to version 8.6.4 * [Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160) * Set billing hours to 0 in timesheet #9535 (#10139) * `update_billing_hours` to use flt not cint * if not billable, reset billable hours * if not billable, reset time rates * test * [Fix] Timesheet Company Issue * Added delivery date in SO parent form. Fixes #10104 (#10155) * Added delivery date in SO parent form. Fixes #10104 * UI tests for sales order delivery date * bumped to version 8.6.5	2017-08-01 11:06:41 +05:30
Nabin Hait	cd95134267	Rounding issue in tax calculation (#10135) ... * Adjust rounding loss of discount in the last item row. Fixes #8952 * Fixed rounding issue in tax calculation. Fixes #8953, #8952, #8893, #6954, #8910 * Rounding related fixes for purchase cycle	2017-07-31 18:07:45 +05:30
Rushabh Mehta	1fb4abc322	[docs] cleanup	2017-07-31 17:40:17 +05:30
Vishal Dhayagude	95dfe27bf7	[UI Test] Sales Order with multi currency and tax (#10189) ... * [UI Test] Sales Order with multi currency and tax * [fix]Codacy fixed * [fix] tests.txt	2017-07-31 17:29:25 +05:30
Rushabh Mehta	4920d73adb	[docs] remove {{docs_base_url}}	2017-07-31 16:41:35 +05:30
Rushabh Mehta	95349fe360	[docs] add headings	2017-07-31 16:21:12 +05:30
Faris Ansari	40d3ad2bb4	Add erpnext-grey.png, add logo in footer (#10101) ... * Add erpnext-grey.png, footer html * Sent via ERPNext	2017-07-31 16:16:22 +05:30
Makarand Bauskar	98b52a7245	resolved merge conflicts on develop (#10185) ... * resolved merge conflicts on develop * [minor] removed the validate_activity	2017-07-31 15:09:52 +05:30
mbauskar	8b6f7914b0	resolved merge conflicts	2017-07-31 12:30:53 +05:30
mbauskar	892cd615f8	bumped to version 8.6.5	2017-07-31 12:51:35 +06:00
Nabin Hait	495ef67caa	Added delivery date in SO parent form. Fixes #10104 (#10155) ... * Added delivery date in SO parent form. Fixes #10104 * UI tests for sales order delivery date	2017-07-31 11:25:51 +05:30
Zarrar	35d3190822	[ui test] Setting up school course+program and their dependencies (#10142) ... * setting up course and its dependencies * rebasing with develop branch * codacy fix * added test for Program * updated test-dada to maintain consistency with future tests	2017-07-31 11:05:52 +05:30
Ameya Shenoy	4e91f28ce5	[ui-testing] added test for production order (#10138) ... * temporary commit for switching branches * [ui-tests] added bill_of_materials test * added warehouses required for production order * [ui-test] added production order test * debugging travis failure	2017-07-31 11:02:28 +05:30
Rohit Waghchaure	33977827c4	[Fix] Timesheet Company Issue	2017-07-29 14:15:50 +05:30
Nabin Hait	1fcd2b0676	Merge branch 'develop' into set_defualt_mode_payment	2017-07-28 21:09:42 +05:30
tundebabzy	41c954b8b3	Set billing hours to 0 in timesheet #9535 (#10139) ... * `update_billing_hours` to use flt not cint * if not billable, reset billable hours * if not billable, reset time rates * test	2017-07-28 21:05:15 +05:30
Faris Ansari	482331b987	[fix] Default Warehouse not obeying form value (#10153)	2017-07-28 20:58:39 +05:30
rohitwaghchaure	e2176b852e	[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10160)	2017-07-28 20:52:02 +05:30
Utkarsh Yadav	8990af458b	[ui test] leave application in HR (#10151) ... * added test for leave application * minor changes and path added * travis fixes * minor changes	2017-07-28 19:37:15 +05:30
Vishal Dhayagude	569011fb21	[UI Test] Test for Product Bundle added (#10158)	2017-07-28 19:36:50 +05:30
Britlog	4c7709efbd	Portal breadcrumbs (#10095)	2017-07-28 18:54:22 +05:30
Rushabh Mehta	11a3d51774	[test] test_sales_order.py	2017-07-28 17:11:11 +05:30
mbauskar	3b27382013	Merge branch 'master' into develop	2017-07-28 16:03:52 +05:30
mbauskar	2b420f7038	bumped to version 8.6.4	2017-07-28 16:33:52 +06:00
rohitwaghchaure	353af64197	[Fix] Unable to save asset because of float error issue (#10157)	2017-07-28 15:55:46 +05:30
Rushabh Mehta	be4fd1100d	[fix] test	2017-07-28 15:54:07 +05:30
Makarand Bauskar	8bccaed35a	Revert "[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)" (#10159) ... This reverts commit 4d2e782e42.	2017-07-28 15:43:23 +05:30
Rushabh Mehta	8af33a513b	[fix] test	2017-07-28 15:34:20 +05:30
rohitwaghchaure	4d2e782e42	[Fix] Error in sales invoice and POS if customer group not defined in the customer (#10148)	2017-07-28 15:21:22 +05:30
Rushabh Mehta	e16ec0c891	[minor] change docs_base_url	2017-07-28 14:56:59 +05:30
Makarand Bauskar	20f4d7f559	Merge branch 'develop' into set_defualt_mode_payment	2017-07-28 14:41:48 +05:30
Rushabh Mehta	0fcf44e1a2	User Permissions Redesign (#10006) ... * [fixes] for user permission * [docs] updated docs for user permissions * [docs] updated docs for user permissions * [docs] updated docs for user permissions	2017-07-28 14:33:15 +05:30
bcornwellmott	bab0c5a8a5	Add disable check for Activity Type (#10120) ... * Add disable check for Activity Type * Add check for disabled in Timesheet * Codacy fixes * Fixed bugs * Restore permissions	2017-07-28 14:32:45 +05:30
Rushabh Mehta	bead70b43a	Docs in website (#10149) ... * [docs] move to erpnext.org * [docs] * [minor] add title	2017-07-28 11:44:08 +05:30
Utkarsh Yadav	1c8d8a9720	[ui test] leave type,leave control panel and leave allocation in HR (#10136) ... * changes in attendance * added test for leave type * added test for leave control panel * added test for leave allocation * codacy fixes	2017-07-28 11:40:29 +05:30
Rushabh Mehta	d50da78f28	[fixes] errors caught on flake8 (#10126)	2017-07-28 11:39:01 +05:30
Rohit Waghchaure	120b6c0b3c	UI test cases and documentation	2017-07-28 01:52:10 +05:30
Rohit Waghchaure	5296e3c321	[enhance] Provision to set default mode of payment for the POS in POS profile	2017-07-27 19:17:05 +05:30
Saurabh	c07741d36f	Merge branch 'master' into staging	2017-07-27 17:50:28 +05:30
Saurabh	8907f1d2c3	Merge branch 'master' into develop	2017-07-27 17:50:27 +05:30
Saurabh	6f9ef5b890	bumped to version 8.6.3	2017-07-27 18:20:27 +06:00
Zarrar	c54510660e	[ui test] Minor files (#10133) ... * added permissions for Administrator user * updated files * minor files for future tests * added entry for all tests	2017-07-27 17:19:06 +05:30
Makarand Bauskar	145393b12f	[hotfix] set the account name in GL entry instead of warehouse (#10134)	2017-07-27 16:46:40 +05:30
Makarand Bauskar	9c6e2c3637	[hotfix] included the get_purchase_trends_filters instead of get_sales_trends_filters in Purchase Receipts trends (#10127)	2017-07-27 16:23:57 +05:30
mbauskar	7b764d03c2	Merge branch 'master' into develop	2017-07-27 12:18:15 +05:30
mbauskar	448d919cc1	bumped to version 8.6.2	2017-07-27 12:48:15 +06:00
Vishal Dhayagude	b528411ed1	[ui test]sales and taxes charges template (#10116)	2017-07-27 12:15:06 +05:30
Utkarsh Yadav	b8b01928d3	[ui test] employee attendance tool and attendance in HR (#10112) ... * added test for attendance tool * added test for attendance * minor changes * minor changes * path added in tests.txt * codacy fixes	2017-07-27 11:49:10 +05:30
tundebabzy	296603a861	auto populate all rows (#10090)	2017-07-27 11:47:56 +05:30
tundebabzy	84227a6c54	Employee Loan Should Be Limited To Employee Company (#10039) (#10093) ... * filter employee drop down by company name * codacy fix	2017-07-27 11:47:03 +05:30
tundebabzy	9281013d51	add transaction date call to get_exchange_rate (#10109)	2017-07-27 11:43:32 +05:30
tundebabzy	87ec6a12ef	adds options to currency fields (#10118)	2017-07-27 11:38:17 +05:30
rohitwaghchaure	059f99e621	[Fix] Wrong avg. buying rate in the Gross Profit report (#10110)	2017-07-27 11:37:30 +05:30
rohitwaghchaure	8579dd1d78	[minor] If customer has removed getting an error (#10107)	2017-07-27 11:21:54 +05:30
cclauss	6848708377	old style exception, raise --> new style for Python 3 (#10082) ... * old style raise --> raise() for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style exception --> new style for Python 3 * old style raise --> raise() for Python 3 * old style raise --> raise() for Python 3 * old style exception, raise --> new style for Python 3	2017-07-27 10:38:35 +05:30
Vishal Dhayagude	c67bf5026e	[UI Test] Create tax account in Charts of account (#10105) ... * [new]tax creation added * [new]path added test.txt	2017-07-27 09:11:08 +05:30
Faris Ansari	fbec103ae7	Remove inline styling, add css classes (#10077)	2017-07-26 18:46:13 +05:30
Makarand Bauskar	1d9fd9aa52	[minor][wiz] fix company image alignment (#10114) (#10117)	2017-07-26 18:19:41 +05:30
KanchanChauhan	58c9934452	[fix] company graph based on base currency (#9950)	2017-07-26 18:17:11 +05:30
Prateeksha Singh	83535811ad	[minor][wiz] fix company image alignment (#10114)	2017-07-26 18:11:37 +05:30
KanchanChauhan	7800bd89dc	Added Project Type new doctype to be added as link field for Project Type field in project instead of select field (#9929)	2017-07-26 17:55:25 +05:30
Utkarsh Yadav	53b877bd8f	[ui test] Employee in HR (#10103) ... * added test for employee * names changed * path added in tests.txt	2017-07-26 16:32:16 +05:30
Utkarsh Goswami	40937083bf	[UI-Test Project] To check a billing cost of a project with multiple tasks (#10084) ... * Updated test for Project Timesheet with multiple tasks * Updated test for Project Timesheet with multiple tasks * Updated test for Project Timesheet with multiple tasks * updated: * Updated * Updated	2017-07-26 16:31:08 +05:30
Makarand Bauskar	d0109a6fc0	[minor] enable all roles and domain before running tests cases (#10108) ... * [minor] enable all roles and domain before running tests cases * Update utils.py	2017-07-26 16:29:22 +05:30
Utkarsh Yadav	b8a4a584e6	[ui test] test for department, designation, company and leave block list (#10085) ... * added test for required items * minor fixes for travis * name changed * added test for employment type * travis fixes	2017-07-26 13:14:34 +05:30
Prateeksha Singh	cda6206c1f	[minor][wiz] remove header brand image (#10016)	2017-07-26 13:05:48 +05:30
Saurabh	7bdc45eceb	Merge branch 'master' into develop	2017-07-25 18:02:58 +05:30
Saurabh	394dbca0e4	bumped to version 8.6.1	2017-07-25 18:32:58 +06:00
Saurabh	4c1caa7e98	[hot][fix] updated modified date for sales order	2017-07-25 17:35:14 +05:30
Saurabh	dc6e369172	Merge branch 'master' into develop	2017-07-25 16:42:28 +05:30
Saurabh	bb5812cf0f	bumped to version 8.6.0	2017-07-25 17:12:26 +06:00
Saurabh	36645e4e2f	Merge branch 'master' into staging	2017-07-25 16:15:51 +05:30
Saurabh	fb4f320df4	Merge branch 'master' into develop	2017-07-25 16:15:50 +05:30
Saurabh	e7c14fcc3d	bumped to version 8.5.5	2017-07-25 16:45:49 +06:00
Rohit Waghchaure	d62fa84ed9	[Fix] Calendar view for sales order	2017-07-25 15:34:20 +05:30
Rohit Waghchaure	baa937aa52	[Fix] Negative amount showing in the grand total for multicurrency if discount has applied	2017-07-25 15:26:01 +05:30
Ameya Shenoy	08450878f1	[ui-test] added test for bill_of_materials (#10063) ... * temporary commit for switching branches * [ui-tests] added bill_of_materials test * fixed minor codacy problems * added minor requested changes	2017-07-25 15:23:58 +05:30
Ashwini Save	2ffe878999	Timeline Title for small resolution Add to knowledge base button. (#9926) ... * Add to Knowledge Base button class updated to hide for mobile view. * Updated code to avoid multiple occurance of Knowledge Base button while updating comment.	2017-07-25 14:16:48 +05:30
rohitwaghchaure	49a6b4a4fa	[Fix] RFQ list showing to all supplier in the portal (#10023)	2017-07-25 14:12:58 +05:30
bcornwellmott	05e51d6c83	Add Get Suppliers dialog (#10025) ... * Add Get Suppliers dialog * Commonize code, use depends_on * Update request_for_quotation.js	2017-07-25 14:10:23 +05:30
rohitwaghchaure	4cccdbdbf9	[Fix] Validating price list currency even if price list is not defined (#10056)	2017-07-25 14:05:01 +05:30
KanchanChauhan	4b888b95d0	[Minor] Added filter condition to Customer Query (#10057)	2017-07-25 14:03:01 +05:30
Zarrar	b5ec8381a6	[UI Tests] School Academic Term test (#10050)	2017-07-25 11:46:34 +05:30
Frappe PR Bot	3b128cabb2	[Translation] Updated Translations (#10047)	2017-07-25 11:46:16 +05:30
Zarrar	1c6828e5d6	[UI Tests] School Academic Year test (#10049)	2017-07-25 11:45:39 +05:30
KanchanChauhan	d65b4b4238	Patch was faling, reload doc was missing (#10072)	2017-07-25 11:39:46 +05:30
ci2014	13abada526	Update email-account.md (#10066) ... * Update email-account.md Add information to conditional import * Add files via upload	2017-07-25 11:06:03 +05:30
tundebabzy	de54f3019f	use api to get default cost center for chosen company (#10067)	2017-07-25 11:05:07 +05:30
bcornwellmott	d023d9a0bd	Add RFQ email sent check (#10068) ... * Add RFQ email sent check * remove blankspace * Removed debugger	2017-07-25 11:03:12 +05:30
Vishal Dhayagude	edb2749dfd	Timesheet web (#10037) ... * [new]Timesheet added * [new] Customer wise timesheet on webportal added	2017-07-25 10:53:12 +05:30
Makarand Bauskar	fcaf313c0f	[minor] make-demo fixes for manufacturing domain (#10029)	2017-07-25 10:49:35 +05:30
Makarand Bauskar	dfc5a454b3	[minor] fixed the delivery date issue in Ordered Item to be Dellivered report (#10028)	2017-07-25 10:48:43 +05:30
bcornwellmott	1c32f5ace9	Whitelist method for adding production orders ops (#9997)	2017-07-24 22:43:44 +05:30
bcornwellmott	96381da547	Supplier Scorecard (#9294) ... * Initial start of scorecard docs * Got basic functionality working * Fixed doc names and added key functions * Basic functional version minus Actions * Hide scorecard docs until functional * Created supplier scorecard documentation * Added default variables and standings. Added restrictions for PO + RFQ * Automatic daily scorecard creation + on save * Added warning for PO nd RFQs * Minor fixes for codepy, automatically add variables for criteria, fix hooks.py typo * Added tests, fixed codacy formatting, small improvements * Fixed test bug w/ criteria. Codacy cleanup * Fixed codacy issues. Fixed sticky criteria * Fixed bug with period search. Remove blank variable child. * Updated docs, automatically add criteria and standings, clean up period create message * Uncommented test, set docs to beta * Fix for nabinhait review * Fix codacy issue. Fix dict assignment for records	2017-07-24 22:42:30 +05:30
Ameya Shenoy	91b2833708	[ui-tests] added workstation and operation (#10044) ... * [ui-test] workstation and operation testing added * [ui-tests] removed unnecessary assertions and used logical names for operations and workstations	2017-07-24 14:34:30 +05:30
Utkarsh Yadav	20a862a6b9	[ui test] holiday list and branch in HR (#10045) ... * added test for holiday list * codacy fixes * added check for all days in list * added test for branch * codacy fixe * minor fixes	2017-07-24 14:33:42 +05:30
tundebabzy	65656ec2df	hide salution and gender if company type is Company (#10040)	2017-07-24 11:32:26 +05:30
Makarand Bauskar	9306aff1bb	[minor] moved the patch to v8_5 and other minor fixes (#10012) ... * Quotation and Supplier Quotation Route and Permission Edits * [minor] moved the patch to v8_5 and other minor fixes	2017-07-21 15:19:47 +05:30
Ameya Shenoy	73f969fd7f	[ui-test] manufacturing item creation testing (#10009)	2017-07-21 14:22:08 +05:30
Prateeksha Singh	283d5550e6	[fix] set sales base field as base_grand_total (#10008)	2017-07-21 14:21:35 +05:30
Rushabh Mehta	dda608dd00	[fix] update_company_current_month_sales in company.py (#10005)	2017-07-21 11:58:14 +05:30
Faris Ansari	e355f99786	Remove ellipsis in title and description (#9992)	2017-07-20 17:51:19 +05:30
mbauskar	6c8d4678db	Merge branch 'master' into develop	2017-07-20 16:49:30 +05:30
mbauskar	ea50c9d1be	bumped to version 8.5.4	2017-07-20 17:19:30 +06:00
Rushabh Mehta	35da7d1fb4	[minor] we buy is also checked by default	2017-07-20 15:58:20 +05:30
Rushabh Mehta	ced14cc789	[fix] setup-wizard	2017-07-20 15:55:54 +05:30
Rushabh Mehta	9d27cf3c62	[tests] refactored (#9984) ... * [tests] refactored * [fix] test_quotation.js * [fix] tests.text * [fix] fiscal year not needed * [test] add long test * [fix] add timeout in lead	2017-07-20 15:35:03 +05:30
mbauskar	0e6933a1e8	resolved merge conflicts	2017-07-20 14:19:47 +05:30
mbauskar	a919be111a	bumped to version 8.5.3	2017-07-20 14:46:57 +06:00
Nabin Hait	9c42161061	Itemised tax breakup fix in docs other than invoice (#9961) ... * Itemised tax breakup fix in docs other than invoice * Set itemised tax breakup and hsn code in existing docs	2017-07-20 13:32:01 +05:30
rohitwaghchaure	79d6266c7b	[Fix] Unable to create production order from the sales order for the bundle items (#9976)	2017-07-20 10:35:51 +05:30
tundebabzy	11d23f84d7	Can't set Start and End Dates in Salary Slip (#9513) (#9944) ... * remove trigger from end_date * adds new function `get_end_date`: - it tries to calculate the appropriate end date for a given frequency - returns an empty string if frequency is 'biweekly' - adds test cases * changes logic in `set_start_end_dates`: - if start_date is empty in form, call process_payroll.get_start_end_dates - else, call process_payroll.get_end_date * `get_end_date` should return a dict * changed "biweekly" to "bimonthly" * change the behaviour of process payroll start and end date: - when payroll frequency is changed, change start/end date as usual - if start date is manually changed, use the frequency to calculate the end date * clean up * further cleanup * in `get_end_date`, if `frequency` isn"t given, "monthly" * remove end_date from cscript and introduce `set_end_date` * fix tests * removed whitespaces	2017-07-20 10:33:03 +05:30
Nabin Hait	8e0f23efc7	Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933) ... * Multiple delivery dates in Sales Order and make DN based on selected delivery dates * Test case and some other minor fixes * Updated docs for multi delivery date * removed the trailing whitespace * removed the trailing whitespace * removed trailing whitespace	2017-07-20 10:30:59 +05:30
Makarand Bauskar	ac9b1332d2	[minor] set no copy to sales goal fields (#9956)	2017-07-19 18:55:12 +05:30
Doridel Cahanap	7b021e0fac	Show Expected End Date in Project List View (#9964)	2017-07-19 18:21:31 +05:30
KanchanChauhan	d6dd25a666	Added indicators on Project Tasks (#9952)	2017-07-19 18:06:52 +05:30
rohitwaghchaure	f86100a734	[Fix] Calendar view not working for leave application (#9963)	2017-07-19 17:09:30 +05:30
_JG_	96bb6099d6	[fix] correctly choice 'Credit Limit' (#9932) ... * [fix] correctly choice 'credit limit' If 'Credit Days Based On' is empty in 'Supplier Type/Customer Group' then value 'Due Date' in 'Purchase/Sales Invoice' doesn't taken from the default settings * Update party.py * [fix] correctly choice 'Credit Limit'	2017-07-19 10:27:09 +05:30
Nabin Hait	e6c2ae3682	Merge pull request #9940 from rmehta/workstation-form ... [ux] workstation form layout	2017-07-19 10:24:28 +05:30
Nabin Hait	8d56f2959b	Merge pull request #9942 from bcornwellmott/bix_bom_qty ... Update qty from stock_qty before validate materials	2017-07-19 10:22:00 +05:30
Rushabh Mehta	d2d24554b3	[ux] workstation form layout	2017-07-18 22:29:59 +05:30
Ben Cornwell-Mott	c7d2bc67e8	Update qty from stock_qty before validate materials	2017-07-18 08:56:25 -07:00
Rushabh Mehta	1283f6308d	[fix] company graph based on base currency	2017-07-18 18:22:16 +05:30
mbauskar	d36c136fc6	Merge branch 'master' into develop	2017-07-18 16:38:24 +05:30
mbauskar	75e65e7079	bumped to version 8.5.2	2017-07-18 17:08:23 +06:00
Saurabh	7f95d587b2	[fix] escape company filter (#9924)	2017-07-18 16:09:34 +05:30
Makarand Bauskar	75b145fe2c	[hotfix] used frappe.db.set value instead of frappe.set_value (#9923)	2017-07-18 16:05:52 +05:30
Nabin Hait	bc3acdd0ba	Merge pull request #9510 from tundebabzy/issue-9166 ... Unable to create Manual Depreciation of Asset due to Error #9166	2017-07-18 15:44:18 +05:30
mbauskar	823b3ca540	bumped to version 8.5.1	2017-07-18 15:40:19 +06:00
Makarand Bauskar	5e75e3ba03	[hotfix] set_restrict_to_domain_for_module_def patch fixes (#9921)	2017-07-18 15:09:30 +05:30
mbauskar	113df55e64	Merge branch 'develop'	2017-07-18 13:07:01 +05:30
mbauskar	3e4b2743c6	bumped to version 8.5.0	2017-07-18 13:37:00 +06:00
Nabin Hait	338c28e78e	Merge pull request #9902 from rohitwaghchaure/sales_invoice_serial_no_issue_from_dn ... [Fix] Sales invoice serial no validation issue	2017-07-18 13:05:50 +05:30
Rohit Waghchaure	7e14996995	[Fix] Sales invoice serial no validation issue	2017-07-18 12:59:55 +05:30
Makarand Bauskar	6e30f04181	[domainify] patch to set the restrict to domain for module_def (#9912)	2017-07-18 12:30:57 +05:30
Nabin Hait	4a10f18ee3	Merge pull request #9913 from mbauskar/quotation ... [minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)	2017-07-18 12:20:47 +05:30
Nabin Hait	f37d43d0c1	Remove newline from serial no values	2017-07-18 12:15:16 +05:30
pratu16x7	aea60f349f	[minor] default qty 0, fixes frappe/erpnext#9880	2017-07-18 12:15:16 +05:30
pratu16x7	90bd5681d1	[batch modal] bind serial_no field in onchange	2017-07-18 12:15:16 +05:30
mbauskar	30e03cc4c8	[minor] fixes for TypeError: get_lead_details() takes at least 1 argument (2 given)	2017-07-18 11:45:53 +05:30
Nabin Hait	4c40a416e6	Merge pull request #9900 from frappe/fixes_9899 ... [fix] #9899	2017-07-18 11:17:45 +05:30
Nabin Hait	3020c8086c	Update stock_balance.py	2017-07-18 11:17:32 +05:30
Makarand Bauskar	c446bf6117	Merge branch 'develop' into rejected_expense_claim_issue	2017-07-18 10:54:13 +05:30
Rushabh Mehta	660de515b5	[fix] filters for calendars frappe/erpnext#9850 (#9870)	2017-07-18 10:50:30 +05:30
Prateeksha Singh	e012e24423	Sales Goal by Company (#9723) ... * [sales goal] in company; dashboard, graph, notifs, wiz * [test] target notifications * cache past year monthly sales of every company daily, patch * [minor] query fixes * update sales goal docs	2017-07-18 10:35:12 +05:30
Nabin Hait	22e82dff20	Removed a deprecated function call	2017-07-17 20:28:30 +05:30
tunde	78d2f542d0	code fix as per review	2017-07-17 15:00:45 +01:00
Nabin Hait	b962fc1573	Show hsn code in tax breakup for India and render via template (#9866) ... * Show hsn code in tax breakup for India and render via template * tax breakup if gst_tax_field does not exists * Fixed tax-breakup test cases	2017-07-17 18:02:31 +05:30
tunde	1ee534889f	Revert "adds if statement for reference_type === "Asset"" ... This reverts commit c7e3a09cfb.	2017-07-17 13:27:59 +01:00
Frappe PR Bot	fa04236c8d	[Translation] Updated Translations (#9898)	2017-07-17 17:50:36 +05:30
pawan	36025468a1	[fix] #9899	2017-07-17 17:28:44 +05:30
Rohit Waghchaure	0e376a464b	test cases	2017-07-17 16:47:01 +05:30
Rohit Waghchaure	8333b5754b	[Fix] Expense claim status issue	2017-07-17 16:38:20 +05:30
Rushabh Mehta	dab1172a18	[refactor] party.js get_party_details (#9888)	2017-07-17 15:31:17 +05:30
rohitwaghchaure	ea4497c8d2	Renamed the report Support Hours to Support Hours Distribution (#9874)	2017-07-17 14:55:42 +05:30
rohitwaghchaure	b994b3dcda	Allow to select asset account in the payable in the expense claim for imprest management (#9891)	2017-07-17 14:33:33 +05:30
Makarand Bauskar	805a41d06c	[minor] fixed the set_portal_settings patch (#9890)	2017-07-17 13:44:56 +05:30
Nabin Hait	e06526ffff	Add indexes in some transaction doctypes (#9889)	2017-07-17 13:28:27 +05:30
Nabin Hait	2df7db0346	Merge pull request #9884 from mbauskar/patch-fixes ... [hotfix] fixed GST code for Uttarakhand	2017-07-17 13:04:54 +05:30
Narciso E. Núñez Arias	c9877c5c1e	Translation of ERPNext manual .md files (#9872) ... * Translate Do I Need An ERP page * Translate getting started with erpnext Page * Translate Implementation Strategy Page * Translate Spanish Index page * Translate Flow Chart of transactions page * Translate open source page * Translate The Champion Page * Fix spanish translation on Index page	2017-07-17 12:10:47 +05:30
strixaluco	372a881d8c	Make 'Financial Year' translatable in Setup wizard (#9879)	2017-07-17 12:06:25 +05:30
mbauskar	71b5250cbd	[hotfix] fixed the state code for Uttarakhand	2017-07-16 21:28:39 +05:30
mbauskar	3ceebaec3f	Merge branch 'master' into develop	2017-07-14 17:47:07 +05:30
mbauskar	30e987a835	bumped to version 8.4.3	2017-07-14 18:17:07 +06:00
Makarand Bauskar	087da2e571	Fixed patch (#9862) (#9871)	2017-07-14 17:44:26 +05:30
Makarand Bauskar	ad7eb9d03c	[minor] check mode_of_payment in Payment entry (#9869) ... * [minor] don't trigger the expense type trigger if value is not set * [minor] check if account is selected or not in Payment Entry * [minor] check mode_of_payment in Payment entry	2017-07-14 17:31:36 +05:30
Nabin Hait	35d0de8276	Merge pull request #9858 from mbauskar/expense-claim ... [minor] don't trigger the expense type trigger if value is not set	2017-07-14 15:28:34 +05:30
Rushabh Mehta	812853aa86	[refactor] account.js to new style (#9787) ... * [fix] conference site update * [test] run all js tests	2017-07-14 15:28:04 +05:30
KanchanChauhan	319c58266b	Changes Quotes to Quotations in website sidebar because that seems more legit (#9825)	2017-07-14 14:30:42 +05:30
rohitwaghchaure	dcf10ee4f6	Fixed patch (#9862)	2017-07-14 13:02:38 +05:30
mbauskar	1394a6557d	[minor] check mode_of_payment in Payment entry	2017-07-14 12:09:17 +05:30
mbauskar	00e825a8af	[minor] check if account is selected or not in Payment Entry	2017-07-14 11:38:39 +05:30
mbauskar	ed89a83584	[minor] don't trigger the expense type trigger if value is not set	2017-07-14 11:21:27 +05:30
Faris Ansari	2c5b3e83f5	New design for daily work summary (#9844) ... * New design for daily work summary * Update tests	2017-07-13 18:37:18 +05:30
Rushabh Mehta	8e2531e2bb	Update Test Runner to run tests one by one (#9843) ... * [update] tests as per new api * [test] unset test_quotation.js * [test] unset test_quotation.js * [test] unset test_quotation.js * [test] unset test_quotation.js	2017-07-13 18:22:20 +05:30
Nabin Hait	d5dd9f1706	Merge pull request #9839 from rmehta/regional-decorators ... [feature] override a function regionally by adding a decorator	2017-07-13 17:51:29 +05:30
mbauskar	ae20748dec	bumped to version 8.4.2	2017-07-13 16:46:20 +06:00
Rushabh Mehta	3df2c9421a	[fix] setup wont be called if declared inside setup	2017-07-13 16:11:54 +05:30
Rushabh Mehta	393becce0b	[fix] name decorator as allow_regional	2017-07-13 15:49:37 +05:30
mbauskar	efaf9f59db	bumped to version 8.4.1	2017-07-13 15:44:29 +06:00
Rushabh Mehta	8f2e21def2	[feature] override a function regionally by adding a decorator	2017-07-13 15:07:51 +05:30
Rushabh Mehta	7231f29e78	[feature] override a function regionally by adding a decorator	2017-07-13 15:00:56 +05:30
Saurabh	e74e4b18c7	[patch][fix] update gst_state only if company country is india	2017-07-13 14:38:43 +05:30
mbauskar	05d62127d0	bumped to version 8.4.0	2017-07-13 14:35:51 +06:00
Nabin Hait	7549a83b9b	Merge pull request #9801 from manassolanki/refractor-report ... changes in the assessment report	2017-07-13 13:46:19 +05:30
rohitwaghchaure	c3153655eb	Fixed patch create_warehouse_nestedset (#9833)	2017-07-13 12:17:12 +05:30
Makarand Bauskar	96488b0f34	[patch] removed create company address patch (#9832)	2017-07-13 12:16:28 +05:30
Nabin Hait	1a60931435	Added SAC codes and 2/4 digit HSN codes, regional setup can be called multiple times (#9820)	2017-07-13 12:16:04 +05:30
Makarand Bauskar	8f507a984e	[minor] check if the company is selected or not before triggering get_bank_cash_account (#9830) ... * [minor] check if the company is selected or not before triggering get_bank_cash_account * [minor] check if production order is available * [minor] fixed codacy errors	2017-07-13 11:44:29 +05:30
Nabin Hait	57d3cecd68	Merge pull request #9811 from rohitwaghchaure/pricing_rule_issue_for_discount ... [Fix] Manual discount is not applying in the transaction if discount amount is zero in the pricing rule	2017-07-13 11:14:53 +05:30
Nabin Hait	7312186c76	Set corrected states list in GST State field's options	2017-07-13 10:41:15 +05:30
Nabin Hait	0a32b7a6eb	Set company address while making invoice from SO, don't show taxes in print if amount is zero, fixed state code	2017-07-12 19:21:05 +05:30
rohitwaghchaure	c1a1e62c0d	[Fix] Data not showing in the heatmap of the customer (#9819)	2017-07-12 18:57:23 +05:30
Rohit Waghchaure	b12f2109b5	[Fix] Manual discount is not applying on the pricing rule if discount amount is zero in the pricing rule	2017-07-12 18:02:02 +05:30
Manas Solanki	a13c6a1bef	codacy cleanup	2017-07-12 17:49:59 +05:30
Manas Solanki	79ed58fd36	chnages in the assessment report	2017-07-12 17:49:59 +05:30
rohitwaghchaure	860144feb7	[Fix] User not able to search an Item if description is null in the item (#9793)	2017-07-12 15:01:56 +05:30
Makarand Bauskar	1efb05233c	[minor] don't trigger source_warehouse if item_code is not set in Production Order (#9806)	2017-07-12 14:53:14 +05:30
Makarand Bauskar	ef8d6dc8f8	[minor] ingore mandatory while auto closing issues and opportunity (#9783)	2017-07-12 14:52:32 +05:30
Nabin Hait	79c2191aa3	[fix] Don't add newline at the end, onchange of serial_no and filter warehouse based on company and is_group (#9809)	2017-07-12 14:10:43 +05:30
Aditya Duggal	4e1a3c1d58	Changed state codes and added state ... -Andaman 35 added -UP changed to 09 from 35 -Uttrakhand changed to 05 from 36	2017-07-12 13:40:11 +05:30
Nabin Hait	fb8e59234b	Merge pull request #9652 from bcornwellmott/sq_lead_time ... Added lead time field to supplier quotation	2017-07-11 23:39:27 +05:30
Umair Sayed	31af0849db	Update navigation.md (#9798)	2017-07-11 21:07:03 +05:30
Frappe PR Bot	bfdb726072	[translation] translation updates (#9788)	2017-07-11 15:20:11 +05:30
mbauskar	b2aa867b70	bumped to version 8.3.6	2017-07-11 13:32:14 +06:00
Makarand Bauskar	30f2bcbccc	[hotfix] allow only 5 character in company_abbr field in setup wizard (#9779)	2017-07-11 12:36:57 +05:30
Prateeksha Singh	7d885432eb	[wiz] add user slide, enforce first entry, static labels (#9744)	2017-07-11 12:36:34 +05:30
Nabin Hait	3b5f774144	Merge pull request #9410 from manassolanki/patch-company ... Patch for the PR 8754, fixes #9011	2017-07-11 11:35:29 +05:30
Nabin Hait	3a200bbc44	Update create_address_doc_from_address_field_in_company.py	2017-07-11 11:34:27 +05:30
Nabin Hait	2bedca04ae	Merge pull request #9750 from rohitwaghchaure/taxable_amount_issue ... [Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice	2017-07-11 11:16:56 +05:30
Manas Solanki	1a0536bff4	changes as per review	2017-07-11 11:16:16 +05:30
Manas Solanki	cdba021802	patch for removing the address field from company and creating address doc, fixes #9011	2017-07-11 11:16:16 +05:30
Shivam Mishra	3fe5ecc611	Added Lead fixture, Added test for Lead, Opportunity (#9607) ... * Added fixtures for Address and Contact * Fixed formatting errors * Added Test for terms, Added Tax and Terms fixture * Add tests for tax * Added Test for Print Format	2017-07-11 10:33:07 +05:30
Rohit Waghchaure	296fbfeaac	[Fix] Taxable amount in tax breakup showing wrong value for duplicate items in the invoice	2017-07-10 23:06:49 +05:30
Rushabh Mehta	4a7b4efbec	[tests] update travis.yml to run ui-tests (#9748) ... * [tests] update travis.yml to run ui-tests * [tests] update travis.yml to run ui-tests * [test] fix item_group.py * [test] fix item_group.py * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] daily work summary fails? * [check] no scheduled jobs for tests * [check] daily work summary fails? * [check] daily work summary fails?	2017-07-10 23:00:01 +05:30
Ben Cornwell-Mott	b1f0fd4ac3	Lead time matches Item master	2017-07-10 09:09:29 -07:00
Nabin Hait	f7d2a59c18	Merge pull request #9538 from sagarvora/fix-bom-issue ... [minor] fix bom price resetting on validation	2017-07-10 20:41:16 +05:30
Nabin Hait	0ac8542eaa	Merge pull request #9772 from tundebabzy/issue-9595 ... Wrong Exchange Rate when making payment against Journal Entry (#9595)	2017-07-10 19:12:48 +05:30
Nabin Hait	c8b6d3badb	Merge pull request #9713 from manassolanki/stud-dashb ... changes in the student dashboard	2017-07-10 19:10:57 +05:30
Nabin Hait	cdf4320b3b	Merge pull request #9673 from rohitwaghchaure/serial_no_sales_return_issue ... Remove sales invoice from serial number while making sales return entery using delivery note	2017-07-10 19:04:30 +05:30
Nabin Hait	5b2d3222f3	Merge pull request #9710 from rohitwaghchaure/sales_invoice_dn_link_revert ... Revert sales invoice dn link issue	2017-07-10 18:47:38 +05:30
Manas Solanki	5d202ca31a	change in the student type	2017-07-10 18:40:53 +05:30
Nabin Hait	7088db9e1f	Merge pull request #9773 from mbauskar/docs ... [docs] corrected the filename from sms_setting2 -> sms_settings2	2017-07-10 18:17:28 +05:30
Nabin Hait	ec344ffa96	Merge pull request #9761 from mbauskar/depends-on ... [minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field	2017-07-10 18:16:15 +05:30
mbauskar	a52e726b6b	[docs] corrected the filename from sms_setting2 -> sms_settings2	2017-07-10 18:11:32 +05:30
Nabin Hait	cf82c3828e	Merge pull request #9769 from manassolanki/payment-entry ... frappe call if posting date is defined	2017-07-10 17:57:26 +05:30
Nabin Hait	6fcfbaa1f9	Merge pull request #9766 from nabinhait/migration_fixes ... minor fixes while upgrading an old instance	2017-07-10 17:45:25 +05:30
Nabin Hait	a6c733d06c	Merge pull request #9753 from rohitwaghchaure/budget_cost_center_issue ... [Fix] Budget against the field in the validation message	2017-07-10 17:45:02 +05:30
tunde	46ef26df71	treat use case where Journal entry is contained in outstanding_invoices in get_outstanding_reference_documents function	2017-07-10 13:05:29 +01:00
Manas Solanki	99d571a786	frappe call if posting date is defined	2017-07-10 17:33:27 +05:30
Rohit Waghchaure	e3ae600277	[Fix] Budget against the field in the validation message	2017-07-10 17:06:54 +05:30
Nabin Hait	dd7a723214	minor fixes while upgrading an old instance	2017-07-10 16:41:59 +05:30
mbauskar	ccaf36a00f	[minor] fixed depends on for stock entry expense_account and purchase receipt item's cost_center field	2017-07-10 16:24:24 +05:30
Manas Solanki	101a021f7b	added student type in program enrollment and changes in the student dashboard	2017-07-10 16:21:44 +05:30
Nabin Hait	68ed0488a3	Merge pull request #9757 from mbauskar/breadcrumb-fixes ... [hotfix] check if the item group exist or not	2017-07-10 15:32:52 +05:30
mbauskar	75a233b472	[hotfix] check if the item group exist or not	2017-07-10 14:36:42 +05:30
Nabin Hait	5a174d61bc	Merge pull request #9754 from creamdory/develop ... Added Quotation as Standard Sidebar Menu	2017-07-10 14:13:35 +05:30
creamdory	7a2815299e	Added Quotation as Standard Sidebar Menu	2017-07-10 16:09:03 +08:00
Manas Solanki	195d2b577f	add few details in the student log (#9670)	2017-07-10 12:29:46 +05:30
Britlog	8c85562ceb	Breadcrumbs management (#9544)	2017-07-10 12:14:05 +05:30
Manas Solanki	77aa4762b8	don't request another ajax call if one is pending (#9620)	2017-07-10 12:12:16 +05:30
Nabin Hait	097da8cc89	bumped to version 8.3.5	2017-07-08 14:25:41 +06:00
Nabin Hait	1d52a4df22	Merge pull request #9732 from adityaduggal/gstin_NA ... First 2 digit validation would disregard NA values	2017-07-08 13:52:35 +05:30
Nabin Hait	cd61a20fb4	Update utils.py	2017-07-08 13:52:13 +05:30
Aditya Duggal	0e285265b1	First 2 digit validation would disregard NA values	2017-07-08 13:35:01 +05:30
Nabin Hait	b866fcf14f	Finish prod order when skipped material transfer	2017-07-08 12:57:13 +05:30
Manas Solanki	3d190a15ab	changes in the student dashboard	2017-07-07 17:29:29 +05:30
mbauskar	7b5ca3e494	bumped to version 8.3.4	2017-07-07 17:42:36 +06:00
Rohit Waghchaure	8f2c8f6e9d	Revert sales invoice dn link issue	2017-07-07 17:07:59 +05:30
Nabin Hait	76c5924cbe	Merge pull request #9699 from manassolanki/productn ... frappe call only when there is item in production order	2017-07-07 15:48:37 +05:30
Rohit Waghchaure	9589527784	Fixed the issue Serial No serial no not found	2017-07-07 15:34:28 +05:30
Nabin Hait	dba3f0048b	Merge pull request #9702 from mbauskar/installation-note ... [hotfix] fixed the customer address set filter on Installation Note	2017-07-07 15:28:23 +05:30
mbauskar	3f6a5b2539	[hotfix] fixed the customer address set filter on Installation Note	2017-07-07 15:24:01 +05:30
Manas Solanki	cf7f72e586	frappe call only when there is item	2017-07-07 15:09:57 +05:30
mbauskar	5cf3868d03	bumped to version 8.3.3	2017-07-07 14:36:45 +06:00
Nabin Hait	1b36336fc3	Added new option in invoice_copy, made state_number read_only (#9695) ... * Added new option in invoice_copy, made state_number read_only * removed the trailing whitespace	2017-07-07 14:05:33 +05:30
mbauskar	7b8d366e3a	bumped to version 8.3.2	2017-07-07 14:11:45 +06:00
rohitwaghchaure	a29442d6bf	[Fix] Setup wizard translation (#9693)	2017-07-07 13:40:13 +05:30
rohitwaghchaure	bbe16c80ff	[Fix] Setup wizard translation issue (#9692)	2017-07-07 13:27:15 +05:30
Nabin Hait	4e21f11864	Merge pull request #9690 from rmehta/additional-discount-fix ... [fix] reset flag after promise	2017-07-07 13:26:14 +05:30
Rushabh Mehta	19d52dc503	[fix] remove extra flag	2017-07-07 13:23:23 +05:30
Nabin Hait	8b486b0f28	Fixed state code of WB and allowed invoice_copy to edit after submit	2017-07-07 13:14:25 +05:30
Rushabh Mehta	6705ab3eaf	[fix] discount setting multiple times	2017-07-07 13:14:08 +05:30
Rushabh Mehta	233a19a373	[fix] reset flag after promise	2017-07-07 13:06:29 +05:30
Nabin Hait	fbb5945ff3	Fixed itemised tax calc to fix pos loading	2017-07-07 12:58:22 +05:30
Nabin Hait	7773ee8960	Sales invoice dashboard, multiple letter head in report and email alert docs	2017-07-07 12:49:05 +05:30
Nabin Hait	29b74b90c8	bumped to version 8.3.1	2017-07-06 23:45:28 +06:00
Nabin Hait	e927b81292	Update production_order.js	2017-07-06 23:11:54 +05:30
Makarand Bauskar	88a37c17a6	[hotfix] commit after every 200 production orders (#9674)	2017-07-06 19:13:09 +05:30
Rohit Waghchaure	934e69fe0b	Remove sales invoice from serial number while making sales return entery using delivery note	2017-07-06 18:19:18 +05:30
Nabin Hait	5fe7f6c3fd	Invoice copy is in the center in gst print format	2017-07-06 17:51:05 +05:30
Nabin Hait	d59819d9bb	Date format issue fixed in setup wizard	2017-07-06 16:12:59 +05:30
mbauskar	7699b5e92a	bumped to version 8.3.0	2017-07-06 16:42:02 +06:00
Nabin Hait	b5d765d19a	Merge pull request #9669 from rohitwaghchaure/sales_invoice_serial_no_revert ... Revert sales invoice serial no issues	2017-07-06 16:07:46 +05:30
Rohit Waghchaure	6d03790b44	Revert sales invoice serial no issues	2017-07-06 15:58:50 +05:30
Nabin Hait	3638250f5d	Merge pull request #9641 from manassolanki/att-report ... show inactive students in the monthly attendance report	2017-07-06 15:53:16 +05:30
Nabin Hait	7bf192e46a	Merge pull request #9526 from manassolanki/validate-criteria ... validate the duplicate assessment criteria	2017-07-06 15:47:10 +05:30
Nabin Hait	fa351f4bdf	Merge pull request #9433 from tundebabzy/issue-9424 ... Errors due to a single quote in Supplier's name #9424	2017-07-06 15:22:16 +05:30
Nabin Hait	f3f0dfef2a	Invoice copy, state code in gst print format, hsn code in other sales/purchase docs (#9658) ... * Invoice copy, state code in gst print format, hsn code in other sales/purchase docs * Formatted Net Amount in item-tax-breakup * GST print format fixes * removed trailing whitespace * removed trailing whitespace	2017-07-06 14:49:34 +05:30
rohitwaghchaure	5d5a81f375	Fixed patch create_warehouse_nestedset (#9656)	2017-07-06 13:03:11 +05:30
Nabin Hait	02c8607d04	Production Order Documentation for Required Items table (#9647)	2017-07-06 11:28:07 +05:30
Makarand Bauskar	ddd4845420	[hotfix] setup wizard, complete_setup fixes (#9654) ... * [hotfix] setup wizard, complete_setup fixes * Update utils.py * Update utils.py	2017-07-06 11:09:34 +05:30
Ben Cornwell-Mott	19d9381197	Added lead time field to supplier quotation	2017-07-05 13:17:13 -07:00
Rushabh Mehta	63b06420e1	[fix] setup wizard dates (#9646)	2017-07-05 17:56:04 +05:30
Makarand Bauskar	bf66d7e041	[minor] setup wizard dates to yyyy-mm-dd format (#9642)	2017-07-05 17:26:34 +05:30
Manas Solanki	fc85768685	show inactive students in the monthly attendance reoprt	2017-07-05 16:35:47 +05:30
Nabin Hait	37c784eb3a	Updated modified in bom doctypes	2017-07-05 16:09:23 +05:30
Makarand Bauskar	a54eb7d022	[minor] added change log for v8.3.0 (#9629)	2017-07-05 15:36:38 +05:30
Makarand Bauskar	48af4289d3	Revert "[enhance] Provision to set the currency in the pricing rule for the price" (#9636)	2017-07-05 15:17:02 +05:30
Rushabh Mehta	03c30a7f92	[minor] throw name error if group matches with name, for setup wizard to nicely catch the exception	2017-07-05 15:12:07 +05:30
Nabin Hait	949a920022	Production Order Enhancements (#9432) ... * Production Order Enhancements - Show required items child table - Source warehouse for each raw materials, in Pro Order Item and BOM Item table - Group warehouse allowed for source and wip warehouse - Patch to populate required items, to fix status and reserved qty for stopped pro order - Cleaned up existing codes - Test cases * Set available qty in source and wip warehouse * minor fix in bom query naming * Minor Fixes * Reload BOM doctypes in patch	2017-07-05 13:55:41 +05:30
Nabin Hait	852cb64e4f	GST tax invoice print format and more (#9616) ... * GST Tax Invoice print format and more. Fixes #9545 #9566 #9608 * Reload gst print format only for Indian users * Fixes as Codacy	2017-07-05 12:58:19 +05:30
mbauskar	b66fb9a4c0	Merge branch 'master' into develop	2017-07-05 11:25:15 +05:30
mbauskar	4b7a30b527	bumped to version 8.2.4	2017-07-05 11:55:14 +06:00
Doridel Cahanap	5ad4a6e161	Total Stock Summary (#9465) ... * Total Stock Summary * indentation fixes and removed the for loop * minor fixes in total stock summery report	2017-07-05 10:49:09 +05:30
rohitwaghchaure	10a4a13e5e	Remove gst reports for non indian accounts (#9553) ... * remove gst reports for non indian accounts * [Fix] GSN code auto name	2017-07-04 16:45:29 +05:30
Frappe PR Bot	3ceab64bfa	[translation] translation updates (#9611)	2017-07-04 16:08:14 +05:30
tundebabzy	6015f0f2ec	Inspection required before delivery isn't working for item variants (#9362) ... * makes `copy_attributes_to_variant` to not ignore "Table" * fixes test cases - `test_auto_material_request` and `test_auto_material_request_for_variant` * adds test case - tables in templates should be copied to variants * [ci] use deprecated trusty build for now	2017-07-04 15:43:02 +05:30
rohitwaghchaure	e5ca48a76a	[fix] Don't update the sales invoice number into the serial no if update stock is disabled in the invoice (#9593)	2017-07-04 10:54:23 +05:30
rohitwaghchaure	3e4bcfe2d8	[Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' (#9585) ... * [Fix] Opening Entry, Unknown column 'warehouse' in 'where clause' * escaped company name in get_opening_accounts	2017-07-04 10:49:37 +05:30
Prateeksha Singh	5e4c8ecd62	Setup wizard refactor (#9441) ... * cleaned up slides, yet to decide on master data * remove item_count * [fix] refresh slides on domain bug * UI test * set header image here in ERPNext * [minor] lint checks * [wiz] change autofilled fiscal year format * [minor] fixed date format to dd-mm-yyyy if fiscal year is not available for country	2017-07-03 18:23:57 +05:30
Makarand Bauskar	11df066ed0	Merge pull request #9586 from Arundhatii/28June ... Added help page for Global Search and updated old images #9241	2017-07-03 16:24:39 +05:30
Makarand Bauskar	87f2848aeb	resolved conflicts	2017-07-03 16:24:01 +05:30
Makarand Bauskar	12450fa473	Merge pull request #9558 from mbauskar/domainify-school ... [domainify] Domainification for the Education Domain	2017-07-03 16:17:21 +05:30
Frappe	67bbcf6932	Resolved conflicts in index.md	2017-07-03 16:00:07 +05:30
Frappe	79918c66c2	Deleted old Images and added Global Search Help page	2017-07-03 15:58:14 +05:30
Makarand Bauskar	960208bae0	Merge pull request #9426 from tundebabzy/issue-9096 ... Gross Profit Does not display Reversal of sales invoice #9096	2017-07-03 15:23:21 +05:30
Makarand Bauskar	1bad1fcc00	Merge pull request #9452 from faztp12/develop ... Customer Query include Search fields	2017-07-03 15:20:23 +05:30
Rushabh Mehta	43ef4e9047	Added first UI tests (#9532) ... * [wip] * [tests] wip * [ui-tests] first-cut * [minor] remove old tests	2017-07-03 11:53:07 +05:30
mbauskar	a06a600d0a	Merge branch 'master' into develop	2017-07-01 14:16:46 +05:30
mbauskar	af9d3a4db6	bumped to version 8.2.3	2017-07-01 14:46:46 +06:00
Makarand Bauskar	f39a9f1c5b	Merge pull request #9562 from mbauskar/gst-hsn-code ... [minor] fix autoname for GST HSN Code (#9536)	2017-07-01 14:15:18 +05:30
Sagar Vora	067991ee30	[minor] fix autoname for GST HSN Code (#9536)	2017-07-01 14:14:14 +05:30
Makarand Bauskar	1589ada04d	Merge pull request #9473 from rohitwaghchaure/pricing_rule_currency ... [enhance] Provision to set the currency in the pricing rule for the price	2017-06-30 18:58:30 +05:30
mbauskar	ee368221cf	[domainify] Domainification for schools doctype	2017-06-30 17:58:57 +05:30
Charles-Henri Decultot	53de2f1b57	Translation correction in P&L report (#9436)	2017-06-30 16:45:11 +05:30
mbauskar	22aaf0cbd0	[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register	2017-06-30 16:43:25 +05:30
Sagar Vora	8ebc0df65f	[minor] fix autoname for GST HSN Code (#9536)	2017-06-30 16:42:26 +05:30
Makarand Bauskar	4095915bff	Merge pull request #9489 from rohitwaghchaure/billed_amt_issue_in_pr ... [fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before	2017-06-30 16:02:31 +05:30
Makarand Bauskar	abe8e2ecce	Merge pull request #9533 from rohitwaghchaure/total_amount_issue ... [minor] Total amount not showing value in bank reconcillation	2017-06-30 14:50:23 +05:30
Makarand Bauskar	b053674781	Merge pull request #9534 from manassolanki/report ... Course wise assessment result tool	2017-06-30 14:47:46 +05:30
Manas Solanki	bb68f8ca01	cleanup for the assessment report and added chart	2017-06-30 12:22:51 +05:30
mbauskar	0407cb0d92	bumped to version 8.2.2	2017-06-30 12:30:22 +06:00
Rohit Waghchaure	3856d14ae6	[Fix] Options must be a valid DocType for field Customs Tariff Number	2017-06-30 11:57:41 +05:30
Manas Solanki	85480b3af7	Added report in config/schools.py	2017-06-30 11:36:57 +05:30
Manas Solanki	c4125b32ee	Course wise assessment reports	2017-06-30 11:36:57 +05:30
Sagar Vora	7640858510	[minor] fix bom price resetting on validation	2017-06-29 22:20:07 +05:30
mbauskar	53e34f5c1c	bumped to version 8.2.1	2017-06-29 22:28:08 +06:00
mbauskar	0c2de6e07a	[minor] fixed the report value for deprecated report patch	2017-06-29 21:47:14 +05:30
Rohit Waghchaure	b801357ecf	[minor] Total amount not showing value in bank reconcillation	2017-06-29 18:40:01 +05:30
mbauskar	8f1f93603d	bumped to version 8.2.0	2017-06-29 15:37:26 +06:00
Aditya Duggal	f1bd39c937	Allow NA values in GSTIN number (#9503) ... -Reason for allowing NA value is that if a user wants to make GSTIN number mandatory then they can do the same easily	2017-06-29 14:25:19 +05:30
Manas Solanki	800c69eec3	validate the duplicate assessment criteria	2017-06-29 13:00:22 +05:30
mbauskar	ec252c806f	resolved merge conflicts	2017-06-29 12:11:07 +05:30
mbauskar	71b4e48ea5	bumped to version 8.1.7	2017-06-29 12:39:39 +06:00
Makarand Bauskar	ae2d92ee76	Merge pull request #9523 from saurabh6790/setup_wiz_fix ... [fix] translate domain	2017-06-29 12:07:19 +05:30
Saurabh	21cf1fd851	[fix] translate domain	2017-06-29 12:04:45 +05:30
Makarand Bauskar	a938d3956a	[minor] get doc using party_name instead of party	2017-06-29 11:58:50 +05:30
Rushabh Mehta	02b0ed4199	[fix] update-gstin	2017-06-29 11:56:14 +05:30
Vishal Dhayagude	76f93d05b7	display image in supplier's list view (#9500) ... * [fix]display supplier image in desk * Supplier image displayed in desk * Show image in supplier desk page * [minor] removed whitespaces	2017-06-29 11:23:13 +05:30
Makarand Bauskar	24ab20fe11	Merge pull request #9467 from rohitwaghchaure/support_hours_report ... [enhance] Report for analysis of support hours count	2017-06-29 11:19:41 +05:30
Makarand Bauskar	1eb31db71f	Merge pull request #9466 from manassolanki/validation ... changes in student settings for validating the students in the student groups	2017-06-29 10:48:59 +05:30
Makarand Bauskar	ef95b4d6e3	Merge pull request #9468 from manassolanki/issue-11 ... in program enrollment filter out students which are already enrolled	2017-06-29 10:48:12 +05:30
Makarand Bauskar	514c0417dd	Merge pull request #9483 from manassolanki/fix-student-fetch ... fetch queries for the students in the student group	2017-06-29 10:47:05 +05:30
Makarand Bauskar	67f6ac848c	Merge pull request #9497 from ashwinisave35/email_template_redesign ... Adding ERPNext logo for email templates.	2017-06-29 10:46:44 +05:30
Makarand Bauskar	5d95ebec4e	Merge pull request #9508 from rohitwaghchaure/contacts_module_error ... [Fix] Module error during patch execution	2017-06-29 10:46:17 +05:30
Makarand Bauskar	bb7317d398	Merge pull request #9512 from mbauskar/patch-fix ... [fixes] delete auto email report of deprecated reports and other minor fixes	2017-06-29 10:45:50 +05:30
Makarand Bauskar	550268eaf3	Merge pull request #9518 from sagarvora/gh-9516 ... [minor] fix supplier GSTIN portal not getting displayed	2017-06-29 10:43:53 +05:30
Makarand Bauskar	7f9af46da5	[minor] removed whitespace	2017-06-29 09:38:46 +05:30
Makarand Bauskar	e38eb83358	[minor] removed print statement	2017-06-29 09:35:11 +05:30
Makarand Bauskar	af00c9f70b	[minor] removed whitespaces from get_students method	2017-06-29 09:25:19 +05:30
Makarand Bauskar	5c7545da0c	[minor] passed index for string format	2017-06-29 09:07:59 +05:30
mbauskar	d6e8bb5452	[fixes] delete auto email report of deprecated reports and other minor fixes	2017-06-29 08:39:01 +05:30
Sagar Vora	435032f5bc	[minor] fix typo	2017-06-28 23:59:47 +05:30
Sagar Vora	1ef50c89db	[minor] use party_name instead of party and save GSTIN in uppercase	2017-06-28 23:52:22 +05:30
tunde	690de64734	Merge branch 'develop' into issue-9166	2017-06-28 13:37:04 +01:00
tunde	c7e3a09cfb	adds if statement for reference_type === "Asset"	2017-06-28 13:23:18 +01:00
Rohit Waghchaure	2e4b4454b3	[Fix] Module error during patch execution	2017-06-28 17:31:59 +05:30
rohitwaghchaure	4b33b7e1c1	Merge pull request #9418 from nick9822/nick9822-patch-3 ... Removed "Asset" filter on payment account	2017-06-28 16:38:21 +05:30
rohitwaghchaure	69279229cc	Merge pull request #8987 from bcornwellmott/bom_convert_uom ... Added BOM UOM selection for items	2017-06-28 16:28:31 +05:30
Rohit Waghchaure	5b7028c7bb	stock qty not changed if item change	2017-06-28 15:58:51 +05:30
mbauskar	e9a4f4e70d	bumped to version 8.1.6	2017-06-28 14:02:29 +06:00
Saurabh	be03de3ad6	Merge pull request #9502 from mbauskar/patch-fix ... [fix] delete/update desktop icon for deprecated report	2017-06-28 13:28:33 +05:30
mbauskar	6daa6e422e	[fix] delete/update desktop icon for deprecated report	2017-06-28 13:26:50 +05:30
Saurabh	07913c3ff2	[fix] delete custom field tax_id if exists in trasaction Sales Order, Sales Invoice and Delivery Note	2017-06-28 13:16:50 +05:30
mbauskar	3b0e6cecd6	[minor] fixed broken image url in gst documentation	2017-06-28 12:29:19 +05:30
Ashwini Save	544de60d36	Adding ERPNext logo for email tempates.	2017-06-28 11:44:09 +05:30
Manas Solanki	d652221071	fetch queries for the students in the student group	2017-06-28 11:26:41 +05:30
mbauskar	3bf9071598	bumped to version 8.1.5	2017-06-28 11:31:40 +06:00
mbauskar	27692670b1	[fix] handle email exception if email account is not configured	2017-06-28 10:56:50 +05:30
Saurabh	3f2dd04b10	[fix] reload gst settings doctype in patch	2017-06-28 10:50:38 +05:30
mbauskar	4e0999dda7	bumped to version 8.1.4	2017-06-28 11:10:07 +06:00
Makarand Bauskar	eef3f62ff7	Merge pull request #9488 from rmehta/gst-reminder ... [regional] ability to send gst reminders to all parties	2017-06-27 19:33:05 +05:30
Makarand Bauskar	104eb8c6ad	[minor] render GSTIN value as "" instead of None	2017-06-27 18:59:35 +05:30
Manas Solanki	3959c7c3c1	filter out students which are already enrolled in program enrollment	2017-06-27 18:22:05 +05:30
Makarand Bauskar	b43f4073db	fixed TypeError: throw() got an unexpected keyword argument 'exception'	2017-06-27 18:15:52 +05:30
Rushabh Mehta	01659271be	[minor] dont make fixtures again by patch	2017-06-27 18:05:54 +05:30
Rushabh Mehta	c616a4a527	[tests] codacy	2017-06-27 17:50:15 +05:30
Rohit Waghchaure	eb7eb43dfc	[fix] Billed Amt does not get updated in Purchase Receipt, if Invoice exists and item has been returned once before	2017-06-27 17:34:44 +05:30
Rushabh Mehta	00ae424cac	[regional] ability to send gst reminders to all parties	2017-06-27 17:31:41 +05:30
Makarand Bauskar	7b6e09b9a7	Merge pull request #9487 from rohitwaghchaure/currency_label_issue ... [fix] Currency label not displaying in the total advance field	2017-06-27 16:16:22 +05:30
Makarand Bauskar	90a3e60de7	Merge pull request #9372 from pratu16x7/serial-batch-entry ... Serial no/batch entry dialog	2017-06-27 16:12:30 +05:30
Rohit Waghchaure	f3e91e2b2b	[minor] Currency label not displaying in the total advance field	2017-06-27 15:51:35 +05:30
pratu16x7	846f5d4bd8	[fix] cloning rows	2017-06-27 14:03:56 +05:30
Makarand Bauskar	51520f9de6	Merge pull request #9479 from frappe-pr-bot/translations-2017-06-27 ... [translation] translation update	2017-06-27 13:58:04 +05:30
frappe-pr-bot	8ddd946dea	[translation] translation updates	2017-06-27 10:10:50 +02:00
Saurabh	c20abf6b2a	send email to system managers about gst setup	2017-06-27 13:21:57 +05:30
mbauskar	8c3f99f12e	revert customer-orders-invoices-and-shipping-status.md documentation	2017-06-27 12:49:10 +05:30
Rushabh Mehta	9b09ff29d2	[fix] address creation for india/setup.py	2017-06-27 12:17:39 +05:30
Rushabh Mehta	f4e908bd91	[minor] general_ledger.js	2017-06-27 11:56:30 +05:30
Makarand Bauskar	5d8803b23e	Merge pull request #9435 from rmehta/gst ... GST (India) Setup and Invoices #8711	2017-06-27 11:44:33 +05:30
pratu16x7	f970ca4d35	Update docs	2017-06-27 10:12:58 +05:30
pratu16x7	29cebbb0cd	use set_value() for setting rows	2017-06-27 09:48:28 +05:30
Rohit Waghchaure	0b078fb4cb	[enhance] Provision to set the currency in the pricing rule for the price	2017-06-27 00:06:40 +05:30
pratu16x7	89d001caf3	[lint] fixes	2017-06-26 17:45:49 +05:30
tunde	6837e69187	Merge branch 'develop' into issue-9424	2017-06-26 13:05:27 +01:00
tunde	5824ae98d9	calls local to build frappe.form_dict in order to pass failing test	2017-06-26 12:42:11 +01:00
Rohit Waghchaure	67526f244e	[enhance] Report for analysis of support hours count	2017-06-26 17:04:52 +05:30
tunde	67cbeb1bb0	Merge branch 'develop' into issue-9096	2017-06-26 12:11:07 +01:00
tunde	8859eb23a3	set form_dict correctly	2017-06-26 12:01:41 +01:00
pratu16x7	ae450fc23b	async call to require, more validation	2017-06-26 15:31:46 +05:30
nick9822	82e816054e	Added report_type to payment account filter	2017-06-26 15:29:44 +05:30
tunde	ea7768d3f3	fixes form_dict failure in travis test	2017-06-26 10:17:53 +01:00
Manas Solanki	cb650f836e	validation of student in student attendance	2017-06-26 14:11:12 +05:30
Saurabh	095701e86b	bumped to version 8.1.3	2017-06-26 14:25:59 +06:00
pratu16x7	5f389c999a	[fix] values update in items in invoices	2017-06-26 13:38:24 +05:30
Saurabh	29fa0a9a17	[fix] patch fixes	2017-06-26 13:28:45 +05:30
tunde	c1d22adb9f	Merge branch 'develop' into issue-9424	2017-06-26 08:52:55 +01:00
tunde	bce13cd0e3	fixes failing test	2017-06-26 08:43:25 +01:00
Saurabh	3bf5a38c6f	bumped to version 8.1.2	2017-06-26 11:31:37 +06:00
Makarand Bauskar	c93de0e803	[minor] removed global roles from company doctype field's depends on propery (#9450)	2017-06-24 10:39:30 +05:30
Rushabh Mehta	d03203966a	[minor] fix old patch	2017-06-24 10:37:19 +05:30
Console Admin	8623166dca	Customer Query include Searchfields ... frappe/erpnext#8821	2017-06-23 20:32:52 +03:00
pratu16x7	577e4c4e28	Add in transaction.js, cleanups	2017-06-23 19:25:01 +05:30
Makarand Bauskar	ebaea08225	Merge pull request #9437 from Arundhatii/20Jun ... Added help pages and deleted old images links to #9241	2017-06-23 18:54:45 +05:30
Makarand Bauskar	1a78a3244b	removed conflicts	2017-06-23 18:37:08 +05:30
rohitwaghchaure	8f51a5e527	In POS on click of delete button, remove the selected item from the cart (#9428)	2017-06-23 18:17:04 +05:30
Makarand Bauskar	1d962dd3f7	removed conflicts	2017-06-23 18:11:58 +05:30
Makarand Bauskar	bbf81aa3a4	image title translation	2017-06-23 18:11:00 +05:30
Makarand Bauskar	862302f02d	image title translation	2017-06-23 18:10:06 +05:30
Makarand Bauskar	408336e7ad	image title translation	2017-06-23 18:08:45 +05:30
Makarand Bauskar	ab49c3100d	corrected image title	2017-06-23 18:04:56 +05:30
Makarand Bauskar	ec27a30069	Merge pull request #9442 from creamdory/develop ... BOM Stock Report to allow Multi Level Warehouse Setup	2017-06-23 17:59:56 +05:30
Makarand Bauskar	5e994ddf65	removed white spaces	2017-06-23 17:58:50 +05:30
Makarand Bauskar	4eced4acec	Merge pull request #9445 from rohitwaghchaure/column_width_issue_bank_reco ... [minor] Fix grid column of the Bank Reconciliation	2017-06-23 17:24:50 +05:30
Frappe	a951e56f9c	Modified help pages	2017-06-23 16:49:35 +05:30
Frappe	1f8e5fbcb1	Edited help page	2017-06-23 16:48:46 +05:30
Frappe	ca6fed359b	Added help pages for Subcontracting and deleted old images	2017-06-23 16:48:17 +05:30
creamdory	9961fb82d6	Bom Stock Report Change Requests	2017-06-23 15:57:52 +08:00
Rohit Waghchaure	8326028d33	Don't validate delivery note and sales order required for the POS invoice	2017-06-23 12:56:12 +05:30
Rohit Waghchaure	666d004b40	[minor] Fix grid column of the Bank Reconciliation	2017-06-23 12:10:21 +05:30
Frappe	9a8f33f855	Replaced screenshot in help pages, links to #9241	2017-06-23 11:30:26 +05:30
Frappe	8181a7463e	added help page for Kanban Board, links to #9241	2017-06-23 11:30:26 +05:30
Frappe	ac08fbd438	added test documentation	2017-06-23 11:30:26 +05:30
Rushabh Mehta	210b6f8f7e	[docs]	2017-06-22 22:32:08 +05:30
Rushabh Mehta	25366a22ad	[minor] cleanup	2017-06-22 22:32:08 +05:30
Rushabh Mehta	919a74ad88	[gst] adde reports + docs	2017-06-22 22:32:08 +05:30
Rushabh Mehta	b3c8f44b3e	[wip] GST for India. Pending reports	2017-06-22 22:31:32 +05:30
tunde	94500fd17b	adds test case	2017-06-22 17:34:54 +01:00
tunde	dcd54209fc	parameterises sql string	2017-06-22 14:03:19 +01:00
pratu16x7	759f669214	Add in delivery note	2017-06-22 18:14:29 +05:30
pratu16x7	70eca9462b	make erpnext.SerialNoBatchSelector	2017-06-22 18:14:29 +05:30
pratu16x7	60d9446656	onchange in df	2017-06-22 18:14:29 +05:30
pratu16x7	934105bf34	fix modified by, blur serial field	2017-06-22 18:14:28 +05:30
pratu16x7	26b8f5c3ce	[minor]	2017-06-22 18:14:16 +05:30
pratu16x7	36693e27be	[fix] tests	2017-06-22 18:14:16 +05:30
pratu16x7	a5d5403bf3	specific change bubbling for grid fields	2017-06-22 18:13:56 +05:30
pratu16x7	0e35651e94	Add get_stock_qty test	2017-06-22 18:13:56 +05:30
pratu16x7	837ffbddbc	[minor]	2017-06-22 18:13:55 +05:30
pratu16x7	ff25573558	cleanup	2017-06-22 18:13:55 +05:30
pratu16x7	82a199d6d7	[fix] availably qty reupdate	2017-06-22 18:13:55 +05:30
pratu16x7	d15a507567	add serial_no_check	2017-06-22 18:13:55 +05:30
pratu16x7	01e79f033e	add warehouse selection and mapping	2017-06-22 18:13:55 +05:30
pratu16x7	9a6e675b41	wip	2017-06-22 18:13:55 +05:30
pratu16x7	7331f169fc	[fix] warehouse required bug	2017-06-22 18:13:54 +05:30
pratu16x7	d09f35fa98	fire modal on item_code, events, validation	2017-06-22 18:13:54 +05:30
pratu16x7	52d703a232	[fix] test	2017-06-22 18:13:54 +05:30
pratu16x7	e4e00d2215	batch item distribution by oldest, serial no check	2017-06-22 18:13:54 +05:30
pratu16x7	60944e3397	get oldest batch in modal, insert batch items	2017-06-22 18:13:30 +05:30
pratu16x7	0b642cd414	set available qty	2017-06-22 18:13:30 +05:30
pratu16x7	b4de1c771b	WIP	2017-06-22 18:13:30 +05:30
Rushabh Mehta	aedaac63ea	[wip] batch, serial number selector	2017-06-22 18:13:30 +05:30
mbauskar	04c8bf0b21	bumped to version 8.1.1	2017-06-22 17:30:25 +06:00
mbauskar	66e2a510b9	[minor] deleted deprecated reprots and changed the lead.json modified time	2017-06-22 16:57:46 +05:30
tunde	96e629a635	adds credits notes to report since double entry for P or L affects sales	2017-06-22 10:04:33 +01:00
mbauskar	ea77b63b4a	bumped to version 8.1.0	2017-06-22 13:40:58 +06:00
Makarand Bauskar	79d36c7c43	Merge pull request #9423 from mbauskar/patch-fix ... [minor] save the system settings document	2017-06-22 12:49:35 +05:30
mbauskar	4b299ba009	[minor] save the system settings document	2017-06-22 12:46:31 +05:30
Makarand Bauskar	e995371b08	Merge pull request #9355 from rohitwaghchaure/company_wise_manufacturing_settings ... [Enhance] Company wise perpetual inventory settings	2017-06-22 12:35:41 +05:30
Rohit Waghchaure	2d9b3cd270	Fixed test cases	2017-06-22 12:23:15 +05:30
Ben Cornwell-Mott	ac3ad0810a	Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom	2017-06-21 10:17:39 -07:00
Ben Cornwell-Mott	1e96b7bbe5	Added conversion_factor update in patch	2017-06-21 10:16:50 -07:00
Makarand Bauskar	0ea5d941e6	Merge branch 'develop' into bom_convert_uom	2017-06-21 21:35:38 +05:30
nick9822	881491cd2b	Removed "Asset" filter on payment account	2017-06-21 19:51:08 +05:30
Makarand Bauskar	1b6746e3bc	Merge pull request #9388 from saurabh6790/dropbox_doc_fix ... [update] dropbox documentation to show how to set redirect url to create access token	2017-06-21 19:10:45 +05:30
Makarand Bauskar	cdfccffc0d	Merge pull request #9341 from manassolanki/training-event ... send email on update and on update after submit	2017-06-21 19:09:21 +05:30
Makarand Bauskar	7a2a2dad35	Merge pull request #9381 from almeidapaulopt/so_proj ... link sales order to new project	2017-06-21 18:48:30 +05:30
Umair Sayyed	5057098a19	Updated help pages and removed old images, links to #9262	2017-06-21 17:54:39 +05:30
Makarand Bauskar	ce7087f08a	Merge pull request #9408 from mbauskar/develop ... merged hotfix branch to develop	2017-06-21 16:41:33 +05:30
Makarand Bauskar	b37eb10421	Merge pull request #9382 from nick9822/nick9822-patch-1 ... Resetting batch and serial nos checks	2017-06-21 16:34:32 +05:30
mbauskar	196f3b1fb8	resolved merge conflicts	2017-06-21 14:38:06 +05:30
mbauskar	9b4690995e	bumped to version 8.0.51	2017-06-21 13:47:12 +06:00
Manas Solanki	29ba4143f9	make quotation against lead company name (#9188)	2017-06-21 12:55:27 +05:30
Makarand Bauskar	9b5d1fc458	Merge pull request #9401 from sagarvora/so-calendar ... [fix] get status in calendar view and show green background	2017-06-21 12:41:27 +05:30
Manas Solanki	7f64f623f0	Trigger assessment plan every time page loads	2017-06-21 12:08:23 +05:30
Sagar Vora	6371b53b7e	[fix] get status in calendar view and show green background	2017-06-21 11:58:29 +05:30
Saurabh	8d269beb45	[minor][fix] pass template item name to make_variant_item_code	2017-06-20 20:14:14 +05:30
Makarand Bauskar	cd5dd890aa	Merge pull request #9384 from nick9822/nick9822-patch-2 ... Bug while fetching stock balance of new item.	2017-06-20 19:52:28 +05:30
Saurabh	88b642637b	update dropbox documentation to show how to set redirect url to create access token	2017-06-20 19:01:16 +05:30
Umair Sayyed	357cd6df90	added new images, links #9262	2017-06-20 18:19:50 +05:30
Umair Sayyed	3292e59dcd	Replaced old images with new, links to #9262	2017-06-20 18:17:40 +05:30
nick9822	cc699a94fd	Bug while fetching new item balance.	2017-06-20 17:13:29 +05:30
nick9822	43a48fd2bc	Resetting batch and serial nos checks	2017-06-20 17:02:55 +05:30
Paulo Almeida	2d5e65ddcf	link sales order to new project	2017-06-20 12:08:22 +01:00
frappe-pr-bot	db4bb720b8	[translation] translation updates	2017-06-20 11:22:36 +02:00
Makarand Bauskar	8fac4314aa	Merge pull request #9373 from sagarvora/gh-9289 ... Check for align_labels_left before adding text-right class	2017-06-20 14:31:22 +05:30
Sagar Vora	89d60ca35e	Check for align_labels_left before adding text-right class	2017-06-20 14:16:06 +05:30
Rushabh Mehta	17e6bb83eb	[fix] typo, item group route to have parent only for non root	2017-06-20 14:07:33 +05:30
Makarand Bauskar	958b06b129	Merge pull request #9369 from sagarvora/gh-4559 ... [minor] calculate balance in company currency instead of account currency	2017-06-20 13:26:10 +05:30
Ayush Shukla	a111f78566	Leaderboard of customers, items, suppliers and sales partner (#9354) ... * First commit leaderboard working * Styling and added href * Changed timeline string * Changes in item * Cleanup * Fix * made changes to currency column * Code cleanup for codacy * Sorting bug fixed and formatting done * Changed type to isinstance	2017-06-20 13:04:45 +05:30
Vishal Dhayagude	310d4dc9e0	UOM column in Batch Wise Balance History Report (#9359) ... * Training Events/Results link to employee dashbord * [minor]Improve validation message for Buying / Selling Setting * [minor]Added UOM cloumn in Batch Wise Balance History Report * modified validation message for buying / selling setting	2017-06-20 13:02:35 +05:30
Britlog	faf75c4ddd	Fix and improve shopping cart (#9348) ... * Fix and improve shopping cart * Update shopping_cart.js * Update shopping_cart.js	2017-06-20 12:51:32 +05:30
Rushabh Mehta	c422874418	Update company.py	2017-06-20 12:19:36 +05:30
Rushabh Mehta	777526e3a8	Update __init__.py	2017-06-20 12:14:32 +05:30
Makarand Bauskar	22773a29f7	Merge pull request #9356 from tundebabzy/issue_6510 ... adds information about "Is Paid" and "Update Stock"	2017-06-20 12:04:16 +05:30
Sagar Vora	5b08d7acb3	[minor] calculate balance in company currency instead of account currency	2017-06-20 11:50:23 +05:30
Rohit Waghchaure	e9ff1914fc	Added is_perpetual_inventory_enabled method	2017-06-20 11:26:37 +05:30
Rohit Waghchaure	65ccb42f95	fixed document	2017-06-20 10:21:34 +05:30
Rohit Waghchaure	6945d0dd8a	fixed test cases	2017-06-20 10:21:33 +05:30
Rohit Waghchaure	a5f40941ae	[Enhance] Companywise perpetual inventory setting	2017-06-20 10:21:33 +05:30
Rushabh Mehta	80ef298519	[fix] [tests] test_delivery_note	2017-06-20 10:07:28 +05:30
Rushabh Mehta	36311020de	[minor] ux fixes	2017-06-20 09:31:06 +05:30
tunde	4961072b51	adds the corrected breadcrumbs trail	2017-06-19 13:51:27 +01:00
Makarand Bauskar	9a5c39d329	Merge pull request #9353 from mbauskar/develop ... [minor] Allow on Submit for Sales Order Customer PO and Customer PO Date	2017-06-19 18:16:22 +05:30
tunde	46db749d62	adds information about "Is Paid" and "Update Stock"	2017-06-19 09:18:57 +01:00
mbauskar	de5a11e8fb	[minor] Allow on Submit for Sales Order Customer PO and Customer PO Date	2017-06-19 13:07:51 +05:30
Sagar Vora	086b6a33ea	Fixed BOM value not updating on changing item (#9350)	2017-06-19 12:25:14 +05:30
Sagar Vora	67fe1010c7	[minor] set_posting_time=1 only when imported data contains posting date. (#9349)	2017-06-19 12:12:22 +05:30
Rushabh Mehta	b7b49f6da7	[fixes] fix message and type conversion;	2017-06-19 09:59:09 +05:30
Charles-Henri Decultot	2305eda82e	Addition of new fields for POS Profile in Sales Invoice and POS Profile User link modification (#9339)	2017-06-19 09:25:54 +05:30
Umair Sayed	ac2e32a511	replaced some old images with new, #9262 (#9335)	2017-06-19 09:23:04 +05:30
Ben Cornwell-Mott	2c77165fc6	Fixed small code issues (codecy)	2017-06-16 13:47:40 -07:00
Manas Solanki	9936100a6a	send email on update and on update after submit fixes #8898	2017-06-16 22:18:20 +05:30
bcornwellmott	6561b8ade9	Merge branch 'develop' into bom_convert_uom	2017-06-16 08:29:00 -07:00
mbauskar	3c1a53c325	[minor] use reload_doc instead of reload_doctype	2017-06-16 18:31:42 +05:30
Rushabh Mehta	73167eae60	[demo] make it faster, do not send user email	2017-06-16 16:55:32 +05:30
tundebabzy	9a3462031d	[UX] Error in purchase transaction - Ignore instead of Prompt #7766 (#9329) ... * sets tax category to "Total" if all items are non-stock items * makes notification message translatable and removes multi-line string * Update buying_controller.py	2017-06-16 15:30:14 +05:30
almeidapaulopt	31692a2595	Create a project from a Sales Order (#9111) ... * init commit * don't get tasks if project name is none * cleanup * Update sales_order.js	2017-06-16 15:29:41 +05:30
mbauskar	2ea55c7143	[minor] reload Domain doctype before executing patch	2017-06-16 14:33:59 +05:30
Makarand Bauskar	3d6697949c	[minor] fixed the child table field name (#9328) ... * [minor] exclude Other domain from Domains * [minor] fixed the child table field name	2017-06-16 14:12:28 +05:30
Sagar Vora	b1c794a4f9	[hot] fix global name args is not defined (#9326)	2017-06-16 13:50:35 +05:30
rohitwaghchaure	fb45913b3b	[fix] Patch for move account head from account to warehouse (#9325)	2017-06-16 13:12:37 +05:30
Makarand Bauskar	dd986f659e	Merge branch 'pratu16x7-domainify' into domainify (#9324) ... * bootstrap domains and set active_domain on setup * [minor] Patch for domain docs * [minor] * Update create_domain_docs.py	2017-06-16 13:02:45 +05:30
Nabin Hait	84bc5601eb	Total sales cost in Project should be updated based on base_grand_total (#9302) ... * Total sales cost in Project should be updated based on base_grand_total * Patch to update sales cost in Project in base currency	2017-06-16 12:13:51 +05:30
Vishal Dhayagude	2510d1c86a	Training Events/Results link added to Employee (#9313)	2017-06-16 11:58:08 +05:30
Umair Sayed	5dadb0e19a	created help page for email inbox, fixes #9262 (#9315)	2017-06-16 11:57:44 +05:30
Britlog	224eb90199	Fix get_parents context (#9296)	2017-06-16 11:51:06 +05:30
Sagar Vora	5f407907a2	fix logic of quantity validation (#9311)	2017-06-16 11:43:36 +05:30
Manas Solanki	b07535bb64	bug in training result module (#9314)	2017-06-16 11:20:42 +05:30
Rushabh Mehta	c8a0de5e59	Revert "sets tax category to "Total" if all items are non-stock items (#9295)" (#9320) ... This reverts commit 476c4fec1d.	2017-06-16 11:18:23 +05:30
tundebabzy	476c4fec1d	sets tax category to "Total" if all items are non-stock items (#9295)	2017-06-16 11:17:40 +05:30
Ben Cornwell-Mott	840c757b12	Merge branch 'bom_convert_uom' of https://github.com/bcornwellmott/erpnext into bom_convert_uom	2017-06-15 08:53:29 -07:00
Ben Cornwell-Mott	7055446508	Reload explosion and scrap items docs	2017-06-15 08:52:55 -07:00
Rushabh Mehta	e0434ad40e	Merge branch 'develop' into bom_convert_uom	2017-06-15 17:32:27 +05:30
mbauskar	5da3ac63bf	[minor] fixed merge conflicts	2017-06-15 16:09:42 +05:30
mbauskar	489550ed59	bumped to version 8.0.50	2017-06-15 16:35:49 +06:00
Makarand Bauskar	a4af7cb7d3	removed extra quote from query	2017-06-15 16:02:44 +05:30
Nabin Hait	5aee7d1b70	Change column length of in_words	2017-06-15 15:35:08 +05:30
mbauskar	f9e2bf1ab4	fixed merge conflicts	2017-06-15 13:42:47 +05:30
mbauskar	39f4130a0a	bumped to version 8.0.49	2017-06-15 13:59:40 +06:00
Nabin Hait	6e9a146f2b	Merge pull request #9193 from tundebabzy/issue_9180 ... Payment Entry - Latest Exchange Rate not fetched	2017-06-15 12:34:27 +05:30
Makarand Bauskar	428e5b7172	Merge pull request #9299 from rohitwaghchaure/refernce_name_issue ... [fix] Payment Entry - draft sales invoices should not be selectable	2017-06-15 12:32:00 +05:30
Nabin Hait	2153399c39	Create journal_entry.py	2017-06-15 12:30:58 +05:30
Rohit Waghchaure	5ea8c97b7c	[fix] Payment Entry - draft sales invoices should not be selectable	2017-06-15 12:16:15 +05:30
Nabin Hait	6d7b0ce794	Warehouse Account Linking (#9292) ... * [enhance] Added account in the warehouse * documentation * patch to move account head from account to warehouse * fixed test cases * Fixes in warehouse-account linking * minor fix in test case	2017-06-15 11:09:27 +05:30
rohitwaghchaure	03ba66d0d8	[Fix] In sales invoice, delivery note link not showing in the dashboard if delivery note has made from sales invoice (#9290)	2017-06-14 19:41:11 +05:30
Umair Sayed	0b8e19b5d8	Added new help pages as per OKR - DO NOT MERGE (#9291) ... * added help pages on Assessment, delete and restore documents and Document versioning, fixed #9262 * some fixes in help docs	2017-06-14 19:40:08 +05:30
tunde	3514332cd8	changes journal_entry.get_exchange_rate to return exchange rate at date not average exchange rate	2017-06-14 13:14:40 +01:00
Manas Solanki	67c4f1713b	Minor changes in the UX and courses automatically fetched upon saving (#9264)	2017-06-14 17:34:36 +05:30
Manas Solanki	95ca531def	make quotation against lead company name (#9188)	2017-06-14 16:13:23 +05:30
tundebabzy	f5604c101c	Once primary key is generated, do not allow changing Series #8911 (#9265) ... * changes set_only_once field for tabDocField to 1 * changes all affected doctypes `set_only_once` option to 1 * add patch name to text file * adds test cases * Revert "add patch name to text file" This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c. * Revert "changes set_only_once field for tabDocField to 1" This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.	2017-06-14 16:10:09 +05:30
Sagar Vora	847444724b	remove bracket (#9284)	2017-06-14 15:51:47 +05:30
Sagar Vora	d19c2e2e93	[minor] Check if item is stock item before validating Warehouse while Purchase Return (#9282) ... * Check if item is stock item before validating Warehouse * changed logic to decide warehouse_mandatory	2017-06-14 15:39:41 +05:30
KanchanChauhan	c849f647f7	Show Stock Level only if any value(actual, reserved, reserved for production or projected) exists (#9168)	2017-06-14 15:37:47 +05:30
Manas Solanki	40be3f4048	fix in the item for the function make_variant_item_code (#9280)	2017-06-14 15:06:07 +05:30
Manas Solanki	737482423b	change in the absent student report (#9185)	2017-06-14 15:05:48 +05:30
tundebabzy	5c9dd42547	fixes #9098: don't skip calculation if income or expense is [] (#9267)	2017-06-14 14:57:34 +05:30
rohitwaghchaure	4c0f9dac94	Total amount not showing for credit note column in the print (#9278)	2017-06-14 12:54:48 +05:30
Makarand Bauskar	0da5f23db6	[minor] fixed Cannot read property 'default_letter_head' of undefined (#9268)	2017-06-14 12:52:13 +05:30
Sagar Vora	99a2db80ab	move bom based rate calculation to end (#9271)	2017-06-14 12:38:27 +05:30
rohitwaghchaure	1b2b4a626f	[Fix] Accounts receivable report showing wrong currency for total amount against the customer (#9276)	2017-06-14 12:32:52 +05:30
bcornwellmott	d53dd7f4c9	Merge branch 'develop' into bom_convert_uom	2017-06-13 08:40:24 -07:00
Sagar Vora	489ab6d70d	[minor] remove hardcoded flt precision and use system default (#9250) ... * possible fix * use system default precision for flt	2017-06-13 18:58:47 +05:30
tundebabzy	26a39610ca	fixes #8941: Better error message for duplicate items (#8968) ... * fixes #8941: Better error message for duplicate items * gathers all non unique items instead of first encountered non unique item * renders errored items with `br` instead of `li`	2017-06-13 17:40:56 +05:30
Ashwini Save	eed0cee186	Solve issue for while changing status of sales order page not reloading (#9204) ... * Solve issue for while changing status of sales order page not reloading * Close Sales order issue : code review Changes.	2017-06-13 17:14:06 +05:30
Makarand Bauskar	da15486624	Merge pull request #9260 from mbauskar/address-and-contacts ... [hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)	2017-06-13 17:08:56 +05:30
Makarand Bauskar	a7a7c835cc	Merge pull request #9196 from msiddiq0/patch-2 ... Fix incorrect youtube link on Video Tutorials	2017-06-13 17:05:50 +05:30
Makarand Bauskar	f339f6d69f	Merge pull request #9195 from msiddiq0/patch-1 ... Fixed wrong YouTube video link	2017-06-13 17:05:36 +05:30
Makarand Bauskar	65f5cf3fc1	Merge pull request #9197 from msiddiq0/patch-3 ... Fix incorrect YouTube link on Video Tutorials	2017-06-13 17:05:19 +05:30
mbauskar	96ce5821b8	[hot] fixed ImportError: Module import failed for Company (erpnext.setup.doctype.company.company)	2017-06-13 17:03:13 +05:30
Makarand Bauskar	0c5d732cd8	Merge pull request #9208 from mbauskar/docs ... removed {next} from documentation and removed the globals from custom scripts	2017-06-13 16:32:26 +05:30
Makarand Bauskar	70ef313b0d	Merge pull request #9245 from frappe-pr-bot/translations-2017-06-13 ... [translation] translation update	2017-06-13 16:23:22 +05:30
KanchanChauhan	1dc26b127b	Salutation and Gender in Lead and Customer (#9199)	2017-06-13 15:26:35 +05:30
Saurabh	797f2030f8	Merge branch 'master' into develop	2017-06-13 15:20:13 +05:30
Saurabh	0b35a3a67a	bumped to version 8.0.48	2017-06-13 15:50:13 +06:00
frappe-pr-bot	f7fe66cc48	[translation] translation updates	2017-06-13 11:17:57 +02:00
Makarand Bauskar	8ce53c94d1	Merge pull request #9189 from mbauskar/mysql-lockout ... [hotfix] fixes for mysql Lock wait timeout exceeded	2017-06-13 14:41:42 +05:30
mbauskar	6f71648719	[minor] removed the else condition in update_qty	2017-06-13 14:36:30 +05:30
mbauskar	f819c93329	[minor] replaced db_save by db_update and added patch to remove the indexes on tabBin	2017-06-13 13:22:34 +05:30
_JG_	aafe0c517f	Update purchase_order_dashboard.py (#9149) ... There are no links to projects	2017-06-13 13:00:47 +05:30
Makarand Bauskar	757e1bf846	Merge pull request #9213 from manassolanki/school-report ... fix for student monthly attendance report	2017-06-13 12:30:37 +05:30
Ashwini Save	7f14f28099	Account Receivable - Credit Note column added to print format. (#9230) ... * Account Receivable - Credit Note column added to print Format. * Review changes for translation: Account Receivable add credit note column * Review changes for translation: Account Receivable add credit note column * Review changes for translation: Account Receivable add credit note column	2017-06-13 11:18:39 +05:30
Makarand Bauskar	88a0d22c10	Merge pull request #9214 from saurabh6790/stock_ledger_entry_indexing ... [fix] add index on voucher type and voucher no in stock ledger entry	2017-06-12 17:26:24 +05:30
Nabin Hait	d0ac0bdc18	Merge branch 'master' into develop	2017-06-12 13:50:12 +05:30
Nabin Hait	d3e1afa2f5	bumped to version 8.0.47	2017-06-12 14:20:11 +06:00
Rohit Waghchaure	782d477be0	[fix] Due Date cannot be before Posting Date	2017-06-12 12:35:40 +05:30
Rushabh Mehta	4f8f9c1d9a	[enhance] create demo with function bench --site sitename make-demo` (#9212)	2017-06-12 09:18:06 +05:30
Rohit Waghchaure	c8490626f9	[minor] added mobile no to search customer in POS	2017-06-10 12:21:37 +05:30
tunde	5127da952e	changes expected payment_account in test case according to the fact that exchange rate should return latest saved rate	2017-06-09 17:11:41 +01:00
bcornwellmott	fed9816213	Removed trailing whitespace	2017-06-09 07:37:27 -07:00
bcornwellmott	a35839aa47	Removing unused pprint	2017-06-09 07:36:15 -07:00
Saurabh	0c21d85f0d	[fix] add index on voucher type and voucher no in stock ledger entry	2017-06-09 19:05:30 +05:30
tunde	7bf4b121f3	Merge branch 'hotfix' into issue_9180	2017-06-09 13:58:22 +01:00
Manas Solanki	4458eb356b	fix for student monthly attendance report	2017-06-09 18:20:21 +05:30
mbauskar	828804fab0	[minor] removed the {next} from the last articles	2017-06-09 17:30:36 +05:30
mbauskar	11f0ee3cac	[docs] removed the globals from documentation	2017-06-09 17:23:06 +05:30
Faris Ansari	0626716f48	Merge pull request #9182 from pratu16x7/stock-entry-detail-global-fix ... [fix] sys_defaults global in stock entry detail	2017-06-09 16:27:07 +05:30
rohitwaghchaure	97fd21a01d	[Fix] Accounts receivable summary report not loading data because credit note column was missing (#9191) ... * [Fix] Accounts receivable summary report not loading data because credit note column was missing * Create accounts_receivable_summary.py	2017-06-09 14:05:10 +05:30
Makarand Bauskar	665311b38a	[hotfix] replaced __ call with _ in project_timesheets.html (#9198)	2017-06-09 14:03:20 +05:30
tunde	0a5db528b1	makes sure latest test fixtures for currency exchange is retrieved before running test	2017-06-09 08:14:10 +01:00
msiddiq0	a05c168808	Fix incorrect YouTube link on Video Tutorials ... The original YouTube video is private and not viewable by anyone. I linked the publicly viewable YouTube video for "Report Builder" now.	2017-06-08 21:02:45 -04:00
msiddiq0	a095d6e04b	Fixing youtube link ... Wrong youtube video linked here: "Managing Advance Payments". Linked to correct video now: "Bulk Update"	2017-06-08 20:51:50 -04:00
msiddiq0	03183332b4	Fixed wrong YouTube video link ... The original link here led to video on "Bulk Update" not "Budgeting". I went and found the Budgeting video and linked it here now.	2017-06-08 20:10:18 -04:00
tunde	9b827e5b95	makes set_exchange_rate retrieve the latest exchange rate not average for "pay" and "internal transfer" payment entries	2017-06-08 20:54:01 +01:00
tunde	6148fe0909	adds test case to confirm that latest exchange rate is automatically selected	2017-06-08 20:50:11 +01:00
tunde	88f1d316d8	adds new tests that verify that get_exchange_rate returns the latest exchange rate	2017-06-08 19:44:26 +01:00
tunde	3eb5cb14d1	calls erpnext.setup.utils.get_exchange_rate instead of get_average_exchange_rate	2017-06-08 14:23:49 +01:00
mbauskar	1042941348	[hotfix] fixes for mysql Lock wait timeout exceeded	2017-06-08 18:45:50 +05:30
pratu16x7	adb418d453	[fix] sys_defaults global in stock entry detail	2017-06-08 10:42:03 +05:30
Nabin Hait	2c808c578d	Merge branch 'master' into develop	2017-06-08 10:34:45 +05:30
Nabin Hait	72f7a1a748	bumped to version 8.0.46	2017-06-08 11:04:44 +06:00
bcornwellmott	5491275b66	Merge branch 'develop' into bom_convert_uom	2017-06-07 08:42:54 -07:00
Javier Wong	b414f73931	[enhancement] Allow on Submit for Sales Order Customer PO and Customer PO Date (#9137)	2017-06-07 20:11:45 +05:30
ahmadRagheb	9017f3768b	Fix labels to accept translation in selling doctype (#9135) ... "label": _("Customer Addresses And Contacts"), "label": _("Sales Partner Addresses And Contacts"), now they can accept to be translated	2017-06-07 20:08:39 +05:30
Nabil Kadimi	41f6f4c200	Fix type (entrys) (#9131)	2017-06-07 20:08:11 +05:30
rohitwaghchaure	1607125815	[minor] POS customer creation was disabled in offline mode (#9169)	2017-06-07 20:06:58 +05:30
Umair Sayed	0dd5a20ca6	Help links added help_links.js (#9170) ... * help links in help_links.js * fixed in help_links.js	2017-06-07 20:05:35 +05:30
rohitwaghchaure	6b95210c19	[Fix] User not able to view projects from the portal (#9173)	2017-06-07 20:03:37 +05:30
Makarand Bauskar	59a1540898	[minor] removed the deprecated inList method from eval (#9177)	2017-06-07 20:02:09 +05:30
tundebabzy	98f8da1294	hides payments field when is_pos is checked (#9174)	2017-06-07 20:01:51 +05:30
tundebabzy	f3be8e0da6	removes check for condition - status == "Submitted" (#9176)	2017-06-07 19:59:33 +05:30
Nabin Hait	a128b21baa	Fixed merge conflict	2017-06-07 12:17:17 +05:30
Nabin Hait	d0e530c63d	bumped to version 8.0.45	2017-06-07 12:42:11 +06:00
Nabil Kadimi	347a79db5a	Fix typo (#9133)	2017-06-07 12:06:05 +05:30
Frappe PR Bot	7c9010018d	[translation] translation updates (#9156)	2017-06-07 12:05:29 +05:30
tundebabzy	f981eee221	fixes issue #9013: Salary calculation Error. (#9044) ... * fixes issue #9013: Salary calculation Error. * adds test case for scenario as in #9013	2017-06-07 12:05:00 +05:30
rohitwaghchaure	d2be55b2e0	[Fix] Orders not creating from the POS for new customer if customer name is based on naming series (#8933) ... * [Fix] Orders not creating from the POS for new customer if customer name is based on naming series * [fix] Disabled price field in POS, if Allow User to Edit Rate field is disabled in POS profile * added customer name in the search bar of the customer * search customer by phone number and email id in the POS	2017-06-07 12:04:01 +05:30
tundebabzy	99b734bfd7	Fix #4587: Status does not display "Pending" in report filter (#9104) ... * adds Material Request to `status_map` * updates eval condition for Partially Ordered in Material Request map * changes material_request doctype to include "pending", "ordered", "partially ordered", "issued", "transferred" as options * adds more options to `validate_status` * adds `set_status` just before saving * adds `check_for_closed_status` in `before_cancel` * adds patch to convert status to material request specific status * adds stricter status update conditions * changes `update_status` to me `set_status` * adds checker such that draft status can only change to pending * renames `check_draft_status` to `status_can_change` * adds Cancelled to Material Request map * makes `status_can_change` block any attempt to change a cancelled document * adds more test cases * updates what `set_status` checks for before adding comment * adds patch to rename the present material request status	2017-06-07 12:02:07 +05:30
Manas Solanki	ba7ed4626c	fetch query for assessment group (#9120)	2017-06-07 11:57:11 +05:30
Nabin Hait	17378e8a29	Added a new column for Credit/Debit Note in AR/AP report (#9123)	2017-06-07 11:56:53 +05:30
Manas Solanki	b76b4f40a0	Added mode of transport in program enrollment (#9124)	2017-06-07 11:56:26 +05:30
Prateeksha Singh	3a18dea8a4	[fix][multiselect] don't show completed PRECs for a PINV (#9125)	2017-06-07 11:55:25 +05:30
Makarand Bauskar	db8363e9eb	[minor] check serial no filedtype before updating (#9126) ... * Update serial_no.py Takes care of Different FieldTypes * [minor] check serial no filedtype before updating	2017-06-07 11:54:26 +05:30
Manas Solanki	214e6906e5	Addition of field 'group based on' in the student attendance tool (#9152)	2017-06-07 11:53:41 +05:30
Manas Solanki	39adfb52f3	Naming in the assessment plan (#9153)	2017-06-07 11:52:36 +05:30
rohitwaghchaure	ce6e621c18	[fix] Not able to cancel the invoice if it's linked with the timesheet (#9157)	2017-06-07 11:52:04 +05:30
Manas Solanki	2a0d650735	fix in the report (#9167)	2017-06-07 11:29:27 +05:30
Faris Ansari	5f27c94100	Merge pull request #9078 from netchampfaris/remove-globals ... Lint and fix JS files	2017-06-06 11:35:42 +05:30
Ben Cornwell-Mott	70fe968f02	Fixed some errors	2017-06-04 20:19:59 -07:00
Ben Cornwell-Mott	a3aa6a4449	Changed Explosion Item as well	2017-06-02 16:54:03 -07:00
Makarand Bauskar	c196d740e5	[minor] added filter for batch no field in purchase transaction (#9038) ... * [minor] added filter for batch no field in purchase transaction * [minor] filter the batch based on item_code instead of get_batch_no method * [minor] filter based on item_code for Purchase Invoice with update stock	2017-06-02 17:28:40 +05:30
Nabin Hait	5b8b4dcce1	Merge branch 'master' into develop	2017-06-02 14:05:54 +05:30
Nabin Hait	52e443cfc8	bumped to version 8.0.44	2017-06-02 14:35:53 +06:00
Nabin Hait	ae07f22d8b	Fixed syntax error	2017-06-02 13:57:16 +05:30
Nabin Hait	02d282f347	Merge branch 'master' into develop	2017-06-01 19:09:37 +05:30
Nabin Hait	1091a25491	bumped to version 8.0.43	2017-06-01 19:39:36 +06:00
Britlog	495a408db0	Fix contact form if email is both customer and lead (#9075)	2017-06-01 19:08:04 +05:30
Charles-Henri Decultot	5ade661a9a	Weekly digest subject translation (#9003)	2017-06-01 19:06:32 +05:30
ahmadRagheb	c4d2bab5b3	Arabic language shows Errors onSubmit in maintenance_schedule (#9082) ... * Arabic language shows Errors onSubmit in maintenance_schedule when trying to submit using arabic language error show up , i replace this way of formating arguments description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \ (self.name, d.item_code, self.customer) to new one :description = frappe._("Reference: %s, Item Code: %s and Customer: %s").format(self.name, d.item_code, self.customer) and it solve the problem on my local * Arabic language shows Errors onSubmit in maintenance_schedule * Arabic language shows Errors onSubmit in maintenance_schedule	2017-06-01 19:06:00 +05:30
Frappe PR Bot	59ee45a1a5	[translation] translation updates (#9081)	2017-06-01 19:05:28 +05:30
Ashwini Save	2020dd37e8	Fixed issue : Payment Entry allocating amount more than invoice amount. (#9084) ... * Fixed issue : Payment Entry allocating amount more than invoice amount. * Added condition to solve issue when allocated amount is null * Code review Changes for payment entry	2017-06-01 19:00:34 +05:30
Faris Ansari	9f6d024260	Set website route field as No Copy field (#9106) ... * Set website route field as No Copy field * minor	2017-06-01 18:58:07 +05:30
rohitwaghchaure	7f2513f7a1	[Fix] Employees working on a holiday report's date filter not working (#9108)	2017-06-01 18:57:34 +05:30
Manas Solanki	f60bd60012	Fix the demo for the schools (#8879) ... * Fix the demo for the schools * Fix for the demo https://github.com/frappe/erpnext/issues/6347	2017-06-01 18:30:35 +05:30
Nabin Hait	e4b3a67e74	Rate validation in return entry	2017-06-01 16:47:45 +05:30
Manas Solanki	f02c82aeca	Fixes in the patch (#9027) ... * fix in the patch * new patch for student groups * changes in the merge student batch patch	2017-06-01 13:08:27 +05:30
tundebabzy	cf92be88b7	[minor] fixes typo (#9093)	2017-05-31 13:21:12 +05:30
Nabin Hait	fa16b849a0	Merge branch 'master' into develop	2017-05-30 22:52:39 +05:30
Nabin Hait	f2c374f524	bumped to version 8.0.42	2017-05-30 23:22:38 +06:00
mbauskar	26044f436a	[minor] fixed a unexpected token error for opportunity	2017-05-30 22:28:08 +05:30
Nabin Hait	c9fa07b16d	Merge branch 'master' into develop	2017-05-30 15:59:04 +05:30
Nabin Hait	93b5367485	bumped to version 8.0.41	2017-05-30 16:29:04 +06:00
Manas Solanki	5995010007	Correction in the validation message (#9079)	2017-05-30 15:56:48 +05:30
bcornwellmott	0d38a6b495	Fix grammar error in HR Training Results (#9076) ... * Fix Typo in message Issue #9074 * Added condition for notifying user of grade.	2017-05-30 15:56:02 +05:30
Manas Solanki	a85b68ee77	link for timesheet, fix https://github.com/frappe/erpnext/issues/9042 (#9071)	2017-05-30 15:55:00 +05:30
Manas Solanki	ca31425bb4	field for the naming series should have no copy attribute (#9067)	2017-05-30 15:36:50 +05:30
Manas Solanki	253c53cf53	updating serial no status from scheduler #9061 (#9066)	2017-05-30 15:35:58 +05:30
Nabin Hait	ac3b2aa913	Set change amount automatically only if it is a cash transaction (#9065)	2017-05-30 15:35:01 +05:30
Nabin Hait	5d7e8d9e83	Minor fix in timesheet (#9063)	2017-05-30 15:34:35 +05:30
Nabin Hait	6a5cf672c1	Fixed opportunity status (#9062)	2017-05-30 15:34:20 +05:30
Manas Solanki	5f7b88d9c3	set student roll no in backend if not given (#9039)	2017-05-30 15:33:50 +05:30
Faris Ansari	ab74ca7fff	Lint and fix JS files	2017-05-30 12:54:42 +05:30
Faris Ansari	dae7721384	Merge pull request #8975 from almeidapaulopt/milestones ... Milestones in Project Gantt	2017-05-29 10:58:35 +05:30
Nabin Hait	6a541a6f7a	Merge branch 'master' into develop	2017-05-26 21:35:42 +05:30
Nabin Hait	38ada81487	bumped to version 8.0.40	2017-05-26 22:05:41 +06:00
Prateeksha Singh	e38c70c8bc	[fix] uppercase filter frappe/erpnext#8996 (#9026)	2017-05-26 21:34:18 +05:30
Francisco Roldán	44c1a610a1	Financial Statements Button translateabled (#9032)	2017-05-26 21:32:51 +05:30
Makarand Bauskar	157c334737	[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents (#9037)	2017-05-26 21:32:33 +05:30
Nabin Hait	4b12896941	Party Dashboard: Consider any random company if default company not set (#9046)	2017-05-26 21:25:36 +05:30
Sagar Vora	7b0c682635	[fix] add round off difference to last row in landed cost voucher (#8989) ... * [fix] add round off difference to last row in landed cost voucher * Add test case for odd numbers * Add assertEquals to verify applicable charges * Use make_purchase_receipt, move round off logic * Allow rounding difference * Specify cost center to pass test	2017-05-26 14:58:54 +05:30
Ashwini Save	d702cbfbfa	Update code to fix issue #erpnext WN-SUP25349 : ValueError: max() arg is an empty sequence. (#9025)	2017-05-25 15:48:08 +05:30
Nabin Hait	45d337a016	Merge branch 'master' into develop	2017-05-25 14:19:51 +05:30
Nabin Hait	d7d9cd2938	bumped to version 8.0.39	2017-05-25 14:49:50 +06:00
Nabin Hait	7e7dc0f254	Update party.py	2017-05-25 14:18:20 +05:30
Ayush Shukla	e9cf1aba77	added float and rebase with hotfix (#9019)	2017-05-25 14:14:55 +05:30
Manas Solanki	c2bf50042f	validate email id only if provided (#9020)	2017-05-25 14:14:42 +05:30
bcornwellmott	8fa1e03367	Merge branch 'develop' into bom_convert_uom	2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott	0f0b121669	Added BOM UOM selection for items ... Added patch for BOM Item UOM Fixed scrap qty issue Added Scrap Qty update to patch Reverted test record for production order	2017-05-24 11:12:51 -07:00
Nabin Hait	c795386230	Fixed merge conflict	2017-05-24 18:39:16 +05:30
Nabin Hait	12ec71781d	bumped to version 8.0.38	2017-05-24 19:08:33 +06:00
Makarand Bauskar	2f17e70793	[minor] removed the {next} for last page (#9002)	2017-05-24 18:35:35 +05:30
Manas Solanki	659a225f24	allow multiple items in purchase receipt (#8997)	2017-05-24 17:49:52 +05:30
Ishan Loya	9bf4563b7a	Change modified time	2017-05-24 17:47:42 +05:30
Ishan Loya	a70b41fbb8	Remove Role 'All' from BOM	2017-05-24 17:47:42 +05:30
CH	d0ebd7f7c2	POS translatable fields correction	2017-05-24 17:45:46 +05:30
Nabin Hait	adfe84b04f	Revert "Website Specification Labls should not be capitalised by default (#8798)" ... This reverts commit 331566d612.	2017-05-24 17:33:07 +05:30
Nabin Hait	7916590528	Revert "Update lead.py (#8789)" ... This reverts commit 9283377f87.	2017-05-24 17:33:07 +05:30
Nabin Hait	fdce7a0dc3	Revert "link the different doctype in the school module (#8844)" ... This reverts commit c320537e4c.	2017-05-24 17:33:07 +05:30
Nabin Hait	b3d4326dcc	Revert "Prompt for mandatory batch number in POS (#8928)" ... This reverts commit ce9ac7885e.	2017-05-24 17:33:07 +05:30
Nabin Hait	54fcf85317	Revert "Documentation for Allow Login using Mobile Number (#8918)" ... This reverts commit 818ad397c8.	2017-05-24 17:33:07 +05:30
Nabin Hait	689da20e7b	Revert "View Attachments in portal (#8830)" ... This reverts commit 7e661437b1.	2017-05-24 17:33:07 +05:30
Nabin Hait	eb92d907bc	Revert "Added flt to convert string to float" ... This reverts commit bf4915b285.	2017-05-24 17:33:07 +05:30
Nabin Hait	0cd792ebb2	Revert "Update taxes_and_totals.py" ... This reverts commit e4afab7fb0.	2017-05-24 17:33:07 +05:30
Rushabh Mehta	e4afab7fb0	Update taxes_and_totals.py	2017-05-24 17:29:23 +05:30
Ayush AS	bf4915b285	Added flt to convert string to float	2017-05-24 17:29:23 +05:30
Charles-Henri Decultot	7e661437b1	View Attachments in portal (#8830) ... * View Attachments in portal * HTML beautify correction * Move option to shopping cart settings * new field in shopping cart settings for public attachments display in portal	2017-05-24 17:29:23 +05:30
Gaurav Naik	818ad397c8	Documentation for Allow Login using Mobile Number (#8918)	2017-05-24 17:29:23 +05:30
Charles-Henri Decultot	ce9ac7885e	Prompt for mandatory batch number in POS (#8928) ... * Prompt for mandatory batch number in POS * Whitespaces correction	2017-05-24 17:29:23 +05:30
Manas Solanki	c320537e4c	link the different doctype in the school module (#8844)	2017-05-24 17:29:23 +05:30
Abdulla P I	9283377f87	Update lead.py (#8789) ... * Update lead.py Import datetime to compare next contact date with now() * Update lead.py * Update lead.py As per the suggestion from Nabin,instead of Datetime,getdate and nowdate from frappe.utils imported	2017-05-24 17:29:23 +05:30
KanchanChauhan	331566d612	Website Specification Labls should not be capitalised by default (#8798)	2017-05-24 17:29:23 +05:30
nick9822	ca150cee8c	Minor change: Alert to msgprint (#8966) ... * Minor change: Alert to msgprint * msgprint to frappe.msgprint	2017-05-24 17:22:26 +05:30
mbauskar	ff70f38eac	[minor] patch to delete the schools deprecated doctypes	2017-05-24 17:13:16 +05:30
mbauskar	d1552f97e4	[minor] moved a comment in item.js	2017-05-24 17:13:16 +05:30