Преглед на файлове

Merge branch 'master' into develop

version-14
mbauskar преди 8 години
родител
ревизия
5a69717ee1
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/public/js/legacy/form.js

+ 1
- 1
frappe/__init__.py Целия файл

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

__version__ = '8.6.7'
__version__ = '8.6.8'
__title__ = "Frappe Framework"

local = Local()


+ 1
- 1
frappe/public/js/legacy/form.js Целия файл

@@ -942,7 +942,7 @@ _f.Frm.prototype.validate_form_action = function(action, resolve) {
// Allow submit, write, cancel and create permissions for read only documents that are assigned by
// workflows if the user already have those permissions. This is to allow for users to
// continue through the workflow states and to allow execution of functions like Duplicate.
if (frappe.workflow.is_read_only(this.doctype, this.docname) && (perms["write"] ||
if (!frappe.workflow.is_read_only(this.doctype, this.docname) && (perms["write"] ||
perms["create"] || perms["submit"] || perms["cancel"])) {
var allowed_for_workflow = true;
}


Зареждане…
Отказ
Запис