Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8.0 koreksi subkon #148

Merged
merged 2 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion l10n_id_djbc_kite_lap_pemakaian_bahan_baku/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "Indonesia - Laporan Pemakaian Bahan Baku for KITE",
"version": "8.0.1.1.0",
"version": "8.0.1.2.0",
"category": "localization",
"website": "https://opensynergy-indonesia.com",
"author": "OpenSynergy Indonesia",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,10 @@
<field name="code">KITE-PMKBB</field>
<field name="active" eval="1"/>
</record>
<record id="djbc_kite_movement_type_pemakaian_bahan_baku_subkontrak" model="l10n_id.djbc_kite_movement_type">
<field name="name">Pemakaian Bahan Baku Subkontrak</field>
<field name="code">KITE-PMKBB-SUB</field>
<field name="active" eval="1"/>
</record>
</data>
</openerp>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
# Copyright 2019 OpenSynergy Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import djbc_kite_lap_pemakaian_bahan_baku
from . import (
djbc_kite_lap_pemakaian_bahan_baku,
djbc_kite_lap_pemakaian_bahan_baku_subkon,
djbc_kite_lap_pemakaian_bahan_baku_union,
)
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,9 @@ def _select(self):
c.name AS nama_barang,
b.default_code AS kode_barang,
a.product_uom AS satuan,
CASE
WHEN e.partner_id IS NULL
THEN a.product_uom_qty
ELSE 0.0
END AS jumlah_digunakan,
CASE
WHEN e.partner_id IS NOT NULL
THEN a.product_uom_qty
ELSE 0.0
END AS jumlah_disubkontrakkan,
e.partner_id AS penerima_subkontrak,
a.product_uom_qty AS jumlah_digunakan,
0.0 AS jumlah_disubkontrakkan,
0 AS penerima_subkontrak,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kok ini 0 mike? Bukannya Flase

d.warehouse_id AS gudang
"""
return select_str
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

<openerp>
<data>
<record id="lap_kite_pemakaian_bahan_baku_view_tree" model="ir.ui.view">
<field name="name">l10n_id.lap_kite_pemakaian_bahan_baku.tree</field>
<field name="model">l10n_id.lap_kite_pemakaian_bahan_baku</field>
<record id="lap_kite_pemakaian_bahan_baku_union_view_tree" model="ir.ui.view">
<field name="name">l10n_id.lap_kite_pemakaian_bahan_baku_union.tree</field>
<field name="model">l10n_id.lap_kite_pemakaian_bahan_baku_union</field>
<field name="arch" type="xml">
<tree>
<field name="no_pengeluaran"/>
Expand All @@ -21,16 +21,18 @@
</field>
</record>

<record id="lap_kite_pemakaian_bahan_baku_view_search" model="ir.ui.view">
<field name="name">l10n_id.lap_kite_pemakaian_bahan_baku.search</field>
<field name="model">l10n_id.lap_kite_pemakaian_bahan_baku</field>
<record id="lap_kite_pemakaian_bahan_baku_union_view_search" model="ir.ui.view">
<field name="name">l10n_id.lap_kite_pemakaian_bahan_baku_union.search</field>
<field name="model">l10n_id.lap_kite_pemakaian_bahan_baku_union</field>
<field name="arch" type="xml">
<search>
<field name="no_pengeluaran"/>
<field name="tgl_pengeluaran"/>
<field name="kode_barang"/>
<field name="nama_barang"/>
<field name="penerima_subkontrak"/>
<filter name="dengan_subkontrak" string="Dengan Subkontrak" domain="[('jumlah_digunakan','=', 0)]"/>
<filter name="tanpa_subkontrak" string="Tanpa Subkontrak" domain="[('jumlah_disubkontrakkan', '=', 0)]"/>
<group name="group0" string="Group By..">
<filter name="filter_picking" string="No Pengeluaran" context="{'group_by':'no_pengeluaran'}"/>
<filter name="filter_subcontract" string="Penerima Subkontrak" context="{'group_by':'penerima_subkontrak'}"/>
Expand All @@ -45,14 +47,14 @@
</record>


<record id="lap_kite_pemakaian_bahan_baku_action" model="ir.actions.act_window">
<record id="lap_kite_pemakaian_bahan_baku_union_action" model="ir.actions.act_window">
<field name="name">Lap. Pemakaian Bahan Baku</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">l10n_id.lap_kite_pemakaian_bahan_baku</field>
<field name="res_model">l10n_id.lap_kite_pemakaian_bahan_baku_union</field>
<field name="view_type">form</field>
<field name="view_mode">tree</field>
<field name="view_id" ref="lap_kite_pemakaian_bahan_baku_view_tree"/>
<field name="search_view_id" ref="lap_kite_pemakaian_bahan_baku_view_search"/>
<field name="view_id" ref="lap_kite_pemakaian_bahan_baku_union_view_tree"/>
<field name="search_view_id" ref="lap_kite_pemakaian_bahan_baku_union_view_search"/>
<field name="target">current</field>
</record>
</data>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
# -*- coding: utf-8 -*-
# Copyright 2017 OpenSynergy Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from openerp import models, fields
from openerp import tools


class LapKitePemakaianBahanBakuSubkon(models.Model):
_name = "l10n_id.lap_kite_pemakaian_bahan_baku_subkon"
_description = "Laporan Pemakaian Bahan Baku Subkontrak KITE"
_auto = False

no_pengeluaran = fields.Many2one(
string="Nomor Pengeluaran",
comodel_name="stock.picking",
)
tgl_pengeluaran = fields.Datetime(
string="Tanggal Pengeluaran",
)
kode_barang = fields.Char(
string="Kode Barang",
)
nama_barang = fields.Char(
string="Nama Barang",
)
satuan = fields.Many2one(
string="Satuan",
comodel_name="product.uom",
)
jumlah_digunakan = fields.Float(
string="Jumlah Digunakan",
)
jumlah_disubkontrakkan = fields.Float(
string="Jumlah Disubkontrakan",
)
penerima_subkontrak = fields.Many2one(
string="Penerima Subkontrak",
comodel_name="res.partner",
)
gudang = fields.Many2one(
string="Gudang",
comodel_name="stock.warehouse"
)

def _get_movement_type(self, cr):
query = """
SELECT res_id
FROM ir_model_data
WHERE
module = 'l10n_id_djbc_kite_lap_pemakaian_bahan_baku' AND
name = 'djbc_kite_movement_type_pemakaian_bahan_baku_subkontrak'
"""
cr.execute(query)
movement_type = cr.fetchone()
if movement_type:
return movement_type
else:
return 0

def _select(self):
select_str = """
SELECT a.id as id,
a.picking_id AS no_pengeluaran,
a.date AS tgl_pengeluaran,
c.name AS nama_barang,
b.default_code AS kode_barang,
a.product_uom AS satuan,
0.0 AS jumlah_digunakan,
a.product_uom_qty AS jumlah_disubkontrakkan,
e.partner_id AS penerima_subkontrak,
d.warehouse_id AS gudang
"""
return select_str

def _from(self):
from_str = """
FROM stock_move AS a
"""
return from_str

def _join(self):
join_str = """
JOIN product_product AS b ON a.product_id = b.id
JOIN product_template AS c ON b.product_tmpl_id = c.id
JOIN stock_picking_type AS d ON a.picking_type_id = d.id
LEFT JOIN stock_picking AS e ON a.picking_id = e.id
JOIN product_categ_rel AS f ON
c.id = f.product_id
JOIN product_category AS g ON
f.categ_id = g.id
JOIN (
SELECT res_id
FROM ir_model_data AS e1
WHERE
e1.module = 'l10n_id_djbc_kite_common' AND
(e1.name = 'product_categ_kite_bahan_baku')
) as h ON
g.id = h.res_id
"""
return join_str

def _where(self, movement_type_id):
where_str = """
WHERE
a.state = 'done' AND
a.djbc_custom IS TRUE AND
d.djbc_kite_scrap IS FALSE AND
d.djbc_kite_movement_type_id=%s
""" % (movement_type_id)
return where_str

def _order_by(self):
join_str = """
ORDER BY a.date, a.id
"""
return join_str

def init(self, cr):
tools.drop_view_if_exists(cr, self._table)
# pylint: disable=locally-disabled, sql-injection
movement_type_id =\
self._get_movement_type(cr)
cr.execute("""CREATE or REPLACE VIEW %s as (
%s
%s
%s
%s
%s
)""" % (
self._table,
self._select(),
self._from(),
self._join(),
self._where(movement_type_id),
self._order_by()
))
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
# -*- coding: utf-8 -*-
# Copyright 2017 OpenSynergy Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from openerp import models, fields
from openerp import tools


class LapKitePemakaianBahanBakuUnion(models.Model):
_name = "l10n_id.lap_kite_pemakaian_bahan_baku_union"
_description = "Laporan Pemakaian Bahan Baku Union KITE"
_auto = False

no_pengeluaran = fields.Many2one(
string="Nomor Pengeluaran",
comodel_name="stock.picking",
)
tgl_pengeluaran = fields.Datetime(
string="Tanggal Pengeluaran",
)
kode_barang = fields.Char(
string="Kode Barang",
)
nama_barang = fields.Char(
string="Nama Barang",
)
satuan = fields.Many2one(
string="Satuan",
comodel_name="product.uom",
)
jumlah_digunakan = fields.Float(
string="Jumlah Digunakan",
)
jumlah_disubkontrakkan = fields.Float(
string="Jumlah Disubkontrakan",
)
penerima_subkontrak = fields.Many2one(
string="Penerima Subkontrak",
comodel_name="res.partner",
)
gudang = fields.Many2one(
string="Gudang",
comodel_name="stock.warehouse"
)

# Object: l10n_id.lap_kite_pemakaian_bahan_baku
def _select_1(self):
select_str = """
SELECT id,
no_pengeluaran,
tgl_pengeluaran,
nama_barang,
kode_barang,
satuan,
jumlah_digunakan,
jumlah_disubkontrakkan,
penerima_subkontrak,
gudang
"""
return select_str

def _from_1(self):
from_str = """
FROM l10n_id_lap_kite_pemakaian_bahan_baku
"""
return from_str

# Object: l10n_id.lap_kite_pemakaian_bahan_baku_subkon
def _select_2(self):
select_str = """
SELECT id,
no_pengeluaran,
tgl_pengeluaran,
nama_barang,
kode_barang,
satuan,
jumlah_digunakan,
jumlah_disubkontrakkan,
penerima_subkontrak,
gudang
"""
return select_str

def _from_2(self):
from_str = """
FROM l10n_id_lap_kite_pemakaian_bahan_baku_subkon
"""
return from_str

def init(self, cr):
tools.drop_view_if_exists(cr, self._table)
# pylint: disable=locally-disabled, sql-injection
cr.execute("""CREATE or REPLACE VIEW %s as (
%s
%s
UNION
%s
%s
)""" % (
self._table,
self._select_1(),
self._from_1(),
self._select_2(),
self._from_2(),
))
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_all_djbc_lap_kite_pemakaian_bahan_baku,all user l10n_id.lap_kite_pemakaian_bahan_baku,model_l10n_id_lap_kite_pemakaian_bahan_baku,,1,0,0,0
access_all_djbc_lap_kite_pemakaian_bahan_baku_subkon,all user l10n_id.lap_kite_pemakaian_bahan_baku_subkon,model_l10n_id_lap_kite_pemakaian_bahan_baku_subkon,,1,0,0,0
access_all_djbc_lap_kite_pemakaian_bahan_baku_union,all user l10n_id.lap_kite_pemakaian_bahan_baku_union,model_l10n_id_lap_kite_pemakaian_bahan_baku_union,,1,0,0,0
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class KitePemakaianBahanBakuWizard(models.TransientModel):
def action_print_sreen(self):
waction = self.env.ref(
"l10n_id_djbc_kite_lap_pemakaian_bahan_baku."
"lap_kite_pemakaian_bahan_baku_action")
"lap_kite_pemakaian_bahan_baku_union_action")
criteria = [
("tgl_pengeluaran", ">=", self.date_start),
("tgl_pengeluaran", "<=", self.date_end),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "Indonesia - Laporan Pemasukan Hasil Produksi for KITE",
"version": "8.0.1.1.0",
"version": "8.0.1.2.0",
"category": "localization",
"website": "https://opensynergy-indonesia.com",
"author": "OpenSynergy Indonesia",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,10 @@
<field name="code">KITE-PMHP</field>
<field name="active" eval="1"/>
</record>
<record id="djbc_kite_movement_type_pemasukan_hasil_produksi_subkon" model="l10n_id.djbc_kite_movement_type">
<field name="name">Pemasukan Hasil Produksi Subkontrak</field>
<field name="code">KITE-PMHP-SUB</field>
<field name="active" eval="1"/>
</record>
</data>
</openerp>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
# Copyright 2019 OpenSynergy Indonesia
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from . import djbc_kite_lap_pemasukan_hasil_produksi
from . import (
djbc_kite_lap_pemasukan_hasil_produksi,
djbc_kite_lap_pemasukan_hasil_produksi_subkon,
djbc_kite_lap_pemasukan_hasil_produksi_union,
)
Loading