Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed address_title from address and removed test

Browse Source
This commit is contained in:
Rushabh Mehta 2014-06-05 15:34:43 +05:30
parent 33020a63b8
commit c02fbd22fa
2 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
erpnext/selling/doctype/customer/test_customer.py
View File

@ -9,44 +9,43 @@ import unittest
from frappe.test_runner import make_test_records from frappe.test_runner import make_test_records
test_ignore = ["Price List"] test_ignore = ["Price List"]
test_records = frappe.get_test_records('Customer') test_records = frappe.get_test_records('Customer')
class TestCustomer(unittest.TestCase): class TestCustomer(unittest.TestCase):
def test_party_details(self): def test_party_details(self):
from erpnext.accounts.party import get_party_details from erpnext.accounts.party import get_party_details
to_check = { to_check = {
'address_display': '_Test Address Line 1\n_Test City\nIndia\nPhone: +91 0000000000', 'selling_price_list': None,
'selling_price_list': None, 'customer_group': '_Test Customer Group',
'customer_group': '_Test Customer Group', 'contact_designation': None,
'contact_designation': None, 'customer_address': '_Test Address-Office',
'customer_address': '_Test Address-Office', 'contact_department': None,
'contact_department': None, 'contact_email': 'test_contact_customer@example.com',
'contact_email': 'test_contact_customer@example.com', 'contact_mobile': None,
'contact_mobile': None, 'sales_team': [],
'sales_team': [], 'contact_display': '_Test Contact For _Test Customer',
'contact_display': '_Test Contact For _Test Customer', 'contact_person': '_Test Contact For _Test Customer-_Test Customer',
'contact_person': '_Test Contact For _Test Customer-_Test Customer', 'territory': u'_Test Territory',
'territory': u'_Test Territory', 'contact_phone': '+91 0000000000',
'contact_phone': '+91 0000000000',
'customer_name': '_Test Customer' 'customer_name': '_Test Customer'
} }
make_test_records("Address") make_test_records("Address")
make_test_records("Contact") make_test_records("Contact")
details = get_party_details("_Test Customer") details = get_party_details("_Test Customer")
for key, value in to_check.iteritems(): for key, value in to_check.iteritems():
self.assertEquals(value, details.get(key)) self.assertEquals(value, details.get(key))
def test_rename(self): def test_rename(self):
frappe.rename_doc("Customer", "_Test Customer 1", "_Test Customer 1 Renamed") frappe.rename_doc("Customer", "_Test Customer 1", "_Test Customer 1 Renamed")
self.assertTrue(frappe.db.exists("Customer", "_Test Customer 1 Renamed")) self.assertTrue(frappe.db.exists("Customer", "_Test Customer 1 Renamed"))
self.assertFalse(frappe.db.exists("Customer", "_Test Customer 1")) self.assertFalse(frappe.db.exists("Customer", "_Test Customer 1"))
frappe.rename_doc("Customer", "_Test Customer 1 Renamed", "_Test Customer 1") frappe.rename_doc("Customer", "_Test Customer 1 Renamed", "_Test Customer 1")

86
erpnext/utilities/doctype/address_template/address_template.json
View File

@ -1,57 +1,57 @@
{ {
"autoname": "field:country", "autoname": "field:country",
"creation": "2014-06-05 02:22:36.029850", "creation": "2014-06-05 02:22:36.029850",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Master", "document_type": "Master",
"fields": [ "fields": [
{ {
"fieldname": "country", "fieldname": "country",
"fieldtype": "Link", "fieldtype": "Link",
"in_list_view": 1, "in_list_view": 1,
"label": "Country", "label": "Country",
"options": "Country", "options": "Country",
"permlevel": 0, "permlevel": 0,
"reqd": 0, "reqd": 0,
"search_index": 1 "search_index": 1
}, },
{ {
"description": "This format is used if country specific format is not found", "description": "This format is used if country specific format is not found",
"fieldname": "is_default", "fieldname": "is_default",
"fieldtype": "Check", "fieldtype": "Check",
"in_list_view": 1, "in_list_view": 1,
"label": "Is Default", "label": "Is Default",
"permlevel": 0 "permlevel": 0
}, },
{ {
"default": "{{ address_title }}<br>\n{{ address_line1 }}<br>\n{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif -%}\n{% if pincode %} PIN: {{ pincode }}<br>{% endif -%}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif -%}\n{% if fax %}Fax: {{ fax }}<br>{% endif -%}\n{% if email_id %}Email: {{ email_id }}<br>{% endif -%}\n", "default": "{{ address_line1 }}<br>\n{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}\n{{ city }}<br>\n{% if state %}{{ state }}<br>{% endif -%}\n{% if pincode %} PIN: {{ pincode }}<br>{% endif -%}\n{{ country }}<br>\n{% if phone %}Phone: {{ phone }}<br>{% endif -%}\n{% if fax %}Fax: {{ fax }}<br>{% endif -%}\n{% if email_id %}Email: {{ email_id }}<br>{% endif -%}\n",
"description": "<h4>Default Template</h4>\n<p>Uses <a href=\"http://jinja.pocoo.org/docs/templates/\">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>\n<pre><code>{{ address_title }}&lt;br&gt;\n{{ address_line1 }}&lt;br&gt;\n{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}\n{{ city }}&lt;br&gt;\n{% if state %}{{ state }}&lt;br&gt;{% endif -%}\n{% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%}\n{{ country }}&lt;br&gt;\n{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}\n{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}\n{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}\n</code></pre>", "description": "<h4>Default Template</h4>\n<p>Uses <a href=\"http://jinja.pocoo.org/docs/templates/\">Jinja Templating</a> and all the fields of Address (including Custom Fields if any) will be available</p>\n<pre><code>{{ address_title }}&lt;br&gt;\n{{ address_line1 }}&lt;br&gt;\n{% if address_line2 %}{{ address_line2 }}&lt;br&gt;{% endif -%}\n{{ city }}&lt;br&gt;\n{% if state %}{{ state }}&lt;br&gt;{% endif -%}\n{% if pincode %} PIN: {{ pincode }}&lt;br&gt;{% endif -%}\n{{ country }}&lt;br&gt;\n{% if phone %}Phone: {{ phone }}&lt;br&gt;{% endif -%}\n{% if fax %}Fax: {{ fax }}&lt;br&gt;{% endif -%}\n{% if email_id %}Email: {{ email_id }}&lt;br&gt;{% endif -%}\n</code></pre>",
"fieldname": "template", "fieldname": "template",
"fieldtype": "Code", "fieldtype": "Code",
"label": "Template", "label": "Template",
"permlevel": 0 "permlevel": 0
} }
], ],
"icon": "icon-map-marker", "icon": "icon-map-marker",
"modified": "2014-06-05 05:12:20.507364", "modified": "2014-06-05 05:12:20.507364",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Utilities", "module": "Utilities",
"name": "Address Template", "name": "Address Template",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"export": 1, "export": 1,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager", "role": "System Manager",
"set_user_permissions": 1, "set_user_permissions": 1,
"write": 1 "write": 1
} }
], ],
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC" "sort_order": "DESC"
} }