summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzka Nathan <darizkyfaz@gmail.com>2024-07-13 10:18:07 +0700
committerAzka Nathan <darizkyfaz@gmail.com>2024-07-13 10:18:07 +0700
commit61a433cd158c27ed871b4d038115e1ae2c6f1c5e (patch)
tree6758f5c64ad3ccc9f3ed975c764acb8c33dcf084
parentaf15247a56c3ef8624683c73b49759e9a2de7d49 (diff)
add date status done, date driver departure and remove date keep barang on so
-rwxr-xr-xindoteknik_custom/models/sale_order.py9
-rwxr-xr-xindoteknik_custom/views/sale_order.xml7
2 files changed, 11 insertions, 5 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py
index 8e6e76d9..11f30792 100755
--- a/indoteknik_custom/models/sale_order.py
+++ b/indoteknik_custom/models/sale_order.py
@@ -68,7 +68,7 @@ class SaleOrder(models.Model):
('partial_chargeback', 'Partial Chargeback'),
('authorize', 'Authorize'),
], tracking=True, string='Payment Status', help='Payment Gateway Status / Midtrans / Web, https://docs.midtrans.com/en/after-payment/status-cycle')
- date_doc_kirim = fields.Datetime(string='Tanggal Keep Barang', help="Tanggal Kirim di cetakan SJ yang terakhir, tidak berpengaruh ke Accounting", tracking=True)
+ date_doc_kirim = fields.Datetime(string='Tanggal Keep Barang', help="Tanggal Kirim di cetakan SJ yang terakhir, tidak berpengaruh ke Accounting", tracking=3)
payment_type = fields.Char(string='Payment Type', help='Jenis pembayaran dengan Midtrans')
gross_amount = fields.Float(string='Gross Amount', help='Jumlah pembayaran yang dilakukan dengan Midtrans')
notification = fields.Char(string='Notification', help='Dapat membantu error dari approval')
@@ -102,13 +102,18 @@ class SaleOrder(models.Model):
compute_fullfillment = fields.Boolean(string='Compute Fullfillment', compute="_compute_fullfillment")
note_ekspedisi = fields.Char(string="Note Ekspedisi")
date_kirim_ril = fields.Datetime(string='Tanggal Kirim SJ', compute='_compute_date_kirim', copy=False)
- date_driver_departure = fields.Datetime(string='Arrival Date', related='picking_ids.driver_arrival_date', copy=False)
+ date_status_done = fields.Datetime(string='Date Done DO', compute='_compute_date_kirim', copy=False)
+ date_driver_arrival = fields.Datetime(string='Arrival Date', compute='_compute_date_kirim', copy=False)
+ date_driver_departure = fields.Datetime(string='Departure Date', compute='_compute_date_kirim', copy=False)
note_website = fields.Char(string="Note Website")
def _compute_date_kirim(self):
for rec in self:
picking = self.env['stock.picking'].search([('sale_id', '=', rec.id), ('state', 'not in', ['cancel'])], order='date_doc_kirim desc', limit=1)
rec.date_kirim_ril = picking.date_doc_kirim
+ rec.date_status_done = picking.date_done
+ rec.date_driver_arrival = picking.driver_arrival_date
+ rec.date_driver_departure = picking.driver_departure_date
def open_form_multi_create_uang_muka(self):
action = self.env['ir.actions.act_window']._for_xml_id('indoteknik_custom.action_sale_order_multi_uangmuka')
diff --git a/indoteknik_custom/views/sale_order.xml b/indoteknik_custom/views/sale_order.xml
index 27d30445..f85a8fd1 100755
--- a/indoteknik_custom/views/sale_order.xml
+++ b/indoteknik_custom/views/sale_order.xml
@@ -223,9 +223,10 @@
<field name="approval_status" />
<field name="client_order_ref"/>
<field name="so_status"/>
- <field name="date_doc_kirim" string="Date Keep Barang"/>
- <field name="date_kirim_ril" string="Date Kirim SJ"/>
- <field name="date_driver_departure" string="Arrival Date"/>
+ <field name="date_status_done"/>
+ <field name="date_kirim_ril"/>
+ <field name="date_driver_arrival"/>
+ <field name="date_driver_departure"/>
<field name="payment_type" optional="hide"/>
<field name="payment_status" optional="hide"/>
</field>