Skip to content

Taufik Yulianto / esipkd

Go to a project
Commit c68590bc by aagusti
Options

recover

1 parent 618ca88d
Inline Side-by-side
Showing 14 changed files with 9 additions and 120 deletions
esipkd/models/isipkd.py
......@@ -97,11 +97,9 @@ class Pajak(NamaModel, Base):
rekening_id = Column(Integer,ForeignKey("rekenings.id"))
tahun = Column(Integer, nullable=False, default=0)
tarif = Column(Float, default=0, nullable=False)
<<<<<<< HEAD
denda_rekening_id = Column(Integer, nullable=True, default=0)
=======
denda_rekening_id = Column(Integer, nullable=False, default=0)
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
UniqueConstraint('rekening_id','tahun', name='rekening_tahun')
rekenings = relationship("Rekening", backref=backref('pajaks'))
......
esipkd/scripts/data/route.csv
......@@ -18,7 +18,6 @@ id,kode,nama,path,factory,perm_name,disabled,created,updated,create_uid
18,"pkb-add","Pajak Kendaraan Bermotor","/pkb/add",,"add",0,"2015-03-08 16:45:45",,1
19,"pap","List Pajak Air Permukaan","/pap",,"read",0,"2015-03-08 16:45:45",,1
20,"pap-add","Pajak Air Permukaan","/pap/add",,"add",0,"2015-03-08 16:45:45",,1
<<<<<<< HEAD
26,"rekening","Kode Rekening","/rekening",,"read",0,"2015-03-08 16:45:45",,1
27,"rekening-act","Baca Kode Rekening","/rekening/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
28,"rekening-add","Tambah Kode Rekening","/rekening/add",,"add",0,"2015-03-08 16:45:45",,1
......@@ -29,18 +28,6 @@ id,kode,nama,path,factory,perm_name,disabled,created,updated,create_uid
43,"skpd-add","Tambah Unit Kerja/OPD","/skpd/add",,"add",0,"2015-03-08 16:45:45",,1
44,"skpd-edit","Edit Unit Kerja/OPD","/skpd/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
45,"skpd-delete","Hapus Unit Kerja/OPD","/skpd/{id}/delete",,"delete",0,"2015-03-08 16:45:45",,1
=======
26,"rekening","Rekening","/rekening",,"read",0,"2015-03-08 16:45:45",,1
27,"rekening-act","Baca Rekening","/rekening/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
28,"rekening-add","Tambah Rekening","/rekening/add",,"add",0,"2015-03-08 16:45:45",,1
29,"rekening-edit","Edit Rekening","/rekening/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
40,"rekening-delete","Hapus Rekening","/rekening/{id}/delete",,"delete",0,"2015-03-08 16:45:45",,1
41,"skpd","SKPD/Unit","/skpd",,"read",0,"2015-03-08 16:45:45",,1
42,"skpd-act","Baca SKPD","/skpd/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
43,"skpd-add","Tambah SKPD/Unit","/skpd/add",,"add",0,"2015-03-08 16:45:45",,1
44,"skpd-edit","Edit SKPD/Unit","/skpd/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
45,"skpd-delete","Hapus SKPD/Unit","/skpd/{id}/delete",,"delete",0,"2015-03-08 16:45:45",,1
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
46,"jabatan","Jabatan","/jabatan",,"read",0,"2015-03-08 16:45:45",,1
47,"jabatan-act","Baca Jabatan","/jabatan/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
48,"jabatan-add","Tambah Jabatan","/jabatan/add",,"add",0,"2015-03-08 16:45:45",,1
......@@ -60,7 +47,6 @@ id,kode,nama,path,factory,perm_name,disabled,created,updated,create_uid
62,"wilayah-act","Baca Wilayah","/wilayah/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
63,"wilayah-add","Tambah Wilayah","/wilayah/add",,"add",0,"2015-03-08 16:45:45",,1
64,"wilayah-edit","Edit Wilayah","/wilayah/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
<<<<<<< HEAD
65,"wp","Subjek","/wp",,"read",0,"2015-03-08 16:45:45",,1
66,"wp-act","Baca Subjek","/wp/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
67,"wp-add","Tambah Subjek","/wp/add",,"add",0,"2015-03-08 16:45:45",,1
......@@ -71,18 +57,6 @@ id,kode,nama,path,factory,perm_name,disabled,created,updated,create_uid
72,"op-add","Tambah Objek","/op/add",,"add",0,"2015-03-08 16:45:45",,1
73,"op-edit","Edit Objek","/op/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
74,"op-delete","Hapus Objek","/op/{id}/delete",,"delete",0,"2015-03-08 16:45:45",,1
=======
65,"wp","Wajib Pajak","/wp",,"read",0,"2015-03-08 16:45:45",,1
66,"wp-act","Baca Wajb Pajak","/wp/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
67,"wp-add","Tambah Wajib Pajak","/wp/add",,"add",0,"2015-03-08 16:45:45",,1
68,"wp-edit","Edit Wajib Pajak","/wp/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
69,"wp-delete","Hapus Wajib Pajak","/wp/{id}/delete",,"delete",0,"2015-03-08 16:45:45",,1
70,"op","Objek Pajak","/op",,"read",0,"2015-03-08 16:45:45",,1
71,"op-act","Baca Objek Pajak","/op/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
72,"op-add","Tambah Objek Pajak","/op/add",,"add",0,"2015-03-08 16:45:45",,1
73,"op-edit","Edit Objek Pajak","/op/{id}/edit",,"edit",0,"2015-03-08 16:45:45",,1
74,"op-delete","Hapus Objek Pajak","/op/{id}/delete",,"delete",0,"2015-03-08 16:45:45",,1
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
75,"arinvoice","Reg. Bayar","/arinvoice",,"read",0,"2015-03-08 16:45:45",,1
76,"arinvoice-act","Register Action","/arinvoice/{act}/act",,"read",0,"2015-03-08 16:45:45",,1
77,"arinvoice-add","Tambah Reg. Bayar","/arinvoice/add",,"add",0,"2015-03-08 16:45:45",,1
......
esipkd/views/arinvoice.py
......@@ -82,12 +82,9 @@ class AddSchema(colander.Schema):
)
unit_nm = colander.SchemaNode(
colander.String(),
<<<<<<< HEAD
title="OPD",
#title="SKPD",
=======
title="SKPD",
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
#widget=auto_unit_nm,
oid="unit_nm"
)
......@@ -102,11 +99,8 @@ class AddSchema(colander.Schema):
subjek_pajak_nm = colander.SchemaNode(
colander.String(),
#widget=auto_wp_nm,
<<<<<<< HEAD
title="Subjek",
=======
title="Subjek Bayar",
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
oid = "subjek_pajak_nm"
)
......@@ -119,11 +113,8 @@ class AddSchema(colander.Schema):
objek_pajak_nm = colander.SchemaNode(
colander.String(),
widget=auto_op_nm,
<<<<<<< HEAD
title="Objek",
=======
title="Objek Bayar",
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
oid = "objek_pajak_nm"
)
......@@ -249,19 +240,13 @@ def save(values, row=None):
row.no_id = 1
else:
row.no_id = invoice_no+1
<<<<<<< HEAD
row.kode = "".join([prefix, re.sub("[^0-9]", "", row.wilayah_kode),
str(tanggal).rjust(2,'0'),
str(bulan).rjust(2,'0'),
str(tahun).rjust(2,'0'),
str(row.no_id).rjust(4,'0')])
=======
row.kode = "".join([prefix, "-",re.sub("[^0-9]", "", row.wilayah_kode),
"-", str(tanggal).rjust(2,'0'),
str(bulan).rjust(2,'0'),
str(tahun).rjust(2,'0'),
"-", str(row.no_id).rjust(4,'0')])
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
#if values['password']:
# row.password = values['password']
DBSession.add(row)
......@@ -336,10 +321,7 @@ def view_edit(request):
row = query_id(request).first()
uid = row.id
kode = row.kode
<<<<<<< HEAD
=======
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
if not row:
return id_not_found(request)
if row.status_bayar:
......
esipkd/views/pkb.py
......@@ -139,15 +139,12 @@ def session_failed(request, session_name):
permission='view')
def view_add(request):
req = request
<<<<<<< HEAD
settings = get_settings()
print 'XXXXXXXXXX_____________XXXXXXXXXX',settings
private_key = settings['recaptcha.private_key']
data_key = settings['recaptcha.private_key']
=======
private_key = '6LcGLQATAAAAABtqq0J20BATKsZPGXwBVj6i5zk_'
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
form = get_form(request, AddSchema)
if request.POST:
if 'simpan' in request.POST:
......
esipkd/views/templates/arsspd/add.pt
<html metal:use-macro="load: ../base.pt">
<div metal:fill-slot="content">
<<<<<<< HEAD
<h4>Tambah Penerimaan</h4>
=======
<h4>Tambah/Batal Penerimaan</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
class="form-horizontal">
......@@ -206,7 +202,6 @@
<label class="control-label col-md-3">
PEMBAYARAN</label>
</div>
<<<<<<< HEAD
<!--tgl_bayar ------------------------------->
<div class="form-group" tal:define="field form['tgl_bayar']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
......@@ -219,8 +214,6 @@
*</p>
</div>
</div>
=======
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<!--bunga ------------------------------->
<div class="form-group" tal:define="field form['bunga']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
......@@ -241,23 +234,7 @@
tal:repeat="error field.error.messages()">
*</p>
</div>
<<<<<<< HEAD
</div>
=======
</div>
<!--tgl_bayar ------------------------------->
<div class="form-group" tal:define="field form['tgl_bayar']" id="item-${field.oid}">
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger"
tal:condition="field.required">&nbsp*</span></label>
<div class="col-md-9">
${structure:field.serialize()}
<p id="error-${field.oid}" class="help-block" tal:condition="field.error"
tal:repeat="error field.error.messages()">
*</p>
</div>
</div>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
</div>
</div>
......
esipkd/views/templates/base.pt
......@@ -75,13 +75,8 @@
<li><a href="/skpd">Unit Kerja/OPD</a></li>
<li><a href="/jabatan">Jabatan</a></li>
<li><a href="/pegawai">Pegawai</a></li>
<<<<<<< HEAD
<li><a href="/rekening">Kode Rekening</a></li>
<li><a href="/pajak">Tarif</a></li>
=======
<li><a href="/rekening">Rekening</a></li>
<li><a href="/pajak">Rekening & Tarif</a></li>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<li><a href="/wilayah">Wilayah</a></li>
</ul>
</li>
......
esipkd/views/templates/op/add.pt
<html metal:use-macro="load: ../base.pt">
<div metal:fill-slot="content" class="form-550">
<<<<<<< HEAD
<h4>Tambah Objek</h4>
=======
<h4>Tambah Obyek Bayar</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
class="form-horizontal">
......
esipkd/views/templates/op/edit.pt
<html metal:use-macro="load: ../base.pt">
<div metal:fill-slot="content" class="form-550">
<h3>Edit Obyek</h3>
<h3>Edit Objek</h3>
<hr>
<form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
class="form-horizontal">
......
esipkd/views/templates/op/list.pt
......@@ -2,11 +2,7 @@
<div metal:fill-slot="content">
<link href="/static/datatables/extensions/TableTools/css/dataTables.tableTools.min.css" rel="stylesheet">
<link href="/static/datatables/media/css/dataTables.bootstrap.css" rel="stylesheet">
<<<<<<< HEAD
<h4>Objek</h4>
=======
<h4>Objek Bayar</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<div class="container">
<!--form class="form-inline" role="form" id="frm_upload" name="frm_upload">
......
esipkd/views/templates/pap/add.pt
......@@ -32,7 +32,6 @@
<label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
${field.title}<span id="error-${field.oid}" class="text text-danger"
tal:condition="field.required">&nbsp*</span></label>
<<<<<<< HEAD
<div class="control-label col-md-2">
Bulan</div>
<div class="col-md-2">
......@@ -45,9 +44,6 @@
<div class="control-label col-md-2">
Tahun</div>
<div class="col-md-3">
=======
<div class="col-md-9">
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
${structure:field.serialize()}
<p id="error-${field.oid}" class="help-block" tal:condition="field.error"
tal:repeat="error field.error.messages()">
......
esipkd/views/templates/pkb/add.pt
<html metal:use-macro="load: ../base.pt">
<div metal:fill-slot="content" class="form-550">
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
<<<<<<< HEAD
<h4>Registrasi e-Samsat</h4>
<!--h4>Registrasi e-PKB</h4-->
=======
<h4>Registrasi e-PKB</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
class="form-horizontal">
......@@ -70,14 +65,9 @@
</div>
<!--g-recaptcha ------------------------------->
<div class="form-group">
<<<<<<< HEAD
${private_key}
<div class="col-md-offset-4" tal:condition="1">
<div class="g-recaptcha" data-sitekey="${private_key}"></div>
=======
<div class="col-md-offset-4">
<div class="g-recaptcha" data-sitekey="6LcGLQATAAAAABtqq0J20BATKsZPGXwBVj6i5zk_"></div>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
</div>
</div>
<!--Button ------------------------------->
......
esipkd/views/templates/wp/add.pt
<html metal:use-macro="load: ../base.pt">
<div metal:fill-slot="content" class="form-550">
<<<<<<< HEAD
<h4>Tambah Subjek</h4>
=======
<h4>Tambah Subjek Bayar</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
class="form-horizontal">
......
esipkd/views/templates/wp/edit.pt
<html metal:use-macro="load: ../base.pt">
<div metal:fill-slot="content" class="form-550">
<<<<<<< HEAD
<h4>Edit Subjek</h4>
=======
<h4>Edit Subjek Bayar</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<form id="deform" method="POST" enctype="multipart/form-data" accept-charset="utf-8"
class="form-horizontal">
......
esipkd/views/templates/wp/list.pt
......@@ -2,11 +2,7 @@
<div metal:fill-slot="content">
<link href="/static/datatables/extensions/TableTools/css/dataTables.tableTools.min.css" rel="stylesheet">
<link href="/static/datatables/media/css/dataTables.bootstrap.css" rel="stylesheet">
<<<<<<< HEAD
<h4>Subjek</h4>
=======
<h4>Subjek Bayar</h4>
>>>>>>> aa2db1210dbe0b6f7b09e18c512117de747379b4
<hr>
<div class="container">
<!--form class="form-inline" role="form" id="frm_upload" name="frm_upload">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!