diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-09-11 13:18:59 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-09-11 13:18:59 +0700 |
| commit | 997cb3d5a1d1d85a886c8f12bb6764b0c2ba4d21 (patch) | |
| tree | 55c4be5ffbe6f0718ad42e2915305d7bfd637913 | |
| parent | 1694e042acb29b476815d29f54f2ec95d37883be (diff) | |
Fix conflict stock_picking
| -rw-r--r-- | indoteknik_custom/models/stock_picking.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indoteknik_custom/models/stock_picking.py b/indoteknik_custom/models/stock_picking.py index 19ac25d0..069a591a 100644 --- a/indoteknik_custom/models/stock_picking.py +++ b/indoteknik_custom/models/stock_picking.py @@ -73,10 +73,8 @@ class StockPicking(models.Model): waybill_id = fields.One2many(comodel_name='airway.bill', inverse_name='do_id', string='Airway Bill') purchase_representative_id = fields.Many2one('res.users', related='move_lines.purchase_line_id.order_id.user_id', string="Purchase Representative", readonly=True) -<<<<<<< HEAD carrier_id = fields.Many2one('delivery.carrier', string='Shipping Method') -======= shipping_status = fields.Char(string='Shipping Status', compute="_compute_shipping_status") def _compute_shipping_status(self): @@ -88,7 +86,6 @@ class StockPicking(models.Model): status = 'completed' rec.shipping_status = status ->>>>>>> feature/voucher-group def action_create_invoice_from_mr(self): """Create the invoice associated to the PO. |