diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py index bcf698316fb..accc4449a88 100644 --- a/addons/purchase/__manifest__.py +++ b/addons/purchase/__manifest__.py @@ -39,14 +39,12 @@ 'assets': { 'web.assets_backend': [ 'purchase/static/src/toaster_button/*', - 'purchase/static/src/scss/purchase.scss', 'purchase/static/src/js/purchase_dashboard.js', 'purchase/static/src/js/purchase_toaster_button.js', 'purchase/static/src/js/tours/purchase.js', ], 'web.assets_frontend': [ 'purchase/static/src/js/purchase_datetimepicker.js', - 'purchase/static/src/scss/purchase_portal.scss', 'purchase/static/src/js/purchase_portal_sidebar.js', ], 'web.assets_qweb': [ diff --git a/addons/purchase/static/src/scss/purchase.scss b/addons/purchase/static/src/scss/purchase.scss deleted file mode 100644 index 1c6644c4667..00000000000 --- a/addons/purchase/static/src/scss/purchase.scss +++ /dev/null @@ -1,54 +0,0 @@ -.o_purchase_dashboard { - flex: 1 0 100%; - padding: 10px 10px 18px 10px; - - background-color: $o-view-background-color; - position: relative; - max-width:100%; - - .row { - margin-right: 0; - margin-left: 0; - } - - .o_dashboard_action { - cursor: pointer; - } - - .table { - margin-bottom: 0; - table-layout: fixed; - border-spacing: 10px 0px; - border-collapse: separate; - font-size: 13px; - - > thead, tbody { - & > tr > td { - text-align: center; - width: 25%; - height: 33px; - vertical-align: middle; - border-top: 1px solid $o-view-background-color; - background-color: $o-brand-lightsecondary; - - &.o_text{ - background-color: $o-view-background-color; - } - - > a:hover { - text-decoration: none; - } - - &.o_main { - background-color: $o-brand-primary; - &:hover { - background-color: darken($o-brand-primary, 10%); - } - > a { - color: white; - } - } - } - } - } -} diff --git a/addons/purchase/static/src/scss/purchase_portal.scss b/addons/purchase/static/src/scss/purchase_portal.scss deleted file mode 100644 index 4d08ffd789b..00000000000 --- a/addons/purchase/static/src/scss/purchase_portal.scss +++ /dev/null @@ -1,13 +0,0 @@ -/* ---- My Orders page ---- */ - -.orders_label_text_align { - vertical-align: 15%; -} - -/* ---- Order page ---- */ - -.purchase_tbody .o_line_note { - word-break: break-word; - word-wrap: break-word; - overflow-wrap: break-word; -} diff --git a/addons/purchase/static/src/xml/purchase_dashboard.xml b/addons/purchase/static/src/xml/purchase_dashboard.xml index 8051ee8b71b..ca0a45149f4 100644 --- a/addons/purchase/static/src/xml/purchase_dashboard.xml +++ b/addons/purchase/static/src/xml/purchase_dashboard.xml @@ -1,68 +1,96 @@ - -
-
-
- - - - - - - - - - - - - - - - - - - -
-
All RFQs
-
-
To Send
-
-
Waiting
-
-
Late
-
-
My RFQs
-
- - - - - -
- -
- - - - - - - - - - - - - - - - - - - -
Avg Order Value ()Purchased Last 7 Days ()
Lead Time to Purchase  DaysRFQs Sent Last 7 Days
-
+
+
+
+
+
+ All RFQs +
+ +
+
+
+ My RFQs +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+
+
+
+
+
+
+
+
+ Avg Order Value +
+
+ +
+
+
+
+ Purchased Last 7 Days +
+
+ +
+
+
+
+
+
+ Lead Time to Purchase +
+
+  Days +
+
+
+
+ RFQs Sent Last 7 Days +
+
+ +
+
+
+
+
+
+
+ diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml index 30fb1a1fc34..162f06ff8f3 100644 --- a/addons/purchase/views/portal_templates.xml +++ b/addons/purchase/views/portal_templates.xml @@ -243,8 +243,8 @@
Date:
- Paid - Waiting Payment + Paid + Waiting Payment
@@ -281,7 +281,7 @@ - + Product