diff --git a/setup/_metapackage/VERSION.txt b/setup/_metapackage/VERSION.txt index af3f970d9..a90053209 100644 --- a/setup/_metapackage/VERSION.txt +++ b/setup/_metapackage/VERSION.txt @@ -1 +1 @@ -11.0.20180623.0 \ No newline at end of file +11.0.20180629.0 \ No newline at end of file diff --git a/setup/_metapackage/setup.py b/setup/_metapackage/setup.py index 3017c476a..d86142aec 100644 --- a/setup/_metapackage/setup.py +++ b/setup/_metapackage/setup.py @@ -12,6 +12,7 @@ setuptools.setup( 'odoo11-addon-base_location', 'odoo11-addon-base_location_geonames_import', 'odoo11-addon-base_location_nuts', + 'odoo11-addon-base_partner_merge', 'odoo11-addon-base_partner_sequence', 'odoo11-addon-base_vat_sanitized', 'odoo11-addon-partner_address_street3', diff --git a/setup/base_partner_merge/odoo/addons/base_partner_merge b/setup/base_partner_merge/odoo/addons/base_partner_merge new file mode 120000 index 000000000..d3e0f699b --- /dev/null +++ b/setup/base_partner_merge/odoo/addons/base_partner_merge @@ -0,0 +1 @@ +../../../../base_partner_merge \ No newline at end of file diff --git a/setup/base_partner_merge/setup.cfg b/setup/base_partner_merge/setup.cfg new file mode 100644 index 000000000..3c6e79cf3 --- /dev/null +++ b/setup/base_partner_merge/setup.cfg @@ -0,0 +1,2 @@ +[bdist_wheel] +universal=1 diff --git a/setup/base_partner_merge/setup.py b/setup/base_partner_merge/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/base_partner_merge/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)