Merge pull request #7033 from strixaluco/develop
[docs] URL fixes
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 9660cb9..48b942e 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.1.16'
+__version__ = '7.1.17'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
index 0e0abc4..7fff5f5 100644
--- a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
@@ -39,11 +39,14 @@
replies = frappe.get_all('Communication', fields=['content', 'text_content', 'sender'],
filters=dict(reference_doctype=self.doctype, reference_name=self.name,
- communication_type='Communication', sent_or_received='Received'))
+ communication_type='Communication', sent_or_received='Received'),
+ order_by='creation asc')
did_not_reply = self.email_sent_to.split()
for d in replies:
+ d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender},
+ "employee_name") or d.sender
if d.sender in did_not_reply:
did_not_reply.remove(d.sender)
if d.text_content:
@@ -62,17 +65,17 @@
def get_summary_template(self):
return '''
-<h4>{{ title }}</h4>
+<h3>{{ title }}</h3>
{% for reply in replies %}
-<h5>{{ frappe.db.get_value("Employee", {"user_id": reply.sender}, "employee_name") or reply.sender }}<h5>
+<h4>{{ reply.sender_name }}</h4>
<p style="padding-bottom: 20px">
{{ reply.content }}
</p>
+<hr>
{% endfor %}
{% if did_not_reply %}
-<hr>
<p>{{ did_not_reply_title }}: {{ did_not_reply }}</p>
{% endif %}
diff --git a/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py b/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py
index 2883a8a..9f159be 100644
--- a/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py
+++ b/erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py
@@ -9,6 +9,8 @@
if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
return
+ frappe.reload_doctype("Purchase Invoice")
+
for pi in frappe.db.sql("""select name from `tabPurchase Invoice`
where update_stock=1 and docstatus=1 order by posting_date asc""", as_dict=1):
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 751b793..d06fbb5 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -220,7 +220,7 @@
"collapsible": 0,
"columns": 0,
"depends_on": "",
- "description": "List of employee which has \"Salary Slip Based on Timesheet\" is enabled in salary structure.",
+ "description": "",
"fieldname": "employee",
"fieldtype": "Link",
"hidden": 0,
@@ -877,7 +877,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-07 06:00:12.460318",
+ "modified": "2016-11-22 01:42:54.204441",
"modified_by": "Administrator",
"module": "Projects",
"name": "Timesheet",
diff --git a/erpnext/schools/doctype/student_admission/student_admission.py b/erpnext/schools/doctype/student_admission/student_admission.py
index b0c7b55..a849d65 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.py
+++ b/erpnext/schools/doctype/student_admission/student_admission.py
@@ -23,7 +23,7 @@
context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }]
def get_title(self):
- return _("Admissions for {0}").format(self.academic_term)
+ return _("Admissions for {0}").format(self.academic_year)
def get_list_context(context):
context.title = _("Student Admissions")
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 59fdf70..97eca54 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -66,7 +66,8 @@
});
}
- if(this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) {
+ if(this.frm.fields_dict["packed_items"] &&
+ this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) {
this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) {
return me.set_query_for_batch(doc, cdt, cdn)
});
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
index adbfa4d..c296d8c 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -2,10 +2,10 @@
def get_data():
return {
- 'fieldname': 'delivery_note_no',
+ 'fieldname': 'delivery_note',
'non_standard_fieldnames': {
- 'Sales Invoice': 'delivery_note',
- 'Packing Slip': 'delivery_note',
+ 'Stock Entry': 'delivery_note_no',
+ 'Quality Inspection': 'reference_name'
},
'internal_links': {
'Sales Order': ['items', 'against_sales_order'],
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 9b83cf2..532452f 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -1491,7 +1491,7 @@
"in_standard_filter": 0,
"label": "Against Sales Order",
"length": 0,
- "no_copy": 0,
+ "no_copy": 1,
"options": "Sales Order",
"permlevel": 0,
"print_hide": 1,
@@ -1519,7 +1519,7 @@
"in_standard_filter": 0,
"label": "Against Sales Invoice",
"length": 0,
- "no_copy": 0,
+ "no_copy": 1,
"options": "Sales Invoice",
"permlevel": 0,
"print_hide": 1,
@@ -1691,7 +1691,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-11-16 16:05:03.945501",
+ "modified": "2016-11-23 11:40:31.739993",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",