diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-09-26 10:20:59 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-09-26 10:20:59 +0700 |
| commit | 25a3271bd14671d57da6b4349745e446e94ebfef (patch) | |
| tree | d5a6554c61a02cd08f41c8068237a926e29874dd /indoteknik_custom/__manifest__.py | |
| parent | bd8a83a76cea6ef2466c250226f7c95c38b3024c (diff) | |
| parent | 50b5bd7bd984ef108e8bd324440050a222d8262f (diff) | |
Merge branch 'change/feature/promotion-program' into production
# Conflicts:
# indoteknik_custom/models/sale_order.py
Diffstat (limited to 'indoteknik_custom/__manifest__.py')
| -rwxr-xr-x | indoteknik_custom/__manifest__.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index 55708acc..10878e32 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -75,10 +75,8 @@ 'views/procurement_monitoring_detail.xml', 'views/product_product.xml', 'views/brand_vendor.xml', - 'views/promotion_program.xml', - 'views/promotion_program_line.xml', - 'views/promotion_program_free_item.xml', - 'views/promotion_program_keyword.xml', + 'views/promotion/promotion_program.xml', + 'views/promotion/promotion_program_line.xml', 'views/requisition.xml', 'views/landedcost.xml', 'views/product_sla.xml', |