TA#66762 [16.0][MIG] admin_light_calendar

Numigi · Jul 30, 2024 · 198e15c · 198e15c
1 parent 9013601
commit 198e15c
Show file tree

Hide file tree

Showing 85 changed files with 0 additions and 1,669 deletions.
diff --git a/admin_light_base/README.rst b/admin_light_base/README.rst
diff --git a/admin_light_base/__init__.py b/admin_light_base/__init__.py
diff --git a/admin_light_base/__manifest__.py b/admin_light_base/__manifest__.py
@@ -2,7 +2,6 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 
 {
-<<<<<<< HEAD
     "name": "Admin Light",
     "version": "16.0.1.0.0",
     "author": "Numigi",
@@ -15,21 +14,6 @@
         "views/base.xml",
         "views/sequence.xml",
         "security/ir.model.access.csv",
-=======
-    'name': 'Admin Light',
-    'version': '1.0.2',
-    'author': 'Numigi',
-    'maintainer': 'Numigi',
-    'website': 'https://github.com/Numigi/odoo-base',
-    'license': 'LGPL-3',
-    'category': 'Other',
-    'summary': 'Add an admin menu with restricted functionalities.',
-    'depends': ['base'],
-    'data': [
-        'data/base.xml',
-        'data/sequence.xml',
-        'security/ir.model.access.csv',
->>>>>>> f37ee2d (TA#65405 [UPD][16.0] odoo-base: genaral settings (#935))
     ],
     "installable": True,
     "application": True,

diff --git a/admin_light_base/i18n/fr.po b/admin_light_base/i18n/fr.po
diff --git a/admin_light_base/security/ir.model.access.csv b/admin_light_base/security/ir.model.access.csv
diff --git a/admin_light_base/static/description/app_icon.png b/admin_light_base/static/description/app_icon.png
diff --git a/admin_light_base/static/description/icon.png b/admin_light_base/static/description/icon.png
diff --git a/admin_light_base/static/description/sequence_group.png b/admin_light_base/static/description/sequence_group.png
diff --git a/admin_light_base/static/description/sequence_list.png b/admin_light_base/static/description/sequence_list.png
diff --git a/admin_light_base/static/description/user_form.png b/admin_light_base/static/description/user_form.png
diff --git a/cron_lock_disable/README.rst b/cron_lock_disable/README.rst
diff --git a/cron_lock_disable/__init__.py b/cron_lock_disable/__init__.py
diff --git a/cron_lock_disable/__manifest__.py b/cron_lock_disable/__manifest__.py
diff --git a/cron_lock_disable/models/__init__.py b/cron_lock_disable/models/__init__.py
diff --git a/cron_lock_disable/models/ir_cron.py b/cron_lock_disable/models/ir_cron.py
diff --git a/cron_lock_disable/static/description/icon.png b/cron_lock_disable/static/description/icon.png
diff --git a/cron_lock_disable/static/description/jenkins_logs.png b/cron_lock_disable/static/description/jenkins_logs.png
diff --git a/cron_lock_disable/static/description/odoo_source_code.png b/cron_lock_disable/static/description/odoo_source_code.png
diff --git a/cron_lock_disable/tests/__init__.py b/cron_lock_disable/tests/__init__.py
diff --git a/cron_lock_disable/tests/test_ir_cron.py b/cron_lock_disable/tests/test_ir_cron.py
diff --git a/ir_attachment_access_token_portal/__init__.py b/ir_attachment_access_token_portal/__init__.py
diff --git a/ir_attachment_access_token_portal/static/description/icon.png b/ir_attachment_access_token_portal/static/description/icon.png
diff --git a/lang_fr_activated/__init__.py b/lang_fr_activated/__init__.py
diff --git a/mail_template_default/__init__.py b/mail_template_default/__init__.py
diff --git a/mail_template_default/static/description/icon.png b/mail_template_default/static/description/icon.png
diff --git a/numikube/__init__.py b/numikube/__init__.py
diff --git a/numikube/__manifest__.py b/numikube/__manifest__.py
diff --git a/numikube_attachment_minio/README.rst b/numikube_attachment_minio/README.rst
diff --git a/numikube_attachment_minio/__init__.py b/numikube_attachment_minio/__init__.py
diff --git a/numikube_attachment_minio/__manifest__.py b/numikube_attachment_minio/__manifest__.py
diff --git a/numikube_attachment_minio/bucket.py b/numikube_attachment_minio/bucket.py
diff --git a/numikube_attachment_minio/data/ir_config_parameter.xml b/numikube_attachment_minio/data/ir_config_parameter.xml
diff --git a/numikube_attachment_minio/init_hook.py b/numikube_attachment_minio/init_hook.py
diff --git a/numikube_attachment_minio/static/description/icon.png b/numikube_attachment_minio/static/description/icon.png
diff --git a/numikube_database_backup/__manifest__.py b/numikube_database_backup/__manifest__.py
diff --git a/numikube_database_backup/bucket.py b/numikube_database_backup/bucket.py
diff --git a/numikube_database_backup/models/__init__.py b/numikube_database_backup/models/__init__.py