diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml index cc3f6015..3bd8260e 100644 --- a/sf_manufacturing/views/mrp_workcenter_views.xml +++ b/sf_manufacturing/views/mrp_workcenter_views.xml @@ -102,197 +102,202 @@ - - - - - - - - - - - - - - - mrp.workcenter.kanban.inherit - mrp.workcenter - - - - - - - - - - - - - - - -
-
-
- - - -
-
- - - -
-
-
-
-
-
- - - - - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - % - - -
-
-
-
- -
- -
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + --> + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -321,22 +326,18 @@ - - - - - - - - - - - - - - + + + mrp.workcenter.inherit + mrp.workcenter + + + + + + + + + - - ======= - >>>>>>> develop diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml index 3366ce49..09ba627a 100644 --- a/sf_plan/views/view.xml +++ b/sf_plan/views/view.xml @@ -27,8 +27,14 @@
+
+

+ +

+
@@ -38,12 +44,25 @@ - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js index 261590fb..582c887f 100644 --- a/web_widget_model_viewer/static/src/js/3d_viewer.js +++ b/web_widget_model_viewer/static/src/js/3d_viewer.js @@ -20,6 +20,7 @@ import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo export class StepViewer extends Component { setup() { + console.log('setup') this.props.url = this.formatUrl(); } @@ -33,9 +34,11 @@ export class StepViewer extends Component { id: JSON.stringify(this.props.record.data['id']), field: this.props.name} url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true' + console.log('url', url) } else { url = "data:model/gltf-binary;base64," + this.props.value; + console.log('url222', url) } } return url