From 75b5846380770adce2d2e7d06bbcb4c47c622b07 Mon Sep 17 00:00:00 2001 From: a-baghirli Date: Fri, 22 Sep 2017 13:40:15 +0300 Subject: [PATCH 1/4] [BSSFL-60] installed modules account_cutoff_accrual_base and account_cutoff_accrual_picking --- HISTORY.rst | 1 + odoo/migration.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index d4a15d3f308b..5c518d3f99fa 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -23,6 +23,7 @@ latest (unreleased) * Add sensefly invoice report * Add Delivery note / invoice report +* Install modules account_cutoff_accrual_base and account_cutoff_accrual_picking **Bugfixes** diff --git a/odoo/migration.yml b/odoo/migration.yml index 5d5d3839d301..c0ed20eee325 100644 --- a/odoo/migration.yml +++ b/odoo/migration.yml @@ -60,6 +60,8 @@ migration: - mrp_plm # OCA/account-closing - account_cutoff_base + - account_cutoff_accrual_base + - account_cutoff_accrual_picking - account_cutoff_prepaid - account_invoice_start_end_dates # OCA/account-financial-tools From b5f1be2831e5b121304feccf6e27fb3724ce1578 Mon Sep 17 00:00:00 2001 From: a-baghirli Date: Tue, 26 Sep 2017 16:18:41 +0300 Subject: [PATCH 2/4] added pending-merge for account closing --- .gitmodules | 2 +- odoo/pending-merges.yaml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 378370a9b827..f7f6bb28a000 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,7 +24,7 @@ url = git@github.com:OCA/bank-payment.git [submodule "odoo/external-src/account-closing"] path = odoo/external-src/account-closing - url = git@github.com:OCA/account-closing.git + url = git@github.com:camptocamp/account-closing.git [submodule "odoo/external-src/partner-contact"] path = odoo/external-src/partner-contact url = git@github.com:OCA/partner-contact.git diff --git a/odoo/pending-merges.yaml b/odoo/pending-merges.yaml index 7d5463da227d..9adbc5c33a24 100644 --- a/odoo/pending-merges.yaml +++ b/odoo/pending-merges.yaml @@ -56,3 +56,12 @@ # [10.0][ADD] auth_totp: MFA Support - oca refs/pull/703/head target: *default_target + ./external-src/account-closing: + remotes: + oca: git@github.com:OCA/account-closing.git + camptocamp: git@github.com:camptocamp/account-closing.git + merges: + - oca 10.0 + # [MIG][10.0] account_cutoff_accrual_picking + - oca refs/pull/52/head + target: *default_target From 7cf6877ca33d4e0a96f7977dbd549a0d6c0fa87a Mon Sep 17 00:00:00 2001 From: a-baghirli Date: Tue, 26 Sep 2017 17:28:36 +0300 Subject: [PATCH 3/4] submodule added remote camptocamp and linked to commit bb4d0f9 --- odoo/external-src/account-closing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo/external-src/account-closing b/odoo/external-src/account-closing index 565c9f35cff2..bb4d0f996b7d 160000 --- a/odoo/external-src/account-closing +++ b/odoo/external-src/account-closing @@ -1 +1 @@ -Subproject commit 565c9f35cff2879d689cff018ab4cd4b3a4f5c6c +Subproject commit bb4d0f996b7ddf1e340e6b37b904934ea0d64bf1 From bb1cde37e961d3d7987d22d70f941169e8e48926 Mon Sep 17 00:00:00 2001 From: a-baghirli Date: Tue, 26 Sep 2017 17:54:22 +0300 Subject: [PATCH 4/4] intendation --- odoo/pending-merges.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odoo/pending-merges.yaml b/odoo/pending-merges.yaml index 9adbc5c33a24..c55e3ef0523a 100644 --- a/odoo/pending-merges.yaml +++ b/odoo/pending-merges.yaml @@ -56,7 +56,7 @@ # [10.0][ADD] auth_totp: MFA Support - oca refs/pull/703/head target: *default_target - ./external-src/account-closing: +./external-src/account-closing: remotes: oca: git@github.com:OCA/account-closing.git camptocamp: git@github.com:camptocamp/account-closing.git