Skip to content

Commit

Permalink
TA#66731 [ADD][16.0] Initiate branch
Browse files Browse the repository at this point in the history
  • Loading branch information
majouda committed Jun 25, 2024
1 parent c99523f commit 833a90e
Show file tree
Hide file tree
Showing 1,231 changed files with 58 additions and 32,920 deletions.
60 changes: 30 additions & 30 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,34 @@ jobs:
name: Setup Log Folder For Reports
command: sudo mkdir -p .log && sudo chmod 777 .log

- run:
name: Run Test
command: docker-compose run --rm odoo run_pytest.sh
# - run:
# name: Run Test
# command: docker-compose run --rm odoo run_pytest.sh

- run:
name: Codacy Coverage
command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml
# - run:
# name: Codacy Coverage
# command: bash <(curl -Ls https://coverage.codacy.com/get.sh) report -l python -r .log/coverage.xml

- store_test_results:
path: .log
# - store_test_results:
# path: .log

# job that find the next tag for the current branch/repo and push the tag to github.
# it will trigger the publish of a new docker image.
auto-tag:
machine: true
steps:
- checkout
- run:
<<: *quay_io_login
- run:
name: Get nws
command: |
curl -L $NWS_BIN_LOCATION > ./nws
chmod +x ./nws
- run:
name: Set tag
command: |
./nws circleci create-tag -t odoo-base
# auto-tag:
# machine: true
# steps:
# - checkout
# - run:
# <<: *quay_io_login
# - run:
# name: Get nws
# command: |
# curl -L $NWS_BIN_LOCATION > ./nws
# chmod +x ./nws
# - run:
# name: Set tag
# command: |
# ./nws circleci create-tag -t odoo-base

workflows:
version: 2
Expand All @@ -57,10 +57,10 @@ workflows:
- tests:
context: quay.io

- auto-tag:
context: nws
requires:
- tests
filters:
branches:
only: /^1\d\.0/
# - auto-tag:
# context: nws
# requires:
# - tests
# filters:
# branches:
# only: /^1\d\.0/
2 changes: 1 addition & 1 deletion .docker_files/main/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# © 2019 Numigi
# © 2024 Numigi
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
80 changes: 2 additions & 78 deletions .docker_files/main/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# © 2023 Numigi
# © 2024 Numigi
# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).

{
Expand All @@ -11,83 +11,7 @@
"category": "Other",
"summary": "Install all addons required for testing.",
"depends": [
"crm_assign_by_area",
"crm_assign_in_house",
"crm_brand",
"crm_kanban_prorated_revenue",
"crm_lead_product",
"crm_team_by_industry",
"delivery_carrier_fixed_over",
"event_sale_order_status",
"partner_sale_target",
"partner_sale_target_change_parent_binding",
"payment_auto_confirm_sale_order",
"product_configurator_sale_ext",
"product_pack_ext",
"sale_commitment_date_update",
"sale_commitment_date_update_mrp",
"sale_coupon_apply_on_domain",
"sale_default_analytic_tag",
"sale_default_term_on_company",
"sale_delivery_completion",
"sale_delivery_completion_rental",
"sale_display_qty_widget_secondary_unit",
"sale_double_validation",
"sale_double_validation_extend",
"sale_dynamic_price",
"sale_intercompany_service",
"sale_invoice_email_warning",
"sale_invoice_group_by_order",
"sale_invoice_no_follow",
"sale_kit",
"sale_minimum_margin",
"sale_order_default_taxes",
"sale_order_groupby_parent_affiliate",
"sale_order_line_checkbox",
"sale_order_line_margin_amount",
"sale_order_line_readonly_conditions",
"sale_order_margin_percent",
"sale_order_partner_restrict_affiliates",
"sale_order_portal_hide_invoices",
"sale_order_type_email_template",
"sale_order_url_tracking",
"sale_order_weight",
"sale_partner_authorized_company",
"sale_persistent_product_warning",
"sale_privilege_level",
"sale_privilege_level_delivery",
"sale_privilege_level_payment",
"sale_privilege_level_pricelist",
"sale_privilege_level_rental_pricelist",
"sale_privilege_level_website",
"sale_product_configurator_img_width",
"sale_product_pack_configurator_binding",
"sale_product_pack_ext",
"sale_product_pack_modifiable",
"sale_project_description",
"sale_project_milestone",
"sale_qweb_report_website_desc",
"sale_rental",
"sale_rental_app",
"sale_rental_order_swap_variant",
"sale_rental_portal",
"sale_rental_pricelist",
"sale_rental_status",
"sale_report_partner",
"sale_stock_availability_popover",
"sale_stock_move_no_merge",
"sale_subscription_extended",
"sale_target_margin",
"sale_warranty",
"sale_warranty_groupby_parent_affiliate",
"sale_whole_order_invoiced",
"sale_xmlrpc_compatible",
"sales_team_account_journal",
"web_view_google_map_itinerary",
"website_payment_message_enhanced",
"website_sale_request_price",
"website_sale_request_price_wishlist",
"website_stock_availability_enhanced",
"sale_management",
],
"installable": True,
}
2 changes: 1 addition & 1 deletion .docker_files/odoo.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test_report_directory = False
translate_modules = ['all']
unaccent = False
without_demo = False
workers = 5
workers = 0
xmlrpc = True
xmlrpc_interface =
xmlrpc_port = 8069
Expand Down
1 change: 0 additions & 1 deletion .docker_files/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
freezegun==0.2.0
ddt==1.1.3
git+https://github.com/OCA/openupgradelib@master
astor==0.8.1
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: pre-commit
on:
pull_request:
branches:
- "14.0*"
- "16.0*"
push:
branches:
- "14.0"
- "16.0"

jobs:
pre-commit:
Expand Down
82 changes: 1 addition & 81 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/numigi/odoo-public:14.latest
FROM quay.io/numigi/odoo-public:16.latest
LABEL maintainer="[email protected]"

USER root
Expand All @@ -16,85 +16,5 @@ RUN gitoo install-all --conf_file /gitoo.yml --destination "${THIRD_PARTY_ADDONS

USER odoo

COPY crm_assign_by_area /mnt/extra-addons/crm_assign_by_area
COPY crm_assign_in_house /mnt/extra-addons/crm_assign_in_house
COPY crm_brand /mnt/extra-addons/crm_brand
COPY crm_kanban_prorated_revenue /mnt/extra-addons/crm_kanban_prorated_revenue
COPY crm_lead_product /mnt/extra-addons/crm_lead_product
COPY crm_team_by_industry /mnt/extra-addons/crm_team_by_industry
COPY delivery_carrier_fixed_over /mnt/extra-addons/delivery_carrier_fixed_over
COPY event_sale_order_status /mnt/extra-addons/event_sale_order_status
COPY partner_sale_target /mnt/extra-addons/partner_sale_target
COPY partner_sale_target_change_parent_binding /mnt/extra-addons/partner_sale_target_change_parent_binding
COPY payment_auto_confirm_sale_order /mnt/extra-addons/payment_auto_confirm_sale_order
COPY product_configurator_sale_ext /mnt/extra-addons/product_configurator_sale_ext
COPY product_pack_ext /mnt/extra-addons/product_pack_ext
COPY sale_commitment_date_update /mnt/extra-addons/sale_commitment_date_update
COPY sale_commitment_date_update_mrp /mnt/extra-addons/sale_commitment_date_update_mrp
COPY sale_coupon_apply_on_domain /mnt/extra-addons/sale_coupon_apply_on_domain
COPY sale_default_analytic_tag /mnt/extra-addons/sale_default_analytic_tag
COPY sale_default_term_on_company /mnt/extra-addons/sale_default_term_on_company
COPY sale_delivery_completion /mnt/extra-addons/sale_delivery_completion
COPY sale_delivery_completion_rental /mnt/extra-addons/sale_delivery_completion_rental
COPY sale_display_qty_widget_secondary_unit /mnt/extra-addons/sale_display_qty_widget_secondary_unit
COPY sale_double_validation /mnt/extra-addons/sale_double_validation
COPY sale_double_validation_extend /mnt/extra-addons/sale_double_validation_extend
COPY sale_dynamic_price /mnt/extra-addons/sale_dynamic_price
COPY sale_intercompany_service /mnt/extra-addons/sale_intercompany_service
COPY sale_invoice_email_warning /mnt/extra-addons/sale_invoice_email_warning
COPY sale_invoice_group_by_order /mnt/extra-addons/sale_invoice_group_by_order
COPY sale_invoice_no_follow /mnt/extra-addons/sale_invoice_no_follow
COPY sale_kit /mnt/extra-addons/sale_kit
COPY sale_minimum_margin /mnt/extra-addons/sale_minimum_margin
COPY sale_order_default_taxes /mnt/extra-addons/sale_order_default_taxes
COPY sale_order_groupby_parent_affiliate /mnt/extra-addons/sale_order_groupby_parent_affiliate
COPY sale_order_line_checkbox /mnt/extra-addons/sale_order_line_checkbox
COPY sale_order_line_margin_amount /mnt/extra-addons/sale_order_line_margin_amount
COPY sale_order_line_readonly_conditions /mnt/extra-addons/sale_order_line_readonly_conditions
COPY sale_order_margin_percent /mnt/extra-addons/sale_order_margin_percent
COPY sale_order_partner_restrict_affiliates /mnt/extra-addons/sale_order_partner_restrict_affiliates
COPY sale_order_portal_hide_invoices /mnt/extra-addons/sale_order_portal_hide_invoices
COPY sale_order_type_email_template /mnt/extra-addons/sale_order_type_email_template
COPY sale_order_url_tracking /mnt/extra-addons/sale_order_url_tracking
COPY sale_order_weight /mnt/extra-addons/sale_order_weight
COPY sale_partner_authorized_company /mnt/extra-addons/sale_partner_authorized_company
COPY sale_persistent_product_warning /mnt/extra-addons/sale_persistent_product_warning
COPY sale_privilege_level /mnt/extra-addons/sale_privilege_level
COPY sale_privilege_level_delivery /mnt/extra-addons/sale_privilege_level_delivery
COPY sale_privilege_level_payment /mnt/extra-addons/sale_privilege_level_payment
COPY sale_privilege_level_pricelist /mnt/extra-addons/sale_privilege_level_pricelist
COPY sale_privilege_level_rental_pricelist /mnt/extra-addons/sale_privilege_level_rental_pricelist
COPY sale_privilege_level_website /mnt/extra-addons/sale_privilege_level_website
COPY sale_product_configurator_img_width /mnt/extra-addons/sale_product_configurator_img_width
COPY sale_product_pack_configurator_binding /mnt/extra-addons/sale_product_pack_configurator_binding
COPY sale_product_pack_ext /mnt/extra-addons/sale_product_pack_ext
COPY sale_product_pack_modifiable /mnt/extra-addons/sale_product_pack_modifiable
COPY sale_project_description /mnt/extra-addons/sale_project_description
COPY sale_project_milestone /mnt/extra-addons/sale_project_milestone
COPY sale_qweb_report_website_desc /mnt/extra-addons/sale_qweb_report_website_desc
COPY sale_rental /mnt/extra-addons/sale_rental
COPY sale_rental_app /mnt/extra-addons/sale_rental_app
COPY sale_rental_order_swap_variant /mnt/extra-addons/sale_rental_order_swap_variant
COPY sale_rental_portal /mnt/extra-addons/sale_rental_portal
COPY sale_rental_pricelist /mnt/extra-addons/sale_rental_pricelist
COPY sale_rental_status /mnt/extra-addons/sale_rental_status
COPY sale_report_partner /mnt/extra-addons/sale_report_partner
COPY sale_stock_availability_popover /mnt/extra-addons/sale_stock_availability_popover
COPY sale_stock_move_no_merge /mnt/extra-addons/sale_stock_move_no_merge
COPY sale_subscription_extended /mnt/extra-addons/sale_subscription_extended
COPY sale_target_margin /mnt/extra-addons/sale_target_margin
COPY sale_warranty /mnt/extra-addons/sale_warranty
COPY sale_warranty_groupby_parent_affiliate /mnt/extra-addons/sale_warranty_groupby_parent_affiliate
COPY sale_whole_order_invoiced /mnt/extra-addons/sale_whole_order_invoiced
COPY sale_xmlrpc_compatible /mnt/extra-addons/sale_xmlrpc_compatible
COPY sales_team_account_journal /mnt/extra-addons/sales_team_account_journal
COPY web_view_google_map_itinerary /mnt/extra-addons/web_view_google_map_itinerary
COPY website_payment_message_enhanced /mnt/extra-addons/website_payment_message_enhanced
COPY website_sale_request_price /mnt/extra-addons/website_sale_request_price
COPY website_sale_request_price_wishlist /mnt/extra-addons/website_sale_request_price_wishlist
COPY website_stock_availability_enhanced /mnt/extra-addons/website_stock_availability_enhanced



COPY .docker_files/main /mnt/extra-addons/main
COPY .docker_files/odoo.conf /etc/odoo
Empty file removed __init__.py
Empty file.
47 changes: 0 additions & 47 deletions crm_assign_by_area/README.rst

This file was deleted.

5 changes: 0 additions & 5 deletions crm_assign_by_area/__init__.py

This file was deleted.

21 changes: 0 additions & 21 deletions crm_assign_by_area/__manifest__.py

This file was deleted.

Loading

0 comments on commit 833a90e

Please sign in to comment.