Merge branch 'main' of https://bitbucket.org/altafixco/fixco-addons

merge

5 files changed, 5 insertions, 24 deletions

diff --git a/fixco_custom/models/detail_order.py b/fixco_custom/models/detail_order.py
index efb63d6..f72e56c 100755
--- a/fixco_custom/models/detail_order.py
+++ b/fixco_custom/models/detail_order.py
@@ -62,7 +62,7 @@ class DetailOrder(models.Model):
 
     def process_queue_item(self, limit=100):
         now = time.strftime('%Y-%m-%d %H:%M:%S')
-        if now < '2025-12-31 00:00:00':
+        if now < '2025-12-31 23:59:59':
             return
         domain = [('execute_status', '=', False)]
         records = self.search(domain, order='create_date asc', limit=limit)
@@ -136,7 +136,7 @@ class DetailOrder(models.Model):
         
     def process_queue_item_detail(self, limit=100):
         now = time.strftime('%Y-%m-%d %H:%M:%S')
-        if now < '2025-12-31 00:00:00':
+        if now < '2025-12-31 23:59:59':
             return
         domain = [
             ('execute_status', '=', 'detail_order'),
diff --git a/fixco_custom/models/stock_picking.py b/fixco_custom/models/stock_picking.py
index 6850b1e..971278b 100755
--- a/fixco_custom/models/stock_picking.py
+++ b/fixco_custom/models/stock_picking.py
@@ -302,7 +302,7 @@ class StockPicking(models.Model):
             now = time.strftime('%Y-%m-%d %H:%M:%S')
             order_id = self.order_reference
 
-            if not self.ginee_task_id and now > '2025-12-31 00:00:00':
+            if not self.ginee_task_id and now > '2025-12-31 23:59:59':
                 raise UserError(_("Klik Ready To Ship terlebih dahulu"))
 
             authorization = self.sign_request(0)
diff --git a/fixco_custom/models/webhook_ginee.py b/fixco_custom/models/webhook_ginee.py
index 65f2238..8bb4973 100755
--- a/fixco_custom/models/webhook_ginee.py
+++ b/fixco_custom/models/webhook_ginee.py
@@ -32,7 +32,7 @@ class WebhookGinee(models.Model):
 
     def process_queue_item(self, limit=100):
         now = time.strftime('%Y-%m-%d %H:%M:%S')
-        if now < '2025-12-31 00:00:00':
+        if now < '2025-12-31 23:59:59':
             return
         domain = [('execute_status', '=', False)]
         records = self.search(domain, order='create_date asc', limit=limit)
diff --git a/fixco_custom/views/product_product.xml b/fixco_custom/views/product_product.xml
index a622d36..52945eb 100755
--- a/fixco_custom/views/product_product.xml
+++ b/fixco_custom/views/product_product.xml
@@ -17,7 +17,7 @@
                     <field name="barcode_box" />
                     <field name="qty_pcs_box" />
                     <field name="qr_code_variant" widget="image" readonly="True"/>
-                    <field name="product_public_category_id" attrs="{'required': [('brand_id', '=', 3)]}"/>
+                    <field name="product_public_category_id"/>
                 </field>
                 <field name="uom_po_id" position="after">
                     <field name="qty_multiple" />
diff --git a/fixco_custom/views/purchase_pricelist.xml b/fixco_custom/views/purchase_pricelist.xml
index b4e70f6..dd4f6ea 100644
--- a/fixco_custom/views/purchase_pricelist.xml
+++ b/fixco_custom/views/purchase_pricelist.xml
@@ -35,23 +35,4 @@
         </field>
     </record>
 
-    <record id="purchase_pricelist_action" model="ir.actions.act_window">
-        <field name="name">Purchase Pricelist</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="res_model">purchase.pricelist</field>
-        <field name="view_mode">tree,form</field>
-        <field name="help" type="html">
-            <p class="o_view_nocontent_smiling_face">
-                Add Purchase Pricelist!
-            </p>
-        </field>
-    </record>
-
-    <menuitem
-            id="menu_purchase_pricelist"
-            name="Purchase Pricelist"
-            parent="purchase.menu_purchase_products"
-            sequence="3"
-            action="purchase_pricelist_action"
-    />
 </odoo>
\ No newline at end of file