Pārlūkot izejas kodu

Merge branch 'master' into staging

version-14
mbauskar pirms 8 gadiem
vecāks
revīzija
15e31ca2aa
2 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -1
      frappe/public/js/frappe/list/list_renderer.js

+ 1
- 1
frappe/__init__.py Parādīt failu

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template


__version__ = '8.7.2'
__version__ = '8.7.3'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 2
- 1
frappe/public/js/frappe/list/list_renderer.js Parādīt failu

@@ -428,7 +428,8 @@ frappe.views.ListRenderer = Class.extend({
}, },
get_indicator_from_doc: function (doc) { get_indicator_from_doc: function (doc) {
var workflow = frappe.workflow.workflows[this.doctype]; var workflow = frappe.workflow.workflows[this.doctype];
return frappe.get_indicator(doc, this.doctype, (workflow && workflow['override_status']) || true);
var override = workflow ? workflow['override_status'] : true;
return frappe.get_indicator(doc, this.doctype, override);
}, },
prepare_data: function (data) { prepare_data: function (data) {
if (data.modified) if (data.modified)


Notiek ielāde…
Atcelt
Saglabāt