Merged in production (pull request #80)

Production

4 files changed, 33 insertions, 21 deletions

diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index f7f9c0ea..d2a59621 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -28,11 +28,15 @@
                     <field name="total_percent_margin"/>
                     <field name="voucher_id" readonly="1" />
                 </field>
+                <field name="source_id" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </field>
                 <field name="analytic_account_id" position="after">
                     <field name="customer_type" attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-28'), ('create_date', '=', False)]}"/>
                     <field name="npwp" placeholder='99.999.999.9-999.999' attrs="{'required': ['|', ('create_date', '&gt;', '2023-06-28'), ('create_date', '=', False)]}"/>
                     <field name="sppkp" attrs="{'invisible': [('customer_type','!=','pkp')], 'required': [('customer_type', '=', 'pkp')]}"/>
                     <field name="due_id" readonly="1"/>
+                    <field name="source_id" domain="[('id', 'in', [32, 59, 60, 61])]" attrs="{'required':[('create_date', '&gt;', '2023-09-10')]}"/>
                 </field>
                 <field name="partner_shipping_id" position="after">
                     <field name="real_shipping_id"/>
@@ -56,11 +60,6 @@
                         }
                     </attribute>
                 </xpath>
-                <field name="source_id" position="attributes">
-                    <attribute name="domain">[('id', 'in', [32, 59, 60, 61])]</attribute>
-                    <attribute name="attrs">{'required':[('create_date', '&gt;', '2023-07-30')]}
-                    </attribute>
-                </field>
                 <xpath expr="//form/sheet/notebook/page/field[@name='order_line']/tree/field[@name='price_total']" position="after">
                     <field name="vendor_id" attrs="{'readonly': [('parent.approval_status', '=', 'approved')]}"/>
                     <field name="purchase_price" attrs="
diff --git a/indoteknik_custom/views/website_categories_homepage.xml b/indoteknik_custom/views/website_categories_homepage.xml
index 22424280..0a7ef2c2 100644
--- a/indoteknik_custom/views/website_categories_homepage.xml
+++ b/indoteknik_custom/views/website_categories_homepage.xml
@@ -11,8 +11,7 @@
             <field name="name">Website Categories Homepage</field>
             <field name="model">website.categories.homepage</field>
             <field name="arch" type="xml">
-                <tree>
-                    <field name="id"/>
+                <tree default_order="sequence">
                     <field name="sequence"/>
                     <field name="category_id"/>
                     <field name="url"/>
@@ -31,11 +30,20 @@
                             <group>
                                 <field name="sequence"/>
                                 <field name="category_id"/>
-                                <field name="image"/>
+                                <field name="image" widget="image"/>
                                 <field name="url"/>
                                 <field name="status"/>
                             </group>
                         </group>
+                        <notebook>
+                            <page string="Products" name="product_ids">
+                                <field name="product_ids" domain="[('sale_ok', '=', True)]">
+                                    <tree>
+                                        <field name="display_name" />
+                                    </tree>
+                                </field>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/indoteknik_custom/views/x_banner_banner.xml b/indoteknik_custom/views/x_banner_banner.xml
index 4f3f1911..10c762af 100755
--- a/indoteknik_custom/views/x_banner_banner.xml
+++ b/indoteknik_custom/views/x_banner_banner.xml
@@ -5,12 +5,13 @@
         <field name="model">x_banner.banner</field>
         <field name="arch" type="xml">
             <tree>
-                <field name="id"/>
-                <field name="x_name"/>
-                <field name="x_banner_category"/>
-                <field name="x_relasi_manufacture"/>
-                <field name="x_url_banner"/>
-                <field name="x_status_banner"/>
+                <field name="sequence" string="Seq" />
+                <field name="x_name" />
+                <field name="for_week" />
+                <field name="x_banner_category" />
+                <field name="x_relasi_manufacture" />
+                <field name="x_url_banner" />
+                <field name="x_status_banner" />
             </tree>
         </field>
     </record>
@@ -23,15 +24,17 @@
                 <sheet>
                     <group>
                         <group>
-                            <field name="x_name"/>
-                            <field name="x_banner_category"/>
-                            <field name="x_relasi_manufacture"/>
-                            <field name="x_url_banner"/>
-                            <field name="x_status_banner"/>
+                            <field name="x_name" />
+                            <field name="x_banner_category" />
+                            <field name="x_relasi_manufacture" />
+                            <field name="x_url_banner" />
+                            <field name="x_status_banner" />
+                            <field name="sequence" />
+                            <field name="for_week" />
                         </group>
                         <group>
-                            <field name="background_color"/>
-                            <field name="x_banner_image" widget="image"/>
+                            <field name="background_color" />
+                            <field name="x_banner_image" widget="image" />
                         </group>
                     </group>
                 </sheet>
diff --git a/indoteknik_custom/views/x_manufactures.xml b/indoteknik_custom/views/x_manufactures.xml
index a88c5d34..dd896179 100755
--- a/indoteknik_custom/views/x_manufactures.xml
+++ b/indoteknik_custom/views/x_manufactures.xml
@@ -16,6 +16,7 @@
             <field name="model">x_manufactures</field>
             <field name="arch" type="xml">
                 <tree>
+                    <field name="sequence" string="Seq"/>
                     <field name="x_name"/>
                     <field name="x_negara_asal"/>
                     <field name="x_short_desc"/>
@@ -37,6 +38,7 @@
                         <group>
                             <group>
                                 <field name="x_name"/>
+                                <field name="sequence"/>
                                 <field name="x_negara_asal"/>
                                 <field name="x_short_desc"/>
                                 <field name="x_manufacture_level"/>