diff options
| author | Rafi Zadanly <zadanlyr@gmail.com> | 2023-03-24 15:51:53 +0700 |
|---|---|---|
| committer | Rafi Zadanly <zadanlyr@gmail.com> | 2023-03-24 15:51:53 +0700 |
| commit | d7838ad087daf51826d3be27888df04eac09a293 (patch) | |
| tree | 629154312c99d14f08d61f541165a2396f175561 /indoteknik_custom/__manifest__.py | |
| parent | 056a719bbb24a931b119515f0483b96ad2f4d415 (diff) | |
| parent | 3aa64db9c10d0fcb8009e9e6f942672a12669099 (diff) | |
fix conflict
Diffstat (limited to 'indoteknik_custom/__manifest__.py')
| -rwxr-xr-x | indoteknik_custom/__manifest__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indoteknik_custom/__manifest__.py b/indoteknik_custom/__manifest__.py index 701f33c0..84a604d8 100755 --- a/indoteknik_custom/__manifest__.py +++ b/indoteknik_custom/__manifest__.py @@ -21,6 +21,7 @@ 'views/product_pricelist_item.xml', 'views/product_public_category.xml', 'views/product_template.xml', + 'views/uangmuka_pembelian.xml', 'views/purchase_order.xml', 'views/purchase_pricelist.xml', 'views/sale_monitoring.xml', @@ -40,6 +41,7 @@ 'views/x_product_tags.xml', 'views/stock_vendor.xml', 'views/crm_lead.xml', + 'views/uangmuka_penjualan.xml', 'views/sale_order.xml', 'views/account_asset_views.xml', 'views/ir_sequence.xml', |