Merge 8d2c888 into 2ad952c

l10n_id_djbc_bc261/README.rst

@@ -2,9 +2,9 @@
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
-=======================================
+=========================================
 Indonesia - Form 2.6.1 for DJBC Reporting
-=======================================
+=========================================
 
 Form BC 2.6.1 for Direktorat Jendral Bea & Cukai IT Inventory
 

l10n_id_djbc_bc261/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Form BC 2.6.1 for DJBC Reporting",
     "version": "8.0.1.0.0",

l10n_id_djbc_bc262/README.rst

@@ -2,9 +2,9 @@
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
-=======================================
+=========================================
 Indonesia - Form 2.6.1 for DJBC Reporting
-=======================================
+=========================================
 
 Form BC 2.6.1 for Direktorat Jendral Bea & Cukai IT Inventory
 

l10n_id_djbc_bc262/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Form BC 2.6.2 for DJBC Reporting",
     "version": "8.0.1.0.0",

l10n_id_djbc_kb_lap_common/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Common Feature for Kawasan Berikat Reporting",
     "version": "8.0.1.4.3",

l10n_id_djbc_kb_lap_common/reports/lap_kb_mutasi_common.py

@@ -52,7 +52,7 @@ def _qty_where(
             """ % (date_end)
         if adjustment:
             str_where += """
-             AND (a.inventory_id != %s OR 
+             AND (a.inventory_id != %s OR
              a.inventory_id IS NULL)
             """ % (adjustment)
 

l10n_id_djbc_kb_lap_mutasi_bahan_baku_penolong/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Lap.  Mutasi Bahan Baku/Penolong "
             "for DJBC's Kawasan Berikat Reporting",

l10n_id_djbc_kb_lap_mutasi_bahan_baku_penolong/wizards/date_range_selector.py

@@ -25,8 +25,8 @@ def action_print_sreen(self):
         context = {
             "date_start": self.date_start,
             "date_end": self.date_end,
-            }
+        }
         domain = [("warehouse_id", "in", self.warehouse_ids.ids)]
         result = waction.read()[0]
-        result.update({"context":context, "domain": domain})
+        result.update({"context": context, "domain": domain})
         return result

l10n_id_djbc_kb_lap_mutasi_barang_jadi/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Lap.  Mutasi Barang Jadi "
             "for DJBC's Kawasan Berikat Reporting",

l10n_id_djbc_kb_lap_mutasi_barang_jadi/wizards/date_range_selector.py

@@ -25,8 +25,8 @@ def action_print_sreen(self):
         context = {
             "date_start": self.date_start,
             "date_end": self.date_end,
-            }
+        }
         domain = [("warehouse_id", "in", self.warehouse_ids.ids)]
         result = waction.read()[0]
-        result.update({"context":context, "domain": domain})
+        result.update({"context": context, "domain": domain})
         return result

l10n_id_djbc_kb_lap_mutasi_mesin_peralatan/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Lap.  Mutasi Mesin Peralatan "
             "for DJBC's Kawasan Berikat Reporting",

l10n_id_djbc_kb_lap_mutasi_mesin_peralatan/wizards/date_range_selector.py

@@ -25,8 +25,8 @@ def action_print_sreen(self):
         context = {
             "date_start": self.date_start,
             "date_end": self.date_end,
-            }
+        }
         domain = [("warehouse_id", "in", self.warehouse_ids.ids)]
         result = waction.read()[0]
-        result.update({"context":context, "domain": domain})
+        result.update({"context": context, "domain": domain})
         return result

l10n_id_djbc_kb_lap_mutasi_reject_scrap/__openerp__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Copyright 2018 OpenSynergy Indonesia
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+# pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Indonesia - Lap.  Mutasi Reject Scrap "
             "for DJBC's Kawasan Berikat Reporting",

l10n_id_djbc_kb_lap_mutasi_reject_scrap/wizards/date_range_selector.py

@@ -25,8 +25,8 @@ def action_print_sreen(self):
         context = {
             "date_start": self.date_start,
             "date_end": self.date_end,
-            }
+        }
         domain = [("warehouse_id", "in", self.warehouse_ids.ids)]
         result = waction.read()[0]
-        result.update({"context":context, "domain": domain})
+        result.update({"context": context, "domain": domain})
         return result

l10n_id_ppajp_kap/README.rst

@@ -0,0 +1,62 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=================
+Indonesia - PPAJP
+=================
+
+
+
+Installation
+============
+
+To install this module, you need to:
+
+1.  Clone the branch 8.0 of the repository https://github.com/open-synergy/opnsynid-l10n-indonesia
+2.  Add the path to this repository in your configuration (addons-path)
+3.  Update the module list
+4.  Go to menu *Setting -> Modules -> Local Modules*
+5.  Search For *Indonesia - PPAJP*
+6.  Install the module
+
+Configuration
+=============
+
+
+Usage
+=====
+
+
+Known issues / Roadmap
+======================
+
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/open-synergy/opnsynid-l10n-indonesia/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed
+and welcomed feedback.
+
+Credits
+=======
+
+
+Contributors
+------------
+
+* Andhitia Rama <andhitia.r@gmail.com>
+* Michael Viriyananda <viriyananda.michael@gmail.com>
+
+
+Maintainer
+----------
+
+.. image:: https://opensynergy-indonesia.com/logo.png
+   :alt: OpenSynergy Indonesia
+   :target: https://opensynergy-indonesia.com
+
+This module is maintained by the OpenSynergy Indonesia.

l10n_id_ppajp_kap/__init__.py

@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models

l10n_id_ppajp_kap/__openerp__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    "name": "Indonesia - PPAJP KAP",
+    "version": "8.0.1.0.0",
+    "category": "localization",
+    "website": "https://opensynergy-indonesia.com/",
+    "author": "OpenSynergy Indonesia",
+    "license": "AGPL-3",
+    "depends": [
+        "accountant_app",
+    ],
+    "data": [
+        "menu.xml",
+        "views/accountant_config_setting_views.xml",
+    ],
+}

l10n_id_ppajp_kap/menu.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2016 OpenSynergy Indonesia
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<openerp>
+<data>
+
+<menuitem
+    id="accountant_ppajp_report_menu"
+    name="PPAJP"
+    sequence="1"
+    parent="accountant_app.accountant_report_menu"
+    />
+
+</data>
+</openerp>

l10n_id_ppajp_kap/models/__init__.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import res_company
+from . import res_config

l10n_id_ppajp_kap/models/res_company.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import models, fields
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    jasa_audit_umum_ids = fields.Many2many(
+        string="Jasa Audit Umum",
+        comodel_name="accountant.service",
+        relation="rel_company_2_jasa_audit_umum",
+        column1="company_id",
+        column2="service_id",
+    )
+
+    jasa_non_audit_umum_ids = fields.Many2many(
+        string="Jasa Non-Audit Umum",
+        comodel_name="accountant.service",
+        relation="rel_company_2_jasa_non_audit_umum",
+        column1="company_id",
+        column2="service_id",
+    )

l10n_id_ppajp_kap/models/res_config.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2018 OpenSynergy Indonesia
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import models, fields
+
+
+class ResConfig(models.TransientModel):
+    _inherit = "accountant.config_setting"
+
+    jasa_audit_umum_ids = fields.Many2many(
+        string="Jasa Audit Umum",
+        comodel_name="accountant.service",
+        related="company_id.jasa_audit_umum_ids",
+        store=True,
+    )
+
+    jasa_non_audit_umum_ids = fields.Many2many(
+        string="Jasa Non-Audit Umum",
+        comodel_name="accountant.service",
+        related="company_id.jasa_non_audit_umum_ids",
+        store=True,
+    )

l10n_id_ppajp_kap/views/accountant_config_setting_views.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2018 OpenSynergy Indonesia
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+
+<openerp>
+<data>
+
+<record id="accountant_config_setting_view_form" model="ir.ui.view">
+    <field name="name">accountant.config_setting form</field>
+    <field name="model">accountant.config_setting</field>
+    <field name="inherit_id" ref="accountant_app.accountant_config_setting_view_form"/>
+    <field name="arch" type="xml">
+        <xpath expr="//form" position="inside">
+            <separator string="PPAJP"/>
+            <group name="ppajp_service_config">
+                <label for="id" string="Kategorisasi Jasa"/>
+                <div>
+                    <div>
+                        <label for="id" string="Audit Umum" class="oe_inline"/>
+                        <field name="jasa_audit_umum_ids" widget="many2many_tags" class="oe_inline"/>
+                    </div>
+                    <div>
+                        <label for="id" string="Non-Audit Umum" class="oe_inline"/>
+                        <field name="jasa_non_audit_umum_ids" widget="many2many_tags" class="oe_inline"/>
+                    </div>
+                </div>
+            </group>
+        </xpath>
+    </field>
+</record>
+
+</data>
+</openerp>

oca_dependencies.txt

@@ -15,6 +15,8 @@
 partner-contact https://github.com/OCA/partner-contact 8.0
 l10n-indonesia https://github.com/OCA/l10n-indonesia 8.0
 stock-logistics-transport https://github.com/OCA/stock-logistics-transport 8.0
+opnsynid-stock-logistics-warehouse https://github.com/open-synergy/opnsynid-stock-logistics-warehouse 8.0
 opnsynid-partner-contact https://github.com/open-synergy/opnsynid-partner-contact 8.0
 account-invoicing https://github.com/OCA/account-invoicing 8.0
 opnsynid-server-tools https://github.com/open-synergy/opnsynid-server-tools 8.0
+opnsynid-vertical-accountant https://github.com/open-synergy/opnsynid-vertical-accountant 8.0