Bladeren bron

[fix] [minor] [bug] int docstatus before to_docstatus check

version-14
Anand Doshi 12 jaren geleden
bovenliggende
commit
8319080497
2 gewijzigde bestanden met toevoegingen van 5 en 3 verwijderingen
  1. +3
    -2
      webnotes/model/bean.py
  2. +2
    -1
      webnotes/model/create_new.py

+ 3
- 2
webnotes/model/bean.py Bestand weergeven

@@ -35,6 +35,7 @@ from webnotes.model.doc import Document

class DocstatusTransitionError(webnotes.ValidationError): pass
class BeanPermissionError(webnotes.ValidationError): pass
class TimestampMismatchError(webnotes.ValidationError): pass

class Bean:
"""
@@ -148,7 +149,7 @@ class Bean:
if conflict:
webnotes.msgprint(_("Error: Document has been modified after you have opened it") \
+ (" (%s, %s). " % (modified, self.doc.modified)) \
+ _("Please refresh to get the latest document."), raise_exception=True)
+ _("Please refresh to get the latest document."), raise_exception=TimestampMismatchError)
def check_docstatus_transition(self, db_docstatus, method):
valid = {
@@ -199,7 +200,7 @@ class Bean:

d.modified_by = user
d.modified = ts
if d.docstatus != 2 and self.to_docstatus >= d.docstatus: # don't update deleted
if d.docstatus != 2 and self.to_docstatus >= int(d.docstatus): # don't update deleted
d.docstatus = self.to_docstatus

def prepare_for_save(self, method):


+ 2
- 1
webnotes/model/create_new.py Bestand weergeven

@@ -11,7 +11,8 @@ def get_new_doc(doctype, parent_doc = None, parentfield = None):
doc = webnotes.doc({
"doctype": doctype,
"__islocal": 1,
"owner": webnotes.session.user
"owner": webnotes.session.user,
"docstatus": 0
})
meta = webnotes.get_doctype(doctype)


Laden…
Annuleren
Opslaan