# Conflicts: # sf_dlm_management/views/product_template_management_view.xml # sf_sale/models/quick_easy_order.py # sf_sale/models/sale_order.py # sf_sale/views/purchase_order_view.xml
# Conflicts: # sf_dlm_management/views/product_template_management_view.xml # sf_sale/models/quick_easy_order.py # sf_sale/models/sale_order.py # sf_sale/views/purchase_order_view.xml