Merged in production (pull request #81)

Production

4 files changed, 64 insertions, 8 deletions

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index 91eb4166..b7aadbdf 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -86,6 +86,7 @@
         'views/bill_receipt.xml',
         'views/account_move_multi_update.xml',
         'views/airway_bill.xml',
+        'views/product_attribute_value.xml',
         'report/report.xml',
         'report/report_banner_banner.xml',
         'report/report_banner_banner2.xml',
diff --git a/indoteknik_custom/models/x_banner_banner.py b/indoteknik_custom/models/x_banner_banner.py
index a9de2067..d6884c9b 100755
--- a/indoteknik_custom/models/x_banner_banner.py
+++ b/indoteknik_custom/models/x_banner_banner.py
@@ -18,9 +18,9 @@ class XBannerBanner(models.Model):
         ('tidak_tayang', 'Tidak Tayang')
     ], string="Status")
     sequence = fields.Integer(string='Sequence')
-    for_week = fields.Selection([
-        ('1', 1),
-        ('2', 2),
-        ('3', 3),
-        ('4', 4)
-    ], string='For Week')
\ No newline at end of file
+    group_by_week = fields.Selection([
+        ('1', '1'),
+        ('2', '2'),
+        ('3', '3'),
+        ('4', '4')
+    ], string='Group by Week')
\ No newline at end of file
diff --git a/indoteknik_custom/views/product_attribute_value.xml b/indoteknik_custom/views/product_attribute_value.xml
new file mode 100644
index 00000000..7c33ba7b
--- /dev/null
+++ b/indoteknik_custom/views/product_attribute_value.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="product_attribute_value_tree_custom" model="ir.ui.view">
+        <field name="name">product.attribute.value.tree</field>
+        <field name="model">product.attribute.value</field>
+        <field name="arch" type="xml">
+            <tree default_order="create_date desc">
+                <field name="name"/>
+                <field name="attribute_id"/>
+                <field name="is_custom"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="product_attribute_value_form_custom" model="ir.ui.view">
+        <field name="name">product.attribute.value.form</field>
+        <field name="model">product.attribute.value</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="attribute_id"/>
+                            <field name="display_type"/>    
+                        </group>
+                        <group>
+                            <field name="html_color"/>
+                            <field name="is_custom"/>
+                            <field name="is_used_on_products"/>
+                            <field name="name"/>
+                        </group>
+                    </group>
+                    <group>
+                        <field name="sequence"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="product_attribute_value_action_custom" model="ir.actions.act_window">
+        <field name="name">Product Attribute</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">product.attribute.value</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem 
+        id="menu_product_attribute_value" 
+        name="Attribute Values" 
+        action="product_attribute_value_action_custom" 
+        parent="sale.prod_config_main" sequence="6" groups="uom.group_uom"
+    />
+</odoo>
diff --git a/indoteknik_custom/views/x_banner_banner.xml b/indoteknik_custom/views/x_banner_banner.xml
index 10c762af..5e6526e0 100755
--- a/indoteknik_custom/views/x_banner_banner.xml
+++ b/indoteknik_custom/views/x_banner_banner.xml
@@ -7,7 +7,7 @@
             <tree>
                 <field name="sequence" string="Seq" />
                 <field name="x_name" />
-                <field name="for_week" />
+                <field name="group_by_week" />
                 <field name="x_banner_category" />
                 <field name="x_relasi_manufacture" />
                 <field name="x_url_banner" />
@@ -30,7 +30,7 @@
                             <field name="x_url_banner" />
                             <field name="x_status_banner" />
                             <field name="sequence" />
-                            <field name="for_week" />
+                            <field name="group_by_week" />
                         </group>
                         <group>
                             <field name="background_color" />