mirror of
https://gitlab.com/flectra-community/mis-builder.git
synced 2024-11-16 19:22:04 +00:00
Merge branch '1.0-fixed' into 1.0
# Conflicts: # mis_builder/models/kpimatrix.py
This commit is contained in:
Renzo Meister
commit
7e51a0d797
@ -26,6 +26,7 @@ test_all_modules:
|
||||
- apt-get install -y expect-dev
|
||||
- su - flectra -c "mkdir ~/others"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/reporting-engine.git ~/others/reporting-engine"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
|
||||
- sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
|
||||
- mkdir ${CI_PROJECT_DIR}/ci_data
|
||||
@ -38,7 +39,7 @@ test_all_modules:
|
||||
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_all
|
||||
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_all
|
||||
- su - flectra -c "/opt/flectra/flectra-bin
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux
|
||||
--db_host psql
|
||||
--db_port 5432
|
||||
--db_user flectra
|
||||
@ -65,6 +66,7 @@ test_module_mis_builder_budget:
|
||||
- apt install -y expect-dev
|
||||
- su - flectra -c "mkdir ~/others"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/reporting-engine.git ~/others/reporting-engine"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
|
||||
- sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
|
||||
- mkdir ${CI_PROJECT_DIR}/ci_data
|
||||
@ -77,7 +79,7 @@ test_module_mis_builder_budget:
|
||||
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder_budget
|
||||
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder_budget
|
||||
- su - flectra -c "/opt/flectra/flectra-bin
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux
|
||||
--db_host psql
|
||||
--db_port 5432
|
||||
--db_user flectra
|
||||
@ -99,6 +101,7 @@ test_module_mis_builder_demo:
|
||||
- apt install -y expect-dev
|
||||
- su - flectra -c "mkdir ~/others"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/reporting-engine.git ~/others/reporting-engine"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
|
||||
- sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
|
||||
- mkdir ${CI_PROJECT_DIR}/ci_data
|
||||
@ -111,7 +114,7 @@ test_module_mis_builder_demo:
|
||||
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder_demo
|
||||
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder_demo
|
||||
- su - flectra -c "/opt/flectra/flectra-bin
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux
|
||||
--db_host psql
|
||||
--db_port 5432
|
||||
--db_user flectra
|
||||
@ -133,6 +136,7 @@ test_module_mis_builder:
|
||||
- apt install -y expect-dev
|
||||
- su - flectra -c "mkdir ~/others"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/reporting-engine.git ~/others/reporting-engine"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-tools.git ~/others/server-tools"
|
||||
- su - flectra -c "git clone --branch 20-fixed --depth 1 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/flectra-community/server-ux.git ~/others/server-ux"
|
||||
- sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=en_US.UTF-8
|
||||
- mkdir ${CI_PROJECT_DIR}/ci_data
|
||||
@ -145,7 +149,7 @@ test_module_mis_builder:
|
||||
- mv ${CI_PROJECT_DIR}/ci_data/filestore /opt/flectra/.local/share/filestore/test_mis_builder
|
||||
- chown -R flectra.flectra /opt/flectra/.local/share/filestore/test_mis_builder
|
||||
- su - flectra -c "/opt/flectra/flectra-bin
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-ux
|
||||
--addons-path ${CI_PROJECT_DIR},~/others/reporting-engine,~/others/server-tools,~/others/server-ux
|
||||
--db_host psql
|
||||
--db_port 5432
|
||||
--db_user flectra
|
||||
|
||||
@ -73,7 +73,10 @@ class KpiMatrixRow(object):
|
||||
def is_empty(self):
|
||||
for cell in self.iter_cells():
|
||||
dp = cell and cell.row.kpi.env.user.company_id.currency_id.decimal_places or 6
|
||||
if cell and not float_is_zero(cell.val, dp) and cell.val not in (AccountingNone, None):
|
||||
try:
|
||||
if cell and not float_is_zero(cell.val, dp) and cell.val not in (AccountingNone, None):
|
||||
return False
|
||||
except Exception:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user