Merge branch 'staging' into release

5 files changed, 127 insertions, 1 deletions

diff --git a/indoteknik_custom/views/midtrans.xml b/indoteknik_custom/views/midtrans.xml
new file mode 100644
index 00000000..1773b9fd
--- /dev/null
+++ b/indoteknik_custom/views/midtrans.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="cron_midtrans_parsing" model="ir.cron">
+        <field name="name">Midtrans: Parsing Notification</field>
+        <field name="interval_number">17</field>
+        <field name="interval_type">minutes</field>
+        <field name="numbercall">-1</field>
+        <field name="doall" eval="False"/>
+        <field name="model_id" ref="model_midtrans_notification"/>
+        <field name="code">model._parse_notification()</field>
+        <field name="state">code</field>
+        <field name="priority">100</field>
+        <field name="active">False</field>
+    </record>
+</odoo>
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/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index ff684451..d6df24a0 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -69,13 +69,18 @@
                 </field>
 
                 <page name="customer_signature" position="after">
-                    <page string="Customer PO" name="customer_purchase_order">
+                    <page string="Website" name="customer_purchase_order">
                         <group>
                             <group>
                                 <field name="partner_purchase_order_name" readonly="True"/>
                                 <field name="partner_purchase_order_description" readonly="True"/>
                                 <field name="partner_purchase_order_file" readonly="True"/>
                             </group>
+                            <group>
+                                <field name="gross_amount" readonly="True"/>
+                                <field name="payment_type" readonly="True"/>
+                                <field name="payment_status" readonly="True"/>
+                            </group>
                         </group>
                     </page>
                 </page>
diff --git a/indoteknik_custom/views/user_company_request.xml b/indoteknik_custom/views/user_company_request.xml
new file mode 100644
index 00000000..2efc1e9b
--- /dev/null
+++ b/indoteknik_custom/views/user_company_request.xml
@@ -0,0 +1,60 @@
+<?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" default_order="is_approve desc">
+                <field name="user_id"/>
+                <field name="user_company_id"/>
+                <field name="user_input"/>
+                <field 
+                    name="is_approve"
+                    widget="badge"
+                    decoration-success="is_approve == 'approved'"
+                    decoration-danger="is_approve == 'rejected'"
+                />
+                <field name="create_date"/>
+            </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" 
+                                required="1"
+                                decoration-success="is_approve == 'approved'"
+                                decoration-danger="is_approve == 'rejected'"
+                            />
+                        </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