Merge https://github.com/frappe/erpnext into item_group

2014-08-25 16:18:31 +05:30 · 2014-08-25 16:18:31 +05:30 · d676491b6e
commit d676491b6e
parent caba531e89 580f447bbd
37 changed files with 870 additions and 898 deletions
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
 "autoname": "naming_series:",
 "creation": "2013-03-07 11:55:06",
 "docstatus": 0,
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
 "allow_import": 1,
 "autoname": "naming_series:",
 "creation": "2013-05-21 16:16:39",
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-05-24 19:29:05", 
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-05-21 16:16:39", 
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-05-21 16:16:45", 
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "naming_series:", 
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "autoname": "field:applicant_name", 
 "creation": "2013-01-29 19:25:37", 
 "description": "Applicant for a Job", 
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1,
  "autoname": "LAP/.#####",
 "creation": "2013-02-20 11:18:11",
 "description": "Apply / Approve Leaves",
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0, 
  "creation": "2013-01-25 11:34:53.000000", 
 "docstatus": 0, 
 "doctype": "DocType", 
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0, 
  "allow_copy": 0, 
 "allow_import": 1, 
 "allow_rename": 0, 
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@ -77,3 +77,4 @@ erpnext.patches.v4_2.fix_account_master_type
 erpnext.patches.v4_2.update_project_milestones
 erpnext.patches.v4_2.add_currency_turkish_lira #2014-08-08
 execute:frappe.delete_doc("DocType", "Landed Cost Wizard")
+erpnext.patches.v4_2.default_website_style
--- a/erpnext/patches/v4_2/default_website_style.py
+++ b/erpnext/patches/v4_2/default_website_style.py
@ -0,0 +1,9 @@
+import frappe
+from frappe.templates.pages.style_settings import default_properties
+
+def execute():
+	style_settings = frappe.get_doc("Style Settings", "Style Settings")
+	if not style_settings.apply_style:
+		style_settings.update(default_properties)
+		style_settings.apply_style = 1
+		style_settings.save()
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:project_name", 
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "TASK.#####", 
 "creation": "2013-01-29 19:25:50", 
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-04-03 16:38:41", 
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@ -15,4 +15,6 @@ $(document).bind('toolbar_setup', function() {
 		"text-overflow": "ellipsis",
 		"white-space": "nowrap"
 	});
+
+	$('[data-link="docs"]').attr("href", "https://erpnext.com/user-guide")
 });
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-05-24 19:29:08", 
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-06-18 12:39:59", 
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0,
  "allow_copy": 1,
 "creation": "2013-01-10 16:34:22",
 "docstatus": 0,
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:item_group_name", 
--- a/erpnext/setup/page/setup_wizard/default_website.py
+++ b/erpnext/setup/page/setup_wizard/default_website.py
@ -6,6 +6,7 @@ import frappe

 from frappe import _
 from frappe.utils import nowdate
+from frappe.templates.pages.style_settings import default_properties

 class website_maker(object):
 	def __init__(self, company, tagline, user):
@ -35,8 +36,8 @@ class website_maker(object):

 	def make_style_settings(self):
 		style_settings = frappe.get_doc("Style Settings", "Style Settings")
-		style_settings.top_bar_background = "F2F2F2"
-		style_settings.font_size = "15px"
+		style_settings.update(default_properties)
+		style_settings.apply_style = 1
 		style_settings.save()

 	def make_website_settings(self):
--- a/erpnext/setup/page/setup_wizard/sample_home_page.css
+++ b/erpnext/setup/page/setup_wizard/sample_home_page.css
@ -22,7 +22,7 @@
 }

 .slide {
-	padding: 60px 40px;
+	padding: 30px 40px;
 	max-width: 800px;
 	margin: auto;
 }
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "field:batch_id", 
 "creation": "2013-03-05 14:50:38.000000", 
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "autoname": "naming_series:", 
 "creation": "2013-05-24 19:29:09", 
 "docstatus": 0, 
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1,
  "allow_import": 1,
 "allow_rename": 1,
 "autoname": "field:item_code",
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "autoname": "naming_series:", 
 "creation": "2013-03-07 14:48:38", 
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0, 
  "allow_copy": 0, 
 "allow_email": 1, 
 "allow_import": 1, 
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "autoname": "naming_series:", 
 "creation": "2013-05-21 16:16:39", 
 "docstatus": 0, 
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "allow_import": 1, 
 "allow_rename": 1, 
 "autoname": "field:serial_no", 
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0, 
  "allow_copy": 0, 
 "allow_import": 1, 
 "allow_rename": 0, 
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0, 
  "allow_copy": 1, 
 "autoname": "SR/.######", 
 "creation": "2013-03-28 10:35:31", 
--- a/erpnext/support/doctype/support_ticket/support_ticket.json
+++ b/erpnext/support/doctype/support_ticket/support_ticket.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 1, 
  "autoname": "naming_series:", 
 "creation": "2013-02-01 10:36:25", 
 "docstatus": 0, 
--- a/erpnext/utilities/doctype/address/address_list.js
+++ b/erpnext/utilities/doctype/address/address_list.js
@ -1,5 +0,0 @@
-frappe.listview_settings['Address'] = {
-    set_title_left: function() {
-        frappe.set_route("Module", "Selling");
-    }
-}
--- a/erpnext/utilities/doctype/contact/contact_list.js
+++ b/erpnext/utilities/doctype/contact/contact_list.js
@ -1,5 +0,0 @@
-frappe.listview_settings['Address'] = {
-    set_title_left: function() {
-        frappe.set_route("Module", "Selling");
-    }
-}
--- a/erpnext/utilities/doctype/note/note_list.js
+++ b/erpnext/utilities/doctype/note/note_list.js
@ -1,6 +1,3 @@
 frappe.listview_settings['Note'] = {
 	add_fields: ["title", "public"],
-	set_title_left: function() {
-		frappe.set_route();
-	}
 }
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@ -1,5 +1,4 @@
 {
- "allow_attach": 0, 
  "allow_email": 1, 
 "allow_print": 1, 
 "creation": "2012-12-03 10:25:59.000000", 
--- a/erpnext/utilities/repost_stock.py
+++ b/erpnext/utilities/repost_stock.py
@ -77,7 +77,7 @@ def get_reserved_qty(item_code, warehouse):
 				(select qty as dnpi_qty, qty as so_item_qty,
 					ifnull(delivered_qty, 0) as so_item_delivered_qty, parent, name
 				from `tabSales Order Item` so_item
-				where item_code = %s and reserved_warehouse = %s
+				where item_code = %s and warehouse = %s
 				and exists(select * from `tabSales Order` so
 					where so.name = so_item.parent and so.docstatus = 1
 					and so.status != 'Stopped'))