pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REV] stock: add hierarchical view for stock locations

Browse Source 
This reverts commit d39a51259e93b84184379a1fc9b824dad94e5ea5.

This view was technically clean and useful to detect configuration
issues (wrong view_location_id for example) but was not liked by our big
boss because "a group by parent_id does the same thing".

task-2166904

closes odoo/odoo#42734

Signed-off-by: Arnold Moyaux <amoyaux@users.noreply.github.com>
This commit is contained in:
Simon Lejeune
2020-01-03 15:12:01 +00:00
parent 9a5608aee7
commit 68be60fc82
5 changed files with 1 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/models/stock_location.py
-26
View File
@@ -163,32 +163,6 @@ class Location(models.Model):
self.ensure_one()
return self.usage in ('supplier', 'customer', 'inventory', 'production') or self.scrap_location
def _qweb_prepare_qcontext(self, view_id, domain):
values = super()._qweb_prepare_qcontext(view_id, domain)
result = self.search_read(domain, ['name', 'location_id', 'usage', 'barcode'])
roots = []
locations = {location['id']: dict(location, **{'childs': []}) for location in result}
for location in locations.values():
parent_location_id = location['location_id']
if parent_location_id and parent_location_id[0] in locations:
locations[parent_location_id[0]]['childs'].append(location)
else:
roots.append(location)
values['data'] = roots
return values
@api.model
def fields_view_get(self, view_id=None, view_type='form', toolbar=False, submenu=False):
result = super().fields_view_get(view_id, view_type, toolbar, submenu)
view_location_qweb = self.env.ref('stock.view_location_qweb', raise_if_not_found=False)
if result['type'] == 'qweb' and view_location_qweb and result['view_id'] == view_location_qweb.id:
result['arch'] = '<qweb js_class="stock_location_hierarchy_qweb"/>'
return result
class Route(models.Model):
_name = 'stock.location.route'
addons/stock/static/src/js/stock_location_hierarchy.js
-19
View File
@@ -1,19 +0,0 @@
odoo.define('stock.stock_location_hierarchy_qweb', function (require) {
"use strict";
var QwebView = require('web.qweb');
var registry = require('web.view_registry');
var QWebView = QwebView.View.extend({
icon: 'fa-sitemap',
searchMenuTypes: ['filter', 'favorite'],
});
registry.add('stock_location_hierarchy_qweb', QWebView);
return {
View: QWebView,
};
});
addons/stock/static/src/scss/stock_location_hierarchy.scss
-105
View File
@@ -1,105 +0,0 @@
$o-hierarchical-highlight-color: $o-brand-primary;
$o-hierarchical-border-color: gray('500');
$o-hierarchical-border-width: 1px;
$o-hierarchical-border-radius: 4px;
@mixin o-stock-hierarchy-level {
position: relative;
padding: 1em 0;
text-align: center;
}
.o_stock_location_hierarchy {
.o_hierarchy_container {
border: 1px solid gray('300');
background-color: lighten(gray('200'), 2%);
border-radius: .5rem;
white-space: nowrap;
overflow-x: auto;
@include o-stock-hierarchy-level();
ul.o_hierarchy_level {
@include o-stock-hierarchy-level();
&:before {
content: '';
@include o-position-absolute($top: 0, $left: 50%);
border-left: $o-hierarchical-border-width solid $o-hierarchical-border-color;
height: 1.2rem;
}
}
li.o_hierarchy_item {
display: inline-block;
vertical-align: top;
position: relative;
padding: 1rem .5rem 0 .5rem;
.o_hierarchy_box {
position: relative;
border: $o-hierarchical-border-width solid gray('white');
padding: .5rem .75rem;
display: inline-block;
border-radius: $o-hierarchical-border-radius;
transition: 0.2s;
background: gray('white');
box-shadow: 0 1px 3px rgba(gray('black'), 0.12), 0 1px 2px rgba(gray('black'), 0.14);
&.disabled {
background-color: #f1f1f1;
border-color: #f1f1f1;
}
.o_hierarchy_box_title, .o_hierarchy_box_subtitle {
max-width: 170px;
}
.o_hierarchy_action {
display: none;
@include o-position-absolute($left: 0, $right: 0, $bottom: -10px);
z-index: 1;
.o_hierarchy_add_child .fa {
background-color: gray('white');
border-radius: 8rem;
}
}
@include media-breakpoint-up(md) {
&:hover .o_hierarchy_action {
display: block;
}
&:hover, &:hover + ul li .o_hierarchy_box {
background: lighten($o-hierarchical-highlight-color, 65);
border: $o-hierarchical-border-width solid $o-hierarchical-highlight-color;
}
&:hover + ul li::after,
&:hover + ul li::before,
&:hover + ul::before,
&:hover + ul ul::before {
border-color: $o-hierarchical-highlight-color;
}
}
}
&::before, &::after {
content: '';
@include o-position-absolute($top: 0, $right: 50%);
border-top: $o-hierarchical-border-width solid $o-hierarchical-border-color;
width: 52%;
height: 1em;
}
&::after {
right: auto;
left: 50%;
border-left: $o-hierarchical-border-width solid $o-hierarchical-border-color;
}
&:only-child::after, &:only-child::before {
display: none;
}
&:only-child {
padding-top: 0;
}
&:first-child::before, &:last-child::after {
border: 0 none;
}
&:last-child::before {
border-right: $o-hierarchical-border-width solid $o-hierarchical-border-color;
border-radius: 0 $o-hierarchical-border-radius 0 0;
}
&:first-child::after {
border-radius: $o-hierarchical-border-radius 0 0 0;
}
}
}
}
addons/stock/views/stock_location_views.xml
+1 -48
View File
@@ -48,53 +48,6 @@
</field>
</record>
<record id="view_location_qweb" model="ir.ui.view">
<field name="name">stock.location.qweb</field>
<field name="type">qweb</field>
<field name="model">stock.location</field>
<field name="arch" type="xml">
<div class="container-fluid o_stock_location_hierarchy">
<div class="row">
<t t-if="data">
<div class="col-12 py-3" t-foreach="data" t-as="location">
<ul class="o_hierarchy_container mb-0">
<t t-call="stock.stock_location_hierarchy"/>
</ul>
</div>
</t>
<t t-else="">
<div class="col py-4 text-center">
<h1>No data available.</h1>
</div>
</t>
</div>
</div>
</field>
</record>
<template id="stock_location_hierarchy" name="Stock Location Hierarchy">
<li class="o_hierarchy_item">
<div t-attf-class="o_hierarchy_box #{location['usage'] == 'view' and 'disabled' or ''}">
<a href="#" type="action" t-att-data-res-id="location['id']" class="o_hierarchy_box_title text-truncate" t-att-title="location['name']">
<t t-esc="location['name']"/>
</a>
<small class="o_hierarchy_box_subtitle text-truncate text-muted d-block" t-att-title="location['barcode']">
<t t-esc="location['barcode']"/>
</small>
<div class="o_hierarchy_action">
<a href="#" type="action" data-views='[[false, "form"]]' t-attf-data-context='{"default_location_id": #{location["id"]}}' class="o_hierarchy_add_child" title="Add a new child record">
<i class="fa fa-plus-circle"/>
</a>
</div>
</div>
<ul class="o_hierarchy_level" t-if="len(location['childs'])">
<t t-foreach="location['childs']" t-as="location">
<t t-call="stock.stock_location_hierarchy"/>
</t>
</ul>
</li>
</template>
<record id="stock_location_view_form_editable" model="ir.ui.view">
<field name="name">stock.location.form.editable</field>
<field name="model">stock.location</field>
@@ -153,7 +106,7 @@
<field name="name">Locations</field>
<field name="res_model">stock.location</field>
<field name="type">ir.actions.act_window</field>
<field name="view_mode">tree,form,qweb</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_location_tree2"/>
<field name="search_view_id" ref="view_location_search"/>
<field name="context">{'search_default_in_location':1}</field>
addons/stock/views/stock_template.xml
-2
View File
@@ -11,11 +11,9 @@
<script type="text/javascript" src="/stock/static/src/js/inventory_validate_button_view.js"></script>
<script type="text/javascript" src="/stock/static/src/js/stock_traceability_report_backend.js"></script>
<script type="text/javascript" src="/stock/static/src/js/stock_traceability_report_widgets.js"></script>
<script type="text/javascript" src="/stock/static/src/js/stock_location_hierarchy.js"></script>
<script type="text/javascript" src="/stock/static/src/js/popover_widget.js"></script>
<script type="text/javascript" src="/stock/static/src/js/stock_rescheduling_popover.js"></script>
<link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/stock_traceability_report.scss"/>
<link rel="stylesheet" type="text/scss" href="/stock/static/src/scss/stock_location_hierarchy.scss"/>
</xpath>
</template>