summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorit-fixcomart <it@fixcomart.co.id>2024-09-17 17:22:50 +0700
committerit-fixcomart <it@fixcomart.co.id>2024-09-17 17:22:50 +0700
commit314125a03d680cd2da6e413200abd8eefec2b1ec (patch)
treef0d4e9cb5f46c476f4a497d23358c8c7c421f741
parentb14ec46d5c0d8e75558cff9cf38cb2372b82af3b (diff)
<iman> uppdate new register
-rw-r--r--indoteknik_api/controllers/api_v1/partner.py4
-rw-r--r--indoteknik_custom/models/res_partner.py31
2 files changed, 3 insertions, 32 deletions
diff --git a/indoteknik_api/controllers/api_v1/partner.py b/indoteknik_api/controllers/api_v1/partner.py
index b7dcdb0d..3cc6b193 100644
--- a/indoteknik_api/controllers/api_v1/partner.py
+++ b/indoteknik_api/controllers/api_v1/partner.py
@@ -66,7 +66,7 @@ class Partner(controller.Controller):
'name': ['required'],
'email': ['required'],
'mobile': ['required'],
- 'phone': ['required'],
+ 'phone': [''],
'street': ['required'],
'city_id': ['required', 'number', 'alias:kota_id'],
'district_id': ['number', 'alias:kecamatan_id'],
@@ -96,7 +96,7 @@ class Partner(controller.Controller):
'name': ['required'],
'email': ['required'],
'mobile': ['required'],
- 'phone': ['required'],
+ 'phone': [''],
'street': ['required'],
'city_id': ['required', 'number', 'alias:kota_id'],
'district_id': ['number', 'alias:kecamatan_id'],
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index b8a6502c..7392b10d 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -60,43 +60,14 @@ class ResPartner(models.Model):
@api.depends("street", "street2", "city", "state_id", "country_id", "blok", "nomor", "rt", "rw", "kelurahan_id",
"kecamatan_id")
- def _alamat_lengkap(self):
+ def _alamat_lengkap_text(self):
for partner in self:
- lengkap = partner.street or ""
- lengkap += " " + (partner.street2 or '')
-
- if partner.blok:
- lengkap += " Blok: " + partner.blok + ", "
- if partner.nomor:
- lengkap += " Nomor: " + partner.nomor + ", "
-
- if partner.rt:
- lengkap += " RT: " + partner.rt
- if partner.rw:
- lengkap += " RW: " + partner.rw
-
- if partner.kelurahan_id:
- lengkap += " Kel: " + partner.kelurahan_id.name + ","
-
- if partner.kecamatan_id:
- lengkap += " Kec: " + partner.kecamatan_id.name
-
- if partner.kota_id:
- lengkap += """
- """ + partner.kota_id.name + ","
-
- if partner.state_id:
- lengkap += " " + partner.state_id.name
-
- partner.alamat_lengkap = lengkap.upper()
-
if partner.company_type == 'person' and not partner.parent_id:
partner.alamat_lengkap_text = partner.street
# if partner.company_type == 'person' and partner.parent_id:
# partner.alamat_lengkap_text = partner.parent_id.alamat_lengkap_text
- alamat_lengkap = fields.Char(string="Alamat Lengkap", required=False, compute="_alamat_lengkap")
alamat_lengkap_text = fields.Text(string="Alamat Lengkap", required=False , tracking=3)
def write(self, vals):