diff --git a/contract_digitized_signature/README.rst b/contract_digitized_signature/README.rst index 40f9d37a..c7b8b995 100644 --- a/contract_digitized_signature/README.rst +++ b/contract_digitized_signature/README.rst @@ -6,11 +6,16 @@ Contract Digitized Signature ============================ -This module adds a signature field (using ``web_widget_digitized_signature``) -to contract report. +This module adds a signature field to contract report. -Also a button has been added to contract form to allow users to send by email -the contract report with digitized signature. +Installation +============ + +This module depends on : + +* web_widget_digitized_signature + +This module is part of the OCA/web suite. Configuration ============= diff --git a/contract_digitized_signature/__openerp__.py b/contract_digitized_signature/__openerp__.py index cf16264b..aded5e03 100644 --- a/contract_digitized_signature/__openerp__.py +++ b/contract_digitized_signature/__openerp__.py @@ -19,7 +19,6 @@ "report/report_contractorder.xml", "report/contract_views.xml", "views/contract_views.xml", - "data/contract_template.xml", ], "installable": True, } diff --git a/contract_digitized_signature/data/contract_template.xml b/contract_digitized_signature/data/contract_template.xml deleted file mode 100644 index 2258bac8..00000000 --- a/contract_digitized_signature/data/contract_template.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - Email Contract Template - ${(object.user_id.email and '%s <%s>' % (object.user_id.name, object.user_id.email) or '')|safe} - ${object.company_id.name} Contract (Ref ${object.name or 'n/a'}) - ${object.partner_id.id} - - - - Contract - ${object.partner_id.lang} - -

Hello ${object.partner_id.name or ''},

-

A new contract has been created:

- -

-   REFERENCES
-   Contract: ${object.name}
-   Contract date start: ${object.date_start or ''}
- - % if object.user_id: -   Your contact: ${object.user_id.name} - % endif -

- -
-

If you have any question, do not hesitate to contact us.

-

Thank you for choosing ${object.company_id.name or 'us'}!

-
-
-
-

- ${object.company_id.name}

-
-
- - ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe} - - % if object.company_id.phone: -
- Phone:  ${object.company_id.phone} -
- % endif - % if object.company_id.website: - - %endif -

-
- - ]]> - - - diff --git a/contract_digitized_signature/i18n/es.po b/contract_digitized_signature/i18n/es.po index 33506f56..6e25176c 100644 --- a/contract_digitized_signature/i18n/es.po +++ b/contract_digitized_signature/i18n/es.po @@ -15,98 +15,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: contract_digitized_signature -#: model:mail.template,body_html:contract_digitized_signature.email_contract_template -msgid "\n" -"
\n" -"

Hello ${object.partner_id.name},

\n" -"

A new contract has been created:

\n" -"\n" -"

\n" -"   REFERENCES
\n" -"   Contract: ${object.name}
\n" -"   Contract date start: ${object.date_start or ''}
\n" -"\n" -" % if object.user_id:\n" -"   Your contact: ${object.user_id.name}\n" -" % endif\n" -"

\n" -"\n" -"
\n" -"

If you have any question, do not hesitate to contact us.

\n" -"

Thank you for choosing ${object.company_id.name or 'us'}!

\n" -"
\n" -"
\n" -"
\n" -"

\n" -" ${object.company_id.name}

\n" -"
\n" -"
\n" -" \n" -" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n" -" \n" -" % if object.company_id.phone:\n" -"
\n" -" Phone:  ${object.company_id.phone}\n" -"
\n" -" % endif\n" -" % if object.company_id.website:\n" -"
\n" -" Web : ${object.company_id.website}\n" -"
\n" -" %endif\n" -"

\n" -"
\n" -"
\n" -" " -msgstr "\n" -"
\n" -"

Hola ${object.partner_id.name},

\n" -"

Un nuevo contrato se ha creado:

\n" -"\n" -"

\n" -"   REFERENCIA
\n" -"   Contrato: ${object.name}
\n" -"   Fecha inicio del contrato: ${object.date_start or ''}
\n" -"\n" -" % if object.user_id:\n" -"   Contacto: ${object.user_id.name}\n" -" % endif\n" -"

\n" -"\n" -"
\n" -"

Si tiene cualquier pregunta, no dude en contactar con nosotros.

\n" -"

Gracias por elegir ${object.company_id.name or 'us'}!

\n" -"
\n" -"
\n" -"
\n" -"

\n" -" ${object.company_id.name}

\n" -"
\n" -"
\n" -" \n" -" ${object.company_id.partner_id.sudo().with_context(show_address=True, html_format=True).name_get()[0][1] | safe}\n" -" \n" -" % if object.company_id.phone:\n" -"
\n" -" Teléfono:  ${object.company_id.phone}\n" -"
\n" -" % endif\n" -" % if object.company_id.website:\n" -"
\n" -" Web : ${object.company_id.website}\n" -"
\n" -" %endif\n" -"

\n" -"
\n" -"
\n" -" " - -#. module: contract_digitized_signature -#: model:mail.template,subject:contract_digitized_signature.email_contract_template -msgid "${object.company_id.name} Contract (Ref ${object.name or 'n/a'})" -msgstr "${object.company_id.name} Contrato (Ref ${object.name or 'n/a'})" - #. module: contract_digitized_signature #: model:ir.ui.view,arch_db:contract_digitized_signature.report_contract_document msgid "Customer acceptance:" @@ -152,15 +60,8 @@ msgstr "Precio unidad" msgid "Analytic Account" msgstr "Contrato" -#. module: contract_digitized_signature -#: code:addons/contract_digitized_signature/models/account_analytic_account.py:39 -#, python-format -msgid "Compose Email" -msgstr "Componer correo electrónico" - #. module: contract_digitized_signature #: model:ir.actions.report.xml,name:contract_digitized_signature.report_contract -#: model:mail.template,report_name:contract_digitized_signature.email_contract_template msgid "Contract" msgstr "Contrato" @@ -189,11 +90,6 @@ msgstr "Responsable" msgid "Responsible:" msgstr "Responsable:" -#. module: contract_digitized_signature -#: model:ir.ui.view,arch_db:contract_digitized_signature.account_analytic_account_recurring_form_form -msgid "Send by Email" -msgstr "Enviar por correo electrónico" - #. module: contract_digitized_signature #: model:ir.ui.view,arch_db:contract_digitized_signature.report_contract_document msgid "VAT:" diff --git a/contract_digitized_signature/models/account_analytic_account.py b/contract_digitized_signature/models/account_analytic_account.py index 1c55e483..d3484e69 100644 --- a/contract_digitized_signature/models/account_analytic_account.py +++ b/contract_digitized_signature/models/account_analytic_account.py @@ -19,35 +19,6 @@ class AccountAnalyticAccount(models.Model): string='Customer acceptance', ) - @api.multi - def action_contract_send(self): - self.ensure_one() - template = self.env.ref( - 'contract_digitized_signature.email_contract_template', - False, - ) - compose_form = self.env.ref('mail.email_compose_message_wizard_form', - False) - ctx = dict( - default_model='account.analytic.account', - default_res_id=self.id, - default_use_template=bool(template), - default_template_id=template and template.id or False, - default_composition_mode='comment', - mark_invoice_as_sent=True, - ) - return { - 'name': _('Compose Email'), - 'type': 'ir.actions.act_window', - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'mail.compose.message', - 'views': [(compose_form.id, 'form')], - 'view_id': compose_form.id, - 'target': 'new', - 'context': ctx, - } - @api.model def create(self, values): contract = super(AccountAnalyticAccount, self).create(values) @@ -58,5 +29,5 @@ class AccountAnalyticAccount(models.Model): @api.multi def write(self, values): - self.env['mail.thread']._track_signature(values, 'customer_signature') + self._track_signature(values, 'customer_signature') return super(AccountAnalyticAccount, self).write(values) diff --git a/contract_digitized_signature/views/contract_views.xml b/contract_digitized_signature/views/contract_views.xml index b4b4d8c1..e35a7986 100644 --- a/contract_digitized_signature/views/contract_views.xml +++ b/contract_digitized_signature/views/contract_views.xml @@ -6,11 +6,6 @@ account.analytic.account - -
-
-