Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[selling] added shipping rule link besides taxes master link field

Browse Source
This commit is contained in:
Anand Doshi 2013-06-27 12:17:30 +05:30
parent f7c4d1e807
commit 77cd10b10a
5 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
"modified": "2013-06-12 15:14:00",
"modified": "2013-06-27 11:35:29",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -432,7 +432,7 @@
"doctype": "DocField",
"fieldname": "charge",
"fieldtype": "Link",
"label": "Taxes and Charges",
"label": "Apply Taxes and Charges Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@ -446,10 +446,11 @@
},
{
"doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"label": "Get Taxes and Charges",
"fieldname": "shipping_rule",
"fieldtype": "Link",
"label": "Apply Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
"read_only": 0
},

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

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:08",
"docstatus": 0,
"modified": "2013-06-19 15:55:15",
"modified": "2013-06-27 11:31:49",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -420,7 +420,7 @@
"fieldname": "charge",
"fieldtype": "Link",
"hidden": 0,
"label": "Sales Taxes and Charges",
"label": "Apply Taxes and Charges Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@ -434,11 +434,12 @@
},
{
"doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"fieldname": "shipping_rule",
"fieldtype": "Link",
"hidden": 0,
"label": "Get Taxes and Charges",
"label": "Apply Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
"read_only": 0
},

2
selling/doctype/sales_common/sales_common.js
View File

@ -368,7 +368,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
}
},
get_charges: function() {
charge: function() {
var me = this;
if(this.frm.doc.charge) {
this.frm.call({

14
selling/doctype/sales_order/sales_order.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-06-18 12:39:59",
"docstatus": 0,
"modified": "2013-06-18 17:49:11",
"modified": "2013-06-27 11:31:02",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -450,7 +450,7 @@
"doctype": "DocField",
"fieldname": "charge",
"fieldtype": "Link",
"label": "Sales Taxes and Charges",
"label": "Apply Taxes and Charges Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@ -463,10 +463,12 @@
},
{
"doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"label": "Get Taxes and Charges",
"oldfieldtype": "Button"
"fieldname": "shipping_rule",
"fieldtype": "Link",
"label": "Apply Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1
},
{
"doctype": "DocField",

11
stock/doctype/delivery_note/delivery_note.txt
View File

@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:09",
"docstatus": 0,
"modified": "2013-06-05 19:22:52",
"modified": "2013-06-27 11:33:53",
"modified_by": "Administrator",
"owner": "Administrator"
},
@ -449,7 +449,7 @@
"doctype": "DocField",
"fieldname": "charge",
"fieldtype": "Link",
"label": "Taxes and Charges",
"label": "Apply Taxes and Charges Master",
"oldfieldname": "charge",
"oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master",
@ -463,10 +463,11 @@
},
{
"doctype": "DocField",
"fieldname": "get_charges",
"fieldtype": "Button",
"label": "Get Taxes and Charges",
"fieldname": "shipping_rule",
"fieldtype": "Link",
"label": "Apply Shipping Rule",
"oldfieldtype": "Button",
"options": "Shipping Rule",
"print_hide": 1,
"read_only": 0
},