Merge branch 'odoo-production' into CR-mbaZila

# Conflicts:
#	indoteknik_custom/security/ir.model.access.csv

1 files changed, 13 insertions, 0 deletions

diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py
index 2feb9c72..cd330aeb 100644
--- a/indoteknik_custom/models/stock_picking.py
+++ b/indoteknik_custom/models/stock_picking.py
@@ -122,6 +122,19 @@ class StockPicking(models.Model):
     ], string='Status Reserve', readonly=True, tracking=True, help="The current state of the stock picking.")
     notee = fields.Text(string="Note")
 
+    @api.model
+    def _compute_dokumen_tanda_terima(self):
+        for picking in self:
+            picking.dokumen_tanda_terima = picking.partner_id.dokumen_pengiriman
+
+    @api.model
+    def _compute_dokumen_pengiriman(self):
+        for picking in self:
+            picking.dokumen_pengiriman = picking.partner_id.dokumen_pengiriman_input
+
+    dokumen_tanda_terima = fields.Char(string='Dokumen Tanda Terima yang Diberikan Pada Saat Pengiriman Barang', readonly=True, compute=_compute_dokumen_tanda_terima)
+    dokumen_pengiriman = fields.Char(string='Dokumen yang Dibawa Saat Pengiriman Barang', readonly=True, compute=_compute_dokumen_pengiriman)
+
     # Envio Tracking Section
     envio_id = fields.Char(string="Envio ID", readonly=True)
     envio_code = fields.Char(string="Envio Code", readonly=True)