audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

update common

Browse Source
This commit is contained in:
ivan deng
2020-11-16 16:37:05 +08:00
parent 1d349b2a58
commit 56ec45102f
11 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app_base_superbar/views/ir_ui_view_views.xml
View File

@@ -8,7 +8,6 @@
<xpath expr="//search">
<searchpanel view_types="kanban,tree">
<field name="type"/>
<field name="model_data_id"/>
</searchpanel>
</xpath>
</field>

2
app_mrp_superbar/views/mrp_production_views.xml
View File

@@ -8,11 +8,11 @@
<field name="arch" type="xml">
<xpath expr="//search" position="inside">
<searchpanel view_types="tree,kanban,pivot,graph">
<field name="company_id" groups="base.group_multi_company" icon="fa-building"/>
<field name="priority"/>
<field name="reservation_state"/>
<field name="state"/>
<field name="routing_id" groups="mrp.group_mrp_routings"/>
<field name="company_id" groups="base.group_multi_company" icon="fa-building"/>
</searchpanel>
</xpath>
</field>

4
app_mrp_workcenter_zchart/__manifest__.py
View File

@@ -33,7 +33,7 @@
{
'name': "MRP Workcenter zChart Parent Child Hierarchy,工作中心分级",
'version': '13.20.08.20',
'version': '13.20.11.10',
'author': 'Sunpop.cn',
'category': 'Base',
'website': 'https://www.sunpop.cn',
@@ -44,7 +44,6 @@
'images': ['static/description/banner.png'],
'depends': [
'mrp_workorder',
'app_mrp_superbar',
],
# 不要误装别的，避免冲突
'excludes': [
@@ -70,7 +69,6 @@
# 'security/ir.model.access.csv.csv',
# 'data/*.xml',
'views/mrp_workcenter_views.xml',
'views/mrp_workorder_views.xml',
],
'qweb': [
'static/src/xml/*.xml',

14
app_mrp_workcenter_zchart/views/mrp_workorder_views.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!--搜索加 superbar-->
<record model="ir.ui.view" id="app_view_mrp_production_workorder_form_view_filter">
<field name="name">app.mrp.production.work.order.select</field>
<field name="model">mrp.workorder</field>
<field name="inherit_id" ref="app_mrp_superbar.app_view_mrp_production_workorder_form_view_filter"/>
<field name="arch" type="xml">
<xpath expr="//searchpanel//field[@name='workcenter_id']" position="replace">
<field name="workcenter_id"/>
</xpath>
</field>
</record>
</odoo>

8
app_odoo_customize/__manifest__.py
View File

@@ -23,7 +23,7 @@
{
'name': 'odoo 14,13 Customize OEM(Boost, Data reset)',
'version': '13.20.11.06',
'version': '13.20.11.10',
'author': 'Sunpop.cn',
'category': 'Productivity',
'website': 'https://www.sunpop.cn',
@@ -78,6 +78,7 @@
35. Fixed for odoo 14.
36. Add refresh translate for multi module.
37. Easy noupdate manage for External Identifiers(xml_id)
38. Add Draggable Dialog enable.
This module can help to white label the Odoo.
Also helpful for training and support for your odoo end-user.
@@ -122,6 +123,7 @@
35. 优化至odoo14适用
36. 可为多个模块强制更新翻译
37. noupdate字段的快速管理，主要针对 xml_id
38. 对话框可拖拽
""",
'images': ['static/description/banner.gif'],
'depends': [
@@ -134,6 +136,8 @@
# 'web_mobile'
],
'data': [
'security/res_groups.xml',
'security/ir.model.access.csv',
'views/app_odoo_customize_views.xml',
'views/app_theme_config_settings_views.xml',
'views/res_config_settings_views.xml',
@@ -149,8 +153,6 @@
'data/ir_module_module_data.xml',
# 'data/digest_template_data.xml',
'data/res_company_data.xml',
'security/res_groups.xml',
'security/ir.model.access.csv',
],
'qweb': [
'static/src/xml/*.xml',

3
app_odoo_customize/static/description/index.html
View File

@@ -47,6 +47,9 @@
<div class="oe_span12">
<h2 class="oe_slogan">This is a Long Term Support Apps.</h2>
<div class="oe_demo" style=" margin: 30px auto 0; padding: 0 15px 0 0; border:none; width: 96%;">
<h3>Update: v13.20.11.09</h3>
<p>38. Add Draggable Dialog enable.</p>
<p>37. Easy noupdate manage for External Identifiers(xml_id).</p>
<h3>Update: v13.20.08.29</h3>
<p>36. Add odoo 14 support.</p>
<h3>Update: v13.20.04.12</h3>

17
app_odoo_customize/static/src/js/dialog.js Normal file
View File

@@ -0,0 +1,17 @@
odoo.define('app_odoo_customize.dialog', function (require) {
'use strict';
var Dialog = require('web.Dialog');
Dialog.include({
open: function () {
this._super.apply(this, arguments);
this._opened.then(function(){
$(".modal-content").draggable({
handle: ".modal-header"
});
});
return this;
},
});
});

7
app_odoo_customize/static/src/scss/dialog.scss Normal file
View File

@@ -0,0 +1,7 @@
.modal {
.modal-content {
.modal-header.ui-draggable-handle {
cursor: move;
}
}
}

2
app_odoo_customize/views/app_odoo_customize_views.xml
View File

@@ -4,11 +4,13 @@
<xpath expr="//link[last()]" position="after">
<link rel="stylesheet" type="text/scss" href="/app_odoo_customize/static/src/scss/app.scss"/>
<link rel="stylesheet" type="text/scss" href="/app_odoo_customize/static/src/scss/ribbon.scss"/>
<link rel="stylesheet" type="text/scss" href="/app_odoo_customize/static/src/scss/dialog.scss"/>
</xpath>
<xpath expr="script[last()]" position="after">
<script type="text/javascript" src="/app_odoo_customize/static/src/js/app_window_title.js"></script>
<script type="text/javascript" src="/app_odoo_customize/static/src/js/customize_user_menu.js"></script>
<script type="text/javascript" src="/app_odoo_customize/static/src/js/ribbon.js"></script>
<script type="text/javascript" src="/app_odoo_customize/static/src/js/dialog.js"></script>
</xpath>
</template>

2
app_product_category_zchart/views/product_category_views.xml
View File

@@ -17,7 +17,7 @@
</div>
</xpath>
<xpath expr="//span[@id='add_title']" position="after">
<xpath expr="//div[@class='oe_title']" position="move"/>
<xpath expr="//div[hasclass('oe_title')]" position="move"/>
</xpath>
<xpath expr="//span[@id='add_group']" position="after">
<xpath expr="//group[1]" position="move"/>

54
app_web_enterprise/static/src/scss/app_style.scss
View File

@@ -54,36 +54,32 @@
overflow: unset;
}
}
// Notebooks ,form_view,移动端优化
.o_form_view {
.o_notebook {
> .nav.nav-tabs {
> .nav-item {
> .nav-link {
//border-left-width: 0!important;
background-color: #fafafa;
&:hover, &:focus, &:active {
background-color: white;
}
&.active {
border-top-width: 2px;
//border-left-width: 1px!important;
//border-right-width: 1px!important;
}
}
&:first-child > .nav-link {
//border-left-width: 1px!important;
}
}
}
// Notebooks ,form_view,pc端优化
.o_form_view .o_notebook > .o_notebook_headers > .nav.nav-tabs > .nav-item > .nav-link {
background-color: #f9f9f9;
&.active {
background-color: white;
border-top-width: 2px;
margin-top: -1px;
border-left-color: $o-enterprise-color;
border-left-width: 1px !important;
border-right-color: $o-enterprise-color;
border-right-width: 1px !important;
border-top-left-radius: 1px;
border-top-right-radius: 1px;
}
// 列表自定义显示调整
.o_content > .o_list_view > .table-responsive > .table .o_optional_columns_dropdown_toggle {
margin-right: 16px;
&:hover, &:focus, &:active {
background-color: white;
}
}
// Notebooks ,form_view,移动端优化
@media (max-width: 768px) {
.o_form_view .o_notebook > .o_notebook_headers > .nav.nav-tabs > .nav-item > .nav-link {
&.active {
margin-top: 0px;
margin-bottom: -1px;
padding-bottom: 0px;
}
}
}