<Miqdad> merge

5 files changed, 13 insertions, 10 deletions

diff --git a/indoteknik_api/controllers/api_v1/sale_order.py b/indoteknik_api/controllers/api_v1/sale_order.py
index 25268856..1c87400f 100644
--- a/indoteknik_api/controllers/api_v1/sale_order.py
+++ b/indoteknik_api/controllers/api_v1/sale_order.py
@@ -727,8 +727,9 @@ class SaleOrder(controller.Controller):
                 _logger.info(f"Updated user_id from partner: {parameters['user_id']}")
 
             if params['value']['type'] == 'sale_order':
-                parameters['approval_status'] = 'pengajuan1'
-                _logger.info("Setting approval_status to 'pengajuan1'")
+                # parameters['approval_status'] = 'pengajuan1'
+                parameters['approval_status'] = False
+                _logger.info("Setting approval_status to 'false'")
 
             sale_order = request.env['sale.order'].with_context(from_website_checkout=True).create([parameters])
             sale_order.onchange_partner_contact()
diff --git a/indoteknik_custom/models/refund_sale_order.py b/indoteknik_custom/models/refund_sale_order.py
index de9870f6..a866af6e 100644
--- a/indoteknik_custom/models/refund_sale_order.py
+++ b/indoteknik_custom/models/refund_sale_order.py
@@ -571,7 +571,9 @@ class RefundSaleOrder(models.Model):
                 domain = [
                     ('journal_id', '=', 11),
                     ('state', '=', 'posted'),
-                    ('ref', 'ilike', 'dp')
+                    '|',
+                    ('ref', 'ilike', 'dp'),
+                    ('ref', 'ilike', 'payment'),
                 ]
                 domain += ['|'] * (len(so_names) - 1)
                 for n in so_names:
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index a9c09ab7..a2bd7339 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -1397,8 +1397,8 @@ class StockPicking(models.Model):
             if picking.name and 'BD/' in picking.name and picking.purchase_id:
                 stock_journal = self.env['account.move'].search([
                     ('ref', 'ilike', picking.name + '%'),
-                    ('journal_id', '=', 3) # Stock Journal ID
-                ], limit = 1)
+                    ('journal_id', '=', 3)  # Stock Journal ID
+                ], limit=1)
                 if stock_journal:
                     stock_journal.write({
                         'purchase_order_id': picking.purchase_id.id
diff --git a/indoteknik_custom/security/ir.model.access.csv b/indoteknik_custom/security/ir.model.access.csv
index ea6670eb..a1adc90a 100755
--- a/indoteknik_custom/security/ir.model.access.csv
+++ b/indoteknik_custom/security/ir.model.access.csv
@@ -198,7 +198,7 @@ access_tukar_guling_mapping_koli_all_users,tukar.guling.mapping.koli.all.users,m
 access_sync_promise_date_wizard,access.sync.promise.date.wizard,model_sync_promise_date_wizard,base.group_user,1,1,1,1
 access_sync_promise_date_wizard_line,access.sync.promise.date.wizard.line,model_sync_promise_date_wizard_line,base.group_user,1,1,1,1
 access_change_date_planned_wizard,access.change.date.planned.wizard,model_change_date_planned_wizard,,1,1,1,1
-access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,base.group_user,1,1,1,1
-access_surat_piutang_user,surat.piutang user,model_surat_piutang,base.group_user,1,1,1,1
-access_surat_piutang_line_user,surat.piutang.line user,model_surat_piutang_line,base.group_user,1,1,1,1
+access_unpaid_invoice_view,access.unpaid.invoice.view,model_unpaid_invoice_view,,1,1,1,1
+access_surat_piutang_user,surat.piutang user,model_surat_piutang,,1,1,1,1
+access_surat_piutang_line_user,surat.piutang.line user,model_surat_piutang_line,,1,1,1,1
 access_sj_tele,access.sj.tele,model_sj_tele,base.group_system,1,1,1,1
diff --git a/indoteknik_custom/views/account_move_line.xml b/indoteknik_custom/views/account_move_line.xml
index 017a9eda..3a20388e 100644
--- a/indoteknik_custom/views/account_move_line.xml
+++ b/indoteknik_custom/views/account_move_line.xml
@@ -6,9 +6,9 @@
             <field name="model">account.move</field>
             <field name="inherit_id" ref="account.view_move_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']" position="attributes">
+                <!-- <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']" position="attributes">
                     <attribute name="attrs">{'readonly': [('refund_id','!=',False)]}</attribute>
-                </xpath>
+                </xpath> -->
                 <xpath expr="//page[@id='aml_tab']/field[@name='line_ids']/tree/field[@name='currency_id']" position="before">
                     <field name="is_required" invisible="1"/>
                 </xpath>