IntenseFinance/flectra
3
0
Fork 0
mirror of https://gitlab.com/flectra-hq/flectra.git synced 2025-02-25 18:55:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

2.0 dms fix

Browse Source
This commit is contained in:
Rohit Prajapati
2021-02-20 12:56:04 +00:00
committed by Parthiv Patel
parent 5364c94a59
commit edeb819c94
8 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
addons/dms/models/dms_file.py
View File

@@ -511,8 +511,8 @@ class File(models.Model):
ids=", ".join(map(lambda id: "(%s)" % id, directories.ids)),
)
query.add_where(where_clause)
else:
query.where_clause += ["0=1"]
# else:
# query.where_clause += tuple("0=1")
return super(File, self)._read_group_process_groupby(gb, query)
@api.model

2
addons/dms/views/directory.xml
View File

@@ -337,7 +337,7 @@
/>
</div>
<div class="oe_kanban_bottom_right">
<a
<a title="Favourite"
role="button"
type="object"
name="toggle_starred"

2
addons/dms/views/dms_file.xml
View File

@@ -230,7 +230,7 @@
<div
class="o_kanban_record_title o_text_overflow"
>
<a
<a title="File Preview"
class="o_kanban_dms_file_preview fa fa-search"
t-att-data-id="widget.db_id"
/>

1
addons/web_flectra/__manifest__.py
View File

@@ -14,6 +14,7 @@
'data': [
'security/ir.model.access.csv',
'data/theme_config.xml',
'data/pwa_config_data.xml',
'views/assets.xml',
'views/pwa_config_view.xml',
'views/res_company_view.xml',

14
addons/web_flectra/data/pwa_config_data.xml Normal file
View File

@@ -0,0 +1,14 @@
<flectra>
<data noupdate="1">
<record id="flectra_pwa_config_data" model="pwa.config">
<field name="pwa_name">Flectra</field>
<field name="pwa_short_name">Flectra</field>
<field name="pwa_display">standalone</field>
<field name="pwa_theme_color">#009efb</field>
<field name="pwa_background_color">#F2F7FB</field>
<field name="pwa_icon_128" type="base64" file="web_flectra/static/src/img/icons/icon-128x128.png"/>
<field name="pwa_icon_192" type="base64" file="web_flectra/static/src/img/icons/icon-192x192.png"/>
<field name="pwa_icon_512" type="base64" file="web_flectra/static/src/img/icons/icon-512x512.png"/>
</record>
</data>
</flectra>

1
addons/web_flectra/models/pwa_config.py
View File

@@ -9,6 +9,7 @@ class ProgressiveWebAppConfig(models.Model):
_rec_name = 'pwa_name'
_description = 'Progressive Web App Configuration'
active = fields.Boolean("Active", default=True)
pwa_name = fields.Char(
string='Name',
)

10
addons/web_flectra/static/src/scss/fonts.scss
View File

@@ -91,31 +91,31 @@
font-family: 'Lato';
font-style: normal;
font-weight: 400;
src: local('Lato'), local('Lato-Regular'), url(/web_flectra/static/src/fonts/Lato/Lato-Regular.ttf) format('woff2');
src: local('Lato'), local('Lato-Regular'), url(/web_flectra/static/src/fonts/lato/Lato-Regular.ttf) format('woff2');
}
@font-face {
font-family: 'Lato-Black';
font-style: normal;
font-weight: 400;
src: local('Lato-Black'), local('Lato-Black'), url(/web_flectra/static/src/fonts/Lato/Lato-Black.ttf) format('woff2');
src: local('Lato-Black'), local('Lato-Black'), url(/web_flectra/static/src/fonts/lato/Lato-Black.ttf) format('woff2');
}
@font-face {
font-family: 'Lato-Bold';
font-style: normal;
font-weight: 400;
src: local('Lato-Bold'), local('Lato-Bold'), url(/web_flectra/static/src/fonts/Lato/Lato-Bold.ttf) format('woff2');
src: local('Lato-Bold'), local('Lato-Bold'), url(/web_flectra/static/src/fonts/lato/Lato-Bold.ttf) format('woff2');
}
@font-face {
font-family: 'Lato-Italic';
font-style: normal;
font-weight: 400;
src: local('Lato-Italic'), local('Lato-Italic'), url(/web_flectra/static/src/fonts/Lato/Lato-Italic.ttf) format('woff2');
src: local('Lato-Italic'), local('Lato-Italic'), url(/web_flectra/static/src/fonts/lato/Lato-Italic.ttf) format('woff2');
}
@font-face {
font-family: 'Lato-Regular';
font-style: normal;
font-weight: 400;
src: local('Lato-Regular'), local('Lato-Regular'), url(/web_flectra/static/src/fonts/Lato/Lato-Regular.ttf) format('woff2');
src: local('Lato-Regular'), local('Lato-Regular'), url(/web_flectra/static/src/fonts/lato/Lato-Regular.ttf) format('woff2');
}
/* Merriweather */

2
addons/web_flectra/views/pwa_config_view.xml
View File

@@ -6,8 +6,10 @@
<field name="arch" type="xml">
<form string="PWA Configuration">
<sheet>
<widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
<group string="General">
<group>
<field name="active" invisible="1"/>
<field name="pwa_name" />
<field name="pwa_short_name" />
<field name="pwa_company_id" />