mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-23 15:09:20 +00:00
refactor: full name field in contract
(cherry picked from commit 016924361a)
# Conflicts:
# erpnext/crm/doctype/contract/contract.json
# erpnext/crm/doctype/contract/contract.py
This commit is contained in:
@@ -14,6 +14,7 @@
|
|||||||
"party_user",
|
"party_user",
|
||||||
"status",
|
"status",
|
||||||
"fulfilment_status",
|
"fulfilment_status",
|
||||||
|
"party_full_name",
|
||||||
"sb_terms",
|
"sb_terms",
|
||||||
"start_date",
|
"start_date",
|
||||||
"cb_date",
|
"cb_date",
|
||||||
@@ -244,11 +245,22 @@
|
|||||||
"fieldname": "authorised_by_section",
|
"fieldname": "authorised_by_section",
|
||||||
"fieldtype": "Section Break",
|
"fieldtype": "Section Break",
|
||||||
"label": "Authorised By"
|
"label": "Authorised By"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "party_full_name",
|
||||||
|
"fieldtype": "Data",
|
||||||
|
"label": "Party Full Name",
|
||||||
|
"read_only": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"grid_page_length": 50,
|
||||||
"is_submittable": 1,
|
"is_submittable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2020-12-07 11:15:58.385521",
|
"modified": "2020-12-07 11:15:58.385521",
|
||||||
|
=======
|
||||||
|
"modified": "2025-05-23 13:54:03.346537",
|
||||||
|
>>>>>>> 016924361a (refactor: full name field in contract)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "CRM",
|
"module": "CRM",
|
||||||
"name": "Contract",
|
"name": "Contract",
|
||||||
@@ -315,9 +327,10 @@
|
|||||||
"write": 1
|
"write": 1
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"row_format": "Dynamic",
|
||||||
"show_name_in_global_search": 1,
|
"show_name_in_global_search": 1,
|
||||||
"sort_field": "modified",
|
"sort_field": "modified",
|
||||||
"sort_order": "DESC",
|
"sort_order": "DESC",
|
||||||
"track_changes": 1,
|
"track_changes": 1,
|
||||||
"track_seen": 1
|
"track_seen": 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,46 @@ from frappe.utils import getdate, nowdate
|
|||||||
|
|
||||||
|
|
||||||
class Contract(Document):
|
class Contract(Document):
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
# begin: auto-generated types
|
||||||
|
# This code is auto-generated. Do not modify anything in this block.
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from frappe.types import DF
|
||||||
|
|
||||||
|
from erpnext.crm.doctype.contract_fulfilment_checklist.contract_fulfilment_checklist import (
|
||||||
|
ContractFulfilmentChecklist,
|
||||||
|
)
|
||||||
|
|
||||||
|
amended_from: DF.Link | None
|
||||||
|
contract_template: DF.Link | None
|
||||||
|
contract_terms: DF.TextEditor
|
||||||
|
document_name: DF.DynamicLink | None
|
||||||
|
document_type: DF.Literal[
|
||||||
|
"", "Quotation", "Project", "Sales Order", "Purchase Order", "Sales Invoice", "Purchase Invoice"
|
||||||
|
]
|
||||||
|
end_date: DF.Date | None
|
||||||
|
fulfilment_deadline: DF.Date | None
|
||||||
|
fulfilment_status: DF.Literal["N/A", "Unfulfilled", "Partially Fulfilled", "Fulfilled", "Lapsed"]
|
||||||
|
fulfilment_terms: DF.Table[ContractFulfilmentChecklist]
|
||||||
|
ip_address: DF.Data | None
|
||||||
|
is_signed: DF.Check
|
||||||
|
party_full_name: DF.Data | None
|
||||||
|
party_name: DF.DynamicLink
|
||||||
|
party_type: DF.Literal["Customer", "Supplier", "Employee"]
|
||||||
|
party_user: DF.Link | None
|
||||||
|
requires_fulfilment: DF.Check
|
||||||
|
signed_by_company: DF.Link | None
|
||||||
|
signed_on: DF.Datetime | None
|
||||||
|
signee: DF.Data | None
|
||||||
|
start_date: DF.Date | None
|
||||||
|
status: DF.Literal["Unsigned", "Active", "Inactive"]
|
||||||
|
# end: auto-generated types
|
||||||
|
|
||||||
|
>>>>>>> 016924361a (refactor: full name field in contract)
|
||||||
def autoname(self):
|
def autoname(self):
|
||||||
name = self.party_name
|
name = self.party_name
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user