From 647e0d11649455524a2878871c600df691ba8631 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 18 Dec 2012 14:47:54 +0530 Subject: [PATCH 1/7] updates to product_page (search) and kb fix --- public/js/kb_common.js | 2 +- stock/doctype/item/item.txt | 5 +- utilities/page/questions/questions.py | 2 +- website/helpers/product.py | 89 ++----------------- website/templates/html/product_page.html | 12 ++- website/templates/html/product_search.html | 9 -- .../templates/html/product_search_box.html | 24 +++++ website/templates/pages/product_search.html | 88 ++++++++++++++++++ 8 files changed, 131 insertions(+), 100 deletions(-) delete mode 100644 website/templates/html/product_search.html create mode 100644 website/templates/html/product_search_box.html create mode 100644 website/templates/pages/product_search.html diff --git a/public/js/kb_common.js b/public/js/kb_common.js index 032d2db143..0686677692 100644 --- a/public/js/kb_common.js +++ b/public/js/kb_common.js @@ -33,7 +33,7 @@ KBItemToolbar = function(args, kb) { this.make_timestamp = function() { this.line1.innerHTML = repl('By %(name)s | %(when)s', { - name: wn.utils.full_name(this.det.first_name, this.det.last_name), + name: wn.user_info(this.det.owner).fullname, when: wn.datetime.comment_when(this.det.modified) }); diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index ce54443c35..10017a69a8 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2012-12-17 14:56:32", "modified_by": "Administrator", - "modified": "2012-12-17 16:02:00" + "modified": "2012-12-18 14:23:19" }, { "allow_attach": 1, @@ -823,11 +823,12 @@ "permlevel": 0 }, { + "description": "Will appear in search", "depends_on": "show_in_website", "doctype": "DocField", "label": "Short Description", "fieldname": "web_short_description", - "fieldtype": "Text", + "fieldtype": "Text Editor", "permlevel": 0 }, { diff --git a/utilities/page/questions/questions.py b/utilities/page/questions/questions.py index b38bc1ed42..20d38034fb 100644 --- a/utilities/page/questions/questions.py +++ b/utilities/page/questions/questions.py @@ -35,7 +35,7 @@ def get_questions(): conds += ' and t1._user_tags like "%'+ t +'%"' return webnotes.conn.sql("""select t1.name, t1.owner, t1.question, t1.modified, t1._user_tags, - t2.first_name, t2.last_name, (select count(*) from tabAnswer where + (select count(*) from tabAnswer where tabAnswer.question = t1.name) as answers from tabQuestion t1, tabProfile t2 where t1.docstatus!=2 diff --git a/website/helpers/product.py b/website/helpers/product.py index fec462607b..ceec17daec 100644 --- a/website/helpers/product.py +++ b/website/helpers/product.py @@ -25,14 +25,6 @@ def get_product_info(item_code): @webnotes.whitelist(allow_guest=True) def get_product_list(args=None): - """ - args = { - 'limit_start': 0, - 'limit_page_length': 20, - 'search': '', - 'product_group': '', - } - """ import webnotes from webnotes.utils import cstr @@ -40,11 +32,11 @@ def get_product_list(args=None): # base query query = """\ - select name, item_name, page_name, website_image, - description, web_short_description + select name, item_name, page_name, website_image, item_group, + if(ifnull(web_short_description,'')='', web_long_description, + web_short_description) as web_short_description from `tabItem` - where is_sales_item = 'Yes' - and docstatus = 0 + where docstatus = 0 and show_in_website = 1""" # search term condition @@ -65,75 +57,6 @@ def get_product_list(args=None): and item_group = %(product_group)s""" # order by - query += """ - order by item_name asc, name asc""" + query += """order by item_name asc, name asc limit %s, 10""" % args.start - from webnotes.widgets.query_builder import add_limit_to_query - query, args = add_limit_to_query(query, args) - - return webnotes.conn.sql(query, args, as_dict=1) - -@webnotes.whitelist(allow_guest=True) -def get_product_category_list(args=None): - """ - args = { - 'limit_start': 0, - 'limit_page_length': 5, - } - """ - import webnotes - - if not args: args = webnotes.form_dict - - query = """\ - select count(name) as items, item_group - from `tabItem` - where is_sales_item = 'Yes' - and docstatus = 0 - and show_in_website = 1 - group by item_group - order by items desc""" - - from webnotes.widgets.query_builder import add_limit_to_query - query, args = add_limit_to_query(query, args) - - - result = webnotes.conn.sql(query, args, as_dict=1) - - # add All Products link - total_count = sum((r.get('items') or 0 for r in result)) - result = [{'items': total_count, 'item_group': 'All Products'}] + (result or []) - - return result - -@webnotes.whitelist(allow_guest=True) -def get_similar_product_list(args=None): - """ - args = { - 'limit_start': 0, - 'limit_page_length': 5, - 'product_name': '', - 'product_group': '', - } - """ - import webnotes - - if not args: args = webnotes.form_dict - - query = """\ - select name, item_name, page_name, website_image, - description, web_short_description - from `tabItem` - where is_sales_item = 'Yes' - and docstatus = 0 - and show_in_website = 1 - and name != %(product_name)s - and item_group = %(product_group)s - order by item_name""" - - from webnotes.widgets.query_builder import add_limit_to_query - query, args = add_limit_to_query(query, args) - - result = webnotes.conn.sql(query, args, as_dict=1) - - return result \ No newline at end of file + return webnotes.conn.sql(query, args, as_dict=1) \ No newline at end of file diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html index 80108f1820..50b306029a 100644 --- a/website/templates/html/product_page.html +++ b/website/templates/html/product_page.html @@ -20,15 +20,19 @@
- {% include 'html/product_search.html' %} + {% include 'html/product_search_box.html' %}

{{ item_name }}

{% if website_image %} {% else %} -
- This is an auto-generated Image +
+
+
+
+ {% endif %}

@@ -51,7 +55,7 @@ {% for d in obj.doclist.get( {"doctype":"Item Website Specification"}) %} - {{ d.label }} + {{ d.label }} {{ d.description }} {% endfor %} diff --git a/website/templates/html/product_search.html b/website/templates/html/product_search.html deleted file mode 100644 index 034ec112f8..0000000000 --- a/website/templates/html/product_search.html +++ /dev/null @@ -1,9 +0,0 @@ -
-
-
- - -
-
-
-
\ No newline at end of file diff --git a/website/templates/html/product_search_box.html b/website/templates/html/product_search_box.html new file mode 100644 index 0000000000..3cbb3e9c81 --- /dev/null +++ b/website/templates/html/product_search_box.html @@ -0,0 +1,24 @@ +
+
+
+ + +
+
+ +
\ No newline at end of file diff --git a/website/templates/pages/product_search.html b/website/templates/pages/product_search.html new file mode 100644 index 0000000000..53a0572d69 --- /dev/null +++ b/website/templates/pages/product_search.html @@ -0,0 +1,88 @@ +{% extends "html/page.html" %} + +{% block title %}Product Search{% endblock %} + +{% block content %} + + +
+
+
+ {% include 'html/product_search_box.html' %} +

Search Results

+
+ +
+ +
+
+
+ +{% endblock %} \ No newline at end of file From fff3eb414230319d73192143bf9b2c5dc82db2d2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 18 Dec 2012 14:57:49 +0530 Subject: [PATCH 2/7] Update production/doctype/bom/bom.py set is_default in current BOM when updating after submit --- production/doctype/bom/bom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/production/doctype/bom/bom.py b/production/doctype/bom/bom.py index ac21d21378..af0a7dd0e1 100644 --- a/production/doctype/bom/bom.py +++ b/production/doctype/bom/bom.py @@ -149,7 +149,8 @@ class DocType: def manage_default_bom(self): """ Uncheck others if current one is selected as default, update default bom in item master""" - + webnotes.conn.set(self.doc, "is_default", cint(self.doc.is_default)) + if self.doc.is_default and self.doc.is_active == 'Yes': sql("update `tabBOM` set is_default = 0 where name != %s and item=%s", (self.doc.name, self.doc.item)) From e109fa4fb8d16b57d66f2c976324c62d8e30dc9d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 19 Dec 2012 10:14:59 +0530 Subject: [PATCH 3/7] website updates and fix to sessions --- setup/doctype/item_group/item_group.js | 3 + setup/doctype/item_group/item_group.py | 19 +- setup/doctype/item_group/item_group.txt | 90 ++-- .../support_ticket/support_ticket_list.js | 2 +- .../website_settings/website_settings.txt | 469 ++++++++---------- website/helpers/product.py | 7 +- website/templates/css/products.css | 11 - website/templates/html/outer.html | 2 +- website/templates/html/product_group.html | 34 ++ website/templates/html/product_page.html | 6 +- .../templates/html/product_search_box.html | 8 +- website/templates/js/blog.js | 13 +- website/templates/js/blog_subscribe.js | 33 -- website/templates/js/product_category.js | 18 - website/templates/js/products.js | 106 ---- website/templates/pages/404.html | 2 +- website/templates/pages/blog.html | 5 +- website/templates/pages/error.html | 11 + website/templates/pages/product_search.html | 15 +- website/templates/pages/products.html | 37 -- website/utils.py | 37 +- 21 files changed, 403 insertions(+), 525 deletions(-) delete mode 100644 website/templates/css/products.css delete mode 100644 website/templates/js/blog_subscribe.js delete mode 100644 website/templates/js/product_category.js delete mode 100644 website/templates/js/products.js create mode 100644 website/templates/pages/error.html delete mode 100644 website/templates/pages/products.html diff --git a/setup/doctype/item_group/item_group.js b/setup/doctype/item_group/item_group.js index db894fa9d6..6bb6fe309d 100644 --- a/setup/doctype/item_group/item_group.js +++ b/setup/doctype/item_group/item_group.js @@ -17,6 +17,9 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc); + cur_frm.add_custom_button("Item Group Tree", function() { + wn.set_route("Sales Browser", "Item Group"); + }) } cur_frm.cscript.set_root_readonly = function(doc) { diff --git a/setup/doctype/item_group/item_group.py b/setup/doctype/item_group/item_group.py index 2cec30dd1a..81c5d80af2 100644 --- a/setup/doctype/item_group/item_group.py +++ b/setup/doctype/item_group/item_group.py @@ -24,4 +24,21 @@ class DocType(DocTypeNestedSet): def __init__(self, doc, doclist=[]): self.doc = doc self.doclist = doclist - self.nsm_parent_field = 'parent_item_group'; \ No newline at end of file + self.nsm_parent_field = 'parent_item_group'; + + def on_update(self): + if self.doc.show_in_website: + # webpage updates + from website.utils import update_page_name + page_name = self.doc.name + if webnotes.conn.get_value("Website Settings", None, + "default_product_category")==self.doc.name: + page_name = "products" + + update_page_name(self.doc, self.doc.name) + + def prepare_template_args(self): + self.doc.sub_groups = webnotes.conn.sql("""select name, page_name + from `tabItem Group` where parent_item_group=%s + and ifnull(show_in_website,0)=1""", self.doc.name, as_dict=1) + \ No newline at end of file diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index 411869bf20..1a3e0637ed 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2012-12-07 15:15:28", "modified_by": "Administrator", - "modified": "2012-12-17 15:00:01" + "modified": "2012-12-18 16:23:48" }, { "in_create": 1, @@ -12,11 +12,13 @@ "module": "Setup", "autoname": "field:item_group_name", "document_type": "Master", - "description": "Item Classification", + "allow_attach": 1, "issingle": 0, "name": "__common__", "allow_rename": 1, - "doctype": "DocType" + "description": "Item Classification", + "doctype": "DocType", + "max_attachments": 3 }, { "name": "__common__", @@ -49,33 +51,6 @@ "search_index": 0, "reqd": 1 }, - { - "description": "Check this if you want to show in website", - "no_copy": 0, - "search_index": 0, - "doctype": "DocField", - "label": "Show in Website", - "fieldname": "show_in_website", - "fieldtype": "Check" - }, - { - "depends_on": "show_in_website", - "doctype": "DocField", - "label": "Featured Items HTML", - "fieldname": "featured_items_html", - "fieldtype": "HTML", - "options": "

Featured Items

" - }, - { - "description": "Items Featured on the Item Group Page", - "depends_on": "show_in_website", - "doctype": "DocField", - "label": "Featured Items", - "fieldname": "featured_items", - "fieldtype": "Table", - "hidden": 1, - "options": "Featured Item" - }, { "doctype": "DocField", "label": "Page Name", @@ -112,6 +87,45 @@ "reqd": 1, "options": "\nYes\nNo" }, + { + "doctype": "DocField", + "label": "Website Settings", + "fieldname": "sb9", + "fieldtype": "Section Break" + }, + { + "description": "Check this if you want to show in website", + "no_copy": 0, + "search_index": 0, + "doctype": "DocField", + "label": "Show in Website", + "fieldname": "show_in_website", + "fieldtype": "Check" + }, + { + "depends_on": "show_in_website", + "doctype": "DocField", + "label": "Description", + "fieldname": "description", + "fieldtype": "Text Editor" + }, + { + "depends_on": "show_in_website", + "doctype": "DocField", + "label": "Featured Items", + "fieldname": "featured_items_html", + "fieldtype": "Section Break" + }, + { + "description": "Items Featured on the Item Group Page", + "depends_on": "show_in_website", + "doctype": "DocField", + "label": "Featured Items", + "fieldname": "featured_items", + "fieldtype": "Table", + "hidden": 0, + "options": "Featured Item" + }, { "print_hide": 1, "no_copy": 1, @@ -154,6 +168,22 @@ "options": "Item Group", "report_hide": 1 }, + { + "doctype": "DocField", + "label": "file_list", + "fieldname": "file_list", + "fieldtype": "Text", + "hidden": 1 + }, + { + "print_hide": 1, + "no_copy": 1, + "doctype": "DocField", + "label": "File List", + "fieldname": "file_list", + "fieldtype": "Text", + "hidden": 1 + }, { "amend": 0, "create": 0, diff --git a/support/doctype/support_ticket/support_ticket_list.js b/support/doctype/support_ticket/support_ticket_list.js index 2d6090c358..9dc84827bc 100644 --- a/support/doctype/support_ticket/support_ticket_list.js +++ b/support/doctype/support_ticket/support_ticket_list.js @@ -15,7 +15,7 @@ wn.doclistviews['Support Ticket'] = wn.views.ListView.extend({ label_style: { "status": { - "Open": "danger", + "Open": "important", "Closed": "success", "Hold": "info", "Waiting for Customer": "info" diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt index 3ae0fbe244..b6429655d7 100644 --- a/website/doctype/website_settings/website_settings.txt +++ b/website/doctype/website_settings/website_settings.txt @@ -1,256 +1,217 @@ -# DocType, Website Settings [ - - # These values are common in all dictionaries - { - 'creation': '2012-05-21 15:54:09', - 'docstatus': 0, - 'modified': '2012-07-09 16:20:58', - 'modified_by': u'Administrator', - 'owner': u'Administrator' - }, - - # These values are common for all DocType - { - '_last_update': u'1329115882', - 'allow_attach': 1, - 'colour': u'White:FFF', - 'doctype': 'DocType', - 'document_type': u'Other', - 'issingle': 1, - 'max_attachments': 10, - 'module': u'Website', - 'name': '__common__', - 'section_style': u'Simple', - 'show_in_menu': 0, - 'version': 1 - }, - - # These values are common for all DocField - { - 'doctype': u'DocField', - 'name': '__common__', - 'parent': u'Website Settings', - 'parentfield': u'fields', - 'parenttype': u'DocType' - }, - - # These values are common for all DocPerm - { - 'doctype': u'DocPerm', - 'name': '__common__', - 'parent': u'Website Settings', - 'parentfield': u'permissions', - 'parenttype': u'DocType', - 'read': 1 - }, - - # DocType, Website Settings - { - 'doctype': 'DocType', - 'name': u'Website Settings' - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'System Manager', - 'write': 1 - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Website Manager', - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'All' - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'top_bar', - 'fieldtype': u'Section Break', - 'label': u'Top Bar', - 'permlevel': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.', - 'doctype': u'DocField', - 'fieldname': u'title_prefix', - 'fieldtype': u'Data', - 'label': u'Title Prefix', - 'permlevel': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'The "Web Page" that is the website home page', - 'doctype': u'DocField', - 'fieldname': u'home_page', - 'fieldtype': u'Link', - 'label': u'Home Page', - 'options': u'Web Page', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'default_product_category', - 'fieldtype': u'Link', - 'label': u'Default Product Category', - 'options': u'Item Group', - 'permlevel': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the <img /> tag', - 'doctype': u'DocField', - 'fieldname': u'brand_html', - 'fieldtype': u'Text', - 'label': u'Brand HTML', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'top_bar_items', - 'fieldtype': u'Table', - 'label': u'Top Bar Items', - 'options': u'Top Bar Item', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'footer', - 'fieldtype': u'Section Break', - 'label': u'Footer', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'address', - 'fieldtype': u'Text', - 'label': u'Address', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'copyright', - 'fieldtype': u'Data', - 'label': u'Copyright', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'footer_items', - 'fieldtype': u'Table', - 'label': u'Footer Items', - 'options': u'Top Bar Item', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'misc_section', - 'fieldtype': u'Section Break', - 'label': u'Misc', - 'permlevel': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]', - 'doctype': u'DocField', - 'fieldname': u'favicon', - 'fieldtype': u'Select', - 'label': u'FavIcon', - 'options': u'attach_files:', - 'permlevel': 0 - }, - - # DocField - { - 'description': u'Sub-domain provided by erpnext.com', - 'doctype': u'DocField', - 'fieldname': u'subdomain', - 'fieldtype': u'Text', - 'label': u'Subdomain', - 'permlevel': 1, - 'reqd': 0 - }, - - # DocField - { - 'description': u'Enter domain names associated to this website, each on a new line', - 'doctype': u'DocField', - 'fieldname': u'domain_list', - 'fieldtype': u'Text', - 'hidden': 1, - 'label': u'Domain List', - 'permlevel': 0, - 'reqd': 0 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'file_list', - 'fieldtype': u'Text', - 'hidden': 1, - 'label': u'File List', - 'no_copy': 1, - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'analytics', - 'fieldtype': u'Section Break', - 'label': u'Startup', - 'permlevel': 0 - }, - - # DocField - { - 'colour': u'White:FFF', - 'description': u'Bind events on startup and page change', - 'doctype': u'DocField', - 'fieldname': u'startup_code', - 'fieldtype': u'Code', - 'label': u'Startup Code', - 'options': u'Javascript', - 'permlevel': 0 - } + { + "owner": "Administrator", + "docstatus": 0, + "creation": "2012-07-12 23:29:36", + "modified_by": "Administrator", + "modified": "2012-12-18 16:15:43" + }, + { + "issingle": 1, + "allow_attach": 1, + "doctype": "DocType", + "module": "Website", + "max_attachments": 10, + "document_type": "Other", + "name": "__common__" + }, + { + "name": "__common__", + "parent": "Website Settings", + "doctype": "DocField", + "parenttype": "DocType", + "parentfield": "fields" + }, + { + "name": "__common__", + "parent": "Website Settings", + "read": 1, + "doctype": "DocPerm", + "parenttype": "DocType", + "parentfield": "permissions" + }, + { + "name": "Website Settings", + "doctype": "DocType" + }, + { + "doctype": "DocField", + "label": "Landing Page", + "fieldname": "sb0", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "description": "The \"Web Page\" that is the website home page", + "doctype": "DocField", + "label": "Home Page", + "options": "Web Page", + "fieldname": "home_page", + "fieldtype": "Link", + "reqd": 1, + "permlevel": 0 + }, + { + "description": "The name of your company / website as you want to appear on browser title bar. All pages will have this as the prefix to the title.", + "doctype": "DocField", + "label": "Title Prefix", + "fieldname": "title_prefix", + "fieldtype": "Data", + "permlevel": 0 + }, + { + "doctype": "DocField", + "fieldname": "cb4", + "fieldtype": "Column Break", + "permlevel": 0 + }, + { + "description": "Only Items / Groups under this Groups will be shown on the website. This will also represent the \"Products\" Home Page.", + "doctype": "DocField", + "label": "Default Product Category", + "options": "Item Group", + "fieldname": "default_product_category", + "fieldtype": "Link", + "permlevel": 0 + }, + { + "description": "If checked, the Home page will be the default Item Group for the website.", + "doctype": "DocField", + "label": "Home Page is Products", + "fieldname": "home_page_is_products", + "fieldtype": "Check", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Top Bar", + "fieldname": "top_bar", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "description": "Brand is what appears on the top-right of the toolbar. If it is an image, make sure it\nhas a transparent background and use the <img /> tag. Keep size as 200px x 30px", + "doctype": "DocField", + "label": "Brand HTML", + "fieldname": "brand_html", + "fieldtype": "Text", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Top Bar Items", + "options": "Top Bar Item", + "fieldname": "top_bar_items", + "fieldtype": "Table", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Footer", + "fieldname": "footer", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Address", + "fieldname": "address", + "fieldtype": "Text", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Copyright", + "fieldname": "copyright", + "fieldtype": "Data", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Footer Items", + "options": "Top Bar Item", + "fieldname": "footer_items", + "fieldtype": "Table", + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Misc", + "fieldname": "misc_section", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]", + "doctype": "DocField", + "label": "FavIcon", + "options": "attach_files:", + "fieldname": "favicon", + "fieldtype": "Select", + "permlevel": 0 + }, + { + "description": "Sub-domain provided by erpnext.com", + "doctype": "DocField", + "label": "Subdomain", + "fieldname": "subdomain", + "fieldtype": "Text", + "reqd": 0, + "permlevel": 1 + }, + { + "description": "Enter domain names associated to this website, each on a new line", + "doctype": "DocField", + "label": "Domain List", + "fieldname": "domain_list", + "fieldtype": "Text", + "reqd": 0, + "hidden": 1, + "permlevel": 0 + }, + { + "print_hide": 1, + "no_copy": 1, + "doctype": "DocField", + "label": "File List", + "fieldname": "file_list", + "fieldtype": "Text", + "hidden": 1, + "permlevel": 0 + }, + { + "doctype": "DocField", + "label": "Startup", + "fieldname": "analytics", + "fieldtype": "Section Break", + "permlevel": 0 + }, + { + "description": "Bind events on startup and page change", + "doctype": "DocField", + "label": "Startup Code", + "options": "Javascript", + "fieldname": "startup_code", + "fieldtype": "Code", + "permlevel": 0 + }, + { + "create": 1, + "doctype": "DocPerm", + "write": 1, + "role": "System Manager", + "permlevel": 0 + }, + { + "create": 1, + "doctype": "DocPerm", + "write": 1, + "role": "Website Manager", + "permlevel": 0 + }, + { + "doctype": "DocPerm", + "role": "All", + "permlevel": 1 + } ] \ No newline at end of file diff --git a/website/helpers/product.py b/website/helpers/product.py index ceec17daec..60d54e67f0 100644 --- a/website/helpers/product.py +++ b/website/helpers/product.py @@ -29,6 +29,7 @@ def get_product_list(args=None): from webnotes.utils import cstr if not args: args = webnotes.form_dict + if not args.search: args.search = "" # base query query = """\ @@ -37,10 +38,10 @@ def get_product_list(args=None): web_short_description) as web_short_description from `tabItem` where docstatus = 0 - and show_in_website = 1""" + and show_in_website = 1 """ # search term condition - if args.get('search'): + if args.search: query += """ and ( web_short_description like %(search)s or @@ -54,7 +55,7 @@ def get_product_list(args=None): # product group condition if args.get('product_group') and args.get('product_group') != 'All Products': query += """ - and item_group = %(product_group)s""" + and item_group = %(product_group)s """ # order by query += """order by item_name asc, name asc limit %s, 10""" % args.start diff --git a/website/templates/css/products.css b/website/templates/css/products.css deleted file mode 100644 index 73289c4e20..0000000000 --- a/website/templates/css/products.css +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html index 9741451a43..1580cbe143 100644 --- a/website/templates/html/outer.html +++ b/website/templates/html/outer.html @@ -9,7 +9,7 @@
-
diff --git a/website/templates/html/product_group.html b/website/templates/html/product_group.html index d5e18714b2..91d79b5f61 100644 --- a/website/templates/html/product_group.html +++ b/website/templates/html/product_group.html @@ -1 +1,35 @@ {% extends "html/page.html" %} + +{% block content %} + +
+
+
+ {% include 'html/product_search_box.html' %} + {% if description %} +
{{ description or ""}}
+ {% else %} +

{{ name }}

+ {% endif %} + {% if sub_groups %} +
+
+ {% for d in sub_groups %} +
+ + {{ d.name }}
+ {% endfor %} +
+
+ {% endif %} + {% if obj.doclist.get({"doctype":"Featured Item"}) %} +
+

Featured Products

+ + {% endif %} + +
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/website/templates/html/product_page.html b/website/templates/html/product_page.html index 50b306029a..dd941901ab 100644 --- a/website/templates/html/product_page.html +++ b/website/templates/html/product_page.html @@ -22,6 +22,7 @@
{% include 'html/product_search_box.html' %}

{{ item_name }}

+

Item Code: {{ name }}

{% if website_image %} @@ -29,7 +30,7 @@ {% else %}
+ width: 32px; font-size: 32px; color: #888;' title='No Image'>
@@ -46,7 +47,8 @@

Product Description

- {{ web_long_description or web_short_description }} + {{ web_long_description or web_short_description or + "[No description given]" }}
{% if obj.doclist.get({"doctype":"Item Website Specification"}) %} diff --git a/website/templates/html/product_search_box.html b/website/templates/html/product_search_box.html index 3cbb3e9c81..125f0ba4b5 100644 --- a/website/templates/html/product_search_box.html +++ b/website/templates/html/product_search_box.html @@ -1,7 +1,8 @@ -
+
- +
@@ -21,4 +22,5 @@ }) }) -
\ No newline at end of file +
+
\ No newline at end of file diff --git a/website/templates/js/blog.js b/website/templates/js/blog.js index 43b2d70a96..6f3260ca86 100644 --- a/website/templates/js/blog.js +++ b/website/templates/js/blog.js @@ -59,10 +59,17 @@ var blog = {

Read with comments...

\

', b)).appendTo($wrap); }); - blog.start += data.length; + blog.start += (data.length || 0); if(!data.length) { - $("#next-page").toggle(false) - .parent().append("
Nothing more to show.
"); + if(blog.start) { + $("#next-page").toggle(false) + .parent().append("
Nothing more to show.
"); + } else { + $("#next-page").toggle(false) + .parent().append("
No blogs written yet.
"); + } + } else { + $("#next-page").toggle(true); } } } \ No newline at end of file diff --git a/website/templates/js/blog_subscribe.js b/website/templates/js/blog_subscribe.js deleted file mode 100644 index cdc013025d..0000000000 --- a/website/templates/js/blog_subscribe.js +++ /dev/null @@ -1,33 +0,0 @@ -wn.provide('erpnext.blog'); - -(function() { - $('body').on('click', '.btn-blog-subscribe', function() { - var d = new wn.ui.Dialog({ - title: "Get Blog Updates via Email", - fields: [ - {label: "Your Name", fieldtype:"Data", reqd:1}, - {label: "Your Email Address", fieldtype:"Data", reqd:1 - ,description: "You can unsubscribe anytime."}, - {label: "Subscribe", fieldtype:"Button"} - ] - }); - $(d.fields_dict.subscribe.input).click(function() { - var args = d.get_values(); - if(!args) return; - wn.call({ - method: 'website.helpers.blog.add_subscriber', - args: args, - callback: function(r) { - if(r.exc) { - msgprint('Opps there seems to be some error, Please check back after some time.'); - } else { - msgprint('Thanks for subscribing!'); - } - d.hide(); - }, - btn: this - }) - }) - d.show() - }) -})() diff --git a/website/templates/js/product_category.js b/website/templates/js/product_category.js deleted file mode 100644 index 2b34708ec2..0000000000 --- a/website/templates/js/product_category.js +++ /dev/null @@ -1,18 +0,0 @@ -wn.provide('erpnext.products'); - -erpnext.products.make_product_categories = function(wrapper) { - if (!wrapper) { wrapper = erpnext.products.wrapper; } - if (!wrapper) { return; } - - wrapper.category_list = new wn.ui.Listing({ - parent: $(wrapper).find('.more-categories').get(0), - method: 'website.helpers.product.get_product_category_list', - hide_refresh: true, - render_row: function(parent, data) { - parent.innerHTML = repl( - '%(item_group)s (%(items)s)', - data); - } - }); - wrapper.category_list.run(); -} \ No newline at end of file diff --git a/website/templates/js/products.js b/website/templates/js/products.js deleted file mode 100644 index 720d192f3e..0000000000 --- a/website/templates/js/products.js +++ /dev/null @@ -1,106 +0,0 @@ -// ERPNext - web based ERP (http://erpnext.com) -// Copyright (C) 2012 Web Notes Technologies Pvt Ltd -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -// js inside blog page - -{% include "js/product_category.js" %} - -wn.pages['{{ name }}'].onload = function(wrapper) { - erpnext.products.wrapper = wrapper; - - // make product categories in the sidebar - erpnext.products.make_product_categories(wrapper); - - // make lists - erpnext.products.make_product_list(wrapper); - - // bind search button or enter key - $(wrapper).find('.products-search .btn').click(function() { - erpnext.products.product_list.run(); - }); - - $(wrapper).find('.products-search input').keypress(function(ev) { - if(ev.which==13) $(wrapper).find('.products-search .btn').click(); - }); -} - -erpnext.products.make_product_list = function(wrapper) { - if (!wrapper) { wrapper = erpnext.products.wrapper; } - if (!wrapper) { return; } - - erpnext.products.product_list = new wn.ui.Listing({ - parent: $(wrapper).find('#products-list').get(0), - run_btn: $(wrapper).find('.products-search .btn').get(0), - no_toolbar: true, - method: 'website.helpers.product.get_product_list', - get_args: function() { - return { - search: $('input[name="products-search"]').val() || '', - product_group: erpnext.products.cur_group || '', - }; - }, - render_row: function(parent, data) { - if (!data.web_short_description) { - data.web_short_description = data.description; - } - parent.innerHTML = repl('\ -
\ -
\ -

%(item_name)s

\ -

%(web_short_description)s

\ -
', data); - - if(data.website_image) { - $(parent).find('.img-area').append(repl( - '', data)) - } else { - $(parent).find('.img-area').append(wn.dom.placeholder(100, - data.item_name)); - } - } - }); -} - -wn.pages['{{ name }}'].onshow = function(wrapper) { - // show default product category - erpnext.products.set_group(); -} - -erpnext.products.set_group = function() { - var cat = erpnext.products.get_group(); - - // get erpnext.products.default_category - var wrapper = erpnext.products.wrapper; - - $(wrapper).find('h1').html(cat.label); - erpnext.products.product_list.run(); -} - -erpnext.products.get_group = function() { - route = wn.get_route(); - if(route && route.length>1) { - // from url - var grp = route[1]; - var label = route[1]; - erpnext.products.cur_group = grp; - } else { - // default - var grp = 'Products'; - var label = 'Products'; - erpnext.products.cur_group = null; - } - return {grp:grp, label:label}; -} \ No newline at end of file diff --git a/website/templates/pages/404.html b/website/templates/pages/404.html index 042360823f..04584d9a72 100644 --- a/website/templates/pages/404.html +++ b/website/templates/pages/404.html @@ -3,7 +3,7 @@ {% block content %}
-

Page missing or moved

+

Page missing or moved


We are very sorry for this, but the page you are looking for is missing (this could be because of a typo in the address) or moved.

diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html index 75681d5045..f31af42222 100644 --- a/website/templates/pages/blog.html +++ b/website/templates/pages/blog.html @@ -17,11 +17,12 @@

Blog


-
+
- +
diff --git a/website/templates/pages/error.html b/website/templates/pages/error.html new file mode 100644 index 0000000000..4fe394f66b --- /dev/null +++ b/website/templates/pages/error.html @@ -0,0 +1,11 @@ +{% extends "html/outer.html" %} + +{% block content %} +
+
+

Oops, a server error has occured

+
+ 
%(error)s
+
+
+{% endblock %} \ No newline at end of file diff --git a/website/templates/pages/product_search.html b/website/templates/pages/product_search.html index 53a0572d69..f8a1144fbb 100644 --- a/website/templates/pages/product_search.html +++ b/website/templates/pages/product_search.html @@ -56,7 +56,13 @@ $(document).ready(function() { } if(data.length < 10) { - $(".more-btn").replaceWith("
Nothing more to show
"); + if(!table) { + $(".more-btn") + .replaceWith("
No results found for your search.
"); + } else { + $(".more-btn") + .replaceWith("
Nothing more to show.
"); + } } else { $(".more-btn").toggle(true) } @@ -78,8 +84,11 @@ $(document).ready(function() {
-
diff --git a/website/templates/pages/products.html b/website/templates/pages/products.html deleted file mode 100644 index aa23ea29c4..0000000000 --- a/website/templates/pages/products.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "html/page.html" %} - -{% block javascript %} - {% include "js/products.js" %} -{% endblock %} - -{% block css %} - {% include "css/products.css" %} -{% endblock %} - -{% block title %} - Products -{% endblock %} - -{% block content %} -
-
- -
-

-
- - -
-
- -
-
- -
-

Categories

-
-
-
-
-
-{% endblock %} \ No newline at end of file diff --git a/website/utils.py b/website/utils.py index 198746f20a..be8f5e1b2e 100644 --- a/website/utils.py +++ b/website/utils.py @@ -48,7 +48,7 @@ def render(page_name): else: html = get_html('index') except Exception, e: - html = get_html('404') + html = get_html('error') from webnotes.handler import eprint, print_zip eprint("Content-Type: text/html") @@ -57,32 +57,29 @@ def render(page_name): def get_html(page_name): """get page html""" page_name = scrub_page_name(page_name) - comments = get_comments(page_name) html = '' # load from cache, if auto cache clear is falsy if not (hasattr(conf, 'auto_cache_clear') and conf.auto_cache_clear or 0): html = webnotes.cache().get_value("page:" + page_name) + from_cache = True - if html: - comments += "\nload status: cache" - else: + if not html: html = load_into_cache(page_name) - comments += "\nload status: fresh" + from_cache = False - # insert comments - html += """\n""" % webnotes.utils.cstr(comments) + if not html: + html = get_html("404") + + if page_name=="error": + html = html % {"error": webnotes.getTraceback()} + else: + comments = "\n\npage:"+page_name+\ + "\nload status: " + (from_cache and "cache" or "fresh") + html += """\n""" % webnotes.utils.cstr(comments) return html - -def get_comments(page_name): - if page_name == '404': - comments = """error: %s""" % webnotes.getTraceback() - else: - comments = """page: %s""" % page_name - - return comments def scrub_page_name(page_name): if page_name.endswith('.html'): @@ -114,6 +111,8 @@ def update_page_name(doc, title): def load_into_cache(page_name): args = prepare_args(page_name) + if not args: + return "" html = build_html(args) webnotes.cache().set_value("page:" + page_name, html) return html @@ -141,6 +140,9 @@ def prepare_args(page_name): else: args = get_doc_fields(page_name) + if not args: + return False + args.update(get_outer_env()) return args @@ -156,6 +158,9 @@ def get_template_pages(): def get_doc_fields(page_name): doc_type, doc_name = get_source_doc(page_name) + if not doc_type: + return False + obj = webnotes.get_obj(doc_type, doc_name, with_children=True) if hasattr(obj, 'prepare_template_args'): From 60ec6ba975d3bdf506a005f32488d5b20904c78f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 19 Dec 2012 10:16:58 +0530 Subject: [PATCH 4/7] web: navbar-inverse --- website/templates/html/outer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html index 1580cbe143..9741451a43 100644 --- a/website/templates/html/outer.html +++ b/website/templates/html/outer.html @@ -9,7 +9,7 @@
-
From b6166caec74e9bc0d6dc4760d0f8f660acd6165b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 19 Dec 2012 10:35:09 +0530 Subject: [PATCH 5/7] modified timestamp --- hr/doctype/leave_application/leave_application.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index dce8539a51..edebe4bfd9 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -4,7 +4,7 @@ "docstatus": 0, "creation": "2012-12-10 10:25:20", "modified_by": "Administrator", - "modified": "2012-12-18 11:06:53" + "modified": "2012-12-18 11:06:54" }, { "is_submittable": 1, From 64a839a747d2ccdbe7dbcdb7f50df145ae2ef383 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 19 Dec 2012 11:43:28 +0530 Subject: [PATCH 6/7] fixes in ordered/delivered items to be billed --- .../delivered_items_to_be_billed.txt | 6 +++--- .../ordered_items_to_be_billed.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt index 4a01347bce..13d238a1fc 100644 --- a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt +++ b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt @@ -2,16 +2,16 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-11-23 16:46:22", + "creation": "2012-11-28 11:24:29", "modified_by": "Administrator", - "modified": "2012-11-26 10:11:53" + "modified": "2012-12-19 11:41:38" }, { "name": "__common__", "ref_doctype": "Sales Invoice", "doctype": "Report", "is_standard": "Yes", - "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description\",\n `tabDelivery Note Item`.qty as \"Qty:Float\",\n `tabDelivery Note Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_qty,0) < ifnull(`tabDelivery Note Item`.qty,0)\norder by `tabDelivery Note`.posting_date asc" + "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description:Data:120\",\n `tabDelivery Note Item`.export_amount as \"Amount:Currency:110\",\n `tabDelivery Note Item`.billed_amt as \"Billed Amount:Currency:110\",\n (ifnull(`tabDelivery Note Item`.export_amount,0) - ifnull(`tabDelivery Note Item`.billed_amt,0)) as \"Pending Amount:Currency:120\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_amt,0) < ifnull(`tabDelivery Note Item`.export_amount,0)\norder by `tabDelivery Note`.posting_date asc" }, { "name": "Delivered Items To Be Billed", diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt index bf410933f3..31b31441a5 100644 --- a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt +++ b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt @@ -2,16 +2,16 @@ { "owner": "Administrator", "docstatus": 0, - "creation": "2012-12-14 10:22:40", + "creation": "2012-12-14 14:27:05", "modified_by": "Administrator", - "modified": "2012-12-14 10:24:16" + "modified": "2012-12-19 11:42:45" }, { "name": "__common__", "ref_doctype": "Sales Invoice", "doctype": "Report", "is_standard": "Yes", - "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description\",\n `tabSales Order Item`.qty as \"Qty:Float\",\n `tabSales Order Item`.billed_qty as \"Billed Qty:Float\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_qty,0) < ifnull(`tabSales Order Item`.qty,0)\norder by `tabSales Order`.transaction_date asc" + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description:Data:120\",\n `tabSales Order Item`.export_amount as \"Amount:Currency:110\",\n `tabSales Order Item`.billed_amt as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.export_amount, 0) - ifnull(`tabSales Order Item`.billed_amt, 0)) as \"Pending Amount:Currency:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.export_amount,0)\norder by `tabSales Order`.transaction_date asc" }, { "name": "Ordered Items To Be Billed", From bb852e45e9598685ea4f3e4eb0b9997a3d1a992b Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 19 Dec 2012 11:55:42 +0530 Subject: [PATCH 7/7] fixes in ordered/delivered items to be billed --- .../delivered_items_to_be_billed.txt | 4 ++-- .../ordered_items_to_be_billed/ordered_items_to_be_billed.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt index 13d238a1fc..bc409f84a2 100644 --- a/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt +++ b/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.txt @@ -4,14 +4,14 @@ "docstatus": 0, "creation": "2012-11-28 11:24:29", "modified_by": "Administrator", - "modified": "2012-12-19 11:41:38" + "modified": "2012-12-19 11:54:55" }, { "name": "__common__", "ref_doctype": "Sales Invoice", "doctype": "Report", "is_standard": "Yes", - "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description:Data:120\",\n `tabDelivery Note Item`.export_amount as \"Amount:Currency:110\",\n `tabDelivery Note Item`.billed_amt as \"Billed Amount:Currency:110\",\n (ifnull(`tabDelivery Note Item`.export_amount,0) - ifnull(`tabDelivery Note Item`.billed_amt,0)) as \"Pending Amount:Currency:120\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_amt,0) < ifnull(`tabDelivery Note Item`.export_amount,0)\norder by `tabDelivery Note`.posting_date asc" + "query": "select \n `tabDelivery Note`.`name` as \"Delivery Note:Link/Delivery Note:120\",\n`tabDelivery Note`.`customer` as \"Customer:Link/Customer:120\",\n`tabDelivery Note`.`status` as \"Status\",\n `tabDelivery Note`.`posting_date` as \"Date:Date\",\n `tabDelivery Note Item`.item_code as \"Item:Link/Item:120\",\n `tabDelivery Note Item`.description as \"Description:Data:120\",\n `tabDelivery Note Item`.amount as \"Amount:Currency:110\",\n (`tabDelivery Note Item`.billed_amt * ifnull(`tabDelivery Note`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabDelivery Note Item`.amount,0) - (ifnull(`tabDelivery Note Item`.billed_amt,0) * ifnull(`tabDelivery Note`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabDelivery Note`, `tabDelivery Note Item`\nwhere\n `tabDelivery Note Item`.`parent` = `tabDelivery Note`.`name`\n and `tabDelivery Note`.docstatus = 1\n and ifnull(`tabDelivery Note Item`.billed_amt,0) < ifnull(`tabDelivery Note Item`.export_amount,0)\norder by `tabDelivery Note`.posting_date asc" }, { "name": "Delivered Items To Be Billed", diff --git a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt index 31b31441a5..b5d4229fdd 100644 --- a/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt +++ b/accounts/report/ordered_items_to_be_billed/ordered_items_to_be_billed.txt @@ -4,14 +4,14 @@ "docstatus": 0, "creation": "2012-12-14 14:27:05", "modified_by": "Administrator", - "modified": "2012-12-19 11:42:45" + "modified": "2012-12-19 11:52:26" }, { "name": "__common__", "ref_doctype": "Sales Invoice", "doctype": "Report", "is_standard": "Yes", - "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description:Data:120\",\n `tabSales Order Item`.export_amount as \"Amount:Currency:110\",\n `tabSales Order Item`.billed_amt as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.export_amount, 0) - ifnull(`tabSales Order Item`.billed_amt, 0)) as \"Pending Amount:Currency:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.export_amount,0)\norder by `tabSales Order`.transaction_date asc" + "query": "select \n `tabSales Order`.`name` as \"Sales Order:Link/Sales Order:120\",\n `tabSales Order`.`customer` as \"Customer:Link/Customer:120\",\n `tabSales Order`.`status` as \"Status\",\n `tabSales Order`.`transaction_date` as \"Date:Date\",\n `tabSales Order Item`.item_code as \"Item:Link/Item:120\",\n `tabSales Order Item`.description as \"Description:Data:120\",\n `tabSales Order Item`.amount as \"Amount:Currency:110\",\n (`tabSales Order Item`.billed_amt * ifnull(`tabSales Order`.conversion_rate, 1)) as \"Billed Amount:Currency:110\",\n (ifnull(`tabSales Order Item`.amount, 0) - (ifnull(`tabSales Order Item`.billed_amt, 0) * ifnull(`tabSales Order`.conversion_rate, 1))) as \"Pending Amount:Currency:120\"\nfrom\n `tabSales Order`, `tabSales Order Item`\nwhere\n `tabSales Order Item`.`parent` = `tabSales Order`.`name`\n and `tabSales Order`.docstatus = 1\n and ifnull(`tabSales Order Item`.billed_amt,0) < ifnull(`tabSales Order Item`.export_amount,0)\norder by `tabSales Order`.transaction_date asc" }, { "name": "Ordered Items To Be Billed",