Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

12.0 ir_attachment_google_cloud_storage #792

Open
wants to merge 15 commits into
base: misc-addons-12.0-ir_attachment_google_cloud_storage
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .DINAR/build-date.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
April 3, 2020
14 changes: 13 additions & 1 deletion .github/workflows/DINAR-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,30 @@ jobs:
mkdir new-deps/
# create dummy file to be sure that Artifact will be uploaded
echo ok > new-deps/.empty
echo "::set-env name=ARTIFACT::empty"
- name: Prepare DINAR with additional dependencies
if: env.PR_MODULES_DEPS != '' || env.PR_DEPS != ''
run: |
# Save artifacts for local run and for integrations Tests
bash DINAR/workflow-files/save-docker-layers.sh new-deps/
echo "${{ env.PR_MODULES_DEPS }}" > new-deps/modules.txt
echo "::set-env name=ARTIFACT::yes"
- name: Save DINAR with dependencies
uses: actions/upload-artifact@v1
with:
name: new-deps
path: new-deps/
- name: HOW TO RUN QUICK TESTS LOCALLY
if: always()
run: |
export MODULES=${{ env.PR_MODULES }}
export LOAD_MODULES=${{ env.PR_MODULES_LOAD }}
export PR_NUM=${{ github.event.number }}
export VERSION=${{ github.event.pull_request.base.ref }}
export REVISION_PR=${{ github.event.pull_request.head.sha}}
export DINAR_REPO="itpp-labs/DINAR-fork"
export ODOO_EXTRA_ARG=--test-enable
bash DINAR/workflow-files/how-to-run-locally.sh ${{ secrets.GITHUB_TOKEN }}
- name: Test updated modules
if: env.PR_MODULES != ''
run: |
Expand Down Expand Up @@ -221,7 +234,6 @@ jobs:
sudo apt-get install jq
- name: HOW TO RUN TESTS LOCALLY
if: always()
# TODO make similar for Quick Tests
run: |
export MODULES=${{ env.ALL_MODULES }}
export LOAD_MODULES=${{ env.ALL_MODULES_LOAD }}
Expand Down
24 changes: 23 additions & 1 deletion .github/workflows/DINAR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,27 @@ jobs:
echo "DINAR_TOKEN is not set"
exit 1
fi

check-branch:
runs-on: ubuntu-latest
steps:
- name: Check that this branch needs docker images
run: |
REF=${GITHUB_BASE_REF:-${GITHUB_REF}}
BRANCH=${REF##*/}
CHECK=$( echo "$BRANCH" | grep -E "^(master|[0-9]+\.[0-9]+)(-dev-.+)?$" || true)
if [ -z "$CHECK" ]
then
echo "This branch is not supposed to be a target of pull requests, so docker image is not needed."
echo "For information check https://github.com/itpp-labs/DINAR/issues/60"
exit 1
fi

rebuild-images:
runs-on: ubuntu-latest
needs:
- check-secret
- check-branch
steps:
- name: Checkout Repo
uses: actions/checkout@v2
Expand All @@ -60,7 +77,12 @@ jobs:
run: |
bash DINAR/workflow-files/configure-docker.sh ${{ secrets.DINAR_TOKEN }}

- name: dinar-odoo-base
cat <<- EOF > REPO/.DINAR/image/.netrc
machine github.com
login $GITHUB_ACTOR
password ${{ secrets.DINAR_TOKEN }}
EOF
- name: Build ${{ env.IMAGE_ODOO_BASE }}
uses: elgohr/Publish-Docker-Github-Action@master
env:
LOCAL_CUSTOM_DIR: ./image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repo2store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Checkout REPO
uses: actions/checkout@v2-beta
with:
fetch-depth: 100
fetch-depth: 0
# custom token is not needed for fetching REPO,
# but the action makes some magic with authentication headers
# which are used on pushing to REPO-store
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
name: prettier xml plugin
additional_dependencies:
- "[email protected]"
- "@prettier/plugin-xml@0.5.0"
- "@prettier/plugin-xml@0.7.2"
files: \.xml$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v6.8.0
Expand Down Expand Up @@ -88,11 +88,11 @@ repos:
name: pylint with optional checks
args: ["--rcfile=.pylintrc", "--exit-zero"]
verbose: true
additional_dependencies: ["pylint-odoo==3.0.3"]
additional_dependencies: ["pylint-odoo==3.1.0"]
- id: pylint
name: pylint with mandatory checks
args: ["--rcfile=.pylintrc-mandatory"]
additional_dependencies: ["pylint-odoo==3.0.3"]
additional_dependencies: ["pylint-odoo==3.1.0"]
- repo: https://github.com/asottile/pyupgrade
rev: v1.26.2
hooks:
Expand Down
1 change: 1 addition & 0 deletions .prettierrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ printWidth: 88
proseWrap: always
semi: true
trailingComma: "es5"
xmlWhitespaceSensitivity: "ignore"
14 changes: 6 additions & 8 deletions auth_signup_confirmation/data/config.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<openerp>
<data noupdate="1">

<record id="url_singup_thankyou" model="ir.config_parameter">
<field name="key">auth_signup_confirmation.url_singup_thankyou</field>
<field name="value">/web/signup/thankyou/</field>
</record>

</data>
<data noupdate="1">
<record id="url_singup_thankyou" model="ir.config_parameter">
<field name="key">auth_signup_confirmation.url_singup_thankyou</field>
<field name="value">/web/signup/thankyou/</field>
</record>
</data>
</openerp>
15 changes: 5 additions & 10 deletions autostaging_project_task/views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,20 @@
Copyright 2019 Artem Rafailov <https://it-projects.info/team/Ommo73/>
License MIT (https://opensource.org/licenses/MIT). -->
<openerp>
<data>
<data>
<record id="mt_autostaging" model="mail.message.subtype">
<field name="name">Autostaging</field>
<field name="res_model">project.task</field>
<field name="default" eval="False" />
<field name="description">Autostaging</field>
</record>

<record id="mt_autostaging_project" model="mail.message.subtype">
<field name="name">Autostaging</field>
<field name="res_model">project.project</field>
<field name="default" eval="True" />
<field name="parent_id" ref="mt_autostaging" />
<field name="relation_field">project_id</field>
</record>

<record id="view_project_form_autostaging_enabled" model="ir.ui.view">
<field name="name">project.form.allow.automove</field>
<field name="model">project.project</field>
Expand All @@ -29,11 +27,10 @@
<xpath expr="//group[@name='misc']" position="inside">
<label for="autostaging_enabled" string="Autostaging enabled" />
<field name="autostaging_enabled" />
</xpath>
</xpath>
</data>
</field>
</record>

<record id="view_project_task_type_form_autostaging" model="ir.ui.view">
<field name="name">project.task.type.form.autostaging</field>
<field name="model">project.task.type</field>
Expand All @@ -50,14 +47,14 @@
<field
name="autostaging_idle_timeout"
attrs="{'required': [('autostaging_enabled','=',True)], 'readonly':[('autostaging_enabled', '=', False)]}"
> <span>days</span> </field>
>
<span>days</span>
</field>
</group>
</xpath>
</data>
</field>
</record>


<record id="view_project_task_type_tree_autostaging" model="ir.ui.view">
<field name="name">project.task.type.tree.autostaging</field>
<field name="model">project.task.type</field>
Expand All @@ -70,7 +67,6 @@
</data>
</field>
</record>

<record id="view_project_task_form_autostaging" model="ir.ui.view">
<field name="name">project.task.form.autostaging</field>
<field name="model">project.task</field>
Expand All @@ -93,6 +89,5 @@
</data>
</field>
</record>

</data>
</openerp>
32 changes: 22 additions & 10 deletions base_attendance/report/res_partner_badge.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
Copyright 2018-2019 Kolushov Alexandr <https://it-projects.info/team/KolushovAlexandr>
License MIT (https://opensource.org/licenses/MIT).-->
<odoo>

<report
id="hr_partner_print_badge"
string="Print Badge"
Expand All @@ -13,7 +12,6 @@
file="base_attendance.print_partner_badge"
print_report_name="'Print Badge - %s' % (object.name).replace('/', '')"
/>

<template id="print_partner_badge">
<t t-call="web.basic_layout">
<div class="page">
Expand Down Expand Up @@ -48,23 +46,37 @@
</td>
<td style="width:67%" valign="center">
<table style="width:155pt; height:85pt">
<tr><th><div
<tr>
<th>
<div
style="font-size:15pt; margin-bottom:0pt;margin-top:0pt;"
align="center"
><t t-esc="partner.name" /></div></th></tr>
>
<t t-esc="partner.name" />
</div>
</th>
</tr>
<!--<tr><td><div align="center" style="font-size:10pt;margin-bottom:5pt;"><t t-esc="partner.job_id.name"/></div></td></tr>-->
<tr><td><div
<tr>
<td>
<div
align="center"
style="font-size:10pt;margin-bottom:5pt;"
><t
t-esc="partner.function"
/></div></td></tr>
<tr><td><img
>
<t t-esc="partner.function" />
</div>
</td>
</tr>
<tr>
<td>
<img
t-if="partner.barcode"
t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', partner.barcode, 600, 120)"
style="max-height:50pt;max-width:100%;"
align="center"
/></td></tr>
/>
</td>
</tr>
</table>
</td>
</table>
Expand Down
8 changes: 0 additions & 8 deletions base_attendance/security/res_attendance_security.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
<field name="description">Helps you manage the partner attendances.</field>
<field name="sequence">15</field>
</record>

<record id="group_res_attendance" model="res.groups">
<field name="name">Read Only</field>
<field name="category_id" ref="module_category_attendance" />
<field name="comment">The user will gain access to see attendances menu.</field>
</record>

<record id="group_manual_attendance" model="res.groups">
<field name="name">Manual Attendances</field>
<field name="category_id" ref="module_category_attendance" />
Expand All @@ -26,31 +24,26 @@
name="comment"
>The user will gain access to manage partners attendance.</field>
</record>

<record id="group_hr_attendance_manager" model="res.groups">
<field name="name">Manager</field>
<field name="category_id" ref="module_category_attendance" />
<field name="implied_ids" eval="[(4, ref('group_manual_attendance'))]" />
<field name="users" eval="[(4, ref('base.user_root'))]" />
</record>

<record id="base.user_admin" model="res.users">
<field
name="groups_id"
eval="[(4,ref('base_attendance.group_hr_attendance_manager'))]"
/>
</record>

<record id="group_hr_attendance_use_pin" model="res.groups">
<field name="name">Enable PIN use (for Partner Attendance)</field>
<field name="category_id" ref="base.module_category_hidden" />
<field
name="comment"
>The user will have to enter his PIN to check in and out manually at the company screen.</field>
</record>

<data noupdate="1">

<record id="hr_attendance_rule_attendance_manager" model="ir.rule">
<field name="name">attendance officer: full access</field>
<field name="model_id" ref="model_res_partner_attendance" />
Expand All @@ -60,6 +53,5 @@
eval="[(4,ref('base_attendance.group_hr_attendance_manager'))]"
/>
</record>

</data>
</odoo>
14 changes: 7 additions & 7 deletions base_attendance/static/src/xml/attendance.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<div class="oe_hr_attendance_status fa fa-user">
</div>
</t>

<t t-name="BaseAttendanceKioskMode">
<div class="o_hr_attendance_kiosk_mode_container">
<div class="o_hr_attendance_kiosk_mode">
Expand All @@ -22,7 +21,6 @@
<div class="o_hr_attendance_clock" />
</div>
</t>

<t t-name="BaseAttendanceKioskConfirm">
<div class="o_hr_attendance_kiosk_mode_container">
<div class="o_hr_attendance_kiosk_mode">
Expand Down Expand Up @@ -52,11 +50,13 @@
<div class="row">
<div class="col-8 offset-2">
<div class="row">
<div class="col-4 offset-4"><input
<div class="col-4 offset-4">
<input
class="o_hr_attendance_PINbox"
type="password"
disabled="true"
/></div>
/>
</div>
</div>
<div class="row o_hr_attendance_pin_pad">
<t
Expand All @@ -68,7 +68,9 @@
>
<a
t-attf-class="btn btn-primary btn-block btn-lg o_hr_attendance_btn-round-corners {{ 'o_hr_attendance_pin_pad_button_' + btn_name }}"
><t t-esc="btn_name" /></a>
>
<t t-esc="btn_name" />
</a>
</div>
</t>
</div>
Expand All @@ -88,7 +90,6 @@
<div class="o_hr_attendance_clock" />
</div>
</t>

<t t-name="BaseAttendanceGreetingMessage">
<div class="o_hr_attendance_message_container">
<div class="o_hr_attendance_message">
Expand All @@ -105,7 +106,6 @@
</h2>
<h3 class="o_hr_attendance_random_message" />
<h2 class="o_hr_attendance_warning_message" />

</t>
<t t-if="!widget.attendance.check_out">
<h1 class="o_hr_attendance_validation checkin">
Expand Down
Loading