Merge branch '16.0' into TA#68033

canada_account_types/__manifest__.py

@@ -11,6 +11,8 @@
     "category": "Accounting",
     "summary": "Add account types for Canada.",
     "depends": ["account"],
-    "data": [],
+    "data": [
+        "views/account_account_views.xml",
+    ],
     "installable": True,
 }

canada_account_types/i18n/fr.po

@@ -17,6 +17,49 @@ msgstr ""
 
 
 
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__liability_non_current
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__liability_non_current
+msgid "Non-current Liabilities"
+msgstr "Passifs non courants"
+
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__asset_prepayments
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__asset_prepayments
+msgid "Prepayments"
+msgstr "Accomptes"
+
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__equity
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__equity
+msgid "Equity"
+msgstr "Fonds propres"
+
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__off_balance
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__off_balance
+msgid "Off-Balance Sheet"
+msgstr "Hors bilan"
+
+
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__equity_unaffected
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__equity_unaffected
+msgid "Current Year Earnings"
+msgstr "Bénéfices de l'année en cours"
+
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__liability_payable
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__liability_payable
+msgid "Payable"
+msgstr "Dette fournisseur"
+
+#. module: account
+#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__liability_credit_card
+#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__liability_credit_card
+msgid "Credit Card"
+msgstr "Carte de crédit"
+
 #. module: canada_account_types
 #: model:ir.model.fields.selection,name:canada_account_types.selection__account_account__account_type__interest_expenses
 #: model:ir.model.fields.selection,name:canada_account_types.selection__account_account_template__account_type__interest_expenses
@@ -55,13 +98,6 @@ msgstr "Autres actifs non courants"
 msgid "Other Current Liabilities"
 msgstr "Autres passifs courants"
 
-
-#. module: account
-#: model:ir.model.fields.selection,name:account.selection__account_account__account_type__liability_non_current
-#: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__liability_non_current
-msgid "Non-current Liabilities"
-msgstr "Passifs non courants"
-
 #. module: canada_account_types
 #: model:ir.model.fields.selection,name:account.selection__account_account__account_type__income
 #: model:ir.model.fields.selection,name:account.selection__account_account_template__account_type__income

canada_account_types/views/account_account_views.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_form" model="ir.ui.view">
+        <field name="name">account.type.widget.form</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_form" />
+        <field name="arch" type="xml">
+            <field name="account_type" position="replace">
+                <field name="account_type" />
+            </field>
+        </field>
+    </record>
+</odoo>