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

Added Tax Rule under ERPNext > Accounts > Setup

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-08-26 15:01:20 +05:30 committed by Saurabh
parent 09f9c96c53
commit ef511b160e
7 changed files with 323 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@ -2375,4 +2375,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "title"
}
}

2
erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
View File

@ -504,7 +504,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"modified": "2015-08-19 12:46:32.687299",
"modified": "2015-08-28 02:57:08.769473",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Taxes and Charges",

2
erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
View File

@ -456,7 +456,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"modified": "2015-08-19 12:46:33.165519",
"modified": "2015-08-28 02:57:00.766305",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Taxes and Charges",

46
erpnext/accounts/doctype/tax_rule/tax_rule.json
View File

@ -11,6 +11,8 @@
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"default": "Sales",
"fieldname": "tax_type",
"fieldtype": "Select",
@ -33,6 +35,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break_1",
"fieldtype": "Column Break",
"hidden": 0,
@ -52,6 +56,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.tax_type==\"Sales\"",
"fieldname": "sales_tax_template",
"fieldtype": "Link",
@ -74,6 +80,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.tax_type==\"Purchase\"",
"fieldname": "purchase_tax_template",
"fieldtype": "Link",
@ -96,6 +104,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "filters",
"fieldtype": "Section Break",
"hidden": 0,
@ -116,6 +126,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.tax_type==\"Sales\"",
"fieldname": "customer",
"fieldtype": "Link",
@ -138,6 +150,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.tax_type==\"Purchase\"",
"fieldname": "supplier",
"fieldtype": "Link",
@ -160,6 +174,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "billing_city",
"fieldtype": "Data",
"hidden": 0,
@ -180,6 +196,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "billing_country",
"fieldtype": "Link",
"hidden": 0,
@ -201,6 +219,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
@ -220,6 +240,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.tax_type==\"Sales\"",
"fieldname": "customer_group",
"fieldtype": "Link",
@ -242,6 +264,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.tax_type==\"Purchase\"",
"fieldname": "supplier_type",
"fieldtype": "Link",
@ -264,6 +288,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "shipping_city",
"fieldtype": "Data",
"hidden": 0,
@ -284,6 +310,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "shipping_country",
"fieldtype": "Link",
"hidden": 0,
@ -305,6 +333,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break_4",
"fieldtype": "Section Break",
"hidden": 0,
@ -325,6 +355,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "from_date",
"fieldtype": "Date",
"hidden": 0,
@ -345,6 +377,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break_7",
"fieldtype": "Column Break",
"hidden": 0,
@ -364,6 +398,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "to_date",
"fieldtype": "Date",
"hidden": 0,
@ -384,6 +420,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@ -403,6 +441,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"default": "1",
"fieldname": "priority",
"fieldtype": "Int",
@ -424,6 +464,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break_20",
"fieldtype": "Column Break",
"hidden": 0,
@ -443,6 +485,8 @@
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
@ -470,7 +514,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"modified": "2015-08-21 03:27:43.564183",
"modified": "2015-08-28 02:56:51.283291",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Tax Rule",

1
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -1609,6 +1609,7 @@
{
"allow_on_submit": 0,
"bold": 0,
<<<<<<< HEAD
"collapsible": 1,
"fieldname": "column_break5",
"fieldtype": "Section Break",

269
erpnext/buying/doctype/supplier/supplier.json
View File

@ -12,6 +12,7 @@
"document_type": "Setup",
"fields": [
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -32,9 +33,32 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "basic_info",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "",
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "icon-user",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -56,9 +80,33 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Series",
"no_copy": 1,
"oldfieldname": "naming_series",
"oldfieldtype": "Select",
"options": "SUPP-",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -79,9 +127,32 @@
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "supplier_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Supplier Name",
"no_copy": 1,
"oldfieldname": "supplier_name",
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -100,9 +171,30 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"width": "50%"
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -124,9 +216,33 @@
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "supplier_type",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Supplier Type",
"no_copy": 0,
"oldfieldname": "supplier_type",
"oldfieldtype": "Link",
"options": "Supplier Type",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -146,9 +262,31 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "is_frozen",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Is Frozen",
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -167,9 +305,33 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Address & Contacts",
"no_copy": 0,
"oldfieldtype": "Column Break",
"options": "icon-map-marker",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -189,9 +351,30 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "address_html",
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Address HTML",
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -254,9 +437,51 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "50%"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "contact_html",
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Contact HTML",
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -275,9 +500,30 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "default_payable_accounts",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Default Payable Accounts",
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{
<<<<<<< HEAD
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
@ -299,6 +545,29 @@
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
=======
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:!doc.__islocal",
"description": "Mention if non-standard receivable account applicable",
"fieldname": "accounts",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Accounts",
"no_copy": 0,
"options": "Party Account",
"permlevel": 0,
"print_hide": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
>>>>>>> Added Tax Rule under ERPNext > Accounts > Setup
"unique": 0
},
{

5
erpnext/config/accounts.py
View File

@ -106,6 +106,11 @@ def get_data():
"name": "Accounts Settings",
"description": _("Default settings for accounting transactions.")
},
{
"type": "doctype",
"name": "Tax Rule",
"description": _("Tax Rule for transactions.")
},
{
"type": "doctype",
"name": "Sales Taxes and Charges Template",