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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2013-07-25 18:53:50 +05:30
parent 60403b2d8f c97fe01837
commit 742b55f700
50 changed files with 226 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
accounts/doctype/pos_setting/pos_setting.js
View File

@@ -60,17 +60,6 @@ cur_frm.fields_dict['cost_center'].get_query = function(doc,cdt,cdn) {
}
}
//get query select Territory
//=================================================================
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return{
filters:{
'is_group': "No"
}
}
}
// ------------------ Get Print Heading ------------------------------------
cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) {
return{

1
accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -58,6 +58,7 @@ class DocType(BuyingController):
self.check_for_acc_head_of_supplier()
self.check_for_stopped_status()
self.validate_with_previous_doc()
self.validate_uom_is_integer("uom", "qty")
if not self.doc.is_opening:
self.doc.is_opening = 'No'

32
accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-07-24 21:44:41",
"modified": "2013-07-25 16:08:44",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -69,21 +69,6 @@
"report_hide": 0,
"reqd": 1
},
{
"description": "Supplier (Payable) Account",
"doctype": "DocField",
"fieldname": "credit_to",
"fieldtype": "Link",
"in_filter": 1,
"label": "Credit To",
"oldfieldname": "credit_to",
"oldfieldtype": "Link",
"options": "Account",
"print_hide": 1,
"read_only": 0,
"reqd": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "supplier",
@@ -675,6 +660,21 @@
"print_hide": 1,
"read_only": 0
},
{
"description": "Supplier (Payable) Account",
"doctype": "DocField",
"fieldname": "credit_to",
"fieldtype": "Link",
"in_filter": 1,
"label": "Credit To",
"oldfieldname": "credit_to",
"oldfieldtype": "Link",
"options": "Account",
"print_hide": 1,
"read_only": 0,
"reqd": 1,
"search_index": 1
},
{
"default": "No",
"description": "Considered as Opening Balance",

8
accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -284,14 +284,6 @@ cur_frm.fields_dict['project_name'].get_query = function(doc, cdt, cdn) {
}
}
//Territory
//-----------------------------
cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
return{
filters: {'is_group': 'NO'}
}
}
// Income Account in Details Table
// --------------------------------
cur_frm.set_query("income_account", "entries", function(doc) {

2
accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -60,6 +60,8 @@ class DocType(SellingController):
self.so_dn_required()
self.validate_proj_cust()
self.validate_with_previous_doc()
self.validate_uom_is_integer("stock_uom", "qty")
sales_com_obj = get_obj('Sales Common')
sales_com_obj.check_stop_sales_order(self)
sales_com_obj.check_active_sales_items(self)

32
accounts/doctype/sales_invoice/sales_invoice.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
"modified": "2013-07-24 21:44:15",
"modified": "2013-07-25 16:08:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -61,21 +61,6 @@
"read_only": 0,
"reqd": 1
},
{
"description": "Customer (Receivable) Account",
"doctype": "DocField",
"fieldname": "debit_to",
"fieldtype": "Link",
"in_filter": 1,
"label": "Debit To",
"oldfieldname": "debit_to",
"oldfieldtype": "Link",
"options": "Account",
"print_hide": 1,
"read_only": 0,
"reqd": 1,
"search_index": 1
},
{
"doctype": "DocField",
"fieldname": "customer",
@@ -821,6 +806,21 @@
"print_hide": 1,
"read_only": 0
},
{
"description": "Customer (Receivable) Account",
"doctype": "DocField",
"fieldname": "debit_to",
"fieldtype": "Link",
"in_filter": 1,
"label": "Debit To",
"oldfieldname": "debit_to",
"oldfieldtype": "Link",
"options": "Account",
"print_hide": 1,
"read_only": 0,
"reqd": 1,
"search_index": 1
},
{
"description": "Track this Sales Invoice against any Project",
"doctype": "DocField",

5
accounts/doctype/sales_invoice_item/sales_invoice_item.txt
View File

@@ -2,7 +2,7 @@
{
"creation": "2013-06-04 11:02:19",
"docstatus": 0,
"modified": "2013-07-10 14:54:19",
"modified": "2013-07-25 16:32:10",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -107,9 +107,10 @@
{
"doctype": "DocField",
"fieldname": "stock_uom",
"fieldtype": "Data",
"fieldtype": "Link",
"in_list_view": 0,
"label": "UOM",
"options": "UOM",
"read_only": 1
},
{