| PAYER'S name, street address, city or town, state or province, country, ZIP or foreign postal code, and telephone no. \n\t{{company if company else \"\"}} \n\t{{payer_street_address if payer_street_address else \"\"}}\n | \n 1 Rents | \nOMB No. 1545-0115 Form 1099-MISC | \n Miscellaneous Income | \n|
| 2 Royalties | \n||||
| 3 Other Income \n\t{{payments if payments else \"\"}}\n\t | \n 4 Federal Income tax withheld | \nCopy A For Internal Revenue Service Center File with Form 1096 | \n ||
| PAYER'S TIN \n\t{{company_tin if company_tin else \"\"}}\n\t | \n \n RECIPIENT'S TIN \n {{tax_id if tax_id else \"None\"}}\n | \n Fishing boat proceeds | \n6 Medical and health care payments | \n|
| RECIPIENT'S name \n {{supplier if supplier else \"\"}}\n | \n 7 Nonemployee compensation \n\t | \n Substitute payments in lieu of dividends or interest | \nFor Privacy Act and Paperwork Reduction Act Notice, see the 2018 General Instructions for Certain Information Returns. | \n |
| Street address (including apt. no.) \n\t{{recipient_street_address if recipient_street_address else \"\"}}\n\t | \n $___________ | \n$___________ | \n||
| 9 Payer made direct sales of $5,000 or more of consumer products to a buyer (recipient) for resale | \n 10 Crop insurance proceeds | \n|||
| City or town, state or province, country, and ZIP or foreign postal code \n\t{{recipient_city_state if recipient_city_state else \"\"}}\n | \n $___________ | \n|||
| 11 | \n12 | \n|||
| Account number (see instructions) | \nFACTA filing requirement | \n 2nd TIN not. | \n13 Excess golden parachute payments $___________ | \n 14 Gross proceeds paid to an attorney $___________ | \n
| 15a Section 409A deferrals | \n15b Section 409 income | \n16 State tax withheld | \n17 State/Payer's state no. | \n18 State income | \n
| $ | \n$ | \n$ | \n\n | $ | \n
| Form 1099-MISC Cat. No. 14425J www.irs.gov/Form1099MISC Department of the Treasury - Internal Revenue Service | \n||||
| PAYER'S name, street address, city or town, state or province, country, ZIP or foreign postal code, and telephone no. \n {{company if company else \"\"}} \n \t{{payer_street_address if payer_street_address else \"\"}} | \n 1 Rents | \nOMB No. 1545-0115 Form 1099-MISC | \n Miscellaneous Income | \n|
| 2 Royalties | \n||||
| 3 Other Income \n\t{{payments if payments else \"\"}}\n\t | \n 4 Federal Income tax withheld | \nCopy 1 For State Tax Department | \n ||
| PAYER'S TIN \n\t{{company_tin if company_tin else \"\"}}\n\t | \n RECIPIENT'S TIN \n\t{{tax_id if tax_id else \"\"}}\n\t | \n Fishing boat proceeds | \n6 Medical and health care payments | \n|
| RECIPIENT'S name | \n {{supplier if supplier else \"\"}}\n7 Nonemployee compensation \n\t | \n Substitute payments in lieu of dividends or interest | \n\n | |
| Street address (including apt. no.) \n\t{{recipient_street_address if recipient_street_address else \"\"}}\n\t | \n $___________ | \n$___________ | \n||
| 9 Payer made direct sales of $5,000 or more of consumer products to a buyer (recipient) for resale | \n 10 Crop insurance proceeds | \n|||
| City or town, state or province, country, and ZIP or foreign postal code \n\t{{recipient_city_state if recipient_city_state else \"\"}}\n\t | \n $___________ | \n|||
| 11 | \n12 | \n|||
| Account number (see instructions) | \nFACTA filing requirement | \n 2nd TIN not. | \n13 Excess golden parachute payments $___________ | \n 14 Gross proceeds paid to an attorney $___________ | \n
| 15a Section 409A deferrals | \n15b Section 409 income | \n16 State tax withheld | \n17 State/Payer's state no. | \n18 State income | \n
| $ | \n$ | \n$ | \n\n | $ | \n
| Form 1099-MISC Cat. No. 14425J www.irs.gov/Form1099MISC Department of the Treasury - Internal Revenue Service | \n||||
Welcome to chapter {{ chapter.name }}!
{{ chapter_button() }} {% else %} diff --git a/erpnext/templates/pages/projects.js b/erpnext/templates/pages/projects.js index b6a2553aed4..262167fc0b9 100644 --- a/erpnext/templates/pages/projects.js +++ b/erpnext/templates/pages/projects.js @@ -3,7 +3,7 @@ frappe.ready(function() { $('.task-status-switch').on('click', function() { var $btn = $(this); if($btn.attr('data-status')==='Open') { - reload_items('closed', 'task', $btn); + reload_items('completed', 'task', $btn); } else { reload_items('open', 'task', $btn); } @@ -13,7 +13,7 @@ frappe.ready(function() { $('.issue-status-switch').on('click', function() { var $btn = $(this); if($btn.attr('data-status')==='Open') { - reload_items('closed', 'issue', $btn); + reload_items('completed', 'issue', $btn); } else { reload_items('open', 'issue', $btn); } @@ -61,9 +61,9 @@ frappe.ready(function() { // update status if(item_status==='open') { - $btn.html(__('Show closed')).attr('data-status', 'Open'); + $btn.html(__('Show Completed')).attr('data-status', 'Open'); } else { - $btn.html(__('Show open')).attr('data-status', 'Closed'); + $btn.html(__('Show Open')).attr('data-status', 'Completed'); } } }); @@ -72,8 +72,8 @@ frappe.ready(function() { var more_items = function(item, item_status){ if(item_status) { - var item_status = $('.project-'+ item +'-section .btn-group .bold').hasClass('btn-closed-'+ item) - ? 'closed' : 'open'; + var item_status = $('.project-'+ item +'-section .btn-group .bold').hasClass('btn-completed-'+ item) + ? 'completed' : 'open'; } $.ajax({ method: "GET", diff --git a/erpnext/templates/pages/search_help.py b/erpnext/templates/pages/search_help.py index 4a4b0dbd934..887d8f4724e 100644 --- a/erpnext/templates/pages/search_help.py +++ b/erpnext/templates/pages/search_help.py @@ -3,6 +3,7 @@ import frappe, requests from frappe import _ from jinja2 import utils from html2text import html2text +from six import text_type from frappe.utils import sanitize_html from frappe.utils.global_search import search @@ -12,7 +13,7 @@ def get_context(context): query = str(utils.escape(sanitize_html(frappe.form_dict.q))) context.title = _('Help Results for') context.query = query - + context.route = '/search_help' d = frappe._dict() d.results_sections = get_help_results_sections(query) @@ -73,7 +74,7 @@ def prepare_api_results(api, topics_data): for topic in topics_data: route = api.base_url + '/' + (api.post_route + '/' if api.post_route else "") for key in api.post_route_key_list.split(','): - route += unicode(topic[key]) + route += text_type(topic[key]) results.append(frappe._dict({ 'title': topic[api.post_title_key],