diff options
| -rwxr-xr-x | indoteknik_custom/models/sale_order.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 185cee0d..6c69bb15 100755 --- a/indoteknik_custom/models/sale_order.py +++ b/indoteknik_custom/models/sale_order.py @@ -4007,7 +4007,6 @@ class SaleOrder(models.Model): 'target': 'current', } -<<<<<<< HEAD def action_open_sjo(self): return { 'name': 'SJO', @@ -4019,7 +4018,6 @@ class SaleOrder(models.Model): 'default_so_id': self.id, } } -======= class SaleForecastCoverage(models.Model): _name = 'sale.forecast.coverage' _description = 'Sale Forecast Coverage' @@ -4041,4 +4039,3 @@ class SaleForecastCoverage(models.Model): reservation = fields.Boolean() is_late = fields.Boolean() replenishment_filled = fields.Boolean() ->>>>>>> e6b6691f518a7400babdbd4b95541fb3d07f154d |