Merge branch 'release' of bitbucket.org:altafixco/indoteknik-addons into release

4 files changed, 18 insertions, 8 deletions

diff --git a/indoteknik_custom/models/apache_solr.py b/indoteknik_custom/models/apache_solr.py
index 4f30d6f6..ebe516a0 100644
--- a/indoteknik_custom/models/apache_solr.py
+++ b/indoteknik_custom/models/apache_solr.py
@@ -52,6 +52,7 @@ class ApacheSolr(models.Model):
                     variants_name += variant.display_name or ''+', '
                     variants_code += variant.default_code or ''+', '
             else:
+                variants_name = template.display_name
                 price_excl = template.product_variant_id._get_website_price_exclude_tax()
                 discount = template.product_variant_id._get_website_disc(0)
                 price_excl_after_disc = template.product_variant_id._get_website_price_after_disc_and_tax()
diff --git a/indoteknik_custom/models/product_pricelist.py b/indoteknik_custom/models/product_pricelist.py
index a309945d..2edaeb80 100644
--- a/indoteknik_custom/models/product_pricelist.py
+++ b/indoteknik_custom/models/product_pricelist.py
@@ -14,6 +14,7 @@ class ProductPricelist(models.Model):
         ('all', 'For All User'),
         ('registered_user', 'Only for Registered User')
     ], string='Flashsale Option')
+    banner_top = fields.Binary(string='Banner Top')
 
 
 class ProductPricelistItem(models.Model):
diff --git a/indoteknik_custom/models/uangmuka_pembelian.py b/indoteknik_custom/models/uangmuka_pembelian.py
index 797d7a01..26a003fd 100644
--- a/indoteknik_custom/models/uangmuka_pembelian.py
+++ b/indoteknik_custom/models/uangmuka_pembelian.py
@@ -50,11 +50,15 @@ class UangmukaPembelian(models.TransientModel):
 
             account_move = request.env['account.move'].create([param_header])
             _logger.info('Success Create Uang Muka Pembelian %s' % account_move.name)
+            if order.partner_id.parent_id:
+                partner_id = order.partner_id.parent_id.id
+            else:
+                partner_id = order.partner_id.id
 
             param_debit = {
                 'move_id': account_move.id,
                 'account_id': 401, # uang muka persediaan barang dagang
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': self.pay_amt,
                 'credit': 0,
@@ -63,7 +67,7 @@ class UangmukaPembelian(models.TransientModel):
             param_debit_ongkir = {
                 'move_id': account_move.id,
                 'account_id': 536, # biaya ongkos kirim
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': self.ongkir_amt,
                 'credit': 0,
@@ -72,7 +76,7 @@ class UangmukaPembelian(models.TransientModel):
             param_debit_selisih = {
                 'move_id': account_move.id,
                 'account_id': 561, # selisih pembayaran
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': self.selisih_amt,
                 'credit': 0,
@@ -82,7 +86,7 @@ class UangmukaPembelian(models.TransientModel):
             param_credit = {
                 'move_id': account_move.id,
                 'account_id': self.account_id.id, # bank in transit
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': 0,
                 'credit': self.pay_amt + self.ongkir_amt + self.selisih_amt,
diff --git a/indoteknik_custom/models/uangmuka_penjualan.py b/indoteknik_custom/models/uangmuka_penjualan.py
index ef0e9196..93a33b52 100644
--- a/indoteknik_custom/models/uangmuka_penjualan.py
+++ b/indoteknik_custom/models/uangmuka_penjualan.py
@@ -53,11 +53,15 @@ class UangmukaPenjualan(models.TransientModel):
 
             account_move = request.env['account.move'].create([param_header])
             _logger.info('Success Create Uang Muka Penjualan %s' % account_move.name)
+            if order.partner_id.parent_id:
+                partner_id = order.partner_id.parent_id.id
+            else:
+                partner_id = order.partner_id.id
 
             param_debit = {
                 'move_id': account_move.id,
                 'account_id': self.account_id.id, # intransit
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': self.pay_amt + self.ongkir_amt + self.selisih_amt,
                 'credit': 0,
@@ -67,7 +71,7 @@ class UangmukaPenjualan(models.TransientModel):
             param_credit = {
                 'move_id': account_move.id,
                 'account_id': 449, # uang muka penjualan
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': 0,
                 'credit': self.pay_amt,
@@ -76,7 +80,7 @@ class UangmukaPenjualan(models.TransientModel):
             param_ongkir_credit = {
                 'move_id': account_move.id,
                 'account_id': 550, # pendapatan ongkos kirim
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': 0,
                 'credit': self.ongkir_amt,
@@ -85,7 +89,7 @@ class UangmukaPenjualan(models.TransientModel):
             param_selisih_credit = {
                 'move_id': account_move.id,
                 'account_id': 561, # selisih pembayaran
-                'partner_id': order.partner_id.id,
+                'partner_id': partner_id,
                 'currency_id': 12,
                 'debit': 0,
                 'credit': self.selisih_amt,