Merge remote-tracking branch 'abaghirli/BSSFL-60_account_cutoff'

sambarros · Sep 28, 2017 · 51d4c5f · 51d4c5f
2 parents 850543c + bb1cde3
commit 51d4c5f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git 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/HISTORY.rst b/HISTORY.rst
@@ -28,6 +28,7 @@ latest (unreleased)
 * Install module sale_product_set and sale_product_set_layout
 * Hide unit price field on mrp repair line
 * Set 'add' as default value on mrp repair line
+* Install modules account_cutoff_accrual_base and account_cutoff_accrual_picking
 
 **Bugfixes**
 

diff --git a/odoo/external-src/account-closing b/odoo/external-src/account-closing
diff --git 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

diff --git 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