diff options
Diffstat (limited to 'indoteknik_custom')
| -rwxr-xr-x | indoteknik_custom/models/sale_order.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indoteknik_custom/models/sale_order.py b/indoteknik_custom/models/sale_order.py index 185cee0d..294cd42d 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' |