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

Merge branch '13.0' of https://github.com/guohuadeng/app-odoo into 13.0

Browse Source
This commit is contained in:
Ivan x390
2020-04-29 01:39:27 +08:00
parent b6bee0b440 c1338cf2b8
commit 26aaf73142
6 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app_base_chinese/__manifest__.py
View File

@@ -18,7 +18,7 @@
{
'name': "App base chinese，中国化基本模块增强",
'version': '13.20.04.11',
'version': '13.20.04.13',
'author': 'Sunpop.cn',
'category': 'Base',
'website': 'https://www.sunpop.cn',
@@ -48,6 +48,7 @@
11. 收款相关显示中国习惯
12. 翻译导出默认中文，默认po
13. 在 base 模型增加 name_en_US 字段，赋值后同时改翻译值
14. 常用小数精度调整
21. todo:中文演示数据(只有demo模式才加载)
""",
'pre_init_hook': 'pre_init_hook',
@@ -68,6 +69,7 @@
'wizard/sale_make_invoice_advance_views.xml',
'data/ir_default_data.xml',
'data/base_data.xml',
'data/decimal_precision_data.xml',
'data/res_country_data.xml',
'data/res_currency_data.xml',
'data/res_lang_data.xml',

14
app_base_chinese/data/decimal_precision_data.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<record id="product.decimal_discount" model="decimal.precision">
<field name="digits">0</field>
</record>
<record id="product.decimal_product_uom" model="decimal.precision">
<field name="digits">2</field>
</record>
<record id="account.decimal_payment" model="decimal.precision">
<field name="digits">3</field>
</record>
</data>
</odoo>

14
app_odoo_customize/views/ir_ui_menu_views.xml
View File

@@ -5,6 +5,20 @@
<record id="base.menu_grant_menu_access" model="ir.ui.menu">
<field name="parent_id" ref="base.menu_administration"/>
</record>
<record id="app_edit_menu" model="ir.ui.view">
<field name="name">app.ir.ui.menu.tree</field>
<field name="model">ir.ui.menu</field>
<field name="inherit_id" ref="base.edit_menu"/>
<field name="arch" type="xml">
<xpath expr="//tree" position="attributes">
<multi_edit eval="True"/>
</xpath>
<field name="complete_name" position="after">
<field name="name"/>
<field name="parent_id"/>
</field>
</field>
</record>
<record id="app_edit_menu_access_search" model="ir.ui.view">
<field name="name">app.ir.ui.menu.search</field>
<field name="model">ir.ui.menu</field>

17
app_product_superbar/static/description/index.html
View File

@@ -18,7 +18,7 @@
free 20 related apps.
</a>
</h1>
<h3 class="oe_slogan">Easy to navigator and browse any data. Support list, kanban, pivot, graph view. </h3>
<h3 class="oe_slogan">Easy to navigator and browse any data. Support Search more, list, kanban, pivot, graph view. </h3>
<h2>Online demo <i class="fa fa-user text-primary"></i> user/password: demo/demo
<a href="http://demo.odooapp.cn/web?#action=263&model=sale.order&view_type=list&menu_id=141" target="_blank">
<i class="fa fa-arrow-right text-warning"></i>Click to get demo.
@@ -35,6 +35,10 @@
<i class="fa fa-check-square-o text-primary"></i>
Easy to show parent children tree for tree, kanban, pivot, graph view.(Note that there would be little different in UI between odoo12,11,10)
</li>
<li>
<i class="fa fa-check-square-o text-primary"></i>
Filter product of any data in "Search More..." popup windows.
</li>
<li>
<i class="fa fa-check-square-o text-primary"></i>
Responsive UI.Only show when width > 992px;
@@ -137,6 +141,17 @@
</div>
</section>
<section class="oe_container">
<div class="oe_row oe_spaced">
</div>
<div class="oe_row oe_spaced">
<h1>&nbsp;</h1>
<h4 class="oe_slogan">Filter product or any data in search more windows</h4>
<div class="oe_demo oe_screenshot">
<img oe_demo oe_screenshot src="searchmore.jpg"/>
</div>
</div>
</section>
<section class="oe_container">
<div class="oe_row oe_spaced">
<h4 class="oe_slogan">Free to Use in product category.</h4>

4
app_sale_superbar/views/sale_order_views.xml
View File

@@ -11,7 +11,7 @@
<field name="company_id" groups="base.group_multi_company" icon="fa-building"/>
<field name="team_id"/>
<field name="user_id"/>
<field name="partner_id" select='multi' domain="[['customer_rank','&gt;', 0]]"/>
<field name="partner_id" filter_domain="[('customer_rank','&gt;', 0)]"/>
</searchpanel>
</xpath>
</field>
@@ -27,7 +27,7 @@
<field name="company_id" groups="base.group_multi_company" icon="fa-building"/>
<field name="invoice_status"/>
<field name="team_id"/>
<field name="partner_id" select='multi' domain="[['customer_rank','&gt;', 0]]"/>
<field name="partner_id" filter_domain="[('customer_rank','&gt;', 0)]"/>
<field name="user_id"/>
</searchpanel>
</xpath>

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

@@ -28,7 +28,27 @@
border-left: 0.3em solid transparent;
}
}
//列表左右显示边框
.o_list_view .table-responsive .o_list_table > thead > tr:first-child > th {
border-left: 1px solid #dfdfdf;;
border-right: 1px solid #dfdfdf;;
}
//内容显示边框
.o_list_view .table-responsive .o_list_table .o_data_row > .o_data_cell {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
.o_list_view .table-responsive .o_list_table .o_data_row:not(.o_selected_row) > .o_data_cell:not(.o_readonly_modifier):not(:last-child) {
border-left: 1px solid #dee2e6;
border-right: 1px solid #dee2e6;
}
//选择列icon，避免被滚动条挡
.o_content > .o_list_view > .table-responsive > .table .o_optional_columns_dropdown_toggle {
padding: 8px 20px 8px 10px;
}
.o_list_view .table-responsive .o_optional_columns_dropdown_toggle {
padding: 0 20px 0 5px;
}
// Notebooks ,form_view,移动端优化
.o_form_view {
.o_notebook {