diff options
| author | trisusilo48 <tri.susilo@altama.co.id> | 2024-10-23 09:12:35 +0700 |
|---|---|---|
| committer | trisusilo48 <tri.susilo@altama.co.id> | 2024-10-23 09:12:35 +0700 |
| commit | e8be87ce9143c92e2b1011649fa6b8280338fa69 (patch) | |
| tree | f86b8688af15aa251c0c56ddc9a624f430c299a9 | |
| parent | 49b8f17c48a04b28a54608cf45367266f35cf420 (diff) | |
fedback indoteknik delivery
| -rw-r--r-- | indoteknik_api/controllers/api_v1/stock_picking.py | 5 | ||||
| -rw-r--r-- | indoteknik_custom/models/stock_picking.py | 8 | ||||
| -rw-r--r-- | indoteknik_custom/views/stock_picking.xml | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/indoteknik_api/controllers/api_v1/stock_picking.py b/indoteknik_api/controllers/api_v1/stock_picking.py index c8bc9a7e..f0c7456d 100644 --- a/indoteknik_api/controllers/api_v1/stock_picking.py +++ b/indoteknik_api/controllers/api_v1/stock_picking.py @@ -1,6 +1,8 @@ from .. import controller from odoo import http from odoo.http import request +from pytz import timezone +from datetime import datetime class StockPicking(controller.Controller): @@ -120,7 +122,8 @@ class StockPicking(controller.Controller): paket_document = kw.get('paket_document', False) params = {'sj_documentation': sj_document, - 'paket_documentation': paket_document + 'paket_documentation': paket_document, + 'driver_arrival_date': self.time_to_str(datetime.utcnow(), '%Y-%m-%d %H:%M:%S'), } picking_data = request.env['stock.picking'].search([('picking_code', '=', picking_code)], limit=1) diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 066ce238..9dede1af 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -25,7 +25,7 @@ class StockPicking(models.Model): # Delivery Order driver_departure_date = fields.Datetime( - string='Driver Departure Date', + string='Delivery Departure Date', copy=False ) arrival_time = fields.Datetime( @@ -33,7 +33,7 @@ class StockPicking(models.Model): copy=False ) driver_arrival_date = fields.Datetime( - string='Driver Arrival Date', + string='Delivery Arrival Date', readonly=True, copy=False ) @@ -55,6 +55,8 @@ class StockPicking(models.Model): ) sj_documentation = fields.Binary(string="Dokumentasi Surat Jalan", ) paket_documentation = fields.Binary(string="Dokumentasi Paket", ) + sj_return_date = fields.Datetime(string="SJ Return Date", ) + responsible = fields.Many2one('res.users', string='Responsible', tracking=True) approval_status = fields.Selection([ ('pengajuan1', 'Approval Accounting'), @@ -419,7 +421,7 @@ class StockPicking(models.Model): self.date_reserved = current_time self.validation_minus_onhand_quantity() - + self.responsible = self.env.user.id res = super(StockPicking, self).button_validate() self.calculate_line_no() self.date_done = datetime.datetime.utcnow() diff --git a/indoteknik_custom/views/stock_picking.xml b/indoteknik_custom/views/stock_picking.xml index d47c1051..37c622ec 100644 --- a/indoteknik_custom/views/stock_picking.xml +++ b/indoteknik_custom/views/stock_picking.xml @@ -122,13 +122,15 @@ <group> <group> <field name="note_logistic"/> + <field name="responsible" /> + <field name="carrier_id"/> + <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/> + <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/> <field name="driver_departure_date" attrs="{'readonly':[('invoice_status', '=', 'invoiced')]}"/> <field name="driver_arrival_date"/> <field name="delivery_tracking_no"/> <field name="driver_id"/> - <field name="carrier_id"/> - <field name="picking_code" attrs="{'invisible': [['picking_code', '=', False]]}"/> - <field name="picking_code" string="Picking code (akan digenerate ketika sudah di-validate)" attrs="{'invisible': [['picking_code', '!=', False]]}"/> + <field name='sj_return_date'/> <field name="sj_documentation" widget="image" /> <field name="paket_documentation" widget="image" /> </group> |