Merge pull request #1205 from akhileshdarjee/master
[fix] [issue] webnotes/erpnext#1191 - set expected delivery date in production order
diff --git a/config.json b/config.json
index d7dcbc1..68782da 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,6 @@
{
"app_name": "ERPNext",
- "app_version": "3.3.1",
+ "app_version": "3.3.2",
"base_template": "app/portal/templates/base.html",
"modules": {
"Accounts": {
diff --git a/patches/1311/p07_scheduler_errors_digest.py b/patches/1311/p07_scheduler_errors_digest.py
index b1fa78e..6811571 100644
--- a/patches/1311/p07_scheduler_errors_digest.py
+++ b/patches/1311/p07_scheduler_errors_digest.py
@@ -12,11 +12,20 @@
if not system_managers:
return
+ # no default company
+ company = webnotes.conn.get_default("company")
+ if not company:
+ company = webnotes.conn.sql_list("select name from `tabCompany`")
+ if company:
+ company = company[0]
+ if not company:
+ return
+
# scheduler errors digest
edigest = webnotes.new_bean("Email Digest")
edigest.doc.fields.update({
"name": "Scheduler Errors",
- "company": webnotes.conn.get_default("company"),
+ "company": company,
"frequency": "Daily",
"enabled": 1,
"recipient_list": "\n".join(system_managers),
diff --git a/setup/page/setup_wizard/setup_wizard.py b/setup/page/setup_wizard/setup_wizard.py
index a0dcf74..c1d3571 100644
--- a/setup/page/setup_wizard/setup_wizard.py
+++ b/setup/page/setup_wizard/setup_wizard.py
@@ -179,7 +179,8 @@
if not system_managers:
return
- for company in webnotes.conn.sql_list("select name FROM `tabCompany`"):
+ companies = webnotes.conn.sql_list("select name FROM `tabCompany`")
+ for company in companies:
if not webnotes.conn.exists("Email Digest", "Default Weekly Digest - " + company):
edigest = webnotes.bean({
"doctype": "Email Digest",
@@ -196,16 +197,17 @@
edigest.insert()
# scheduler errors digest
- edigest = webnotes.new_bean("Email Digest")
- edigest.doc.fields.update({
- "name": "Scheduler Errors",
- "company": webnotes.conn.get_default("company"),
- "frequency": "Daily",
- "recipient_list": "\n".join(system_managers),
- "scheduler_errors": 1,
- "enabled": 1
- })
- edigest.insert()
+ if companies:
+ edigest = webnotes.new_bean("Email Digest")
+ edigest.doc.fields.update({
+ "name": "Scheduler Errors",
+ "company": companies[0],
+ "frequency": "Daily",
+ "recipient_list": "\n".join(system_managers),
+ "scheduler_errors": 1,
+ "enabled": 1
+ })
+ edigest.insert()
def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year
diff --git a/stock/doctype/material_request_item/material_request_item.txt b/stock/doctype/material_request_item/material_request_item.txt
index 15884a3..e0b9330 100644
--- a/stock/doctype/material_request_item/material_request_item.txt
+++ b/stock/doctype/material_request_item/material_request_item.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-22 01:28:02",
"docstatus": 0,
- "modified": "2013-11-03 20:36:45",
+ "modified": "2013-12-18 14:52:02",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -219,7 +219,7 @@
"fieldname": "sales_order_no",
"fieldtype": "Link",
"label": "Sales Order No",
- "no_copy": 1,
+ "no_copy": 0,
"options": "Sales Order",
"print_hide": 1,
"read_only": 1
diff --git a/stock/report/stock_projected_qty/stock_projected_qty.py b/stock/report/stock_projected_qty/stock_projected_qty.py
index 11d5195..d116d03 100644
--- a/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -26,10 +26,10 @@
def get_columns():
return ["Item Code:Link/Item:140", "Item Name::100", "Description::200",
- "Brand:Link/Brand:100", "Warehouse:Link/Warehouse:120", "UOM:Link/UOM:100",
- "Actual Qty:Float:100", "Planned Qty:Float:100", "Requested Qty:Float:110",
- "Ordered Qty:Float:100", "Reserved Qty:Float:100", "Projected Qty:Float:100",
- "Reorder Level:Float:100", "Reorder Qty:Float:100"]
+ "Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Warehouse:Link/Warehouse:120",
+ "UOM:Link/UOM:100", "Actual Qty:Float:100", "Planned Qty:Float:100",
+ "Requested Qty:Float:110", "Ordered Qty:Float:100", "Reserved Qty:Float:100",
+ "Projected Qty:Float:100", "Reorder Level:Float:100", "Reorder Qty:Float:100"]
def get_item_conditions(filters):
conditions = []