Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Pratik Vyas 2014-02-07 16:03:09 +05:30
commit 17cb5b7799
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.json
View File

@ -1,6 +1,6 @@
{ {
"app_name": "ERPNext", "app_name": "ERPNext",
"app_version": "3.8.3", "app_version": "3.8.4",
"base_template": "app/portal/templates/base.html", "base_template": "app/portal/templates/base.html",
"modules": { "modules": {
"Accounts": { "Accounts": {
@ -74,5 +74,5 @@
"type": "module" "type": "module"
} }
}, },
"requires_framework_version": "==3.9.2" "requires_framework_version": "==3.9.3"
} }

4
stock/doctype/serial_no/serial_no.py
View File

@ -213,6 +213,10 @@ def validate_serial_no(sle, item_det):
if len(serial_nos) and len(serial_nos) != abs(cint(sle.actual_qty)): if len(serial_nos) and len(serial_nos) != abs(cint(sle.actual_qty)):
webnotes.throw(_("Serial Nos do not match with qty") + \ webnotes.throw(_("Serial Nos do not match with qty") + \
(": %s (%s)" % (sle.item_code, sle.actual_qty)), SerialNoQtyError) (": %s (%s)" % (sle.item_code, sle.actual_qty)), SerialNoQtyError)
if len(serial_nos) != len(set(serial_nos)):
webnotes.throw(_("Duplicate Serial No entered against item") +
(": %s" % sle.item_code), SerialNoDuplicateError)
for serial_no in serial_nos: for serial_no in serial_nos:
if webnotes.conn.exists("Serial No", serial_no): if webnotes.conn.exists("Serial No", serial_no):

4
support/doctype/support_ticket/support_ticket.py
View File

@ -49,10 +49,6 @@ class DocType(TransactionBase):
self.doc.company = webnotes.conn.get_value("Lead", self.doc.lead, "company") or \ self.doc.company = webnotes.conn.get_value("Lead", self.doc.lead, "company") or \
webnotes.conn.get_default("company") webnotes.conn.get_default("company")
def on_trash(self):
webnotes.conn.sql("""update `tabCommunication` set support_ticket=NULL
where support_ticket=%s""", (self.doc.name,))
def update_status(self): def update_status(self):
status = webnotes.conn.get_value("Support Ticket", self.doc.name, "status") status = webnotes.conn.get_value("Support Ticket", self.doc.name, "status")
if self.doc.status!="Open" and status =="Open" and not self.doc.first_responded_on: if self.doc.status!="Open" and status =="Open" and not self.doc.first_responded_on: