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

feat: add tax category in pos profile (#20413)

Browse Source 
* feat: add tax category in pos profile

* fix: review fixes
This commit is contained in:
Saqib
2020-02-03 15:53:27 +05:30
committed by GitHub
parent 589f2cd16c
commit 4fca6cae34
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/pos_profile/pos_profile.json
View File

@@ -3,6 +3,7 @@
"autoname": "Prompt", "autoname": "Prompt",
"creation": "2013-05-24 12:15:51", "creation": "2013-05-24 12:15:51",
"doctype": "DocType", "doctype": "DocType",
"engine": "InnoDB",
"field_order": [ "field_order": [
"disabled", "disabled",
"section_break_2", "section_break_2",
@@ -50,6 +51,7 @@
"income_account", "income_account",
"expense_account", "expense_account",
"taxes_and_charges", "taxes_and_charges",
"tax_category",
"apply_discount_on", "apply_discount_on",
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
@@ -381,11 +383,17 @@
{ {
"fieldname": "dimension_col_break", "fieldname": "dimension_col_break",
"fieldtype": "Column Break" "fieldtype": "Column Break"
},
{
"fieldname": "tax_category",
"fieldtype": "Link",
"label": "Tax Category",
"options": "Tax Category"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"modified": "2019-05-25 22:56:30.352693", "modified": "2020-01-24 15:52:03.797701",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",

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

@@ -421,6 +421,9 @@ class SalesInvoice(SellingController):
if pos: if pos:
self.allow_print_before_pay = pos.allow_print_before_pay self.allow_print_before_pay = pos.allow_print_before_pay
if not for_validate:
self.tax_category = pos.get("tax_category")
if not for_validate and not self.customer: if not for_validate and not self.customer:
self.customer = pos.customer self.customer = pos.customer