Commit 50441a41 by taufikyu

revisi alamat

1 parent 309da8a5
...@@ -461,7 +461,7 @@ def _DTstrftime(chain): ...@@ -461,7 +461,7 @@ def _DTstrftime(chain):
def _DTnumberformat(chain): def _DTnumberformat(chain):
import locale import locale
locale.setlocale(locale.LC_ALL, 'id_ID.utf8') locale.setlocale(locale.LC_ALL, get_settings()['localization'])
ret = locale.format("%d", chain, grouping=True) ret = locale.format("%d", chain, grouping=True)
if ret: if ret:
return ret return ret
......
...@@ -809,7 +809,7 @@ def view_pdf(request): ...@@ -809,7 +809,7 @@ def view_pdf(request):
item = Item() item = Item()
item.opd = row.unit_nama item.opd = row.unit_nama
item.nama = row.wp_nama item.nama = row.wp_nama
item.alamat = row.wp_alamat_2 and ('{} {}'.format(row.wp_alamat_1, row.wp_alamat_2)) or row.wp_alamat_1 item.alamat = (row.wp_alamat_2 and row.wp_alamat_2 != '-') and ('{} {}'.format(row.wp_alamat_1, row.wp_alamat_2)) or row.wp_alamat_1
item.rek_nama = row.rek_nama item.rek_nama = row.rek_nama
item.tahunskrd = row.tahun_id item.tahunskrd = row.tahun_id
item.tahun = datetime.now().year item.tahun = datetime.now().year
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!