Merge branch 'staging' of bitbucket.org:altafixco/indoteknik-addons into staging

9 files changed, 125 insertions, 1 deletions

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index 243b3028..449fd09c 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -16,6 +16,7 @@
         'views/delivery_order.xml',
         'views/product_pricelist.xml',
         'views/res_groups.xml',
+        'views/res_partner_company_type.xml',
         'views/res_partner.xml',
         'views/product_pricelist_item.xml',
         'views/product_public_category.xml',
@@ -25,6 +26,7 @@
         'views/sale_monitoring.xml',
         'views/sale_monitoring_detail.xml',
         'views/user_activity_log.xml',
+        'views/user_company_request.xml',
         'views/vit_kelurahan.xml',
         'views/vit_kecamatan.xml',
         'views/vit_kota.xml',
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 62a024e3..ebbf2e09 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -19,6 +19,7 @@ from . import purchase_order_line
 from . import purchase_order
 from . import purchase_outstanding
 from . import purchase_pricelist
+from . import res_partner_company_type
 from . import res_partner
 from . import res_users
 from . import sale_monitoring_detail
@@ -32,6 +33,7 @@ from . import stock_picking_type
 from . import stock_picking
 from . import stock_vendor
 from . import user_activity_log
+from . import user_company_request
 from . import users
 from . import website_brand_homepage
 from . import website_categories_homepage
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index 403245fb..1cdf7c72 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -5,3 +5,4 @@ class ResPartner(models.Model):
     _inherit = 'res.partner'
 
     reference_number = fields.Char(string="Reference Number")
+    company_type_id = fields.Many2one('res.partner.company_type', string='Company Type')
diff --git a/indoteknik_custom/models/res_partner_company_type.py b/indoteknik_custom/models/res_partner_company_type.py
new file mode 100644
index 00000000..2bd356a1
--- /dev/null
+++ b/indoteknik_custom/models/res_partner_company_type.py
@@ -0,0 +1,7 @@
+from odoo import models, fields
+
+
+class ResPartnerCompanyType(models.Model):
+    _name = 'res.partner.company_type'
+
+    name = fields.Char('Name')
\ No newline at end of file
diff --git a/indoteknik_custom/models/user_company_request.py b/indoteknik_custom/models/user_company_request.py
new file mode 100644
index 00000000..c69b789c
--- /dev/null
+++ b/indoteknik_custom/models/user_company_request.py
@@ -0,0 +1,15 @@
+from odoo import models, fields
+
+
+class UserCompanyRequest(models.Model):
+    _name = 'user.company.request'
+    _rec_name = 'user_id'
+
+    user_id = fields.Many2one('res.partner', string='User')
+    user_company_id = fields.Many2one('res.partner', string='Company')
+    user_input = fields.Char(string='User Input')
+    is_approve = fields.Selection([
+        ('approved', 'Approve'),
+        ('rejected', 'Reject'),
+    ], string='Approval')
+    
\ No newline at end of file
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index 977f3a1b..d5142381 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -33,4 +33,6 @@ access_midtrans_recurring,access.midtrans.recurring,model_midtrans_recurring,,1,
 access_midtrans_account,access.midtrans.account,model_midtrans_account,,1,1,1,1
 access_ip_lookup,access.ip.lookup,model_ip_lookup,,1,1,1,1
 access_ip_lookup_line,access.ip.lookup.line,model_ip_lookup_line,,1,1,1,1
-access_wati_notification,access.wati.notification,model_wati_notification,,1,1,1,1
\ No newline at end of file
+access_wati_notification,access.wati.notification,model_wati_notification,,1,1,1,1
+access_user_company_request,access.user.company.request,model_user_company_request,,1,1,1,1
+access_res_partner_company_type,access.res.partner.company_type,model_res_partner_company_type,,1,1,1,1
\ No newline at end of file
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index 673718c4..47f41ab2 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -9,6 +9,9 @@
                 <field name="vat" position="after">
                     <field name="reference_number"/>
                 </field>
+                <field name="industry_id" position="after">
+                    <field name="company_type_id"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/res_partner_company_type.xml b/indoteknik_custom/views/res_partner_company_type.xml
new file mode 100644
index 00000000..ed21c1c9
--- /dev/null
+++ b/indoteknik_custom/views/res_partner_company_type.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="res_partner_company_type_tree" model="ir.ui.view">
+        <field name="name">res.partner.company_type.tree</field>
+        <field name="model">res.partner.company_type</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="res_partner_company_type_form" model="ir.ui.view">
+        <field name="name">res.partner.company_type.form</field>
+        <field name="model">res.partner.company_type</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_res_partner_company_type" model="ir.actions.act_window">
+        <field name="name">Company Type</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner.company_type</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_res_partner_company_type"
+        name="Company Type"
+        parent="contacts.res_partner_menu_config"
+        sequence="2"
+        action="action_res_partner_company_type"
+    />
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
new file mode 100644
index 00000000..0b787683
--- /dev/null
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="user_company_request_tree" model="ir.ui.view">
+        <field name="name">user.company.request.tree</field>
+        <field name="model">user.company.request</field>
+        <field name="arch" type="xml">
+            <tree create="0">
+                <field name="user_id"/>
+                <field name="user_company_id"/>
+                <field name="user_input"/>
+                <field name="is_approve"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="user_company_request_form" model="ir.ui.view">
+        <field name="name">user.company.request.form</field>
+        <field name="model">user.company.request</field>
+        <field name="arch" type="xml">
+            <form create="0">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="user_id" readonly="1"/>
+                            <field name="user_company_id" readonly="1"/>
+                            <field name="user_input" readonly="1"/>
+                            <field name="is_approve"/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_user_company_request" model="ir.actions.act_window">
+        <field name="name">User Company Request</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">user.company.request</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_user_company_request"
+        name="User Company Request"
+        parent="contacts.menu_contacts"
+        sequence="3"
+        action="action_user_company_request"
+    />
+</odoo>
\ No newline at end of file