Przeglądaj źródła

Fixes in DB Query, Number Appending to Name

version-14
Anand Doshi 11 lat temu
rodzic
commit
e34b1f687e
3 zmienionych plików z 3 dodań i 3 usunięć
  1. +1
    -1
      frappe/model/db_query.py
  2. +1
    -1
      frappe/model/doc.py
  3. +1
    -1
      frappe/utils/response.py

+ 1
- 1
frappe/model/db_query.py Wyświetl plik

@@ -55,7 +55,7 @@ class DatabaseQuery(object):
if self.with_childnames: if self.with_childnames:
for t in self.tables: for t in self.tables:
if t != "`tab" + doctype + "`":
if t != "`tab" + self.doctype + "`":
fields.append(t + ".name as '%s:name'" % t[4:-1]) fields.append(t + ".name as '%s:name'" % t[4:-1])
# query dict # query dict


+ 1
- 1
frappe/model/doc.py Wyświetl plik

@@ -307,7 +307,7 @@ class Document:
def append_number_if_name_exists(self): def append_number_if_name_exists(self):
if frappe.db.exists(self.doctype, self.name): if frappe.db.exists(self.doctype, self.name):
last = frappe.db.sql("""select name from `tab{}` last = frappe.db.sql("""select name from `tab{}`
where name regexp '{}-[[:digit:]]*'
where name regexp '{}-[[:digit:]]+'
order by name desc limit 1""".format(self.doctype, self.name)) order by name desc limit 1""".format(self.doctype, self.name))
if last: if last:


+ 1
- 1
frappe/utils/response.py Wyświetl plik

@@ -12,7 +12,7 @@ import frappe.model.utils
from werkzeug.local import LocalProxy from werkzeug.local import LocalProxy


def report_error(status_code): def report_error(status_code):
if status_code!=404:
if status_code!=404 or frappe.conf.logging:
frappe.errprint(frappe.utils.get_traceback()) frappe.errprint(frappe.utils.get_traceback())
frappe._response.status_code = status_code frappe._response.status_code = status_code
if frappe.request_method == "POST": if frappe.request_method == "POST":


Ładowanie…
Anuluj
Zapisz