diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index 3a0b7d3e2..b81290698 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -12.0.20191218.0 \ No newline at end of file +12.0.20200107.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 8b73e2315..92a7664d4 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -11,6 +11,7 @@ setuptools.setup( 'odoo12-addon-attachment_unindex_content', 'odoo12-addon-auditlog', 'odoo12-addon-auto_backup', + 'odoo12-addon-base_conditional_image', 'odoo12-addon-base_cron_exclusion', 'odoo12-addon-base_custom_info', 'odoo12-addon-base_exception', diff --git a/setup/base_conditional_image/odoo/addons/base_conditional_image b/setup/base_conditional_image/odoo/addons/base_conditional_image new file mode 120000 index 000000000..3e3201d04 --- /dev/null +++ b/setup/base_conditional_image/odoo/addons/base_conditional_image @@ -0,0 +1 @@ +../../../../base_conditional_image \ No newline at end of file diff --git a/setup/base_conditional_image/setup.py b/setup/base_conditional_image/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_conditional_image/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)