feat(lpe): add distretionary reason

frappe · Sep 5, 2024 · f1ed5ef · f1ed5ef
1 parent aa54516
commit f1ed5ef
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json b/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
@@ -15,14 +15,16 @@
   "purchase_amount",
   "expiry_date",
   "posting_date",
-  "company"
+  "company",
+  "discretionary_reason"
  ],
  "fields": [
   {
    "fieldname": "loyalty_program",
    "fieldtype": "Link",
    "label": "Loyalty Program",
-   "options": "Loyalty Program"
+   "options": "Loyalty Program",
+   "reqd": 1
   },
   {
    "fieldname": "loyalty_program_tier",
@@ -34,7 +36,8 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Customer",
-   "options": "Customer"
+   "options": "Customer",
+   "reqd": 1
   },
   {
    "fieldname": "redeem_against",
@@ -46,7 +49,8 @@
    "fieldname": "loyalty_points",
    "fieldtype": "Int",
    "in_list_view": 1,
-   "label": "Loyalty Points"
+   "label": "Loyalty Points",
+   "reqd": 1
   },
   {
    "fieldname": "purchase_amount",
@@ -57,36 +61,45 @@
    "fieldname": "expiry_date",
    "fieldtype": "Date",
    "in_list_view": 1,
-   "label": "Expiry Date"
+   "label": "Expiry Date",
+   "reqd": 1
   },
   {
    "fieldname": "posting_date",
    "fieldtype": "Date",
-   "label": "Posting Date"
+   "label": "Posting Date",
+   "reqd": 1
   },
   {
    "fieldname": "company",
    "fieldtype": "Link",
    "label": "Company",
-   "options": "Company"
+   "options": "Company",
+   "reqd": 1
   },
   {
    "fieldname": "invoice_type",
    "fieldtype": "Link",
    "label": "Invoice Type",
-   "options": "DocType"
+   "options": "DocType",
+   "reqd": 1
   },
   {
    "fieldname": "invoice",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
    "label": "Invoice",
    "options": "invoice_type"
+  },
+  {
+   "fieldname": "discretionary_reason",
+   "fieldtype": "Data",
+   "label": "Discretionary Reason"
   }
  ],
  "in_create": 1,
  "links": [],
- "modified": "2024-03-27 13:10:03.015035",
+ "modified": "2024-07-01 08:51:13.927009",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Loyalty Point Entry",
@@ -123,4 +136,4 @@
  "states": [],
  "title_field": "customer",
  "track_changes": 1
-}
+}
diff --git a/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.py b/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.py
@@ -18,15 +18,16 @@ class LoyaltyPointEntry(Document):
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		company: DF.Link | None
-		customer: DF.Link | None
-		expiry_date: DF.Date | None
+		company: DF.Link
+		customer: DF.Link
+		discretionary_reason: DF.Data | None
+		expiry_date: DF.Date
 		invoice: DF.DynamicLink | None
-		invoice_type: DF.Link | None
+		invoice_type: DF.Link
 		loyalty_points: DF.Int
-		loyalty_program: DF.Link | None
+		loyalty_program: DF.Link
 		loyalty_program_tier: DF.Data | None
-		posting_date: DF.Date | None
+		posting_date: DF.Date
 		purchase_amount: DF.Currency
 		redeem_against: DF.Link | None
 	# end: auto-generated types