clearcorp team mailing list archive

[Diana Rodríguez Martínez <diana.rodriguez@xxxxxxxxxxxxxxx>]

Diana Rodríguez Martínez has proposed merging lp:~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report into lp:openerp-ccorp-addons.

Requested reviews:
  CLEARCORP drivers (clearcorp-drivers)

For more details, see:
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report/+merge/137936

[FIX] Fix email in invoices and sales order report
-- 
https://code.launchpad.net/~dr.clearcorp/openerp-ccorp-addons/6.1-sales_order_report/+merge/137936
Your team CLEARCORP development team is subscribed to branch lp:openerp-ccorp-addons.

=== modified file 'account_invoice_webkit_report/__init__.py'
--- account_invoice_webkit_report/__init__.py	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/__init__.py	2012-12-04 18:03:28 +0000
@@ -21,3 +21,4 @@
 ##############################################################################
 
 import report
+import account_invoice_webkit_report

=== modified file 'account_invoice_webkit_report/__openerp__.py'
--- account_invoice_webkit_report/__openerp__.py	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/__openerp__.py	2012-12-04 18:03:28 +0000
@@ -35,6 +35,7 @@
     "images" : [],
     "icon" : False,
     "depends" : [
+        'base',
         'report_webkit',
         'account_invoice_global_discount',
         ],

=== added file 'account_invoice_webkit_report/account_invoice_webkit_report.py'
--- account_invoice_webkit_report/account_invoice_webkit_report.py	1970-01-01 00:00:00 +0000
+++ account_invoice_webkit_report/account_invoice_webkit_report.py	2012-12-04 18:03:28 +0000
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Addons modules by CLEARCORP S.A.
+#    Copyright (C) 2009-TODAY CLEARCORP S.A. (<http://clearcorp.co.cr>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class res_company(osv.osv):
+    _name = 'res.company'
+    _inherit = 'res.company'
+    
+    _columns = {
+           'use_email_invoice':fields.boolean('Use user email',help="In the invoice, if it is selected appears the user's mail is logged in. If not selected, do not appear any associated email"),
+           }
+res_company()
\ No newline at end of file

=== modified file 'account_invoice_webkit_report/ccorp_account_webkit_report.xml'
--- account_invoice_webkit_report/ccorp_account_webkit_report.xml	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/ccorp_account_webkit_report.xml	2012-12-04 18:03:28 +0000
@@ -1,7 +1,31 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<report auto="False" id="account_invoice_ccorp" model="account.invoice" name="account.invoice.layout_ccorp"  file="account_invoice_webkit_report/report/invoice.mako" string="Invoice HTML" report_type="webkit" 				attachment="(object.state in ('open','paid')) and ('Fac.'+(object.number or '').replace('/',''))"
-				attachment_use="1"/>
+		<report auto="False" 
+		    id="account.account_invoices" 
+		    model="account.invoice" 
+		    name="account.invoice.layout_ccorp"  
+		    file="account_invoice_webkit_report/report/invoice.mako" 
+		    string="Invoice HTML" report_type="webkit" 				
+		    attachment="(object.state in ('open','paid')) and ('Fac.'+(object.number or '').replace('/',''))"
+		    attachment_use="1"/>
+				
+				
+	   <record id="view_company_form_inherit" model="ir.ui.view">
+            <field name="name">res.company.form.inherit</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <data>                
+                    <page string="General Information" position="after">
+                        <page string="Configuration Report" groups="base.group_extended">
+                            <separator colspan="4" string="Invoices"/>
+                            <field colspan="4" name="use_email_invoice"/>
+                        </page>
+                    </page>
+                </data>
+            </field>
+        </record> 
 	</data>
 </openerp>

=== modified file 'account_invoice_webkit_report/i18n/es_CR.po'
--- account_invoice_webkit_report/i18n/es_CR.po	2012-06-30 22:41:06 +0000
+++ account_invoice_webkit_report/i18n/es_CR.po	2012-12-04 18:03:28 +0000
@@ -1,13 +1,13 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* ccorp_account
+#	* account_invoice_webkit_report
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.2\n"
-"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-10-06 19:15+0000\n"
-"PO-Revision-Date: 2011-10-06 19:15+0000\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-04 17:11+0000\n"
+"PO-Revision-Date: 2012-12-04 17:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,176 +15,195 @@
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:93
-#: report:report.account.invoice.layout_ccorp:98
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:93
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:98
 msgid "Sub Total"
 msgstr "Sub Total"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:39
+#. module: account_invoice_webkit_report
+#: field:res.company,use_email_invoice:0
+msgid "Use user email"
+msgstr "Usar email del usuario logueado"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:39
 msgid "Date:"
 msgstr "Fecha:"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:36
-msgid "ID Num."
-msgstr "Céd. Jur.."
+#. module: account_invoice_webkit_report
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:47
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:47
 msgid "Payment tems"
 msgstr "Plazo de pago"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:81
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:81
 msgid "Note"
 msgstr "Nota"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:23
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:23
 msgid "Supplier Invoice"
 msgstr "Factura de proveedor"
 
-#. module: ccorp_account
-#: model:ir.module.module,description:ccorp_account.module_meta_information
-msgid "ClearCorp 'account' modifications:\n"
-"    Reports:\n"
-"      * Invoice\n"
-"    "
-msgstr "ClearCorp 'account' modifications:\n"
-"    Reports:\n"
-"      * Invoice\n"
-"    "
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:63
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:65
+msgid "Unit Price"
+msgstr "Precio unitario"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:63
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:63
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:48
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:48
 msgid "Email"
 msgstr "Email"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:63
-#: report:report.account.invoice.layout_ccorp:65
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:63
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:65
 msgid "Total Price"
 msgstr "Precio total"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:17
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:17
 msgid "PROFORMA"
 msgstr "PROFORMA"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:44
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:44
 msgid "Fax"
 msgstr "Fax"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:94
-msgid "Discount"
-msgstr "Descuento"
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:40
+msgid "Phone"
+msgstr "Phone"
 
-#. module: ccorp_account
-#: model:ir.actions.report.xml,name:ccorp_account.account_invoice_ccorp
+#. module: account_invoice_webkit_report
+#: model:ir.actions.report.xml,name:account_invoice_webkit_report.account_invoice_ccorp
 msgid "Invoice HTML"
-msgstr "Factura"
+msgstr "Facturas"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:21
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:21
 msgid "Canceled Invoice"
 msgstr "Factura cancelada"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:40
-msgid "Phone"
-msgstr "Tel."
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:94
+msgid "Discount"
+msgstr "Descuento"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:107
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:107
 msgid "Invoice Note"
 msgstr "Nota de factura"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:63
-#: report:report.account.invoice.layout_ccorp:65
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:63
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:65
 msgid "[Code] Description / (Taxes)"
 msgstr "[Cód.] Descripción / (Imp.)"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:19
+#. module: account_invoice_webkit_report
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:19
 msgid "Draft Inovice"
-msgstr "Factura Borrador"
-
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:55
+msgstr "Factura borrador"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:36
+msgid "ID Num."
+msgstr "ID Num."
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:55
 msgid "Address"
 msgstr "Dirección"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:15
+#. module: account_invoice_webkit_report
+#: model:ir.model,name:account_invoice_webkit_report.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:15
 msgid "Electronic Invoice"
-msgstr "Factura Electrónica"
+msgstr "Factura electrónica"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:95
-#: report:report.account.invoice.layout_ccorp:99
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:95
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:99
 msgid "Taxes"
 msgstr "Impuestos"
 
-#. module: ccorp_account
-#: model:ir.module.module,shortdesc:ccorp_account.module_meta_information
-msgid "ClearCorp account module modifications"
-msgstr "ClearCorp account module modifications"
-
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:110
+#. module: account_invoice_webkit_report
+#: help:res.company,use_email_invoice:0
+msgid "In the invoice, if it is selected appears the user's mail is logged in. If not selected, do not appear any associated email"
+msgstr "En la factura, si está seleccionado aparece el email del usuario logueado. Si no está seleccionado no aparece ningún email"
+
+#. module: account_invoice_webkit_report
+#: view:res.company:0
+msgid "Configuration Report"
+msgstr "Configuración de reportes"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:111
 msgid "Payment Note"
 msgstr "Nota de pago"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:25
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:25
 msgid "Refund"
 msgstr "Reembolso"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:43
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:43
 msgid "Due date"
 msgstr "Vence"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:63
-#: report:report.account.invoice.layout_ccorp:65
+#. module: account_invoice_webkit_report
+#: view:res.company:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:63
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:65
 msgid "Qty"
 msgstr "Cant."
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:63
-#: report:report.account.invoice.layout_ccorp:65
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: ccorp_account
-#: view:account.account:0
-msgid "Inactive Accounts"
-msgstr "Cuentas inactivas"
-
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:27
+#. module: account_invoice_webkit_report
+#: view:res.company:0
+msgid "General Information"
+msgstr "Información general"
+
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:27
 msgid "Supplier Refund"
 msgstr "Reembolso de proveedor"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:96
-#: report:report.account.invoice.layout_ccorp:100
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:96
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:100
 msgid "Total"
 msgstr "Total"
 
-#. module: ccorp_account
-#: report:report.account.invoice.layout_ccorp:51
+#. module: account_invoice_webkit_report
+#: report:addons/account_invoice_webkit_report/report/invoice.mako:51
 msgid "Salesman"
 msgstr "Vendedor"