diff --git a/addons/account/company.py b/addons/account/company.py index c7836e0128b..0d8abe430bb 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -24,6 +24,7 @@ from osv import fields, osv class res_company(osv.osv): _inherit = "res.company" _columns = { + 'paypal_account': fields.char("Paypal Account", size=128, help="the paypal username (usually email)"), 'overdue_msg': fields.text('Overdue Payments Message', translate=True), 'property_reserve_and_surplus_account': fields.property( 'account.account', @@ -44,4 +45,4 @@ class res_company(osv.osv): res_company() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml index 60a3d0eea84..0be85f680e7 100644 --- a/addons/account/company_view.xml +++ b/addons/account/company_view.xml @@ -24,6 +24,7 @@ + diff --git a/addons/account/edi_invoice.py b/addons/account/edi_invoice.py index 22d1c793f22..179f2eb7234 100644 --- a/addons/account/edi_invoice.py +++ b/addons/account/edi_invoice.py @@ -114,7 +114,6 @@ class account_invoice(osv.osv, ir_edi.edi): return edi_doc_list def edi_import(self, cr, uid, edi_document, context=None): - """ During import, invoices will import the company that is provided in the invoice as a new partner (e.g. supplier company for a customer invoice will be come a supplier record for the new invoice. @@ -230,7 +229,6 @@ class account_invoice(osv.osv, ir_edi.edi): if journal_id: journal = account_journal_pool.browse(cr, uid, journal_id, context=context) edi_document['journal_id'] = journal and self.edi_m2o(cr, uid, journal, context=context) or False - # for invoice lines, the account_id value should be taken from the product's default, i.e. from the default category, as it will not be provided. for edi_invoice_line in edi_document.get('invoice_line', []): product_id = edi_invoice_line.get('product_id', False) diff --git a/addons/account/edi_invoice_action_data.xml b/addons/account/edi_invoice_action_data.xml index 4cf3de86489..95633aea21b 100644 --- a/addons/account/edi_invoice_action_data.xml +++ b/addons/account/edi_invoice_action_data.xml @@ -4,7 +4,7 @@ context.update({'edi_web_url_view': '%s/edi/view_edi?db=%s&token=%s' %(self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url'),cr.dbname, self.pool.get('ir.edi.document').export_edi(cr, uid, [object], context = context)[0])}) -if object.partner_id.opt_out: self.pool.get('email.template').generate_mail(cr, +if not object.partner_id.opt_out: self.pool.get('email.template').generate_mail(cr, uid, self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'email_template_edi_invoice')[1], [object.id], @@ -26,25 +26,51 @@ if object.partner_id.opt_out: self.pool.get('email.template').generate_mail(cr, - ${object.company_id.name} - Invoice ${object.number} - ${object.address_invoice_id.email} + ${object.company_id.name} Invoice (Ref ${object.number or 'n/a' }) + ${object.address_invoice_id.email or ''} - True - Hello ${object.address_invoice_id.name}, + +<div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); "> -We just registered the invoice ${object.number} for ${object.amount_total} ${object.currency_id.name} for your company ${object.partner_id.name}. -You can click on the following link to preview, print and pay this invoice: +<p> Hello ${object.address_invoice_id.name and ' ' or ''},</p> +<p> You can click on the following link to preview, print and pay invoice: + <a href="${object._context.get('edi_web_url_view')}">${object._context.get('edi_web_url_view')}</a> +</p> - ${object._context.get('edi_web_url_view')} -Please note that this invoice has to be paid before ${object.date_due or ''} +<p style="border-left: 1px solid #8e0000; margin-left: 30px;"> <strong>REFERENCES</strong><br /> Invoice number: <strong>${object.number}</strong><br /> Invoice amount: <strong>${object.amount_total} ${object.currency_id.name}</strong><br /> Invoice date: ${object.date_invoice or 'n/a'}<br /> Order reference: ${object.origin or 'n/a'}<br /> Your contact: <a href="mailto:${object.user_id.user_email or ''}?subject=Invoice%20${object.number}">${object.user_id.name}</a></p> -Regards, +${object.company_id.paypal_account and '<p>It is possible to pay with Paypal: <br/> <a href=/"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business='+object.company_id.paypal_account+'&item_name=OpenERP%20Invoice%20'+object.number and object.number.replace('/','%2f') or ''+'&invoice='+object.number and object.number.replace('/','%2f') or ''+'&amount='+object.amount_total+'&currency_code='+object.currency_id.name+'&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_'+object.currency_id.name+'/"><img src=/"https://www.paypalobjects.com/en_US/i/btn/btn_paynowCC_LG.gif/" style=/"margin-left: 100px; border: 0px; padding: 1px; text-decoration: none;/"/></a> </p>'} + +<p> If you have any question, do not hesitate to reply directly to this e-mail.</p> <p> Thank you for choosing OpenERP!<br /> </p> <div style="width: 375px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; overflow-x: hidden; overflow-y: hidden; zoom: 1; background-image: url(http://www.openerp.com/sites/default/files/red_gradient_bg.png); background-attachment: initial; background-origin: initial; background-clip: initial; background-color: rgb(142, 0, 0); border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; border-bottom-right-radius: 0px 0px; border-bottom-left-radius: 0px 0px; background-position: 0% 0%; background-repeat: repeat no-repeat; "> <h3 style="margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 9px; padding-right: 14px; padding-bottom: 9px; padding-left: 14px; font-size: 12px; font-weight: normal; font-style: normal; color: rgb(255, 255, 255); "> <strong>${object.company_id.name}</strong></h3> </div> <div style="width: 347px; margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 12px; padding-right: 14px; padding-bottom: 12px; padding-left: 14px; overflow-x: hidden; overflow-y: hidden; zoom: 1; line-height: 16px; background-image: initial; background-attachment: initial; background-origin: initial; background-clip: initial; background-color: rgb(242, 242, 242); "> <div> Contact:<a href="mailto:${object.user_id.user_email or ''}?subject=Invoice%20${object.number}">${object.user_id.name}</a></div> <div> </div> </div> </div> <p> </p> + + +Hello ${object.address_invoice_id.name and ' ' or ''}, + +You can click on the following link to preview, print and pay invoice: + + ${object._context.get('edi_web_url_view')} + +Invoice Number: *${object.number}* +Amount: *${object.amount_total} ${object.currency_id.name}* +Invoice date: ${object.date_invoice or 'n/a'} +Order reference: ${object.origin or 'n/a'} +Your contact: ${object.user_id.name} <${object.user_id.user_email or ''}> + +${object.company_id.paypal_account and 'It is possible to pay with Paypal: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business='+object.company_id.paypal_account+'&item_name=OpenERP%20Invoice%20'+object.number and object.number.replace('/','%2f') or ''+'&invoice='+object.number and object.number.replace('/','%2f') or ''+'&amount='+object.amount_total+'&currency_code='+object.currency_id.name+'&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_'+object.currency_id.name} + +If you have any question, do not hesitate to reply directly to this e-mail. + +Thank you for choosing our service! + +-- +${object.company_id.name} +Contact: ${object.user_id.name} <${object.user_id.user_email or ''}> mako Mail Template of Invoice For EDI Document account.invoice - ${object.user_id.email or ''} + ${object.user_id.user_email or ''} diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml index 9cf8e9a284c..0a03c3ca9dc 100644 --- a/addons/account/test/test_edi_invoice.yml +++ b/addons/account/test/test_edi_invoice.yml @@ -16,6 +16,7 @@ name: Junjun wala supplier: False company_id: res_company_test11 + opt_out: True - I create one customer invoice -