Merge lp:~javieredm/openerp-venezuela-localization/javy-bug905320 into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

Proposed by Javier Duran
Status: Merged
Merged at revision: 488
Proposed branch: lp:~javieredm/openerp-venezuela-localization/javy-bug905320
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 64 lines (+19/-3)
2 files modified
l10n_ve_split_invoice/i18n/es_VE.po (+17/-3)
l10n_ve_split_invoice/invoice.py (+2/-0)
To merge this branch: bzr merge lp:~javieredm/openerp-venezuela-localization/javy-bug905320
Reviewer Review Type Date Requested Status
Javier Duran (community) Approve
Review via email: mp+86414@code.launchpad.net

Description of the change

Correccion bug905320

To post a comment you must log in.
Revision history for this message
Javier Duran (javieredm) wrote :

merged en el trunk:

revno: 488 [merge]
revision-id: javier@squezee-vir-20111220151204-2mndi3ngt5h0imlo

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ve_split_invoice/i18n/es_VE.po'
--- l10n_ve_split_invoice/i18n/es_VE.po 2011-10-25 20:33:16 +0000
+++ l10n_ve_split_invoice/i18n/es_VE.po 2011-12-20 15:07:29 +0000
@@ -6,8 +6,8 @@
6msgstr ""6msgstr ""
7"Project-Id-Version: OpenERP Server 6.0.3\n"7"Project-Id-Version: OpenERP Server 6.0.3\n"
8"Report-Msgid-Bugs-To: support@openerp.com\n"8"Report-Msgid-Bugs-To: support@openerp.com\n"
9"POT-Creation-Date: 2011-10-05 14:10+0000\n"9"POT-Creation-Date: 2011-12-16 15:04+0000\n"
10"PO-Revision-Date: 2011-10-05 14:10+0000\n"10"PO-Revision-Date: 2011-12-16 15:04+0000\n"
11"Last-Translator: <>\n"11"Last-Translator: <>\n"
12"Language-Team: \n"12"Language-Team: \n"
13"MIME-Version: 1.0\n"13"MIME-Version: 1.0\n"
@@ -21,6 +21,12 @@
21msgstr "Configuración de líneas de factura"21msgstr "Configuración de líneas de factura"
2222
23#. module: l10n_ve_split_invoice23#. module: l10n_ve_split_invoice
24#: code:addons/l10n_ve_split_invoice/invoice.py:40
25#, python-format
26msgid "Error !"
27msgstr "Error !"
28
29#. module: l10n_ve_split_invoice
24#: model:ir.module.module,description:l10n_ve_split_invoice.module_meta_information30#: model:ir.module.module,description:l10n_ve_split_invoice.module_meta_information
25msgid "\n"31msgid "\n"
26"For legal reasons in Venezuela we need just ONE invoice per page, with this module depending on your company configuration you will stablish the number of lines per invoice, with this you will be able of:\n"32"For legal reasons in Venezuela we need just ONE invoice per page, with this module depending on your company configuration you will stablish the number of lines per invoice, with this you will be able of:\n"
@@ -68,7 +74,7 @@
68#. module: l10n_ve_split_invoice74#. module: l10n_ve_split_invoice
69#: model:ir.model,name:l10n_ve_split_invoice.model_res_company75#: model:ir.model,name:l10n_ve_split_invoice.model_res_company
70msgid "Companies"76msgid "Companies"
71msgstr "Empresas"77msgstr "Compañías"
7278
73#. module: l10n_ve_split_invoice79#. module: l10n_ve_split_invoice
74#: constraint:res.company:080#: constraint:res.company:0
@@ -81,6 +87,14 @@
81msgstr "Número de líneas por factura"87msgstr "Número de líneas por factura"
8288
83#. module: l10n_ve_split_invoice89#. module: l10n_ve_split_invoice
90#: code:addons/l10n_ve_split_invoice/invoice.py:40
91#, python-format
92msgid "Please set an invoice lines value in:\n"
93"Administration->Company->Configuration->Invoice lines"
94msgstr "Por favor establezca un valor para las líneas de facturas en:\n"
95"Administración->Compañía->Configuración->Líneas de la factura"
96
97#. module: l10n_ve_split_invoice
84#: model:ir.model,name:l10n_ve_split_invoice.model_account_invoice98#: model:ir.model,name:l10n_ve_split_invoice.model_account_invoice
85msgid "Invoice"99msgid "Invoice"
86msgstr "Factura"100msgstr "Factura"
87101
=== modified file 'l10n_ve_split_invoice/invoice.py'
--- l10n_ve_split_invoice/invoice.py 2011-11-11 21:12:37 +0000
+++ l10n_ve_split_invoice/invoice.py 2011-12-20 15:07:29 +0000
@@ -36,6 +36,8 @@
36 '''36 '''
37 for inv in self.browse(cr, uid, ids):37 for inv in self.browse(cr, uid, ids):
38 inv_id =False38 inv_id =False
39 if inv.company_id.lines_invoice < 1:
40 raise osv.except_osv(_('Error !'), _('Please set an invoice lines value in:\nAdministration->Company->Configuration->Invoice lines'))
39 if inv.type in ["out_invoice","out_refund"]:41 if inv.type in ["out_invoice","out_refund"]:
40 if len(inv.invoice_line)> inv.company_id.lines_invoice:42 if len(inv.invoice_line)> inv.company_id.lines_invoice:
41 lst = []43 lst = []