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

changed fieldname from charge to taxes

Browse Source
This commit is contained in:
Akhilesh Darjee 2014-01-28 19:16:05 +05:30
parent a7ab20ec78
commit 2ced3b07d4
16 changed files with 73 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:04", "modified": "2014-01-28 18:46:48",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -324,16 +324,16 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
"read_only": 0 "read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "purchase_other_charges", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Tax Master", "label": "Taxes and Charges",
"oldfieldname": "purchase_other_charges", "oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Purchase Taxes and Charges Master", "options": "Purchase Taxes and Charges Master",

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

@ -215,7 +215,7 @@ class DocType(SellingController):
# fetch charges # fetch charges
if self.doc.charge and not len(self.doclist.get({"parentfield": "other_charges"})): if self.doc.charge and not len(self.doclist.get({"parentfield": "other_charges"})):
self.set_taxes("other_charges", "charge") self.set_taxes("other_charges", "taxes_and_charges")
def get_customer_account(self): def get_customer_account(self):
"""Get Account Head to which amount needs to be Debited based on Customer""" """Get Account Head to which amount needs to be Debited based on Customer"""

7
erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 19:29:05", "creation": "2013-05-24 19:29:05",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:20", "modified": "2014-01-28 18:43:10",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -376,9 +376,9 @@
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "charge", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Tax Master", "label": "Taxes and Charges",
"oldfieldname": "charge", "oldfieldname": "charge",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master", "options": "Sales Taxes and Charges Master",
@ -1231,6 +1231,7 @@
"write": 1 "write": 1
}, },
{ {
"cancel": 0,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Customer" "role": "Customer"

4
erpnext/buying/doctype/purchase_common/purchase_common.js
View File

@ -241,9 +241,9 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
} }
}, },
purchase_other_charges: function() { taxes_and_charges: function() {
var me = this; var me = this;
if(this.frm.doc.purchase_other_charges) { if(this.frm.doc.taxes_and_charges) {
return this.frm.call({ return this.frm.call({
doc: this.frm.doc, doc: this.frm.doc,
method: "get_purchase_tax_details", method: "get_purchase_tax_details",

9
erpnext/buying/doctype/purchase_order/purchase_order.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:08", "modified": "2014-01-28 18:49:03",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -299,7 +299,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
"print_hide": 0 "print_hide": 0
@ -307,9 +307,9 @@
{ {
"description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "purchase_other_charges", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Tax Master", "label": "Taxes and Charges",
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_other_charges", "oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@ -699,6 +699,7 @@
"write": 1 "write": 1
}, },
{ {
"cancel": 0,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Supplier" "role": "Supplier"

17
erpnext/buying/doctype/supplier/supplier.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:11", "creation": "2013-01-10 16:34:11",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:29", "modified": "2014-01-28 19:05:55",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -157,6 +157,14 @@
"reqd": 1, "reqd": 1,
"search_index": 0 "search_index": 0
}, },
{
"doctype": "DocField",
"fieldname": "default_currency",
"fieldtype": "Link",
"label": "Default Currency",
"no_copy": 1,
"options": "Currency"
},
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "default_price_list", "fieldname": "default_price_list",
@ -166,11 +174,10 @@
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "default_currency", "fieldname": "default_taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Default Currency", "label": "Taxes and Charges",
"no_copy": 1, "options": "Purchase Taxes and Charges Master"
"options": "Currency"
}, },
{ {
"doctype": "DocField", "doctype": "DocField",

8
erpnext/buying/doctype/supplier_quotation/supplier_quotation.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:45", "creation": "2013-05-21 16:16:45",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:29", "modified": "2014-01-28 18:50:58",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -290,16 +290,16 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money" "options": "icon-money"
}, },
{ {
"description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "purchase_other_charges", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Purchase Taxes and Charges", "label": "Taxes and Charges",
"no_copy": 1, "no_copy": 1,
"oldfieldname": "purchase_other_charges", "oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",

4
erpnext/controllers/buying_controller.py
View File

@ -38,7 +38,7 @@ class BuyingController(StockController):
self.set_missing_item_details(get_item_details) self.set_missing_item_details(get_item_details)
if self.doc.fields.get("__islocal"): if self.doc.fields.get("__islocal"):
self.set_taxes("purchase_tax_details", "purchase_other_charges") self.set_taxes("purchase_tax_details", "taxes_and_charges")
def set_supplier_from_item_default(self): def set_supplier_from_item_default(self):
if self.meta.get_field("supplier") and not self.doc.supplier: if self.meta.get_field("supplier") and not self.doc.supplier:
@ -59,7 +59,7 @@ class BuyingController(StockController):
def get_purchase_tax_details(self): def get_purchase_tax_details(self):
self.doclist = self.doc.clear_table(self.doclist, "purchase_tax_details") self.doclist = self.doc.clear_table(self.doclist, "purchase_tax_details")
self.set_taxes("purchase_tax_details", "purchase_other_charges") self.set_taxes("purchase_tax_details", "taxes_and_charges")
def validate_stock_or_nonstock_items(self): def validate_stock_or_nonstock_items(self):
if not self.get_stock_items(): if not self.get_stock_items():

4
erpnext/controllers/selling_controller.py
View File

@ -30,7 +30,7 @@ class SellingController(StockController):
self.set_missing_lead_customer_details() self.set_missing_lead_customer_details()
self.set_price_list_and_item_details() self.set_price_list_and_item_details()
if self.doc.fields.get("__islocal"): if self.doc.fields.get("__islocal"):
self.set_taxes("other_charges", "charge") self.set_taxes("other_charges", "taxes_and_charges")
def set_missing_lead_customer_details(self): def set_missing_lead_customer_details(self):
if self.doc.customer: if self.doc.customer:
@ -52,7 +52,7 @@ class SellingController(StockController):
def get_other_charges(self): def get_other_charges(self):
self.doclist = self.doc.clear_table(self.doclist, "other_charges") self.doclist = self.doc.clear_table(self.doclist, "other_charges")
self.set_taxes("other_charges", "charge") self.set_taxes("other_charges", "taxes_and_charges")
def apply_shipping_rule(self): def apply_shipping_rule(self):
if self.doc.shipping_rule: if self.doc.shipping_rule:

13
erpnext/selling/doctype/customer/customer.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-06-11 14:26:44", "creation": "2013-06-11 14:26:44",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:48:32", "modified": "2014-01-28 19:06:18",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -26,6 +26,7 @@
"parenttype": "DocType" "parenttype": "DocType"
}, },
{ {
"cancel": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"name": "__common__", "name": "__common__",
"parent": "Customer", "parent": "Customer",
@ -252,6 +253,14 @@
"options": "Price List", "options": "Price List",
"permlevel": 0 "permlevel": 0
}, },
{
"doctype": "DocField",
"fieldname": "default_taxes_and_charges",
"fieldtype": "Link",
"label": "Taxes and Charges",
"options": "Sales Taxes and Charges Master",
"permlevel": 0
},
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "credit_days", "fieldname": "credit_days",
@ -343,7 +352,6 @@
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0,
"create": 1, "create": 1,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
@ -363,7 +371,6 @@
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"doctype": "DocPerm", "doctype": "DocPerm",

8
erpnext/selling/doctype/quotation/quotation.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 19:29:08", "creation": "2013-05-24 19:29:08",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:16", "modified": "2014-01-28 18:50:17",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -373,17 +373,17 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
"read_only": 0 "read_only": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "charge", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"label": "Tax Master", "label": "Taxes and Charges",
"oldfieldname": "charge", "oldfieldname": "charge",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master", "options": "Sales Taxes and Charges Master",

10
erpnext/selling/doctype/sales_order/sales_order.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-06-18 12:39:59", "creation": "2013-06-18 12:39:59",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:23", "modified": "2014-01-28 18:47:42",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -398,16 +398,16 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
"print_hide": 0 "print_hide": 0
}, },
{ {
"doctype": "DocField", "doctype": "DocField",
"fieldname": "charge", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Tax Master", "label": "Taxes and Charges",
"oldfieldname": "charge", "oldfieldname": "charge",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master", "options": "Sales Taxes and Charges Master",
@ -928,11 +928,13 @@
"write": 1 "write": 1
}, },
{ {
"cancel": 0,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Accounts User" "role": "Accounts User"
}, },
{ {
"cancel": 0,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Customer" "role": "Customer"

2
erpnext/selling/sales_common.js
View File

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

9
erpnext/stock/doctype/delivery_note/delivery_note.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-24 19:29:09", "creation": "2013-05-24 19:29:09",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:48:35", "modified": "2014-01-28 18:51:42",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -402,7 +402,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
"read_only": 0 "read_only": 0
@ -410,9 +410,9 @@
{ {
"description": "If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.", "description": "If you have created a standard template in Sales Taxes and Charges Master, select one and click on the button below.",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "charge", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Tax Master", "label": "Taxes and Charges",
"oldfieldname": "charge", "oldfieldname": "charge",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Sales Taxes and Charges Master", "options": "Sales Taxes and Charges Master",
@ -1071,6 +1071,7 @@
"write": 0 "write": 0
}, },
{ {
"cancel": 0,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Customer" "role": "Customer"

9
erpnext/stock/doctype/purchase_receipt/purchase_receipt.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-05-21 16:16:39", "creation": "2013-05-21 16:16:39",
"docstatus": 0, "docstatus": 0,
"modified": "2014-01-20 17:49:12", "modified": "2014-01-28 18:52:19",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -329,16 +329,16 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "taxes", "fieldname": "taxes",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"label": "Taxes", "label": "Taxes and Charges",
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money" "options": "icon-money"
}, },
{ {
"description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "purchase_other_charges", "fieldname": "taxes_and_charges",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Purchase Taxes and Charges", "label": "Taxes and Charges",
"oldfieldname": "purchase_other_charges", "oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Purchase Taxes and Charges Master", "options": "Purchase Taxes and Charges Master",
@ -836,6 +836,7 @@
"write": 1 "write": 1
}, },
{ {
"cancel": 0,
"delete": 0, "delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"role": "Supplier" "role": "Supplier"

7
erpnext/utilities/transaction_base.py
View File

@ -64,7 +64,7 @@ class TransactionBase(StatusUpdater):
out[f] = customer.fields.get(f) out[f] = customer.fields.get(f)
# fields prepended with default in Customer doctype # fields prepended with default in Customer doctype
for f in ['sales_partner', 'commission_rate', 'currency', 'price_list']: for f in ['sales_partner', 'commission_rate', 'currency', 'price_list', 'taxes_and_charges']:
if customer.fields.get("default_" + f): if customer.fields.get("default_" + f):
out[f] = customer.fields.get("default_" + f) out[f] = customer.fields.get("default_" + f)
@ -129,6 +129,11 @@ class TransactionBase(StatusUpdater):
if supplier.default_currency: if supplier.default_currency:
out["currency"] = supplier.default_currency out["currency"] = supplier.default_currency
# fields prepended with default in Customer doctype
for f in ['currency', 'taxes_and_charges']:
if supplier.fields.get("default_" + f):
out[f] = supplier.fields.get("default_" + f)
out["buying_price_list"] = self.get_user_default_price_list("buying_price_list") or \ out["buying_price_list"] = self.get_user_default_price_list("buying_price_list") or \
supplier.default_price_list or self.doc.buying_price_list supplier.default_price_list or self.doc.buying_price_list