diff options
| author | Mqdd <ahmadmiqdad27@gmail.com> | 2026-03-11 20:28:20 +0700 |
|---|---|---|
| committer | Mqdd <ahmadmiqdad27@gmail.com> | 2026-03-11 20:28:20 +0700 |
| commit | e48e19b7167cad21ef780d7a2e2f5a6267f5399c (patch) | |
| tree | 67cebf4184c7ae4d78621913c59271d8c158e643 /indoteknik_custom/models | |
| parent | 281ef9da5abb74b1d38dd7f7ea07c0f02e47b992 (diff) | |
<Miqdad> fix merge error
Diffstat (limited to 'indoteknik_custom/models')
| -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' |