-
+
-
{{ doc.customer or doc.supplier }}
+
+
{{ doc.name }}
+
{{ doc.items_preview }}
+
- {%- if doc.status_percent > 0 -%}
- {%- if doc.status_percent % 100 == 0 -%}
- {{ doc.status_display }}
- {%- else -%}
- {{ doc.status_display }}
- {%- endif -%}
- {%- elif doc.status -%}
- {{ doc.status }}
- {%- endif -%}
+
+ {{ doc.indicator_title or doc.status or "Submitted" }}
+
{{ doc.get_formatted("grand_total") }}
-
- {{ doc.name }}
-
{{ frappe.utils.pretty_date(doc.creation) }}
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index e4e4a6a6c1..a97e65876c 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -3,53 +3,63 @@
{% block header %}
{{ _("My Cart") }}
{% endblock %}
{% block script %}{% include "templates/includes/cart.js" %}{% endblock %}
+{% block style %}{% include "templates/includes/cart.css" %}{% endblock %}
+
+
+{% block header_actions %}
+{% if doc.items %}
+
+{% endif %}
+{% endblock %}
{% block content %}
+
+{% from "templates/includes/macros.html" import item_name_and_description %}
+
-
{{ _("Loading") }}...
-
-
-
-
-
-
-
-
-
{{ _("Item Details") }}
-
-
-
{{ _("Qty, Amount") }}
-
-
-
-
-
-
-
-
-
-
-
-
{{ _("Shipping Address") }}
-
-
-
-
-
Billing Address
-
-
-
-
-
-
-
-
+
+
+
+
+ {% if doc.items %}
+
+ {% include "templates/includes/cart/cart_items.html" %}
+
+ {% else %}
+
{{ _("Cart is Empty") }}
+ {% endif %}
+
+ {% if doc.items %}
+
+
+
+
+ {% include "templates/includes/order/order_taxes.html" %}
+
+
+
+
+
+ {% include "templates/includes/cart/cart_address.html" %}
+
+
+ {% endif %}
+
diff --git a/erpnext/templates/pages/cart.py b/erpnext/templates/pages/cart.py
index fe50f0fe47..c57d826130 100644
--- a/erpnext/templates/pages/cart.py
+++ b/erpnext/templates/pages/cart.py
@@ -2,7 +2,11 @@
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
-from __future__ import unicode_literals
-
no_cache = 1
-no_sitemap = 1
\ No newline at end of file
+no_sitemap = 1
+
+import frappe
+from erpnext.shopping_cart.cart import get_cart_quotation
+
+def get_context(context):
+ context.update(get_cart_quotation())
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
new file mode 100644
index 0000000000..73763921f8
--- /dev/null
+++ b/erpnext/templates/pages/order.html
@@ -0,0 +1,72 @@
+{% block header %}
+
{{ doc.name }}
+
+{% endblock %}
+
+{% block style %}{% include "templates/includes/order/order.css" %}{% endblock %}
+
+{% block content %}
+
+{% from "erpnext/templates/includes/order/order_macros.html" import item_name_and_description %}
+
+
+
+
+ {{ doc.indicator_title or doc.status or "Submitted" }}
+
+
+
+ {{ doc.get_formatted("transaction_date") }}
+
+
+
+{% if doc._header %}
+{{ doc._header }}
+{% endif %}
+
+
+
+
+
+
+ {% for d in doc.items %}
+
+
+ {{ item_name_and_description(d) }}
+
+
+ {{ d.qty }}
+ {% if d.delivered_qty != None %}
+
{{
+ _("Delivered: {0}").format(d.delivered_qty) }}
+ {% endif %}
+
+
+ {{ d.get_formatted("amount") }}
+
{{
+ _("Rate: {0}").format(d.get_formatted("rate")) }}
+
+
+ {% endfor %}
+
+
+
+
+
+
+ {% include "erpnext/templates/includes/order/order_taxes.html" %}
+
+
+
+
+{% endblock %}
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
new file mode 100644
index 0000000000..36444d1f30
--- /dev/null
+++ b/erpnext/templates/pages/order.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+from frappe import _
+
+def get_context(context):
+ context.no_cache = 1
+ context.doc = frappe.get_doc(frappe.form_dict.doctype, frappe.form_dict.name)
+ if hasattr(context.doc, "set_indicator"):
+ context.doc.set_indicator()
+
+ context.parents = frappe.form_dict.parents
+
+ if not context.doc.has_permission("read"):
+ frappe.throw(_("Not Permitted"), frappe.PermissionError)
diff --git a/erpnext/templates/pages/user.py b/erpnext/templates/pages/user.py
index c944289661..5ab5545d87 100644
--- a/erpnext/templates/pages/user.py
+++ b/erpnext/templates/pages/user.py
@@ -5,36 +5,31 @@ from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import cstr
-from erpnext.shopping_cart.cart import get_lead_or_customer
+from erpnext.shopping_cart.cart import get_customer
no_cache = 1
no_sitemap = 1
def get_context(context):
- party = get_lead_or_customer()
- if party.doctype == "Lead":
- mobile_no = party.mobile_no
- phone = party.phone
- else:
- mobile_no, phone = frappe.db.get_value("Contact", {"email_id": frappe.session.user,
- "customer": party.name}, ["mobile_no", "phone"])
-
+ party = get_customer()
+ mobile_no, phone = frappe.db.get_value("Contact", {"email_id": frappe.session.user,
+ "customer": party.name}, ["mobile_no", "phone"])
+
return {
"company_name": cstr(party.customer_name if party.doctype == "Customer" else party.company_name),
"mobile_no": cstr(mobile_no),
"phone": cstr(phone)
}
-
+
@frappe.whitelist()
def update_user(fullname, password=None, company_name=None, mobile_no=None, phone=None):
from erpnext.shopping_cart.cart import update_party
update_party(fullname, company_name, mobile_no, phone)
-
+
if not fullname:
return _("Name is required")
-
+
frappe.db.set_value("User", frappe.session.user, "first_name", fullname)
frappe.local.cookie_manager.set_cookie("full_name", fullname)
-
+
return _("Updated")
-
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/address/address.py b/erpnext/utilities/doctype/address/address.py
index b3f67175e5..8ae7c4da6f 100644
--- a/erpnext/utilities/doctype/address/address.py
+++ b/erpnext/utilities/doctype/address/address.py
@@ -70,6 +70,9 @@ class Address(Document):
(is_address_type, fieldname, "%s", "%s"), (self.get(fieldname), self.name))
break
+ def get_display(self):
+ return get_address_display(self.as_dict())
+
@frappe.whitelist()
def get_address_display(address_dict):
if not address_dict:
diff --git a/erpnext/utilities/doctype/address/test_records.json b/erpnext/utilities/doctype/address/test_records.json
index 41a6abcd09..a7bde9a814 100644
--- a/erpnext/utilities/doctype/address/test_records.json
+++ b/erpnext/utilities/doctype/address/test_records.json
@@ -3,7 +3,8 @@
"address_line1": "_Test Address Line 1",
"address_title": "_Test Address",
"address_type": "Office",
- "city": "_Test City",
+ "city": "_Test City",
+ "state": "Test State",
"country": "India",
"customer": "_Test Customer",
"customer_name": "_Test Customer",
diff --git a/setup.py b/setup.py
index 4fdee0555a..0b523227c7 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "6.2.0"
+version = "6.3.0"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()