diff --git a/account_payment_sale/i18n/account_payment_sale.pot b/account_payment_sale/i18n/account_payment_sale.pot
index e16cd1319..f2ba0905d 100644
--- a/account_payment_sale/i18n/account_payment_sale.pot
+++ b/account_payment_sale/i18n/account_payment_sale.pot
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 11.0\n"
+"Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
@@ -14,18 +14,18 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr ""
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
+msgid "Sale Order"
 msgstr ""
 
 #. module: account_payment_sale
diff --git a/account_payment_sale/i18n/ca.po b/account_payment_sale/i18n/ca.po
index 99b025307..154a3b4a9 100644
--- a/account_payment_sale/i18n/ca.po
+++ b/account_payment_sale/i18n/ca.po
@@ -19,18 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Mode de pagament:</strong>"
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Mode de pagament"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
+msgid "Sale Order"
 msgstr ""
 
 #. module: account_payment_sale
diff --git a/account_payment_sale/i18n/da_DK.po b/account_payment_sale/i18n/da_DK.po
index cd9fe167b..592e57d59 100644
--- a/account_payment_sale/i18n/da_DK.po
+++ b/account_payment_sale/i18n/da_DK.po
@@ -19,18 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Betalingsform"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
+msgid "Sale Order"
 msgstr ""
 
 #. module: account_payment_sale
diff --git a/account_payment_sale/i18n/de.po b/account_payment_sale/i18n/de.po
index 0675f8379..387410be8 100644
--- a/account_payment_sale/i18n/de.po
+++ b/account_payment_sale/i18n/de.po
@@ -19,18 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Zahlungsmethode:</strong>"
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Zahlungsmodus"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
+msgid "Sale Order"
 msgstr ""
 
 #. module: account_payment_sale
diff --git a/account_payment_sale/i18n/es.po b/account_payment_sale/i18n/es.po
index 685035d51..e8038e6ed 100644
--- a/account_payment_sale/i18n/es.po
+++ b/account_payment_sale/i18n/es.po
@@ -20,21 +20,24 @@ msgstr ""
 "X-Generator: Weblate 3.0.1\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Modo de pago:</strong>"
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Modo de pago"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
-msgstr "Presupuesto"
+msgid "Sale Order"
+msgstr ""
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
 msgstr "Ventas. Anticipo pago factura"
+
+#~ msgid "Quotation"
+#~ msgstr "Presupuesto"
diff --git a/account_payment_sale/i18n/fr.po b/account_payment_sale/i18n/fr.po
index 2ee643504..797d82ef5 100644
--- a/account_payment_sale/i18n/fr.po
+++ b/account_payment_sale/i18n/fr.po
@@ -20,21 +20,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Mode de paiement :</strong>"
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Mode de paiement"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
-msgstr "Devis"
+msgid "Sale Order"
+msgstr ""
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
 msgstr "Facture de paiement anticipé des ventes"
+
+#~ msgid "Quotation"
+#~ msgstr "Devis"
diff --git a/account_payment_sale/i18n/nl.po b/account_payment_sale/i18n/nl.po
index 2b46a39ec..9ed504117 100644
--- a/account_payment_sale/i18n/nl.po
+++ b/account_payment_sale/i18n/nl.po
@@ -19,18 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr "<strong>Betaalmode:</strong>"
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Betaalwijze"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
+msgid "Sale Order"
 msgstr ""
 
 #. module: account_payment_sale
diff --git a/account_payment_sale/i18n/nl_NL.po b/account_payment_sale/i18n/nl_NL.po
index 3fb82721e..19712745b 100644
--- a/account_payment_sale/i18n/nl_NL.po
+++ b/account_payment_sale/i18n/nl_NL.po
@@ -20,24 +20,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr ""
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
-msgstr ""
+#, fuzzy
+msgid "Sale Order"
+msgstr "Verkooporder"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
 msgstr ""
-
-#~ msgid "Sales Order"
-#~ msgstr "Verkooporder"
diff --git a/account_payment_sale/i18n/pt_BR.po b/account_payment_sale/i18n/pt_BR.po
index 259e20329..b0df2c64e 100644
--- a/account_payment_sale/i18n/pt_BR.po
+++ b/account_payment_sale/i18n/pt_BR.po
@@ -9,32 +9,33 @@ msgstr ""
 "Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-02-02 03:43+0000\n"
-"PO-Revision-Date: 2018-02-02 03:43+0000\n"
-"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2018\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
-"teams/23907/pt_BR/)\n"
+"PO-Revision-Date: 2019-09-03 03:23+0000\n"
+"Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/"
+"23907/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.8\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
-msgstr ""
+msgstr "<strong>Modo de Pagamento:</strong>"
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Modo de Pagamento"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
-msgstr ""
+msgid "Sale Order"
+msgstr "Ordem de Venda"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Fatura de pagamento antecipado de vendas"
diff --git a/account_payment_sale/i18n/sl.po b/account_payment_sale/i18n/sl.po
index fa672c0e9..4a90e5fd8 100644
--- a/account_payment_sale/i18n/sl.po
+++ b/account_payment_sale/i18n/sl.po
@@ -20,18 +20,18 @@ msgstr ""
 "%100==4 ? 2 : 3);\n"
 
 #. module: account_payment_sale
-#: model:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
 msgid "<strong>Payment Mode:</strong>"
 msgstr ""
 
 #. module: account_payment_sale
-#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order_payment_mode_id
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
 msgid "Payment Mode"
 msgstr "Metoda plačila"
 
 #. module: account_payment_sale
 #: model:ir.model,name:account_payment_sale.model_sale_order
-msgid "Quotation"
+msgid "Sale Order"
 msgstr ""
 
 #. module: account_payment_sale
diff --git a/account_payment_sale/i18n/zh_CN.po b/account_payment_sale/i18n/zh_CN.po
new file mode 100644
index 000000000..685913871
--- /dev/null
+++ b/account_payment_sale/i18n/zh_CN.po
@@ -0,0 +1,37 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_payment_sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-09-04 04:23+0000\n"
+"Last-Translator: 黎伟杰 <674416404@qq.com>\n"
+"Language-Team: none\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 3.8\n"
+
+#. module: account_payment_sale
+#: model_terms:ir.ui.view,arch_db:account_payment_sale.report_sale_payment_mode
+msgid "<strong>Payment Mode:</strong>"
+msgstr "<strong>付款方式：</strong>"
+
+#. module: account_payment_sale
+#: model:ir.model.fields,field_description:account_payment_sale.field_sale_order__payment_mode_id
+msgid "Payment Mode"
+msgstr "付款方式"
+
+#. module: account_payment_sale
+#: model:ir.model,name:account_payment_sale.model_sale_order
+msgid "Sale Order"
+msgstr "销售订单"
+
+#. module: account_payment_sale
+#: model:ir.model,name:account_payment_sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "销售预付款发票"
diff --git a/account_payment_sale/tests/common.py b/account_payment_sale/tests/common.py
index 2fb2ee119..ca53295de 100644
--- a/account_payment_sale/tests/common.py
+++ b/account_payment_sale/tests/common.py
@@ -12,6 +12,7 @@ class CommonTestCase(SavepointCase):
 
         cls.bank = cls.env["res.partner.bank"].create({
             'acc_number': 'test',
+            'partner_id': cls.env.user.company_id.partner_id.id,
         })
         cls.journal = cls.env["account.journal"].create({
             'name': 'test journal',
@@ -37,6 +38,14 @@ class CommonTestCase(SavepointCase):
         cls.products = {
             'prod_order': cls.env.ref('product.product_order_01'),
             'prod_del': cls.env.ref('product.product_delivery_01'),
-            'serv_order': cls.env.ref('product.service_order_01'),
-            'serv_del': cls.env.ref('product.service_delivery'),
+            'serv_order': cls.env['product.product'].create({
+                'name': 'Test service product order',
+                'type': 'service',
+                'invoice_policy': 'order',
+            }),
+            'serv_del': cls.env['product.product'].create({
+                'name': 'Test service product delivery',
+                'type': 'service',
+                'invoice_policy': 'delivery',
+            }),
         }