diff options
| author | it-fixcomart <it@fixcomart.co.id> | 2024-12-31 09:44:11 +0700 |
|---|---|---|
| committer | it-fixcomart <it@fixcomart.co.id> | 2024-12-31 09:44:11 +0700 |
| commit | 8d00df73e76162d624d2f32eefdd47ca68ca154c (patch) | |
| tree | ef2b9706de3bbe895709502bf60506bca8f20a91 /indoteknik_api/models/res_users.py | |
| parent | 6a7b2e28c9c1612ac3e91ac321b72e3400fdb5a3 (diff) | |
| parent | d35c2dce88a87bc05d30c4935d51d7d58aa5d37d (diff) | |
Merge branch 'production' into iman/telegram
# Conflicts:
# indoteknik_custom/models/stock_picking.py
Diffstat (limited to 'indoteknik_api/models/res_users.py')
| -rw-r--r-- | indoteknik_api/models/res_users.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indoteknik_api/models/res_users.py b/indoteknik_api/models/res_users.py index 52a044dc..77aeeef7 100644 --- a/indoteknik_api/models/res_users.py +++ b/indoteknik_api/models/res_users.py @@ -72,7 +72,7 @@ class ResUsers(models.Model): data['state_id'] = { 'id': user.state_id.id, 'name': user.state_id.name - } or None + } or 0 if user.kota_id: data['city'] = { |