nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-21 05:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

Browse Source 
Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt
This commit is contained in:
Anand Doshi
2013-05-23 15:22:47 +05:30
parent 65d8755567 ded5da5b40
commit 4543884021
35 changed files with 463 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
selling/doctype/quotation/quotation.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-05-21 16:16:40",
"creation": "2013-05-22 12:10:46",
"docstatus": 0,
"modified": "2013-05-21 18:29:59",
"modified": "2013-05-22 16:55:07",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -851,12 +851,11 @@
"width": "100px"
},
{
"description": "Keep a track on communications regarding this Quotation. This will help you remember earlier communications in case the Customer comes back again",
"doctype": "DocField",
"fieldname": "communication_history",
"fieldtype": "Section Break",
"label": "Communication History",
"oldfieldtype": "Section Break",
"options": "Simple",
"print_hide": 1,
"read_only": 0
},
@@ -887,28 +886,23 @@
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Sales Manager",
"role": "Sales User",
"submit": 1,
"write": 1
},
{
"doctype": "DocPerm",
"role": "Customer"
},
{
"amend": 1,
"cancel": 1,
"create": 1,
"doctype": "DocPerm",
"role": "Sales User",
"role": "Sales Manager",
"submit": 1,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 0,
"doctype": "DocPerm",
"role": "Customer",
"submit": 0,
"write": 0
},
{
"amend": 1,
"cancel": 1,

11
selling/doctype/quotation_item/quotation_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-04-19 13:30:50",
"creation": "2013-03-07 11:42:57",
"docstatus": 0,
"modified": "2013-05-21 16:45:44",
"modified": "2013-05-22 12:10:32",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -37,6 +37,7 @@
"options": "Item",
"print_hide": 0,
"print_width": "150px",
"read_only": 0,
"reqd": 1,
"search_index": 1,
"width": "150px"
@@ -60,6 +61,7 @@
"oldfieldtype": "Data",
"print_hide": 1,
"print_width": "150px",
"read_only": 0,
"reqd": 1,
"search_index": 1,
"width": "150px"
@@ -73,6 +75,7 @@
"oldfieldtype": "Small Text",
"print_hide": 0,
"print_width": "300px",
"read_only": 0,
"reqd": 1,
"width": "300px"
},
@@ -87,6 +90,7 @@
"oldfieldtype": "Currency",
"print_hide": 0,
"print_width": "100px",
"read_only": 0,
"reqd": 1,
"search_index": 0,
"width": "100px"
@@ -129,6 +133,7 @@
"oldfieldtype": "Float",
"print_hide": 1,
"print_width": "100px",
"read_only": 0,
"width": "100px"
},
{
@@ -143,6 +148,7 @@
"options": "currency",
"print_hide": 0,
"print_width": "100px",
"read_only": 0,
"reqd": 0,
"search_index": 0,
"width": "100px"
@@ -293,6 +299,7 @@
"oldfieldname": "page_break",
"oldfieldtype": "Check",
"print_hide": 1,
"read_only": 0,
"report_hide": 1
}
]

5
selling/doctype/sales_order/sales_order.py
View File

@@ -213,7 +213,10 @@ class DocType(SellingController):
self.validate_proj_cust()
self.validate_po()
#self.validate_reference_value()
self.validate_for_items()
if self.doc.docstatus == 1:
self.validate_for_items()
sales_com_obj = get_obj(dt = 'Sales Common')
sales_com_obj.check_active_sales_items(self)
sales_com_obj.check_conversion_rate(self)

13
selling/doctype/sales_order_item/sales_order_item.txt
View File

@@ -1,8 +1,8 @@
[
{
"creation": "2013-04-19 13:30:51",
"creation": "2013-03-07 11:42:58",
"docstatus": 0,
"modified": "2013-05-21 16:44:41",
"modified": "2013-05-22 12:10:03",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -35,6 +35,7 @@
"oldfieldtype": "Link",
"options": "Item",
"print_width": "150px",
"read_only": 0,
"reqd": 1,
"search_index": 1,
"width": "150px"
@@ -57,6 +58,7 @@
"oldfieldtype": "Data",
"print_hide": 1,
"print_width": "150",
"read_only": 0,
"reqd": 1,
"width": "150"
},
@@ -69,6 +71,7 @@
"oldfieldname": "description",
"oldfieldtype": "Small Text",
"print_width": "300px",
"read_only": 0,
"reqd": 1,
"search_index": 1,
"width": "300px"
@@ -82,6 +85,7 @@
"oldfieldname": "qty",
"oldfieldtype": "Currency",
"print_width": "100px",
"read_only": 0,
"reqd": 1,
"width": "100px"
},
@@ -123,6 +127,7 @@
"oldfieldtype": "Float",
"print_hide": 1,
"print_width": "70px",
"read_only": 0,
"width": "70px"
},
{
@@ -135,6 +140,7 @@
"oldfieldtype": "Currency",
"options": "currency",
"print_width": "100px",
"read_only": 0,
"reqd": 0,
"width": "100px"
},
@@ -208,6 +214,7 @@
"options": "Warehouse",
"print_hide": 1,
"print_width": "150px",
"read_only": 0,
"reqd": 0,
"width": "150px"
},
@@ -331,6 +338,7 @@
"hidden": 0,
"in_filter": 1,
"label": "Quotation No.",
"no_copy": 1,
"oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link",
"options": "Quotation",
@@ -347,6 +355,7 @@
"oldfieldname": "page_break",
"oldfieldtype": "Check",
"print_hide": 1,
"read_only": 0,
"report_hide": 1
},
{