Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/controllers/selling_controller.py b/controllers/selling_controller.py
index db2d621..086c42e 100644
--- a/controllers/selling_controller.py
+++ b/controllers/selling_controller.py
@@ -3,7 +3,7 @@
from __future__ import unicode_literals
import webnotes
-from webnotes.utils import cint, flt, comma_or, _round
+from webnotes.utils import cint, flt, comma_or, _round, add_days, cstr
from setup.utils import get_company_currency
from selling.utils import get_item_details
from webnotes import msgprint, _
@@ -291,7 +291,7 @@
sr.doc.customer = self.doc.customer
sr.doc.customer_name = self.doc.customer_name
if sr.doc.warranty_period:
- sr.doc.warranty_expiry_date = add_days(cstr(self.doc.delivery_date),
+ sr.doc.warranty_expiry_date = add_days(cstr(self.doc.posting_date),
cint(sr.doc.warranty_period))
sr.doc.status = 'Delivered'
diff --git a/patches/august_2013/p06_fix_sle_against_stock_entry.py b/patches/august_2013/p06_fix_sle_against_stock_entry.py
index dbc2c94..02588be 100644
--- a/patches/august_2013/p06_fix_sle_against_stock_entry.py
+++ b/patches/august_2013/p06_fix_sle_against_stock_entry.py
@@ -4,10 +4,9 @@
uncancelled = []
def execute():
- from stock.stock_ledger import update_entries_after
-
+ global cancelled, uncancelled
stock_entries = webnotes.conn.sql("""select * from `tabStock Entry`
- where docstatus >= 1 and date(modified) >= "2013-08-16" and date(modified) <= "2013-08-21"
+ where docstatus >= 1 and date(modified) >= "2013-08-16"
and ifnull(production_order, '') != '' and ifnull(bom_no, '') != ''
order by modified desc, name desc""", as_dict=True)
@@ -18,7 +17,6 @@
where voucher_type='Stock Entry' and voucher_no=%s
and is_cancelled='No'""", entry.name, as_dict=True)
if res:
- print entry
make_stock_entry_detail(entry, res)
if cancelled or uncancelled:
@@ -98,11 +96,11 @@
if cancelled else ""
subject = "[ERPNext] [Important] Cancellation undone for some Stock Entries"
- content = """Dear user,
+ content = """Dear System Manager,
-An error got introduced into the code that cleared the item table in Stock Entry associated to a Production Order.
+An error got introduced into the code that cleared the item table in a Stock Entry associated to a Production Order.
-Hence,
+To undo its effect,
%s
%s
@@ -114,6 +112,6 @@
Regards,
Team ERPNext.""" % (uncancelled, cancelled)
- print subject, content
+ # print subject, content
- # sendmail_to_system_managers(subject, content)
\ No newline at end of file
+ sendmail_to_system_managers(subject, content)
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index c7ec0c9..3dc6c76 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -256,5 +256,5 @@
"patches.august_2013.p05_update_serial_no_status",
"patches.august_2013.p05_employee_birthdays",
"execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-08-16",
- # "patches.august_2013.p06_fix_sle_against_stock_entry",
+ "patches.august_2013.p06_fix_sle_against_stock_entry",
]
\ No newline at end of file
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
index c3746eb..2eba0f4 100644
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-16 10:59:15",
"docstatus": 0,
- "modified": "2013-08-16 10:16:00",
+ "modified": "2013-08-21 13:37:01",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -35,8 +35,7 @@
"parenttype": "DocType",
"permlevel": 0,
"read": 1,
- "report": 1,
- "submit": 0
+ "write": 1
},
{
"doctype": "DocType",
@@ -447,37 +446,25 @@
"search_index": 1
},
{
- "doctype": "DocField",
- "fieldname": "fiscal_year",
- "fieldtype": "Select",
- "in_filter": 1,
- "label": "Fiscal Year",
- "options": "link:Fiscal Year",
- "read_only": 0,
- "reqd": 1,
- "search_index": 1
- },
- {
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
- "role": "Material Master Manager",
- "write": 1
- },
- {
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "doctype": "DocPerm",
+ "report": 1,
"role": "Material Manager",
- "write": 0
+ "submit": 0
},
{
"amend": 0,
"cancel": 0,
+ "create": 1,
+ "doctype": "DocPerm",
+ "report": 1,
+ "role": "Material User",
+ "submit": 0
+ },
+ {
"create": 0,
"doctype": "DocPerm",
- "role": "Material User",
- "write": 0
+ "role": "Accounts User"
}
]
\ No newline at end of file