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

7 files changed, 45 insertions, 5 deletions

diff --git a/indoteknik_custom/models/res_partner.py b/indoteknik_custom/models/res_partner.py
index fa2f6a81..fe04535c 100644
--- a/indoteknik_custom/models/res_partner.py
+++ b/indoteknik_custom/models/res_partner.py
@@ -58,6 +58,7 @@ class ResPartner(models.Model):
 
     # Pengiriman
     pic_name = fields.Char(string='Nama PIC Penerimaan Barang')
+    pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Barang')
     street_pengiriman = fields.Char(string="Alamat Perusahaan")
     state_id_pengiriman = fields.Many2one('res.country.state', string='State')
     city_id_pengiriman = fields.Many2one('vit.kota', string='City')
@@ -65,6 +66,7 @@ class ResPartner(models.Model):
     subDistrict_id_pengiriman = fields.Many2one('vit.kelurahan', string='Kelurahan')
     zip_pengiriman = fields.Char(string="Zip")
     invoice_pic = fields.Char(string='Nama PIC Penerimaan Invoice')
+    invoice_pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Invoice')
     street_invoice = fields.Char(string="Alamat Perusahaan")
     state_id_invoice = fields.Many2one('res.country.state', string='State')
     city_id_invoice = fields.Many2one('vit.kota', string='City')
@@ -73,6 +75,7 @@ class ResPartner(models.Model):
     zip_invoice = fields.Char(string="Zip")
     tukar_invoice = fields.Char(string='Jadwal Penukaran Invoice')
     jadwal_bayar = fields.Char(string='Jadwal Pembayaran')
+    dokumen_prosedur = fields.Many2one('ir.attachment', string="Dokumen Pengiriman", tracking=3, readonly=True)
     dokumen_pengiriman = fields.Char(string='Dokumen Tanda Terima yang Diberikan Pada Saat Pengiriman Barang')
     dokumen_pengiriman_input = fields.Char(string='Dokumen yang Dibawa Saat Pengiriman Barang')
     dokumen_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice')
@@ -254,6 +257,7 @@ class ResPartner(models.Model):
 
             # Pengiriman
             vals['pic_name'] = vals.get('pic_name', self.pic_name)
+            vals['pic_mobile'] = vals.get('pic_mobile', self.pic_mobile)
             vals['street_pengiriman'] = vals.get('street_pengiriman', self.street_pengiriman)
             vals['state_id_pengiriman'] = vals.get('state_id_pengiriman', self.state_id_pengiriman)
             vals['city_id_pengiriman'] = vals.get('city_id_pengiriman', self.city_id_pengiriman)
@@ -261,6 +265,7 @@ class ResPartner(models.Model):
             vals['subDistrict_id_pengiriman'] = vals.get('subDistrict_id_pengiriman', self.subDistrict_id_pengiriman)
             vals['zip_pengiriman'] = vals.get('zip_pengiriman', self.zip_pengiriman)
             vals['invoice_pic'] = vals.get('invoice_pic', self.invoice_pic)
+            vals['invoice_pic_mobile'] = vals.get('invoice_pic_mobile', self.invoice_pic_mobile)
             vals['street_invoice'] = vals.get('street_invoice', self.street_invoice)
             vals['state_id_invoice'] = vals.get('state_id_invoice', self.state_id_invoice)
             vals['city_id_invoice'] = vals.get('city_id_invoice', self.city_id_invoice)
@@ -269,6 +274,7 @@ class ResPartner(models.Model):
             vals['zip_invoice'] = vals.get('zip_invoice', self.zip_invoice)
             vals['tukar_invoice'] = vals.get('tukar_invoice', self.tukar_invoice)
             vals['jadwal_bayar'] = vals.get('jadwal_bayar', self.jadwal_bayar)
+            vals['dokumen_prosedur'] = vals.get('dokumen_prosedur', self.dokumen_prosedur)
             vals['dokumen_pengiriman'] = vals.get('dokumen_pengiriman', self.dokumen_pengiriman)
             vals['dokumen_pengiriman_input'] = vals.get('dokumen_pengiriman_input', self.dokumen_pengiriman_input)
             vals['dokumen_invoice'] = vals.get('dokumen_invoice', self.dokumen_invoice)
@@ -323,6 +329,7 @@ class ResPartner(models.Model):
                 'finance_mobile': vals.get('finance_mobile'),
                 'finance_email': vals.get('finance_email'),
                 'pic_name': vals.get('pic_name'),
+                'pic_mobile': vals.get('pic_mobile'),
                 'street_pengiriman': vals.get('street_pengiriman'),
                 'state_id_pengiriman': vals.get('state_id_pengiriman'),
                 'city_id_pengiriman': vals.get('city_id_pengiriman'),
@@ -330,6 +337,7 @@ class ResPartner(models.Model):
                 'subDistrict_id_pengiriman': vals.get('subDistrict_id_pengiriman'),
                 'zip_pengiriman': vals.get('zip_pengiriman'),
                 'invoice_pic': vals.get('invoice_pic'),
+                'invoice_pic_mobile': vals.get('invoice_pic_mobile'),
                 'street_invoice': vals.get('street_invoice'),
                 'state_id_invoice': vals.get('state_id_invoice'),
                 'city_id_invoice': vals.get('city_id_invoice'),
@@ -338,6 +346,7 @@ class ResPartner(models.Model):
                 'zip_invoice': vals.get('zip_invoice'),
                 'tukar_invoice': vals.get('tukar_invoice'),
                 'jadwal_bayar': vals.get('jadwal_bayar'),
+                'dokumen_prosedur': vals.get('dokumen_prosedur'),
                 'dokumen_pengiriman': vals.get('dokumen_pengiriman'),
                 'dokumen_pengiriman_input': vals.get('dokumen_pengiriman_input'),
                 'dokumen_invoice': vals.get('dokumen_invoice'),
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 498f2467..852e3cf0 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -214,6 +214,7 @@ class SaleOrder(models.Model):
         ('dokumen_tidak_support', 'Indoteknik tidak bisa support document yang dibutuhkan (Ex: TKDN, COO, SNI)'),
         ('ganti_quotation', 'Ganti Quotation'),
         ('testing_internal', 'Testing Internal'),
+        ('revisi_data', 'Revisi Data'),
     ], string='Reason for Cancel', copy=False, index=True, tracking=3)
     attachment_bukti = fields.Many2one(
         'ir.attachment',
diff --git a/indoteknik_custom/models/user_pengajuan_tempo.py b/indoteknik_custom/models/user_pengajuan_tempo.py
index 0fdcdbeb..0b3ab63d 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo.py
@@ -74,6 +74,7 @@ class UserPengajuanTempo(models.Model):
 
     # Pengiriman
     pic_tittle = fields.Char(string='Tittle PIC Penerimaan Barang')
+    pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Barang')
     pic_name = fields.Char(string='Nama PIC Penerimaan Barang')
     street_pengiriman = fields.Char(string="Alamat Perusahaan")
     state_id_pengiriman = fields.Many2one('res.country.state', string='State')
@@ -83,6 +84,7 @@ class UserPengajuanTempo(models.Model):
     zip_pengiriman = fields.Char(string="Zip")
     invoice_pic_tittle = fields.Char(string='Tittle PIC Penerimaan Invoice')
     invoice_pic = fields.Char(string='Nama PIC Penerimaan Invoice')
+    invoice_pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Invoice')
     street_invoice = fields.Char(string="Alamat Perusahaan")
     state_id_invoice = fields.Many2one('res.country.state', string='State')
     city_id_invoice = fields.Many2one('vit.kota', string='City')
@@ -97,6 +99,7 @@ class UserPengajuanTempo(models.Model):
     dokumen_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice')
     is_same_address = fields.Boolean(string="Same Address pengiriman invoicr dan alamat pengiriman barang")
     is_same_address_street = fields.Boolean(string="Same Address pengiriman barang dan alamat bisnis")
+    dokumen_prosedur = fields.Many2many('ir.attachment', 'dokumen_prosedur_rel', string="Dokumen Prosedur", tracking=True)
 
     # Referensi
     supplier_ids = fields.Many2many('user.pengajuan.tempo.line', string="Suppliers")
diff --git a/indoteknik_custom/models/user_pengajuan_tempo_request.py b/indoteknik_custom/models/user_pengajuan_tempo_request.py
index be4293a0..abcb6f2f 100644
--- a/indoteknik_custom/models/user_pengajuan_tempo_request.py
+++ b/indoteknik_custom/models/user_pengajuan_tempo_request.py
@@ -108,6 +108,7 @@ class UserPengajuanTempoRequest(models.Model):
 
     # Pengiriman
     pic_tittle = fields.Char(string='Tittle PIC Penerimaan Barang', related='pengajuan_tempo_id.pic_tittle', store=True, readonly=False)
+    pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Barang', related='pengajuan_tempo_id.pic_mobile', store=True, readonly=False)
     pic_name = fields.Char(string='Nama PIC Penerimaan Barang', related='pengajuan_tempo_id.pic_name', store=True, readonly=False)
     street_pengiriman = fields.Char(string="Alamat Perusahaan", related='pengajuan_tempo_id.street_pengiriman', store=True, readonly=False)
     state_id_pengiriman = fields.Many2one('res.country.state', string='State', related='pengajuan_tempo_id.state_id_pengiriman', store=True, readonly=False)
@@ -116,6 +117,7 @@ class UserPengajuanTempoRequest(models.Model):
     subDistrict_id_pengiriman = fields.Many2one('vit.kelurahan', string='Kelurahan', related='pengajuan_tempo_id.subDistrict_id_pengiriman', store=True, readonly=False)
     zip_pengiriman = fields.Char(string="Zip", related='pengajuan_tempo_id.zip_pengiriman', store=True, readonly=False)
     invoice_pic_tittle = fields.Char(string='Tittle PIC Penerimaan Invoice', related='pengajuan_tempo_id.invoice_pic_tittle', store=True, readonly=False)
+    invoice_pic_mobile = fields.Char(string='Nomor HP PIC Penerimaan Invoice', related='pengajuan_tempo_id.invoice_pic_mobile', store=True, readonly=False)
     invoice_pic = fields.Char(string='Nama PIC Penerimaan Invoice', related='pengajuan_tempo_id.invoice_pic', store=True, readonly=False)
     street_invoice = fields.Char(string="Alamat Perusahaan", related='pengajuan_tempo_id.street_invoice', store=True, readonly=False)
     state_id_invoice = fields.Many2one('res.country.state', string='State', related='pengajuan_tempo_id.state_id_invoice', store=True, readonly=False)
@@ -130,7 +132,14 @@ class UserPengajuanTempoRequest(models.Model):
     dokumen_invoice = fields.Char(string='Dokumen yang dilampirkan saat Pengiriman Invoice', related='pengajuan_tempo_id.dokumen_invoice', store=True, readonly=False)
     is_same_address = fields.Boolean(string="Same Address pengiriman invoicr dan alamat pengiriman barang", related='pengajuan_tempo_id.is_same_address', store=True, readonly=False)
     is_same_address_street = fields.Boolean(string="Same Address pengiriman barang dan alamat bisnis", related='pengajuan_tempo_id.is_same_address_street', store=True, readonly=False)
-
+    dokumen_prosedur = fields.Many2many(
+        'ir.attachment',
+        'dokumen_prosedur_rel',
+        string="Dokumen Prosedur",
+        related='pengajuan_tempo_id.dokumen_prosedur',
+        readonly=False,
+        tracking=3
+    )
     #Referensi
     supplier_ids = fields.Many2many('user.pengajuan.tempo.line',related='pengajuan_tempo_id.supplier_ids', string="Suppliers", readonly=False)
 
@@ -292,16 +301,17 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.finance_mobile = self.finance_mobile
             self.pengajuan_tempo_id.finance_email = self.finance_email
 
-    @api.onchange('pic_tittle', 'pic_name', 'street_pengiriman', 'state_id_pengiriman', 'city_id_pengiriman',
+    @api.onchange('pic_tittle','pic_mobile', 'pic_name', 'street_pengiriman', 'state_id_pengiriman', 'city_id_pengiriman',
                   'zip_pengiriman', 'district_id_pengiriman', 'subDistrict_id_pengiriman'
-                  'invoice_pic_tittle', 'invoice_pic', 'street_invoice', 'state_id_invoice', 'city_id_invoice',
+                  'invoice_pic_tittle','invoice_pic_mobile', 'invoice_pic', 'street_invoice', 'state_id_invoice', 'city_id_invoice',
                   'district_id_invoice', 'subDistrict_id_invoice', 'zip_invoice',
                   'tukar_invoice', 'jadwal_bayar', 'dokumen_pengiriman', 'dokumen_pengiriman_input', 'dokumen_invoice',
-                  'is_same_address', 'is_same_address_street')
+                  'is_same_address', 'is_same_address_street','dokumen_prosedur')
     def _onchange_related_fields_pengiriman(self):
         if self.pengajuan_tempo_id:
             # Perbarui nilai di pengajuan_tempo_id
             self.pengajuan_tempo_id.pic_tittle = self.pic_tittle
+            self.pengajuan_tempo_id.pic_mobile = self.pic_mobile
             self.pengajuan_tempo_id.pic_name = self.pic_name
             self.pengajuan_tempo_id.street_pengiriman = self.street_pengiriman
             self.pengajuan_tempo_id.state_id_pengiriman = self.state_id_pengiriman
@@ -310,6 +320,7 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.subDistrict_id_pengiriman = self.subDistrict_id_pengiriman
             self.pengajuan_tempo_id.zip_pengiriman = self.zip_pengiriman
             self.pengajuan_tempo_id.invoice_pic_tittle = self.invoice_pic_tittle
+            self.pengajuan_tempo_id.invoice_pic_mobile = self.invoice_pic_mobile
             self.pengajuan_tempo_id.invoice_pic = self.invoice_pic
             self.pengajuan_tempo_id.street_invoice = self.street_invoice
             self.pengajuan_tempo_id.state_id_invoice = self.state_id_invoice
@@ -324,6 +335,7 @@ class UserPengajuanTempoRequest(models.Model):
             self.pengajuan_tempo_id.dokumen_invoice = self.dokumen_invoice
             self.pengajuan_tempo_id.is_same_address = self.is_same_address
             self.pengajuan_tempo_id.is_same_address_street = self.is_same_address_street
+            self.pengajuan_tempo_id.dokumen_prosedur = self.dokumen_prosedur
 
     @api.onchange('supplier_ids')
     def _onchange_supplier_ids(self):
@@ -337,7 +349,6 @@ class UserPengajuanTempoRequest(models.Model):
     def _onchange_related_fields_dokumen(self):
         if self.pengajuan_tempo_id:
             # Perbarui nilai di pengajuan_tempo_id
-            self.pengajuan_tempo_id.dokumen_nib = self.dokumen_nib
             self.pengajuan_tempo_id.dokumen_siup = self.dokumen_siup
             self.pengajuan_tempo_id.dokumen_tdp = self.dokumen_tdp
             self.pengajuan_tempo_id.dokumen_skdp = self.dokumen_skdp
@@ -509,6 +520,7 @@ class UserPengajuanTempoRequest(models.Model):
                 {
                     "type": "delivery",
                     "name": self.pengajuan_tempo_id.pic_name,
+                    "phone": self.pengajuan_tempo_id.pic_mobile,
                     "street": self.pengajuan_tempo_id.street_pengiriman,
                     "state_id": self.pengajuan_tempo_id.state_id_pengiriman.id,
                     "kota_id": self.pengajuan_tempo_id.city_id_pengiriman.id,
@@ -519,6 +531,7 @@ class UserPengajuanTempoRequest(models.Model):
                 {
                     "type": "invoice",
                     "name": self.pengajuan_tempo_id.invoice_pic,
+                    "phone": self.pengajuan_tempo_id.invoice_pic_mobile,
                     "street": self.pengajuan_tempo_id.street_invoice,
                     "state_id": self.pengajuan_tempo_id.state_id_invoice.id,
                     "kota_id": self.pengajuan_tempo_id.city_id_invoice.id,
@@ -583,6 +596,10 @@ class UserPengajuanTempoRequest(models.Model):
             self.user_company_id.dokumen_pengiriman = self.pengajuan_tempo_id.dokumen_pengiriman
             self.user_company_id.dokumen_pengiriman_input = self.pengajuan_tempo_id.dokumen_pengiriman_input
             self.user_company_id.dokumen_invoice = self.pengajuan_tempo_id.dokumen_invoice
+            self.user_company_id.dokumen_prosedur = self.pengajuan_tempo_id.dokumen_prosedur[0] if self.pengajuan_tempo_id.dokumen_prosedur else []
+            if self.user_company_id.dokumen_prosedur:
+                self.user_company_id.message_post(body='Dokumen Prosedur',
+                                                  attachment_ids=[self.user_company_id.dokumen_prosedur.id])
 
             # Referensi
             self.user_company_id.supplier_ids = self.pengajuan_tempo_id.supplier_ids
@@ -592,6 +609,8 @@ class UserPengajuanTempoRequest(models.Model):
             if self.user_company_id.dokumen_npwp:
                 self.user_company_id.message_post(body='Dokumen NPWP', attachment_ids=[self.user_company_id.dokumen_npwp.id])
 
+
+
             self.user_company_id.dokumen_sppkp = self.pengajuan_tempo_id.dokumen_sppkp[0] if self.pengajuan_tempo_id.dokumen_sppkp else []
             if self.user_company_id.dokumen_sppkp:
                 self.user_company_id.message_post(body='Dokumen SPPKP', attachment_ids=[self.user_company_id.dokumen_sppkp.id])
diff --git a/indoteknik_custom/views/res_partner.xml b/indoteknik_custom/views/res_partner.xml
index af5e0db3..cb9fa3ac 100644
--- a/indoteknik_custom/views/res_partner.xml
+++ b/indoteknik_custom/views/res_partner.xml
@@ -131,6 +131,7 @@
                         <group string="Pengiriman" colspan="4">
                             <group>
                                 <field name="pic_name"/>
+                                <field name="pic_mobile"/>
                                 <field name="street_pengiriman"/>
                                 <field name="state_id_pengiriman"/>
                                 <field name="city_id_pengiriman"/>
@@ -140,6 +141,7 @@
                             </group>
                             <group>
                                 <field name="invoice_pic"/>
+                                <field name="invoice_pic_mobile"/>
                                 <field name="street_invoice"/>
                                 <field name="state_id_invoice"/>
                                 <field name="city_id_invoice"/>
@@ -150,6 +152,7 @@
                             <group>
                                 <field name="tukar_invoice"/>
                                 <field name="jadwal_bayar"/>
+                                <field name="dokumen_prosedur"  />
                                 <field name="dokumen_pengiriman"/>
                                 <field name="dokumen_pengiriman_input"/>
                                 <field name="dokumen_invoice"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo.xml b/indoteknik_custom/views/user_pengajuan_tempo.xml
index 7f1faa41..4eebe9e4 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo.xml
@@ -53,6 +53,7 @@
                     <group string="Pengiriman" colspan="4">
                         <group>
                             <field name="pic_name"/>
+                            <field name="pic_mobile"/>
                             <field name="street_pengiriman"/>
                             <field name="state_id_pengiriman"/>
                             <field name="city_id_pengiriman"/>
@@ -62,6 +63,7 @@
                         </group>
                         <group>
                             <field name="invoice_pic"/>
+                            <field name="invoice_pic_mobile"/>
                             <field name="street_invoice"/>
                             <field name="state_id_invoice"/>
                             <field name="city_id_invoice"/>
diff --git a/indoteknik_custom/views/user_pengajuan_tempo_request.xml b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
index 7063231b..339ce8db 100644
--- a/indoteknik_custom/views/user_pengajuan_tempo_request.xml
+++ b/indoteknik_custom/views/user_pengajuan_tempo_request.xml
@@ -102,6 +102,7 @@
                     <Page string="Pengiriman">
                         <group>
                             <field name="pic_name"/>
+                            <field name="pic_mobile"/>
                             <field name="street_pengiriman"/>
                             <field name="state_id_pengiriman"/>
                             <field name="city_id_pengiriman"/>
@@ -111,6 +112,7 @@
                         </group>
                         <group>
                             <field name="invoice_pic"/>
+                            <field name="invoice_pic_mobile"/>
                             <field name="street_invoice"/>
                             <field name="state_id_invoice"/>
                             <field name="city_id_invoice"/>
@@ -121,6 +123,7 @@
                         <group>
                             <field name="tukar_invoice"/>
                             <field name="jadwal_bayar"/>
+                            <field name="dokumen_prosedur" widget="many2many_binary"/>
                             <field name="dokumen_pengiriman"/>
                             <field name="dokumen_pengiriman_input"/>
                             <field name="dokumen_invoice"/>