<Miqdad> add vendor

2 files changed, 46 insertions, 13 deletions

diff --git a/indoteknik_custom/models/gudang_service.py b/indoteknik_custom/models/gudang_service.py
index d4f7397c..72a0f00e 100644
--- a/indoteknik_custom/models/gudang_service.py
+++ b/indoteknik_custom/models/gudang_service.py
@@ -13,6 +13,7 @@ class GudangService(models.Model):
 
     name = fields.Char('Name', readonly=True)
     partner_id = fields.Many2one('res.partner', string='Customer', readonly=True)
+    vendor_id = fields.Many2one('res.partner', string='Vendor', readonly=True, required=True)
     origin = fields.Many2one('sale.order', string='Origin SO', required=True)
     # picking_id = fields.Many2one('stock.picking', string = 'Picking ID', domain="[('sale_id', '=', origin)]")
     schedule_date = fields.Date(
@@ -26,10 +27,17 @@ class GudangService(models.Model):
         copy=False,
         tracking=True
     )
-
+    create_date = fields.Datetime(string='Create Date', copy=False, tracking=True, default=fields.Datetime.now())
     done_date = fields.Datetime(string='Date Done', copy=False, tracking=True)
     gudang_service_lines = fields.One2many('gudang.service.line', 'gudang_service_id', string='Gudang Service Lines')
-    remaining_date = fields.Char('Unprocessed Since', compute='_compute_remaining_date')
+    # unprocessed_date = fields.Char(
+    #     string='Unprocessed Since',
+    #     compute='_compute_unprocessed_date'
+    # )
+    remaining_date = fields.Char(
+        compute='_compute_remaining_date',
+        string='Remaining Date'
+    )
     state = fields.Selection([('draft', 'Backlog'), ('onprogress', 'On Progress'),('done', 'Done'), ('cancel', 'Cancel')], default='draft', tracking=True)
     cancel_reason = fields.Text('Cancel Reason', tracking=True)
 
@@ -99,26 +107,47 @@ class GudangService(models.Model):
         if records:
             records._send_logistic_notification()
 
+    # @api.depends('schedule_date', 'start_date', 'state')
+    # def _compute_unprocessed_date(self):
+    #     today = fields.Date.today()
+
+    #     for rec in self:
+    #         if not rec.schedule_date or rec.state == 'cancel':
+    #             rec.unprocessed_date = "-"
+    #             continue
+
+    #         schedule = rec.schedule_date
+
+    #         # BELUM DIPROSES
+    #         if not rec.start_date:
+    #             days = (today - schedule).days
 
-    @api.depends('start_date', 'done_date', 'state')
+    #         # SUDAH DIPROSES
+    #         else:
+    #             days = (rec.start_date.date() - schedule).days
+
+    #         rec.unprocessed_date = _("Unprocessed %s days") % max(days, 0)
+
+    @api.depends('schedule_date', 'create_date')
     def _compute_remaining_date(self):
         today = fields.Date.today()
 
         for rec in self:
-            if not rec.start_date:
+            if not rec.schedule_date:
                 rec.remaining_date = "-"
                 continue
 
-            start = rec.start_date.date()
+            base_date = rec.create_date.date() if rec.create_date else today
 
-            if rec.state == 'done' and rec.done_date:
-                end = rec.done_date.date()
-            else:
-                end = today
-
-            days = (end - start).days
-            rec.remaining_date = _("%s days") % days
+            schedule = rec.schedule_date
+            days = (schedule - base_date).days
 
+            if days > 0:
+                rec.remaining_date = _("In %s days") % days
+            elif days == 0:
+                rec.remaining_date = _("Today")
+            else:
+                rec.remaining_date = _("Overdue %s days") % abs(days)
 
 
     def action_submit(self):
diff --git a/indoteknik_custom/views/gudang_service.xml b/indoteknik_custom/views/gudang_service.xml
index 42674585..e06e9e7e 100644
--- a/indoteknik_custom/views/gudang_service.xml
+++ b/indoteknik_custom/views/gudang_service.xml
@@ -17,13 +17,16 @@
 		>
 				<field name="name"/>
 				<field name="partner_id"/>
+				<field name="vendor_id"/>
 				<field name="origin"/>
 				<field name="schedule_date"/>
 				<field name="start_date" optional="hide"/>
 				<field name="remaining_date"/>
+				<!-- <field name="unprocessed_date"/> -->
 				<field name="state" widget="badge" decoration-danger="state in ('draft')" decoration-warning="state == 'onprogress'" 
 				decoration-success="state == 'done'" decoration-muted="state == 'cancel'" />
 				<field name="cancel_reason" optional="hide"/>
+				<field name="create_date" optional="hide"/>
 				<!-- <field name="picking_id"/> -->
             </tree>
         </field>
@@ -58,7 +61,9 @@
 				<group>
 					<field name="origin" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
 					<field name="partner_id"/>
+					<field name="vendor_id"/>
 					<field name="remaining_date"/>
+					<!-- <field name="unprocessed_date"/> -->
 					<field name="schedule_date" attrs="{'readonly': [('state', 'not in', ['draft'])]}"/>
 					<field name="start_date" readonly="1"/>
 					<field name="done_date" attrs="{'invisible': [('state', 'not in', ['done'])]}"/>
@@ -91,7 +96,6 @@
 		<field name="type">ir.actions.act_window</field>
 		<field name="res_model">gudang.service</field>
 		<field name="view_mode">tree,form</field>
-		<!-- <field name="context">{'group_by': ['state']}</field> -->
 	</record>
 
 	<!-- Menu -->