Merge branch 'master' into 8.0

CompassionCH · Feb 11, 2016 · f96926d · f96926d
2 parents 37156b1 + 0876e24
commit f96926d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/recurring_contract/tests/test_recurring_contract.py b/recurring_contract/tests/test_recurring_contract.py
@@ -92,12 +92,12 @@ def test_generated_invoice_second_scenario(self):
             other_vals={'recurring_value': 1, 'recurring_unit': 'month'})
 
         contract = self._create_contract(
-            datetime.today() + timedelta(days=2), group,
-            datetime.today() + timedelta(days=2))
+            (datetime.today() + timedelta(days=2)).strftime(DF), group,
+            (datetime.today() + timedelta(days=2)).strftime(DF))
         contract_line = self._create_contract_line(contract.id, '75.0')
         contract2 = self._create_contract(
-            datetime.today() + timedelta(days=2),
-            group, datetime.today() + timedelta(days=2))
+            (datetime.today() + timedelta(days=2)).strftime(DF),
+            group, (datetime.today() + timedelta(days=2)).strftime(DF))
         contract_line2 = self._create_contract_line(
             contract2.id, '85.0')
 

diff --git a/recurring_contract/view/res_partner_view.xml b/recurring_contract/view/res_partner_view.xml
@@ -12,11 +12,11 @@
 		<field name="inherit_id" ref="base.view_partner_form" />
 		<field name="arch" type="xml">
 			<data>
-			<notebook position="inside">
+			<page string="Contacts" position="before">
 				<page string="Contracts">
 					<field name="contract_ids" context="{'partner_contracts_view': True, 'default_partner_id': active_id}" />
 				</page>
-			</notebook>
+			</page>
 			</data>
 		</field>
 	</record>