diff options
| -rw-r--r-- | indoteknik_custom/models/logbook_sj.py | 2 | ||||
| -rw-r--r-- | indoteknik_custom/models/report_logbook_sj.py | 2 | ||||
| -rw-r--r-- | indoteknik_custom/views/report_logbook_sj.xml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/indoteknik_custom/models/logbook_sj.py b/indoteknik_custom/models/logbook_sj.py index bf4acd14..d12d3feb 100644 --- a/indoteknik_custom/models/logbook_sj.py +++ b/indoteknik_custom/models/logbook_sj.py @@ -20,6 +20,7 @@ class LogbookSJ(models.TransientModel): report_logbook_ids = [] parameters_header = { 'date': current_time, + 'created_by': self.env.user.id, } report_logbook = self.env['report.logbook.sj'].create([parameters_header]) @@ -29,6 +30,7 @@ class LogbookSJ(models.TransientModel): data = { 'picking_id': stock.id, + 'sale_id': stock.sale_id.id, 'name': stock.name, 'driver_id': stock.driver_id.id, 'departure_date': stock.driver_departure_date, diff --git a/indoteknik_custom/models/report_logbook_sj.py b/indoteknik_custom/models/report_logbook_sj.py index 5ff56c9a..33a7ccb1 100644 --- a/indoteknik_custom/models/report_logbook_sj.py +++ b/indoteknik_custom/models/report_logbook_sj.py @@ -11,6 +11,7 @@ class ReportLogbookSJ(models.Model): date_approve = fields.Datetime(string='Date Approve') approve_by_finance = fields.Boolean(string='Approve By Finance') approve_by = fields.Many2one(comodel_name='res.users', string='Approve By') + created_by = fields.Many2one(comodel_name='res.users', string='Created By') report_logbook_sj_line = fields.One2many( comodel_name='report.logbook.sj.line', inverse_name='report_logbook_sj_id', @@ -60,5 +61,6 @@ class ReportLogbookSJLine(models.Model): logbook_sj_id = fields.Many2one('report.logbook.sj', string='Logbook SJ') # Corrected model name partner_id = fields.Many2one('res.partner', string='Customer') picking_id = fields.Many2one('stock.picking', string='Picking') + sale_id = fields.Many2one('sale.order', string='Sale Order') report_logbook_sj_id = fields.Many2one('report.logbook.sj', string='Logbook SJ') not_exist = fields.Boolean(string='Not Exist') diff --git a/indoteknik_custom/views/report_logbook_sj.xml b/indoteknik_custom/views/report_logbook_sj.xml index ea58aefd..8fd2c861 100644 --- a/indoteknik_custom/views/report_logbook_sj.xml +++ b/indoteknik_custom/views/report_logbook_sj.xml @@ -7,13 +7,14 @@ <tree create="0"> <field name="name"/> <field name="approve_by"/> + <field name="created_by"/> <field name="date"/> <field name="date_approve"/> <field name="approve_by_finance"/> <field name="state"/> </tree> </field> - </record> + </record> <record id="report_logbook_sj_line_tree" model="ir.ui.view"> <field name="name">report.logbook.sj.line.tree</field> @@ -28,6 +29,7 @@ <field name="tracking_no"/> <field name="partner_id"/> <field name="picking_id"/> + <field name="sale_id"/> <field name="not_exist"/> </tree> </field> @@ -55,6 +57,7 @@ <group> <field name="approve_by_finance" readonly="1"/> <field name="state" readonly="1"/> + <field name="created_by" readonly="1"/> <field name="approve_by" readonly="1"/> </group> </group> |