12223 Commits

Author	SHA1	Message	Date
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
mbauskar	baa4afd67b	[minor] removed the Grade Interval and Grading Structure doctype	2017-05-24 17:13:16 +05:30
Nabin Hait	2f0c34385b	Check if doctype exists before renaming	2017-05-24 17:12:07 +05:30
Nabin Hait	258f7da778	Paid amount + Write Off Amount can not be greater than Grand Total in return POS	2017-05-24 17:12:07 +05:30
Nabin Hait	799a9cabe7	Can't change valuation method in stock settings, if there are transactions against some items which does not have it's own valuation method	2017-05-24 17:11:48 +05:30
Nabin Hait	24f0b13b22	Total unpaid amount in party is based on GLE	2017-05-24 16:46:56 +05:30
Nabin Hait	2d79a641c2	Annual billing amount in party dashboard based on grand total	2017-05-24 16:46:56 +05:30
Charles-Henri Decultot	032374e76e	Correction of the digest template (#8992)	2017-05-24 16:29:42 +05:30
Nabin Hait	7a9bd41a72	Improved currency exchange rate message	2017-05-24 16:18:36 +05:30
Nabin Hait	8fac45a885	Merge branch 'master' into develop	2017-05-24 09:07:26 +05:30
Nabin Hait	88906cfc63	bumped to version 8.0.37	2017-05-24 09:37:26 +06:00
Nabin Hait	e72c98dafb	On change of item rate, set margin amount on price list rate, instead of margin percentage (#8988)	2017-05-24 09:01:44 +05:30
Makarand Bauskar	3b9c2a4438	Added a reference of Sales Invoice in Serial No (#8855) ... * [enhance] added Sales Invoice reference in Serial Number * [patch] added test cases for Sales Invoice and added patch to copy sales invoice * [minor] minor fixes in validate_serial_against_delivery_note * [minor] fixes in sales invoice serial number validation	2017-05-23 18:45:34 +05:30
Nabin Hait	dce8dfc4fe	Merge branch 'master' into develop	2017-05-23 17:48:43 +05:30
Nabin Hait	c8a25b6dac	bumped to version 8.0.36	2017-05-23 18:18:42 +06:00
Makarand Bauskar	724cc35421	[minor] added columns to pos print_template (#8978)	2017-05-23 17:43:42 +05:30
Nabin Hait	c9f5d84742	Merge branch 'master' into develop	2017-05-23 17:16:19 +05:30
Nabin Hait	8854f8bd50	bumped to version 8.0.35	2017-05-23 17:46:19 +06:00
Manas Solanki	fe05645051	fix issue when image not saved after attaching (#8957)	2017-05-23 17:13:26 +05:30
Faris Ansari	29d64cae34	POS print format fix (#8973)	2017-05-23 17:12:51 +05:30
Paulo Almeida	97ff6fea47	add milestone field	2017-05-23 11:55:37 +01:00
Nabin Hait	889e456dab	Merge branch 'master' into develop	2017-05-23 12:04:06 +05:30
Nabin Hait	2ef20a968c	bumped to version 8.0.34	2017-05-23 12:34:05 +06:00
Nabin Hait	fdc7d7f3de	Check for active quotations before declaring it as lost (#8969)	2017-05-23 12:02:34 +05:30
Manas Solanki	a68fff470c	minor fix in student group (#8959)	2017-05-23 11:39:53 +05:30
Manas Solanki	552f7ab678	fix in the patch for merging the student batch and student group (#8961)	2017-05-23 11:38:57 +05:30
Faris Ansari	2424aa73d7	Fix translated string in jinja (#8956)	2017-05-22 13:09:36 +05:30
Rushabh Mehta	2b06633919	Merge branch 'master' into develop	2017-05-19 19:24:43 +05:30
Rushabh Mehta	f3a318921f	bumped to version 8.0.33	2017-05-19 19:54:42 +06:00
rohitwaghchaure	529f5ce503	[fix] Not able to change the status as Lost in opportunity (#8938)	2017-05-19 18:56:54 +05:30
rohitwaghchaure	177a26849d	[fix] Trial balance not working (#8937)	2017-05-19 18:56:25 +05:30
Rushabh Mehta	612b31b626	Merge branch 'master' into develop	2017-05-19 18:33:55 +05:30
Rushabh Mehta	d2484ece24	bumped to version 8.0.32	2017-05-19 19:03:54 +06:00
Rushabh Mehta	04ea4910f0	[rename] zh-tw -> zh-TW	2017-05-19 18:27:53 +05:30
Rushabh Mehta	03fb6ff003	[rename] zh-tw -> zh-TW	2017-05-19 18:26:49 +05:30
Charles-Henri Decultot	2de1cd3529	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-19 16:04:10 +05:30
Gaurav Naik	7f02714c26	Documentation for Allow Login using Mobile Number (#8918)	2017-05-19 16:03:05 +05:30
Charles-Henri Decultot	8bec0239b9	Prompt for mandatory batch number in POS (#8928) ... * Prompt for mandatory batch number in POS * Whitespaces correction	2017-05-19 16:02:30 +05:30
Manas Solanki	56549fd3d9	link the different doctype in the school module (#8844)	2017-05-19 15:16:50 +05:30
Abdulla P I	6cbc9b03f9	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-19 15:15:36 +05:30
KanchanChauhan	32cbbe5cc2	Website Specification Labls should not be capitalised by default (#8798)	2017-05-19 15:14:31 +05:30
Rushabh Mehta	65a27395fe	[minor] remove student batch name from activation.py	2017-05-19 14:53:32 +05:30
Nabin Hait	4d2d996782	bumped to version 8.0.31	2017-05-19 14:42:28 +06:00
Nabin Hait	47afc55939	Merge branch 'master' of github.com:frappe/erpnext into hotfix	2017-05-19 14:10:53 +05:30
Nabin Hait	0096240a65	bumped to version 8.0.30	2017-05-19 14:38:59 +06:00
Makarand Bauskar	864f134610	[minor] removed the da-DK.csv translations (#8930)	2017-05-19 14:04:52 +05:30
Rohit Waghchaure	8a1c58c3c3	[fix] _ is not defined while accessing the POS	2017-05-19 13:01:32 +05:30
Ayush Shukla	ae696d005a	Changed report_hide=0 for reference_name (#8902)	2017-05-19 12:38:08 +05:30
Prateeksha Singh	89cec18467	set variant name based on template name (frappe/erpnext#6367) (#8920)	2017-05-19 12:35:36 +05:30
Rushabh Mehta	4bcc2316a9	Don't update variant when template is updated (#8922) ... * [fix] allow editing of variant properties, reverting earlier fix * [minor] dont automatically update variants when the template is saved	2017-05-19 12:33:00 +05:30
Nabin Hait	012c9a0916	Set default account in mode-of-payment Cash, only if default cash account exists (#8909)	2017-05-19 12:30:58 +05:30
Frappe PR Bot	c080479f1f	[translation] translation updates (#8927)	2017-05-19 12:30:04 +05:30
tundebabzy	a109141624	Issue 8842 (#8869) ... * adds test that confirms #8842 * fixes #8842 and adds tests * fixes new test case * adds test for `encode_company_abbr` * adds six as a requirement * fixes six.moves.range import * fixes duplicate company used in test * fresh commit of test * fixes failing test - company not saving * fixes failing test * Revert "adds six as a requirement" This reverts commit 80454d98dc5859c37dbf589a4152663d2d644906. * replaces whitespace indentation with tabs	2017-05-19 11:42:45 +05:30
Prateeksha Singh	064530d11f	[minor] remove order_type as setter in multiselect (#8906)	2017-05-19 11:09:12 +05:30
Rushabh Mehta	6799e27390	[fix] chart of accounts root sorting, #8784, #8897 (#8904)	2017-05-18 16:21:21 +05:30
Rushabh Mehta	c6d75eb942	[fix] allow editing of variant properties, reverting earlier fix (#8905)	2017-05-18 16:21:01 +05:30
Nabin Hait	83f8344e62	Merge branch 'master' of github.com:frappe/erpnext into hotfix	2017-05-18 14:06:37 +05:30
Nabin Hait	ee59ecd396	Merge branch 'hotfix' of github.com:frappe/erpnext into hotfix	2017-05-18 14:06:06 +05:30
gmplab	7607cc9dfa	try to fix #997 ,when cart is disabled, it will not show error and it will dedirect to 'contact' page (#8636)	2017-05-18 12:41:19 +05:30
Frappe PR Bot	32e453b8eb	[translation] translation updates (#8867)	2017-05-18 12:35:26 +05:30
Nabin Hait	9422f69fdf	bumped to version 8.0.29	2017-05-18 12:31:53 +06:00
Nabin Hait	61ac683847	Fixed chart of accounts for Indonesia (#8900)	2017-05-18 11:58:38 +05:30
Nabin Hait	8fac2ad183	Don't set batch nos automatically on saving, if already set and validate qty with batch (#8887)	2017-05-18 11:54:24 +05:30
Omar Jaber	52e1ba7714	update throw message in maintenance_schedule.py (#8896) ... updating Throw message	2017-05-18 11:53:26 +05:30
Nabin Hait	08ea710c8f	Minor fix in creating chart of accounts based on existing (#8890)	2017-05-17 19:43:12 +05:30
Nabin Hait	4b544347a9	Hide 'Edit Posting Time' from printing (#8888)	2017-05-17 19:42:38 +05:30
Francisco Roldán	85bfc05efa	Fix missing translations (#8871) ... * Fix missing translations * Fix	2017-05-17 19:42:04 +05:30
Nabin Hait	e4f80a6eaa	Open lost opportunity again if quotation made against it (#8854)	2017-05-17 19:41:39 +05:30
Rushabh Mehta	f69ffeb0b4	[fix] if rate is greater than price_list_rate, set margin instead of discount. Fixes frappe/erpnext#6468 (#8856)	2017-05-17 19:40:40 +05:30
Faris Ansari	f7a9023fda	Show empty state when no students are found in student attendance tool (#8862) ... - fixes #8839	2017-05-17 19:37:31 +05:30
Julian Robbins	3d6567411d	Spelling improvmement (#8866)	2017-05-17 19:36:15 +05:30
Felipe Orellana	0952df29dc	Update product.py (#8877) ... Hi! If template_item_code is None on line 71-72 the query will return ALL "Item Price" records irrespective of item_code, potentially causing the wrong price list rate to be used. Noticed this behavior when fetching product price for a group of items without "variant_of" data.	2017-05-17 19:20:01 +05:30
Ayush Shukla	76d965f340	[minor]-Changed receivable to payable (#8880)	2017-05-17 19:18:47 +05:30
Ayush Shukla	c55b805b66	[minor] process_payroll_create salary fixed, fixes frappe/erpnext#8853 (#8881) ... * [minor] process_payroll_create salary fixed * [minor] indentation fix	2017-05-17 19:18:26 +05:30
tundebabzy	cf7df5d106	fixes #8883 (#8885)	2017-05-17 19:17:04 +05:30
Sagar Vora	3b04b030eb	Fix cost center not getting pulled in DN and SINV (#8878) ... * Fixes for getting selling cost center instead of company's default cost center. * fix error in update_item	2017-05-17 19:16:27 +05:30
Nabin Hait	def2e4678c	bumped to version 8.0.28	2017-05-17 14:24:04 +06:00
Nabin Hait	1e2d7b3519	Filters for multiselect dialog for DN/PR in Sales/Purchase Invoice (#8882)	2017-05-17 13:52:21 +05:30
Nabin Hait	a282c13d84	bumped to version 8.0.27	2017-05-16 14:09:41 +06:00
rohitwaghchaure	a689432a6e	[fix] Can't update naming series if format has year,month (#8836)	2017-05-16 12:47:34 +05:30
rohitwaghchaure	3da400b532	[fix] Due Date cannot be before Posting Date during amendement of an invoice (#8841)	2017-05-16 12:43:18 +05:30
Nabin Hait	8a27cf3785	Fix status of invoices with negative outstanding, if no return entry (#8829) ... * Move allowance field in Item to the first section to apply it for both stock and non-stock items * Fix status of invoices with negative outstanding, if no return entry * get_value included in safe_eval	2017-05-16 12:43:00 +05:30
rohitwaghchaure	73456ac81a	[fix] Payments on the invoice is showing even if IS POS option is disabled (#8802)	2017-05-16 11:29:57 +05:30
Saurabh	aa1be1ce92	[documentaion] stripe documentation (#8780)	2017-05-16 09:30:07 +05:30
rohitwaghchaure	654f186f95	[fix] Apply pricing rule on the item based on quantity as per stock uom (#8792)	2017-05-16 08:54:29 +05:30
rohitwaghchaure	09483d3c0f	[fix] Numeric keypad not displaying after creation of new customer (#8797)	2017-05-16 08:51:24 +05:30
Makarand Bauskar	5886aafbae	[minor] removed cur_frm and added frappe.ui.form.on (#8803)	2017-05-16 08:35:39 +05:30
Charles-Henri Decultot	156eef1907	Description correction (#8811)	2017-05-16 08:34:33 +05:30
Faris Ansari	74e2e4672c	Fix for duplicated project dependencies (#8817) ... - skip when task is not found	2017-05-16 08:32:45 +05:30
Saurabh	f4ee682400	[fix] pass company filter as string in get_value (#8823)	2017-05-16 08:30:27 +05:30
Makarand Bauskar	475d140b5c	[minor] made items table mandatory for quotation (#8825)	2017-05-16 08:26:21 +05:30
Ishan Loya	bdb2f95957	Show duplicate button in BOM unless in draft stage (#8826)	2017-05-16 08:25:07 +05:30
Makarand Bauskar	3e2c9d00f1	[minor] Corrected field label & placed Expense Claim button in Next Step (#8828)	2017-05-16 08:22:45 +05:30
rohitwaghchaure	d678809939	[fix] Party balance field showing wrong currency symbol (#8832)	2017-05-16 08:06:45 +05:30
Manas Solanki	59472e5449	Changes in the student group creation tool (#8833)	2017-05-16 08:05:14 +05:30
Manas Solanki	c5f79d2ec4	Fix for the student batch-wise attendance report (#8834)	2017-05-16 08:00:24 +05:30
Makarand Bauskar	b0df661e81	[minor] set set_posting_time to 1 while data import (#8835)	2017-05-16 07:59:58 +05:30
Rushabh Mehta	939db36ad4	[fix] copy item variant values on save and make non no_copy fields as not editable. fixes frappe/erpnext#4253 (#8837)	2017-05-16 07:42:44 +05:30
Faris Ansari	4fcd8a6db3	Fix sales funnel legend position (Fixes #5073) (#8838)	2017-05-16 07:40:26 +05:30
Faris Ansari	769b6bada8	[POS] Add Pay menu item in mobile view (#8801) (#8845)	2017-05-16 07:31:10 +05:30
Faris Ansari	125996e21c	Increase item cart height in mobile view (Fixes #8827) (#8846)	2017-05-16 07:29:15 +05:30
Nabin Hait	7bf810300e	Fixed #8822, active students patch	2017-05-15 11:42:37 +05:30
Prateeksha Singh	edeb4dc7e0	Multiselect dialog for getting items (#8583) ... * Concatenate docnames and send to mapper * Multiselect with checkboxes * set setters as separate filters * Map filter fields to target_doc * Get items from quotation (in SO) working * [major] Set dialog setters for all forms * Add date field * Specify non-default date_fields * [minor] add test_mapper.py * [minor] remove cur_frm * [minor][fix] test * [minor] fix test with make_test_records	2017-05-15 11:32:06 +05:30
Julian Robbins	62e3e75555	Addition of Imap to description of usable mail accounts (#8806)	2017-05-13 09:55:23 +05:30
Saurabh	82e303882e	bumped to version 8.0.26	2017-05-13 08:12:03 +06:00
Saurabh	45540569ff	[fix] rename Student Batch to Student Batch Name in activation check	2017-05-13 06:30:41 +05:30
Makarand Bauskar	d4e15ca359	[minor] create student batch if does not exists (#8781) ... * [minor] create student batch if does not exists * [fix] minor fixes in if condition	2017-05-12 11:23:58 +05:30
Makarand Bauskar	e8270fe21c	[fix] minor fix in get_context for item variants (#8791)	2017-05-12 11:23:23 +05:30
Saurabh	62c7deee00	[fix] don't allow string values in limits to avoid sql injection (#8779)	2017-05-11 18:03:12 +05:30
Nabin Hait	b579fd7ada	bumped to version 8.0.25	2017-05-11 17:36:56 +06:00
Nabin Hait	4f5ad50ecf	Item Rate in Sales Return must be less than or equal to reference doc (#8775) ... * Item Rate in Sales Return must be less than or equal to reference doc * Fix as rate field is not there in Packed Item	2017-05-11 16:44:19 +05:30
Nabin Hait	5ad6126832	On saving of Accounts Settings, only save enabled warehouses (#8772)	2017-05-11 13:34:04 +05:30
Nabin Hait	62d27ab7d3	Reload doctype bewfore renaming margin fields (#8771)	2017-05-11 13:26:55 +05:30
KanchanChauhan	f74010d379	Calculations based on working and payment days should be made if salary structure exists (#8770)	2017-05-11 11:42:35 +05:30
Makarand Bauskar	0e4c5c9efb	[minor] renamed a Total Margin field to Rate With Margin (#8720) ... * [minor] renamed a Total Margin field to Rate With Margin * [minor] minor fixes in field lable	2017-05-11 11:40:02 +05:30
Faris Ansari	734d7795f8	Show party name in General Ledger print report (#8760)	2017-05-11 11:38:30 +05:30
Makarand Bauskar	464f108586	[minor] added currency in Totals for Trial Balance report (#8757) ... * [minor] added currency in Totals for Trial Balance report * [minor] used erpnext.get_default_currency to fetch the company currency	2017-05-10 19:40:36 +05:30
KanchanChauhan	323e46ba5a	Added parent filter to the Salary Structure Employee since it was getting base and variable value from first found Salary Structure Employee (#8756)	2017-05-10 17:46:32 +05:30
Makarand Bauskar	62414565b1	[minor] added the address_html field in company doctype (#8754)	2017-05-10 14:52:03 +05:30
Manas Solanki	426b8a14fd	Merge the student group and student batch (#8663) ... * deleted student batch creation tool * Patch for deleting the doctype and config * Changes in the student attendance * Patch for renaming the student batch as student group * Changes in the student attendance * Change in the student attendance reports - Absent student report - Student Batch-wise attendance - Student monthly attendance sheet * Changes in the patch * Changes in the course schedule * Changes in the course scheduling tool * Change in the assessment plan * Changes in the assessment result tool * Cleanup * Changes in the api.py * create student group from student batch * delete student batch * add patch * remove student batch from config/schools.py * Delete the depricated doctype with patch * Changes in patch * Changes as per PR	2017-05-09 15:32:52 +05:30
Nabin Hait	70e1778712	bumped to version 8.0.24	2017-05-09 15:43:32 +06:00
Nabin Hait	4e6ff8ccd8	Ignore permission for Bin in warehouse query (#8742)	2017-05-09 15:09:10 +05:30
Rushabh Mehta	95233a62d7	[minor] item route item_name + random string	2017-05-09 07:48:41 +05:30
Nabin Hait	226ea7db88	Filter issue on timesheet calendar view (#8730)	2017-05-08 17:34:07 +05:30
Saurabh	9df45bbc42	[fix] Reference Document is required to create Payment Request (#8729) ... * [fix] Referene Document is required to create Payment Request * Update payment_request.py	2017-05-08 17:24:23 +05:30
Rushabh Mehta	a6bc583daf	[minor] item route is item name + code	2017-05-08 11:35:40 +05:30
Nabin Hait	b5a9822fff	bumped to version 8.0.23	2017-05-06 14:10:52 +06:00
Nabin Hait	17179ee83a	minor syntax fix	2017-05-06 13:23:12 +05:30
Ishan Loya	120ee275cc	Fix typo (#8719)	2017-05-06 12:48:22 +05:30
Makarand Bauskar	486045e1d1	[minor] check if date of joining is available before creating Salary Slip (#8700)	2017-05-06 12:47:42 +05:30
Nabin Hait	3257aeeb55	Price list rate fix multiple uom and validation with prev doc (#8718)	2017-05-06 12:47:14 +05:30
Nabin Hait	7228e1af6e	Customer/Supplier Name in sales/purchase analytics (#8717)	2017-05-06 12:45:37 +05:30
Nabin Hait	6e7407962f	Get exchange rate only if date and currency is present (#8712) ... * Get exchange rate only if date and currency is present * Update transaction.js	2017-05-06 12:45:16 +05:30
Rushabh Mehta	b7e740ff45	[minor] ignore permissions for bin on warehouse_query (#8713)	2017-05-06 12:44:03 +05:30
Dominik Ottenbreit	51cd2df763	Fix Romanian Translation (#8706)	2017-05-05 17:30:45 +05:30
Pawan Mehta	cac94b9bd5	[fix] #8373 (#8707)	2017-05-05 17:29:57 +05:30
Manas Solanki	65c8466622	check for mandatory field before frappe.call (#8705)	2017-05-05 17:28:09 +05:30
Nabin Hait	42343bbc2c	Selling price validation against last purchase rate / valuation rate (#8702)	2017-05-05 17:23:17 +05:30
KanchanChauhan	ed56b8afd8	Website route for item based on name not item name (#8682)	2017-05-05 11:56:55 +05:30
Makarand Bauskar	6b3bc8a8e1	[hotfix] fixed the recursion error while saving the User (#8696)	2017-05-05 11:53:00 +05:30
Makarand Bauskar	c4ec937835	[hotfix] fixed object has no attribute 'delivered_by_supplier' (#8699)	2017-05-05 11:52:17 +05:30
Nabin Hait	d2a966eef3	Update general_ledger.py	2017-05-05 10:41:16 +05:30
rohitwaghchaure	6324987c15	[fix] Company's abbreviation change will not update the warehouse (#8685)	2017-05-04 16:12:29 +05:30
Nabin Hait	8470b39d4c	bumped to version 8.0.22	2017-05-04 12:50:31 +06:00
Nabin Hait	932423ecba	Balance Sheet always shows accumulated values from previous fiscal year (#8668)	2017-05-04 12:12:29 +05:30
Faris Ansari	1c09a991f3	Change beta_version to 8.x-beta (#8673) ... * Change beta_version to 8.x-beta * change to 8.x.x-beta	2017-05-04 12:12:14 +05:30
Nabin Hait	fcc0246b38	Get mobile nos for customer contact (#8674)	2017-05-04 12:11:48 +05:30
Nabin Hait	3ce41d6b1f	Fixed related to auto fetching batch nos and date valiation in salary structure (#8666) ... * Fixed related to auto fetching batch nos and date valiation in salary structure * Update get_item_details.py	2017-05-03 18:22:24 +05:30
Javier Wong	470535ae9b	Removed set_default_roles ... set_default_roles was removed in 7fff0908a4 It is not required anymore. It currently breaks the patch.	2017-05-03 16:44:14 +05:30
rohitwaghchaure	a1923574c6	Merge pull request #8657 from rohitwaghchaure/pos_email_id_issue ... [fix] Contact not creating if only email id has entered in the POS	2017-05-03 12:56:13 +05:30
Nabin Hait	ef027e9030	Correct args to the fmt_money function	2017-05-03 11:51:47 +05:30
Aditya Duggal	bd8c7d683b	Website related fields now consider show_variant_in_website field as well ... -Resolves issue #8635	2017-05-03 10:14:09 +05:30
Rohit Waghchaure	fd37516165	[fix] Contact not creating if only email id has entered in the POS	2017-05-02 18:27:09 +05:30
Nabin Hait	504eba7fb2	Test case fixed for Employee Loan Application	2017-05-02 18:19:48 +05:30
Nabin Hait	e15721df48	Caluculate total interest and payable amount in Loan Application if fixed amount per period	2017-05-02 18:19:48 +05:30
mbauskar	c482aeda1a	[fixes] added missing get_linked_material_requests method to buying utils	2017-05-02 14:05:54 +05:30
Rohit Waghchaure	61165127fc	[fix] Default pos profile's customer not working for the POS	2017-05-02 13:04:08 +05:30
Nabin Hait	fb73621db2	bumped to version 8.0.21	2017-05-02 10:28:48 +06:00
Rohit Waghchaure	3df7eef6cc	[fix] Unable to create an asset due to rounding issue	2017-05-02 09:49:02 +05:30
akshay	b674d27285	Test Cleanup	2017-05-02 09:48:51 +05:30
akshay	949fbc559e	Serial No Rename	2017-05-02 09:48:51 +05:30
Nabin Hait	1117125841	Update domainify.py	2017-05-01 11:40:13 +05:30
mbauskar	e94c6e7b8e	[minor] disabled the instructor role if the company domain is not Education	2017-05-01 11:40:13 +05:30
Nabin Hait	589927b37d	bumped to version 8.0.20	2017-04-28 16:04:58 +06:00
Nabin Hait	2afb9b96cd	pricing rule fix	2017-04-28 15:20:49 +05:30
Nabin Hait	8c9fb76854	Remove pricing rules if 'Ignore Pricing Rule' manually triggered	2017-04-28 15:20:49 +05:30
Manas Solanki	0da9bc6309	Fix for program enrollment	2017-04-28 14:37:25 +05:30
Manas Solanki	5a8a5b7d06	Fixes in Student Group	2017-04-28 14:37:25 +05:30
Manas Solanki	71373a176d	Configurable validation setting for the student group	2017-04-28 14:37:25 +05:30
mbauskar	1b6270ef40	[hotfix] error while sending the auto email report of Ordered Items To Be Delivered	2017-04-28 14:35:18 +05:30
Rohit Waghchaure	ac28ffb41e	[fix] frappe.db.exists('Series', series) is not working because tabSeries table did not have column modified	2017-04-28 14:34:11 +05:30
Rohit Waghchaure	0e6ac8b9b4	Enabled option User Cannot Search for the gl entry doctype	2017-04-28 10:03:18 +05:30
Rohit Waghchaure	07ef5f42c4	[enhance] Show notification for draft state records if doctype is submittable	2017-04-28 09:59:29 +05:30
Nabin Hait	7b04f092a6	Fixed test cases	2017-04-28 09:58:41 +05:30
Nabin Hait	c98f37f91c	Patch for reverting manufacturers table from item	2017-04-28 09:58:41 +05:30
Nabin Hait	b6a8920489	Fixed conflict	2017-04-28 09:58:41 +05:30
Nabin Hait	ecd46588ec	bumped to version 8.0.19	2017-04-26 15:15:37 +06:00
Nabin Hait	96c247c834	Pick batch autmatically only if batch found	2017-04-26 14:37:33 +05:30
Nabin Hait	db8f41ba55	Added Payment documents as Quick Links in SO/PO	2017-04-26 14:34:41 +05:30
Nabin Hait	5b73a4864a	bumped to version 8.0.18	2017-04-25 21:14:54 +06:00
Nabin Hait	85622f9ccb	Update update_status_as_paid_for_completed_expense_claim.py	2017-04-25 20:43:29 +05:30
pawan	c27d9f712b	Add Report Links	2017-04-25 20:12:55 +05:30
Umair Sayyed	175646572a	updated help pages	2017-04-25 16:27:50 +05:30
Nabin Hait	d5d8db7a3f	Cleanup on financial statement PR	2017-04-25 16:26:33 +05:30
Nabin Hait	39bcb3de4b	Merge branch 'accumulated_header_std' of https://github.com/RicardoJohann/erpnext into RicardoJohann-accumulated_header_std	2017-04-25 16:13:54 +05:30
Ishan Loya	09fe8e0522	Add bank guarantee to Accounts module display screen	2017-04-25 16:08:22 +05:30
Ishan Loya	17737e4ab1	Change permissions, change account fieldname and add notes section	2017-04-25 16:08:22 +05:30
Ishan Loya	2fca72ae8e	Change owner	2017-04-25 16:08:22 +05:30
Ishan Loya	0dbe8547e7	Add screenshot to documentation, change naming series to BG-#####, make Bank Guarantee number unique	2017-04-25 16:08:22 +05:30
Ishan Loya	e1ed5ba726	Remove commented out code	2017-04-25 16:08:22 +05:30
Ishan Loya	0fc57a7df2	Change doctype owner	2017-04-25 16:08:22 +05:30
Ishan Loya	c7a72684fd	Add bank guarantee doctype with documentation	2017-04-25 16:08:22 +05:30
Nabin Hait	020dedd00e	Cleaned up and commonified the campaign efficiency and lead owner efficiency report	2017-04-25 16:05:01 +05:30
Nabin Hait	28dad095fa	Merge branch 'fixes_8466' of https://github.com/PawanMeh/erpnext into PawanMeh-fixes_8466	2017-04-25 15:00:45 +05:30
Nabin Hait	8590d5b05d	bumped to version 8.0.17	2017-04-25 15:00:50 +06:00
sburanaw	66951e528f	Fix an import typo in get_item_details.py	2017-04-25 14:09:51 +05:30
Nabin Hait	9b20e07431	[fix] currency field precision	2017-04-25 14:09:29 +05:30
Manas Solanki	d7afa69c6f	fix	2017-04-25 14:08:43 +05:30
Manas Solanki	c61dc9c7ea	Change in the assessment tool	2017-04-25 14:08:43 +05:30
mbauskar	9cf6d630e9	[minor] fixes for expense claim status	2017-04-25 13:15:50 +05:30
Faris Ansari	5687e2da9d	[ui-fix] POS item list	2017-04-24 19:22:05 +05:30
Nabin Hait	e3c122d8c4	AR report: filter based on customer group and credit days based on field. Fixed #8214	2017-04-24 19:06:07 +05:30
Nabin Hait	4cc5e61f60	Update course_schedule.py	2017-04-24 19:00:49 +05:30
Manas Solanki	6293263095	test case fixed	2017-04-24 19:00:49 +05:30
Manas Solanki	810e483757	Changes in the student group	2017-04-24 19:00:49 +05:30
Nabin Hait	e2741e85fd	bumped to version 8.0.16	2017-04-24 19:29:01 +06:00
Rohit Waghchaure	dd70fbfdae	[fix] Letter head not showing in the report	2017-04-24 18:57:51 +05:30
Manas Solanki	6eaf281b2b	Export and import program enrollments	2017-04-24 18:44:12 +05:30
pawan	134487ab2a	Changes after review	2017-04-24 13:48:40 +05:30
pawan	7bd7df3742	Changes after review	2017-04-24 13:19:22 +05:30
Ishan Loya	56c1b2a625	Make proposed corrections	2017-04-24 10:44:36 +05:30
Ishan Loya	b12e15dcc4	Change modified by	2017-04-24 10:44:36 +05:30
Ishan Loya	e5fdd47fd8	Hide 'Qty Transferred for Manufacturing' field if skip material transfer	2017-04-24 10:44:36 +05:30
Ishan Loya	04c69fb46d	Minor fix	2017-04-24 10:44:36 +05:30
Ishan Loya	f04ef8dfe0	Update documentation for Production Order skipping material transfer entry option	2017-04-24 10:44:36 +05:30
Ishan Loya	7544904857	Add option to skip material transfer for production orders	2017-04-24 10:44:36 +05:30
Rushabh Mehta	c44910370b	[fix] is_sample_item	2017-04-24 10:28:38 +05:30
Rushabh Mehta	551406ab11	[enhance] automatic batch selection in Delivery Note and Stock Entry	2017-04-24 10:28:38 +05:30
Rushabh Mehta	e385b5b97b	[enhance] automatic batch creation, move and split	2017-04-24 10:28:38 +05:30
mbauskar	bb2670d57a	[fixes] minor fixes in bank reconciliation form and report	2017-04-24 10:23:50 +05:30
mbauskar	0b293133be	[minor] fixes for unsupported operand type(s) for +=: 'int' and 'NoneType'	2017-04-21 21:40:30 +05:30
ibi	83c1c3a171	fleet_management: replace references to fleet_management by hr in vehicle_log doctype	2017-04-21 17:57:07 +05:30
mbauskar	c3d642e5d1	[minor] allow bulk edit for doctype	2017-04-21 17:50:40 +05:30
Manas Solanki	8230ce095f	[Fix] fixed routing to the assessment result	2017-04-21 17:49:52 +05:30
Nabin Hait	557847a5ba	bumped to version 8.0.15	2017-04-21 12:19:09 +06:00
mbauskar	9bac58cdc6	[fixes] fixes in setup wizard for education domain	2017-04-21 11:38:28 +05:30
Nabin Hait	9afb53203f	bumped to version 8.0.14	2017-04-20 09:21:44 +06:00
Nabin Hait	825e053e66	Fixed project_copied_from patch	2017-04-20 08:50:37 +05:30
Nabin Hait	e42fb32f6f	Fixed allow_zero_valuation_rate patch	2017-04-20 08:45:18 +05:30
Nabin Hait	68ae9f3f88	Merge branch 'develop' into allow_on_submit_fix	2017-04-19 21:10:23 +05:30
mbauskar	8f3cc81302	[minor] minor fixes in pricing_rule and set_missing_value	2017-04-19 21:05:37 +05:30
mbauskar	9e9d242a24	[minor] fixes in test cases and added the test case for multiple uom in selling	2017-04-19 21:05:37 +05:30
mbauskar	287fe81329	[minor] calculate price list rate based on items uom	2017-04-19 21:05:37 +05:30
Nabin Hait	f382373cf4	Merge branch 'develop' into develop	2017-04-19 21:01:19 +05:30
CH	61f4a8e757	Make the address type translatable in the Address_HTML field	2017-04-19 20:58:53 +05:30
Nabin Hait	eef55185fc	Update purchase_receipt_item.json	2017-04-19 20:58:09 +05:30
Nabin Hait	8691e0777b	Update purchase_invoice_item.json	2017-04-19 20:58:09 +05:30
Nabin Hait	2de3bf7a0f	Fixed indexes on sales and purchase transactions	2017-04-19 20:58:09 +05:30
Julian Robbins	2e6f12b850	Update purchase-details.md	2017-04-19 20:55:04 +05:30
mbauskar	ba41242f1f	[fixes] fixed the pricing rule issue https://github.com/frappe/erpnext/issues/8493	2017-04-19 20:54:23 +05:30
Kanchan Chauhan	0633df5872	Item variant searchable in website products	2017-04-19 20:51:43 +05:30
Rohit Waghchaure	f4f774d1df	[fix] offline_pos_name is not defined during print from the POS	2017-04-19 20:50:35 +05:30
Faris Ansari	695327a513	Duplicate dependencies when project is duplicated ... - fix frappe/erpnext#8274	2017-04-19 20:48:49 +05:30
Rohit Waghchaure	019501e4a0	[fix] Balance Sheet, linking account to general ledger is not working	2017-04-19 20:46:30 +05:30
Nabin Hait	2704162f5a	Fixes allowd on submit	2017-04-19 16:25:39 +05:30
Nabin Hait	117be7ddd5	Added a settings in Accounts Settings to disable booking depreciation entry automatically	2017-04-18 14:03:06 +05:30
Nabin Hait	8a01980757	Unlink Journal Entry reference from Asset	2017-04-18 13:11:10 +05:30
mbauskar	5123a8519b	[minor] check if joining date is available before validating attandance date	2017-04-18 11:08:57 +05:30
Rohit Waghchaure	d7de3c606b	[fix] Pricing rule for pos	2017-04-17 17:32:36 +05:30
Rohit Waghchaure	dc981dc546	[fix] Auto serial no fecthed on the invoice even if stock update is disabled issue	2017-04-17 17:31:32 +05:30
Nabin Hait	4d1cf53466	bumped to version 8.0.13	2017-04-17 16:06:58 +06:00
Nabin Hait	e2431fd5e9	minor fix	2017-04-17 15:35:36 +05:30
Nabin Hait	ad65be8250	bumped to version 8.0.12	2017-04-17 15:42:17 +06:00
Manas Solanki	ae30026005	Calender view fix for course schedule	2017-04-17 14:55:54 +05:30
Manas Solanki	54c4240d9c	Changes in the program enrollment	2017-04-17 14:55:54 +05:30
Manas Solanki	79683d0871	Added school setting	2017-04-17 14:55:54 +05:30
Manas Solanki	a6d1876958	Changes in course and program	2017-04-17 14:55:54 +05:30
Manas Solanki	346928f2bc	changes in program enrollment and tool	2017-04-17 14:55:54 +05:30
Nabin Hait	310d238d17	Merge pull request #8460 from rohitwaghchaure/client_followup_report ... Client followup report	2017-04-17 14:13:38 +05:30
Nabin Hait	5e25731188	Update crm_reports.md	2017-04-17 14:13:20 +05:30
Nabin Hait	83ca262e38	Merge pull request #8453 from StrellaGroup/develop ... [fix] Stock Entry - Change "Is Sample Item" to "Allow Zero Valuation Rate"	2017-04-17 14:00:12 +05:30
mbauskar	8a2e6f427b	[minor] if address is not found then set the address_field to '' instead of None	2017-04-17 13:58:52 +05:30
Faris Ansari	8371c1c4cd	Text overflow fix for product text in portal	2017-04-17 13:57:19 +05:30
Julian Robbins	361e7f6ddc	Remove typos and use better English	2017-04-17 13:56:53 +05:30
mbauskar	22cedeb006	[minor] POS & RFQ format_number fixes	2017-04-17 12:24:24 +05:30
pawan	83c8ed0827	”[fix]	2017-04-17 01:02:56 +05:30