CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 06:02:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: added missing project field on pos profile

Browse Source 
(cherry picked from commit 821d64241a)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.json
This commit is contained in:
diptanilsaha
2025-04-09 11:37:51 +05:30
committed by Mergify
parent d43ce7f8e0
commit 8e9ddb7a69
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,8 @@
"apply_discount_on", "apply_discount_on",
"accounting_dimensions_section", "accounting_dimensions_section",
"cost_center", "cost_center",
"dimension_col_break" "dimension_col_break",
"project"
], ],
"fields": [ "fields": [
{ {
@@ -389,6 +390,14 @@
"fieldname": "disable_grand_total_to_default_mop", "fieldname": "disable_grand_total_to_default_mop",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Disable auto setting Grand Total to default Payment Mode" "label": "Disable auto setting Grand Total to default Payment Mode"
},
{
"fieldname": "project",
"fieldtype": "Link",
"label": "Project",
"oldfieldname": "cost_center",
"oldfieldtype": "Link",
"options": "Project"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -416,7 +425,7 @@
"link_fieldname": "pos_profile" "link_fieldname": "pos_profile"
} }
], ],
"modified": "2025-01-29 13:12:30.796630", "modified": "2025-04-09 11:35:13.779613",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",
@@ -442,7 +451,12 @@
"role": "Accounts User" "role": "Accounts User"
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 821d64241a (fix: added missing project field on pos profile)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }

1
erpnext/accounts/doctype/pos_profile/pos_profile.py
View File

@@ -54,6 +54,7 @@ class POSProfile(Document):
payments: DF.Table[POSPaymentMethod] payments: DF.Table[POSPaymentMethod]
print_format: DF.Link | None print_format: DF.Link | None
print_receipt_on_order_complete: DF.Check print_receipt_on_order_complete: DF.Check
project: DF.Link | None
select_print_heading: DF.Link | None select_print_heading: DF.Link | None
selling_price_list: DF.Link | None selling_price_list: DF.Link | None
tax_category: DF.Link | None tax_category: DF.Link | None