Merged in production (pull request #132)

Production

20 files changed, 233 insertions, 32 deletions

diff --git a/indoteknik_api/controllers/api_v1/user.py b/indoteknik_api/controllers/api_v1/user.py
index 7a522d0c..9b89e82c 100644
--- a/indoteknik_api/controllers/api_v1/user.py
+++ b/indoteknik_api/controllers/api_v1/user.py
@@ -42,9 +42,18 @@ class User(controller.Controller):
             uid = request.session.authenticate(
                 config.get('db_name'), email, password)
             user = request.env['res.users'].browse(uid)
+            role = ''
+
+            if user.is_inbound and user.is_outbound:
+                role = 'admin'
+            elif user.is_outbound:
+                role = 'outbound'
+            elif user.is_inbound:
+                role = 'inbound'
             data = {
                 'is_auth': True,
-                'user': self.response_with_token(user)
+                'role': role,
+                'user': self.response_with_token(user),
             }
             return self.response(data)
         except:
@@ -95,17 +104,29 @@ class User(controller.Controller):
         password = kw.get('password')
         if not name or not email or not password:
             return self.response(code=400, description='email, name and password is required')
+        
+        company = kw.get('company', False)
+        phone = kw.get('phone')
+        
+        response = {
+            'register': False,
+            'reason': None
+        }
 
         user = self.get_user_by_email(email)
         if user:
-            return self.response({
-                'register': False,
-                'reason': 'EMAIL_USED'
-            })
+            if user.active:
+                response['reason'] = 'EMAIL_USED'
+            else:
+                user.send_activation_mail()
+                response['reason'] = 'NOT_ACTIVE'
+            
+            return self.response(response)
 
         user_data = {
             'name': name,
             'login': email,
+            'phone': phone,
             'password': password,
             'active': False,
             'sel_groups_1_9_10': 9
@@ -114,18 +135,15 @@ class User(controller.Controller):
         user = request.env['res.users'].create(user_data)
         user.partner_id.email = email
 
-        company = kw.get('company', False)
         if company:
             parameter = [
                 ('company_type', '=', 'company'),
                 ('name', 'ilike', company)
             ]
-            match_company = request.env['res.partner'].search(
-                parameter, limit=1)
+            match_company = request.env['res.partner'].search(parameter, limit=1)
             match_ratio = 0
             if match_company:
-                match_ratio = SequenceMatcher(
-                    None, match_company.name, company).ratio()
+                match_ratio = SequenceMatcher(None, match_company.name, company).ratio()
             if match_ratio > 0.8:
                 request.env['user.company.request'].create({
                     'user_id': user.partner_id.id,
@@ -138,27 +156,33 @@ class User(controller.Controller):
                 })
                 user.parent_id = new_company.id
 
-        return self.response({'register': True})
+        user.send_activation_mail()
+
+        response['register'] = True
+        return self.response(response)
 
     @http.route(prefix + 'user/activation-request', auth='public', methods=['POST'], csrf=False)
     @controller.Controller.must_authorized()
     def request_activation_user(self, **kw):
         email = kw.get('email')
+        response = {
+            'activation_request': False,
+            'reason': None
+        }
+        
         user = self.get_user_by_email(email)
         if not user:
-            return self.response({'activation_request': False, 'reason': 'NOT_FOUND'})
+            response['reason'] = 'NOT_FOUND'
+            return self.response(response)
 
         if user.active:
-            return self.response({'activation_request': False, 'reason': 'ACTIVE'})
+            response['reason'] = 'ACTIVE'
+            return self.response(response)
 
-        token_source = string.ascii_letters + string.digits
-        user.activation_token = ''.join(
-            random.choice(token_source) for i in range(21))
-        return self.response({
-            'activation_request': True,
-            'token': user.activation_token,
-            'user': request.env['res.users'].api_single_response(user)
-        })
+        user.send_activation_mail()
+
+        response['activation_request'] = True
+        return self.response(response)
 
     @http.route(prefix + 'user/activation', auth='public', methods=['POST'], csrf=False)
     @controller.Controller.must_authorized()
@@ -166,18 +190,54 @@ class User(controller.Controller):
         token = kw.get('token')
         if not token:
             return self.response(code=400, description='token is required')
+        
+        response = {
+            'activation': False,
+            'reason': None,
+            'user': None
+        }
 
-        user = request.env['res.users'].search(
-            [('activation_token', '=', token), ('active', '=', False)], limit=1)
+        user = request.env['res.users'].search([('activation_token', '=', token), ('active', '=', False)], limit=1)
         if not user:
-            return self.response({'activation': False, 'reason': 'INVALID_TOKEN'})
+            response['reason'] = 'INVALID_TOKEN'
+            return self.response(response)
 
         user.active = True
         user.activation_token = ''
-        return self.response({
+        response.update({
+            'activation': True,
+            'user': self.response_with_token(user)
+        })
+        return self.response(response)
+        
+    @http.route(prefix + 'user/activation-token', auth='public', methods=['POST'], csrf=False)
+    @controller.Controller.must_authorized()
+    def activation_user_with_token(self, **kw):
+        return self.activation_user(**kw)
+    
+    @http.route(prefix + 'user/activation-otp', auth='public', methods=['POST'], csrf=False)
+    @controller.Controller.must_authorized()
+    def activation_user_with_otp(self, **kw):
+        email = kw.get('email')
+        otp = kw.get('otp')
+        
+        response = {
+            'activation': False,
+            'reason': None,
+            'user': None
+        }
+        
+        user = self.get_user_by_email(email)
+        if user.otp_code != otp:
+            response['reason'] = 'INVALID_OTP'
+            return self.response(response)
+        
+        user.active = True
+        response.update({
             'activation': True,
             'user': self.response_with_token(user)
         })
+        return self.response(response)
 
     @http.route(prefix + 'user/forgot-password', auth='public', methods=['POST'], csrf=False)
     @controller.Controller.must_authorized()
diff --git a/indoteknik_api/models/product_product.py b/indoteknik_api/models/product_product.py
index aa9e0ad7..1db58d8e 100644
--- a/indoteknik_api/models/product_product.py
+++ b/indoteknik_api/models/product_product.py
@@ -273,7 +273,8 @@ class ProductProduct(models.Model):
 
         base_price = 0
         if base_pricelist:
-            base_price = base_pricelist.computed_price / 1.11
+            base_price = base_pricelist.computed_price
+            # base_price = base_pricelist.computed_price / 1.11
 
         discount = 0
         price_flashsale = 0
diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py
index bab86aab..bc11b346 100755
--- a/indoteknik_custom/__manifest__.py
+++ b/indoteknik_custom/__manifest__.py
@@ -99,6 +99,7 @@
         'views/quotation_so_multi_update.xml',
         'views/stock_move_line.xml',
         'views/product_monitoring.xml',
+        'views/res_users.xml',
         'views/account_bank_statement.xml',
         'views/stock_warehouse_orderpoint.xml',
         'views/customer_commision.xml',
diff --git a/indoteknik_custom/models/account_move.py b/indoteknik_custom/models/account_move.py
index fe9db583..d55cca38 100644
--- a/indoteknik_custom/models/account_move.py
+++ b/indoteknik_custom/models/account_move.py
@@ -48,8 +48,9 @@ class AccountMove(models.Model):
 
     def unlink(self):
         res = super(AccountMove, self).unlink()
-        if self.state == 'posted':
-            raise UserError('Data Hanya Bisa Di Cancel')
+        for rec in self:
+            if rec.state == 'posted':
+                raise UserError('Data Hanya Bisa Di Cancel')
         return res
 
     def button_cancel(self):
diff --git a/indoteknik_custom/models/commision.py b/indoteknik_custom/models/commision.py
index d4942a0d..a11d85c7 100644
--- a/indoteknik_custom/models/commision.py
+++ b/indoteknik_custom/models/commision.py
@@ -148,6 +148,10 @@ class CustomerCommision(models.Model):
         ('cashback', 'Cashback'),
         ('rebate', 'Rebate'),
     ], string='Commision Type', required=True)
+    bank_name = fields.Char(string='Bank', tracking=3)
+    account_name = fields.Char(string='Account Name', tracking=3)
+    bank_account = fields.Char(string='Account No', tracking=3)
+    note_transfer = fields.Char(string='Keterangan')
 
     # add status for type of commision, fee, rebate / cashback
     # include child or not?
diff --git a/indoteknik_custom/models/dunning_run.py b/indoteknik_custom/models/dunning_run.py
index 8e5b2c19..abfd68be 100644
--- a/indoteknik_custom/models/dunning_run.py
+++ b/indoteknik_custom/models/dunning_run.py
@@ -10,6 +10,7 @@ class DunningRun(models.Model):
     _name = 'dunning.run'
     _description = 'Dunning Run'
     _order = 'dunning_date desc, id desc'
+    _rec_name = 'number'
 
     number = fields.Char(string='Document No', index=True, copy=False, readonly=True)
     dunning_date = fields.Date(string='Dunning Date', required=True)
diff --git a/indoteknik_custom/models/product_template.py b/indoteknik_custom/models/product_template.py
index d1de2221..90e8a144 100755
--- a/indoteknik_custom/models/product_template.py
+++ b/indoteknik_custom/models/product_template.py
@@ -120,6 +120,8 @@ class ProductTemplate(models.Model):
             rate = 0
             if product.web_price:
                 rate += 4
+            if product.qty_sold > 0:
+                rate += 3
             if product.have_promotion_program: #have discount from pricelist
                 rate += 5
             if product.image_128:
@@ -313,8 +315,9 @@ class ProductTemplate(models.Model):
         return values
 
     def write(self, vals):
-        if self.id == 224484:
-            raise UserError('Tidak dapat mengubah produk sementara')
+        for rec in self:
+            if rec.id == 224484:
+                raise UserError('Tidak dapat mengubah produk sementara')
         
         return super(ProductTemplate, self).write(vals)
         
diff --git a/indoteknik_custom/models/purchase_order.py b/indoteknik_custom/models/purchase_order.py
index b0f1a569..e00a671c 100755
--- a/indoteknik_custom/models/purchase_order.py
+++ b/indoteknik_custom/models/purchase_order.py
@@ -50,6 +50,7 @@ class PurchaseOrder(models.Model):
     description = fields.Char(string='Description', help='bisa diisi sebagai informasi indent barang tertentu atau apapun')
     purchase_order_lines = fields.One2many('purchase.order.line', 'order_id', string='Indent', auto_join=True)
     responsible_ids = fields.Many2many('res.users', string='Responsibles', compute='_compute_responsibles')
+    status_paid_cbd = fields.Boolean(string='Paid Status', tracking=3, help='Field ini diisi secara manual oleh Finance AP dan hanya untuk status PO CBD')
 
     def _compute_responsibles(self):
         for purchase in self:
diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index a1b57147..fcde9369 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -21,6 +21,7 @@ class ResPartner(models.Model):
     counter = fields.Integer(string="Counter", default=0)
     digital_invoice_tax = fields.Boolean(string="Digital Invoice & Faktur Pajak")
     is_potential = fields.Boolean(string='Potential')
+    pakta_integritas = fields.Boolean(string='Pakta Integritas')
 
     def get_child_ids(self):
         partner = self.env['res.partner'].search([('id', '=', self.id)], limit=1)
diff --git a/indoteknik_custom/models/res_users.py b/indoteknik_custom/models/res_users.py
index 7f94771f..09321fc6 100755
--- a/indoteknik_custom/models/res_users.py
+++ b/indoteknik_custom/models/res_users.py
@@ -1,4 +1,7 @@
 from odoo import models, fields
+from datetime import datetime
+from pytz import UTC
+import random, string
 
 
 class ResUsers(models.Model):
@@ -6,3 +9,33 @@ class ResUsers(models.Model):
 
     reset_password_token = fields.Char(string="Reset Password Token")
     activation_token = fields.Char(string="Activation Token")
+    otp_code = fields.Char(string='OTP Code')
+    otp_create_date = fields.Datetime(string='OTP Create Date')
+
+    def _generate_otp(self):
+        for user in self:
+            user.otp_code = '{:04d}'.format(random.randint(0, 9999))
+            user.otp_create_date = fields.Datetime.now()
+            
+    def _generate_activation_token(self):
+        for user in self:
+            token_source = string.ascii_letters + string.digits
+            user.activation_token = ''.join(random.choice(token_source) for i in range(21))
+            
+    def send_activation_mail(self):
+        template = self.env.ref('indoteknik_custom.mail_template_res_user_activation_request')
+        for user in self:
+            user._generate_otp()
+            user._generate_activation_token()
+            template.send_mail(user.id, force_send=True)
+            
+    def get_activation_token_url(self):
+        base_url = self.env['ir.config_parameter'].get_param('site.base.url')
+        return f'{base_url}/register?activation=token&token={self.activation_token}'
+    
+    def get_voucher_code(self, type):
+        if type == 'activation':
+            vouchers = self.env['voucher'].get_active_voucher([('show_on_email', '=', 'user_activation')])
+            if not vouchers: return None
+            return ', '.join(x.code for x in vouchers)
+        return None
diff --git a/indoteknik_custom/models/solr/product_product.py b/indoteknik_custom/models/solr/product_product.py
index 03eaaf13..fe2a08dc 100644
--- a/indoteknik_custom/models/solr/product_product.py
+++ b/indoteknik_custom/models/solr/product_product.py
@@ -29,6 +29,12 @@ class ProductProduct(models.Model):
             product.product_tmpl_id._create_solr_queue('_sync_price_to_solr')
             product.solr_flag = 1
 
+    @api.constrains('active')
+    def _constrains_active(self):
+        for rec in self:
+            if not rec.active:
+                rec.unpublished = True
+
     def _sync_variants_to_solr(self):
         solr_model = self.env['apache.solr']
 
diff --git a/indoteknik_custom/models/solr/product_template.py b/indoteknik_custom/models/solr/product_template.py
index 648a0625..bba98edc 100644
--- a/indoteknik_custom/models/solr/product_template.py
+++ b/indoteknik_custom/models/solr/product_template.py
@@ -28,13 +28,19 @@ class ProductTemplate(models.Model):
     def _create_solr_queue_sync_product_template(self):
         self._create_solr_queue('_sync_product_template_to_solr')
 
+    @api.constrains('active')
+    def _constrains_active(self):
+        for rec in self:
+            if not rec.active:
+                rec.unpublished = True
+
     def action_sync_to_solr(self):
         template_ids = self.env.context.get('active_ids', [])
         templates = self.search([('id', 'in', template_ids)])
         templates._create_solr_queue('_sync_product_template_to_solr')
     
     def solr_flag_to_solr(self, limit=500):
-        template_products = self.search([('solr_flag', '=', 2)], limit=limit)
+        template_products = self.search([('solr_flag', '=', 2), ('active', 'in', [True, False])], limit=limit)
         for product in template_products:
             product._create_solr_queue('_sync_product_template_to_solr')
             product._create_solr_queue('_sync_price_to_solr')
diff --git a/indoteknik_custom/models/users.py b/indoteknik_custom/models/users.py
index 2ff9933e..d95b56e7 100644
--- a/indoteknik_custom/models/users.py
+++ b/indoteknik_custom/models/users.py
@@ -12,6 +12,8 @@ class Users(models.Model):
     is_logistic_approver = fields.Boolean(string='Logistic Approver', help='Berhak Approval Penerimaan Barang')
     is_editor_product = fields.Boolean(string='Editor Product', help='Berhak Mengedit Data Product')
     is_admin_reconcile = fields.Boolean(string='Admin Reconcile', help='Berhak Mengedit Journal Reconcile')
+    is_inbound = fields.Boolean(string='Operator Inbound')
+    is_outbound = fields.Boolean(string='Operator Outbound')
 
     def notify_internal_users(self, message, title):
         users = self.search([('share', '=', False)])
diff --git a/indoteknik_custom/models/voucher.py b/indoteknik_custom/models/voucher.py
index 66c50c24..588e9ac5 100644
--- a/indoteknik_custom/models/voucher.py
+++ b/indoteknik_custom/models/voucher.py
@@ -55,6 +55,9 @@ class Voucher(models.Model):
         ('brand', "Selected product brand"),
     ])
     count_order = fields.Integer(string='Count Order', compute='_compute_count_order')
+    show_on_email = fields.Selection([
+        ('user_activation', 'User Activation')
+    ], 'Show on Email')
 
     @api.constrains('description')
     def _check_description_length(self):
@@ -219,7 +222,7 @@ class Voucher(models.Model):
         tnc.append(f'<li>Voucher berlaku {self._res_remaining_time()} lagi</li>')
         tnc.append(f'<li>Voucher tidak bisa digunakan apabila terdapat produk flash sale</li>')
         if len(self.voucher_line) > 0:
-            brand_names = ', '.join([x.manufacture_id.x_name for x in self.voucher_line])
+            brand_names = ', '.join([x.manufacture_id.x_name or '' for x in self.voucher_line])
             tnc.append(f'<li>Voucher berlaku untuk produk dari brand {brand_names}</li>')
         tnc.append(self.generate_detail_tnc())
         tnc.append('</ol>')
diff --git a/indoteknik_custom/views/customer_commision.xml b/indoteknik_custom/views/customer_commision.xml
index 008c79f8..993521ca 100644
--- a/indoteknik_custom/views/customer_commision.xml
+++ b/indoteknik_custom/views/customer_commision.xml
@@ -72,6 +72,14 @@
                             <page string="Lines">
                                 <field name="commision_lines"/>
                             </page>
+                            <page string="Other Info" name="customer_commision_info">
+                                <group>
+                                    <field name="bank_name"/>
+                                    <field name="account_name"/>
+                                    <field name="bank_account"/>
+                                    <field name="note_transfer"/>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
diff --git a/indoteknik_custom/views/purchase_order.xml b/indoteknik_custom/views/purchase_order.xml
index bc84bcd1..08dde8e1 100755
--- a/indoteknik_custom/views/purchase_order.xml
+++ b/indoteknik_custom/views/purchase_order.xml
@@ -80,6 +80,7 @@
                     <field name="total_so_percent_margin"/>
                     <field name="has_active_invoice" invisible="1" />
                     <field name="responsible_ids" widget="many2many_tags"/>
+                    <field name="status_paid_cbd"/>
                 </field>
 
                 <field name="order_line" position="attributes">
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index c1ae3ed3..58fff00a 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -20,6 +20,9 @@
                 <field name="npwp" position="before">
                     <field name="customer_type"/>
                 </field>
+                <field name="is_berikat" position="after">
+                    <field name="pakta_integritas"/>
+                </field>
             </field>
         </record>
     </data>
diff --git a/indoteknik_custom/views/res_users.xml b/indoteknik_custom/views/res_users.xml
new file mode 100644
index 00000000..976f46c9
--- /dev/null
+++ b/indoteknik_custom/views/res_users.xml
@@ -0,0 +1,63 @@
+<odoo>
+    <data>
+        <record id="mail_template_res_user_activation_request" model="mail.template">
+            <field name="name">Users: Activation Request</field>
+            <field name="model_id" ref="base.model_res_users"/>
+            <field name="subject">Aktivasi Akun - Indoteknik.com</field>
+            <field name="email_from">sales@indoteknik.com</field>
+            <field name="email_to">${object.login | safe}</field>
+            <field name="body_html" type="html">
+                <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #F1F1F1; font-family:Inter, Helvetica, Verdana, Arial,sans-serif; line-height: 24px; color: #454748; width: 100%; border-collapse:separate;">
+                    <tr><td align="center">
+                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="font-size: 13px; padding: 16px; background-color: white; color: #454748; border-collapse:separate;">
+                            <!-- HEADER -->
+                            <tbody>
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr>
+                                                <td valign="middle">
+                                                    <span></span>
+                                                </td>
+                                            </tr>
+
+                                            <tr>
+                                                <td colspan="2" style="text-align:center;">
+                                                    <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                                <tr>
+                                    <td align="center" style="min-width: 590px;">
+                                        <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                            <tr><td style="padding-bottom: 24px;">Dear ${object.name},</td></tr>
+
+                                            <tr><td style="padding-bottom: 16px;">Kami senang Anda bergabung dengan Indoteknik.</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Untuk mengaktifkan akun anda salin kode OTP berikut <strong>${object.otp_code}</strong>, lalu masukan pada kolom yang disediakan pada website Indoteknik.com</td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Atau anda dapat klik tautan berikut: <a href="${object.get_activation_token_url() | safe}">Aktivasi akun</a></td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Jika anda mengalami kesulitan atau memiliki pertanyaan, hubungi tim dukungan kami melalui email <a href="mailto:sales@indoteknik.com">sales@indoteknik.com</a></td></tr>
+                                            <tr><td style="padding-bottom: 16px;">Gunakan kode voucher berikut untuk mendapatkan diskon belanja hingga 10 juta: <strong>${object.get_voucher_code('activation')}</strong></td></tr>
+
+                                            <tr><td style="padding-bottom: 2px;">Hormat kami,</td></tr>
+                                            <tr><td style="padding-bottom: 2px;">PT. Indoteknik Dotcom Gemilang</td></tr>
+                                            <tr>
+                                                <td style="text-align:center;">
+                                                    <hr width="100%"
+                                                        style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;" />
+                                                </td>
+                                            </tr>
+                                        </table>
+                                    </td>
+                                </tr>
+                                <!-- CONTENT -->
+                            </tbody>
+                        </table>
+                    </td></tr>
+                </table>
+            </field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/indoteknik_custom/views/users.xml b/indoteknik_custom/views/users.xml
index 020d8ddc..6519aeaa 100644
--- a/indoteknik_custom/views/users.xml
+++ b/indoteknik_custom/views/users.xml
@@ -14,6 +14,8 @@
                     <field name="is_logistic_approver"/>
                     <field name="is_editor_product"/>
                     <field name="is_admin_reconcile"/>
+                    <field name="is_outbound"/>
+                    <field name="is_inbound"/>
                 </field>
             </field>
         </record>
diff --git a/indoteknik_custom/views/voucher.xml b/indoteknik_custom/views/voucher.xml
index b8489942..71c0df0b 100755
--- a/indoteknik_custom/views/voucher.xml
+++ b/indoteknik_custom/views/voucher.xml
@@ -35,6 +35,7 @@
                                 <field name="limit" required="1"/>
                                 <field name="limit_user" required="1"/>
                                 <field name="apply_type" required="1" />
+                                <field name="show_on_email" />
                                 <field name="excl_pricelist_ids" widget="many2many_tags" domain="[('id', 'in', [4, 15037, 15038, 15039, 17023, 17024, 17025, 17026,17027])]"/>
                             </group>
                             <group string="Discount Settings" attrs="{'invisible': [('apply_type', '!=', 'all')]}">