Rename module & add field to view

OCA · Jun 15, 2017 · aca8d78 · aca8d78
1 parent 863408a
commit aca8d78
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 6 deletions.
diff --git a/contract_auto/README.rst → contract_payment_auto/README.rst b/contract_auto/README.rst → contract_payment_auto/README.rst
@@ -2,9 +2,9 @@
    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
-=============
-Contract Auto
-=============
+=====================
+Contract Auto Payment
+=====================
 
 This module allows for the configuration of automatic payments on invoices that are created by a contract.
 

diff --git a/contract_auto/__init__.py → contract_payment_auto/__init__.py b/contract_auto/__init__.py → contract_payment_auto/__init__.py
diff --git a/contract_auto/__manifest__.py → contract_payment_auto/__manifest__.py b/contract_auto/__manifest__.py → contract_payment_auto/__manifest__.py
diff --git a/contract_auto/data/ir_cron_data.xml → contract_payment_auto/data/ir_cron_data.xml b/contract_auto/data/ir_cron_data.xml → contract_payment_auto/data/ir_cron_data.xml
diff --git a/contract_auto/data/mail_template_data.xml → ..._payment_auto/data/mail_template_data.xml b/contract_auto/data/mail_template_data.xml → ..._payment_auto/data/mail_template_data.xml
diff --git a/contract_auto/models/__init__.py → contract_payment_auto/models/__init__.py b/contract_auto/models/__init__.py → contract_payment_auto/models/__init__.py
diff --git a/...t_auto/models/account_analytic_account.py → ...t_auto/models/account_analytic_account.py b/...t_auto/models/account_analytic_account.py → ...t_auto/models/account_analytic_account.py
@@ -130,7 +130,10 @@ def _pay_invoice(self, invoice):
         else:
             template = self.pay_retry_mail_template_id
 
-        template.send_mail(invoice.id)
+        if template:
+            template.send_mail(invoice.id)
+
+        return True
 
     @api.multi
     def _get_tx_vals(self, invoice):

diff --git a/..._auto/models/account_analytic_contract.py → ..._auto/models/account_analytic_contract.py b/..._auto/models/account_analytic_contract.py → ..._auto/models/account_analytic_contract.py
@@ -69,14 +69,14 @@ def _default_invoice_mail_template_id(self):
     @api.model
     def _default_pay_retry_mail_template_id(self):
         return self.env.ref(
-            'contract_auto.mail_template_auto_pay_retry',
+            'contract_payment_auto.mail_template_auto_pay_retry',
             raise_if_not_found=False,
         )
 
     @api.model
     def _default_pay_fail_mail_template_id(self):
         return self.env.ref(
-            'contract_auto.mail_template_auto_pay_fail',
+            'contract_payment_auto.mail_template_auto_pay_fail',
             raise_if_not_found=False,
         )
 

diff --git a/contract_auto/models/account_invoice.py → ...ct_payment_auto/models/account_invoice.py b/contract_auto/models/account_invoice.py → ...ct_payment_auto/models/account_invoice.py
diff --git a/contract_auto/models/res_partner.py → contract_payment_auto/models/res_partner.py b/contract_auto/models/res_partner.py → contract_payment_auto/models/res_partner.py
diff --git a/contract_auto/tests/__init__.py → contract_payment_auto/tests/__init__.py b/contract_auto/tests/__init__.py → contract_payment_auto/tests/__init__.py
diff --git a/...to/tests/test_account_analytic_account.py → ...to/tests/test_account_analytic_account.py b/...to/tests/test_account_analytic_account.py → ...to/tests/test_account_analytic_account.py
diff --git a/...o/tests/test_account_analytic_contract.py → ...o/tests/test_account_analytic_contract.py b/...o/tests/test_account_analytic_contract.py → ...o/tests/test_account_analytic_contract.py
diff --git a/...o/views/account_analytic_account_view.xml → ...o/views/account_analytic_account_view.xml b/...o/views/account_analytic_account_view.xml → ...o/views/account_analytic_account_view.xml
diff --git a/.../views/account_analytic_contract_view.xml → .../views/account_analytic_contract_view.xml b/.../views/account_analytic_contract_view.xml → .../views/account_analytic_contract_view.xml
diff --git a/contract_auto/views/res_partner_view.xml → ...t_payment_auto/views/res_partner_view.xml b/contract_auto/views/res_partner_view.xml → ...t_payment_auto/views/res_partner_view.xml
@@ -13,6 +13,7 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <xpath expr="//group[@name='sale']" position="inside">
+                <field name="payment_token_ids" invisible="1" />
                 <field name="payment_token_id" />
             </xpath>
         </field>