Merge branch 'odoo-backup' of https://bitbucket.org/altafixco/indoteknik-addons into odoo-backup

9 files changed, 37 insertions, 6 deletions

diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index 7a179ce3..cf4d4ce3 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -191,6 +191,7 @@
         'views/sj_tele.xml',
         'views/close_tempo_mail_template.xml',
         'views/domain_apo.xml',
+        'views/uom_uom.xml',
     ],
     'demo': [],
     'css': [],
diff --git a/indoteknik_custom/models/__init__.py b/indoteknik_custom/models/__init__.py
index 165dae4e..6e1ef2e0 100755
--- a/indoteknik_custom/models/__init__.py
+++ b/indoteknik_custom/models/__init__.py
@@ -163,3 +163,4 @@ from . import letter_receivable
 from . import sj_tele
 from . import partial_delivery
 from . import domain_apo
+from . import uom_uom
\ No newline at end of file
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index e6547a88..9eae5b32 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -989,7 +989,7 @@ class RefundSaleOrder(models.Model):
         for rec in self:
             if self.env.uid not in allowed_user_ids and not is_fat:
                 raise UserError("❌ Hanya user yang bersangkutan atau Finance (FAT) yang bisa melakukan penolakan.")
-            if rec.status not in ['refund', 'reject']:
+            if rec.status != 'reject':
                 rec.status = 'reject'
                 rec.status_payment = 'reject'
 
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 273fda82..c17fdbd5 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -198,6 +198,14 @@ class StockPicking(models.Model):
         ('partial_final', 'Partial Final'),
         ('full', 'Full'),
     ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
+    so_num = fields.Char('SO Number', compute='_get_so_num')
+
+    @api.depends('group_id')
+    def _get_so_num(self):
+        for record in self:
+            record.so_num = record.group_id.name
+
+
 
     @api.depends('move_line_ids_without_package.qty_done', 'move_line_ids_without_package.product_uom_qty', 'state')
     def _compute_delivery_status_detail(self):
diff --git a/indoteknik_custom/models/tukar_guling_po.py b/indoteknik_custom/models/tukar_guling_po.py
index 2a5ca3dd..739898a1 100644
--- a/indoteknik_custom/models/tukar_guling_po.py
+++ b/indoteknik_custom/models/tukar_guling_po.py
@@ -366,8 +366,8 @@ class TukarGulingPO(models.Model):
         #         if bu_put:
         #             raise UserError("❌ Tidak bisa retur BU/INPUT karena BU/PUT sudah Done!")
 
-        if self.operations.picking_type_id.id == 28 and tipe == 'tukar_guling':
-            raise UserError("❌ BU/INPUT tidak boleh di retur tukar guling")
+        # if self.operations.picking_type_id.id == 28 and tipe == 'tukar_guling':
+        #     raise UserError("❌ BU/INPUT tidak boleh di retur tukar guling")
 
         # if self.operations.picking_type_id.id != 28:
         #     if self._is_already_returned(self.operations):
diff --git a/indoteknik_custom/models/uom_uom.py b/indoteknik_custom/models/uom_uom.py
new file mode 100644
index 00000000..32e53d73
--- /dev/null
+++ b/indoteknik_custom/models/uom_uom.py
@@ -0,0 +1,6 @@
+from odoo import fields, models, api, _
+
+class Uom(models.Model):
+    _inherit = 'uom.uom'
+
+    coretax_id = fields.Char(string='Coretax ID')
diff --git a/indoteknik_custom/report/purchase_report.xml b/indoteknik_custom/report/purchase_report.xml
index 9c0c3983..673c6924 100644
--- a/indoteknik_custom/report/purchase_report.xml
+++ b/indoteknik_custom/report/purchase_report.xml
@@ -61,9 +61,9 @@
                         <td style="width:50%; border:1px solid #ccc; border-radius:8px; padding:10px; background:#fcfcfc; vertical-align:top;">
                             <strong style="color:#d32f2f;">Alamat Pengiriman</strong><br/>
                             PT. Indoteknik Dotcom Gemilang<br/>
-                            Jl. Bandengan Utara Komp A 8 B
-                            RT. Penjaringan, Kec. Penjaringan, Jakarta
-                            (BELAKANG INDOMARET)<br/>
+                            JALAN BANDENGAN UTARA 85A NO.8-9 RT. 003 RW. 						
+                            016, PENJARINGAN, PENJARINGAN, KOTA ADM. 						
+                            JAKARTA UTARA, DKI JAKARTA<br/>
                             Daerah Khusus Ibukota Jakarta 14440
                         </td>
                         <td style="width:50%; border:1px solid #ccc; border-radius:8px; padding:10px; background:#fcfcfc; vertical-align:top;">
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index 78594375..cc9469cb 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -180,6 +180,7 @@
                            'required': [['is_internal_use', '=', True]]
                            }"
                     />
+                    <field name="so_num"/>
                 </field>
                 <field name="group_id" position="before">
                     <field name="date_reserved"/>
diff --git a/indoteknik_custom/views/uom_uom.xml b/indoteknik_custom/views/uom_uom.xml
new file mode 100644
index 00000000..a7fb55e5
--- /dev/null
+++ b/indoteknik_custom/views/uom_uom.xml
@@ -0,0 +1,14 @@
+<odoo>
+    <data>
+        <record id="uom_form_view_inherit" model="ir.ui.view">
+        <field name="name">Uom</field>
+        <field name="model">uom.uom</field>
+        <field name="inherit_id" ref="uom.product_uom_form_view"/>
+        <field name="arch" type="xml">
+            <field name="rounding" position="after">
+                <field name="coretax_id"/>
+            </field>
+        </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file