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

merge

5 files changed, 11 insertions, 2 deletions

diff --git a/indoteknik_custom/models/advance_payment_request.py b/indoteknik_custom/models/advance_payment_request.py
index a50fabd7..d379eac8 100644
--- a/indoteknik_custom/models/advance_payment_request.py
+++ b/indoteknik_custom/models/advance_payment_request.py
@@ -1211,7 +1211,7 @@ class AdvancePaymentSettlement(models.Model):
         cab_move = self.pum_id.move_id
 
         # Account Bank Intransit dari CAB: 
-        bank_intransit_line = cab_move.line_ids.filtered(lambda l: l.account_id.id in [573, 389, 392])
+        bank_intransit_line = cab_move.line_ids.filtered(lambda l: l.account_id.id in [573, 389, 392, 683])
         if not bank_intransit_line:
             raise UserError("Account Bank Intransit dengan tidak ditemukan di CAB terkait.")
         account_sisa_pum = bank_intransit_line[0].account_id.id
diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index 13e99707..ee33a185 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -74,6 +74,7 @@ class ProductTemplate(models.Model):
     merchandise_ok = fields.Boolean(string='Product Promotion')
     print_barcode = fields.Boolean(string='Print Barcode', default=True)
     # qr_code = fields.Binary("QR Code", compute='_compute_qr_code')
+    # has_magento = fields.Boolean(string='Has Magento?', default=False)
 
     @api.model
     def create(self, vals):
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index b108f544..9ef9ce9a 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -401,6 +401,7 @@ class SaleOrder(models.Model):
     is_so_fiktif = fields.Boolean('SO Fiktif?', tracking=3)    
     team_id = fields.Many2one(tracking=True)
 
+    client_order_ref = fields.Char(tracking=True)
 
 
     def action_set_shipping_id(self):
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 900529b9..155664cb 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -201,6 +201,12 @@ class StockPicking(models.Model):
     ], string='Delivery Status', compute='_compute_delivery_status_detail', store=False)
     so_num = fields.Char('SO Number', compute='_get_so_num')
     is_so_fiktif = fields.Boolean('SO Fiktif?', compute='_compute_is_so_fiktif', tracking=3)
+    payment_term = fields.Char('Payment Term', compute='_get_partner_payment_term')
+
+    @api.depends('sale_id.payment_term_id')
+    def _get_partner_payment_term(self):
+        for record in self:
+            record.payment_term = record.sale_id.payment_term_id.name
 
     @api.depends('sale_id.is_so_fiktif')
     def _compute_is_so_fiktif(self):
diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml
index bad85963..e1d9bd1f 100644
--- a/indoteknik_custom/views/stock_picking.xml
+++ b/indoteknik_custom/views/stock_picking.xml
@@ -185,6 +185,7 @@
                            }"
                     />
                     <field name="so_num" attrs="{'invisible': [('picking_type_id', 'not in', [29,30,73,74])]}"/>
+                    <field name="payment_term"/>
                 </field>
                 <field name="group_id" position="before">
                     <field name="date_reserved"/>
@@ -481,4 +482,4 @@
             <field name="target">new</field>
         </record>
     </data>
-</odoo>
\ No newline at end of file
+</odoo>