Merged in feature/request-by-abl (pull request #140)

Feature/request by abl

9 files changed, 104 insertions, 0 deletions

diff --git a/indoteknik_custom/views/automatic_purchase.xml b/indoteknik_custom/views/automatic_purchase.xml
index 71d292c9..974fbd17 100644
--- a/indoteknik_custom/views/automatic_purchase.xml
+++ b/indoteknik_custom/views/automatic_purchase.xml
@@ -53,6 +53,7 @@
                 <field name="partner_invoice_id" readonly="1"/>
                 <field name="salesperson_id" readonly="1"/>
                 <field name="purchase_price" readonly="1"/>
+                <field name="purchase_tax_id" readonly="1"/>
                 <field name="product_id" readonly="1"/>
                 <field name="qty_so" readonly="1"/>
                 <field name="qty_po" readonly="1"/>
diff --git a/indoteknik_custom/views/cust_commision.xml b/indoteknik_custom/views/cust_commision.xml
index be58a68c..f080bc60 100644
--- a/indoteknik_custom/views/cust_commision.xml
+++ b/indoteknik_custom/views/cust_commision.xml
@@ -12,6 +12,7 @@
                 <field name="achieve_1st"/>
                 <field name="achieve_2nd"/>
                 <field name="commision_type"/>
+                <field name="brand_ids"/>
             </tree>
         </field>
     </record>
@@ -31,6 +32,7 @@
                                 <field name="achieve_1st"/>
                                 <field name="achieve_2nd"/>
                                 <field name="commision_type"/>
+                                <field name="brand_ids"/>
                             </group>
                         </group>
                 </sheet>
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 600ad192..4b74cd34 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -12,6 +12,7 @@
                 <field name="commision_percent"/>
                 <field name="commision_amt" readonly="1"/>
                 <field name="status" readonly="1"/>
+                <field name="brand_ids" widget="many2many_tags"/>
             </tree>
         </field>
     </record>
@@ -63,6 +64,7 @@
                                 </div>
                                 <field name="date_to"/>
                                 <field name="commision_type"/>
+                                <field name="brand_ids" widget="many2many_tags"/>
                                 <field name="notification" readonly="1"/>
                                 <field name="status" readonly="1"/>
                                 <field name="total_dpp"/>
diff --git a/indoteknik_custom/views/logbook_sj.xml b/indoteknik_custom/views/logbook_sj.xml
index 9eb9aa12..0fa65be5 100644
--- a/indoteknik_custom/views/logbook_sj.xml
+++ b/indoteknik_custom/views/logbook_sj.xml
@@ -22,6 +22,7 @@
                             <field name="carrier_id" readonly="1"/>
                             <field name="tracking_no" readonly="1"/>
                             <field name="partner_id" readonly="1"/>
+                            <field name="note"/>
                         </tree>
                     </field>
                 </sheet>
diff --git a/indoteknik_custom/views/promotion/promotion_program_line.xml b/indoteknik_custom/views/promotion/promotion_program_line.xml
index 025ea35a..7c8e403d 100644
--- a/indoteknik_custom/views/promotion/promotion_program_line.xml
+++ b/indoteknik_custom/views/promotion/promotion_program_line.xml
@@ -73,6 +73,14 @@
         action="promotion_program_line_action"
     />
 
+    <record id="ir_actions_server_promotion_program_line_sync_to_solr" model="ir.actions.server">
+        <field name="name">Sync to Solr</field>
+        <field name="model_id" ref="indoteknik_custom.model_promotion_program_line"/>
+        <field name="binding_model_id" ref="indoteknik_custom.model_promotion_program_line"/>
+        <field name="state">code</field>
+        <field name="code">model.action_sync_to_solr()</field>
+    </record>
+
     <data noupdate="1">
         <record id="cron_program_line_solr_flag_solr" model="ir.cron">
             <field name="name">Program Line: Solr Flag to Queue</field>
diff --git a/indoteknik_custom/views/report_logbook_sj.xml b/indoteknik_custom/views/report_logbook_sj.xml
index 8221b419..687464f0 100644
--- a/indoteknik_custom/views/report_logbook_sj.xml
+++ b/indoteknik_custom/views/report_logbook_sj.xml
@@ -31,6 +31,7 @@
                 <field name="picking_id"/>
                 <field name="sale_id"/>
                 <field name="not_exist"/>
+                <field name="note"/>
             </tree>
         </field>
     </record>
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index e7b8517a..f79b684e 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -31,6 +31,11 @@
                     <field name="use_only_ready_stock" attrs="{'invisible': [('parent_id', '!=', False), ('company_type', '!=', 'company')]}" />
                     <field name="web_role" attrs="{'invisible': ['|', ('parent_id', '=', False), ('company_type', '=', 'company')]}" />
                 </field>
+                <xpath expr="//field[@name='child_ids']/form//field[@name='name']" position="before">
+                    <field name="parent_id" invisible="1" />
+                    <field name="main_parent_id" invisible="1" />
+                    <field name="site_id" attrs="{'readonly': [('parent_id', '=', False)]}" domain="[('partner_id', '=', main_parent_id)]" context="{'default_partner_id': active_id}" />
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/res_partner_site.xml b/indoteknik_custom/views/res_partner_site.xml
new file mode 100644
index 00000000..df4c8c4a
--- /dev/null
+++ b/indoteknik_custom/views/res_partner_site.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="res_partner_site_form_view" model="ir.ui.view">
+            <field name="name">Partner Site</field>
+            <field name="model">res.partner.site</field>
+            <field name="arch" type="xml">
+                <form>
+                    <group>
+                        <group>
+                            <field name="name" required="1" />
+                            <field name="partner_id" invisible="1" />
+                            <label for="street" string="Address" />
+                            <div class="o_address_format" name="div_address">
+                                <field name="street" placeholder="Street..." class="o_address_street"/>
+                                <field name="street2" placeholder="Street 2..." class="o_address_street"/>
+                                <field name="city" placeholder="City" class="o_address_city"/>
+                                <field name="state_id" class="o_address_state" placeholder="State" options="{'no_open': True, 'no_quick_create': True}" context="{'country_id': country_id, 'default_country_id': country_id, 'zip': zip}"/>
+                                <field name="zip" placeholder="ZIP" class="o_address_zip"/>
+                                <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/>
+                            </div>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 23905ef7..77740dd0 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -306,4 +306,60 @@
             </field>
         </record>
     </data>
+
+    <data>
+        <record id="mail_template_sale_order_notification_to_salesperson" model="mail.template">
+            <field name="name">Sale Order: Notification to Salesperson</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="subject">Konsolidasi Pengiriman</field>
+            <field name="email_from">sales@indoteknik.com</field>
+            <field name="email_to">${object.user_id.login | safe}</field>
+            <field name="body_html" type="html">
+                <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
+                    <tr><td align="center">
+                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                            <!-- HEADER -->
+                            <tbody>
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr>
+                                                <td valign="middle">
+                                                    <span></span>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td colspan="2" style="text-align:center;">
+                                                    <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr><td style="padding-bottom: 24px;">Dear ${object.user_id.name},</td></tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Terdapat pesanan ${object.name} dari ${object.partner_id.main_parent_id.name} untuk site ${object.partner_shipping_id.site_id.name | safe} dengan total pembelian ${object.grand_total}</td></tr>
+
+                                            <tr>
+                                                <td style="text-align:center;">
+                                                    <hr width="100%"
+                                                        style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                            </tbody>
+                        </table>
+                    </td></tr>
+                </table>
+            </field>
+        </record>
+    </data>
 </odoo>
\ No newline at end of file