Merge branch 'master' into sl/bom/20200528
# Conflicts: # app/Http/routes.php
Showing
with
5334 additions
and
1166 deletions
public/js/change_order.js
0 → 100644
public/js/details.js
0 → 100644
public/js/list.js
0 → 100644
public/js/order_audit.js
0 → 100644
public/js/order_cancel.js
0 → 100644
public/js/order_send_email.js
0 → 100644
public/js/order_track.js
0 → 100644
resources/views/changeOrder.blade.php
0 → 100644
File moved
resources/views/changeOrder/js.blade.php
0 → 100644
resources/views/detail/css.blade.php
0 → 100644
resources/views/detail/detail_action_log.php
0 → 100644
resources/views/detail/detail_items_info.php
0 → 100644
resources/views/detail/detail_multi_info.php
0 → 100644
resources/views/detail/js.blade.php
0 → 100644
Please
register
or
sign in
to comment