openerp-dev-web team mailing list archive

["ARA\(OpenERP\)" <ara@xxxxxxxxxxx>]

ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029


hello,
    I have fix the buildbot warning of l10n_*.
    http://test.openobject.com:8010/builders/buildbot-trunk-dev-addons3/builds/720

Thank you,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/40696
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'l10n_cr/__openerp__.py'
--- l10n_cr/__openerp__.py	2010-11-11 13:08:05 +0000
+++ l10n_cr/__openerp__.py	2010-11-12 08:52:11 +0000
@@ -40,12 +40,12 @@
 	'website': 'http://clearcorp.co.cr',
 	'category': 'Localisation/Account Charts',
 	'description': """Chart of accounts for Costa Rica
-	Includes:
-	* account.type
-	* account.account.template
-	* account.tax.template
-	* account.tax.code.template
-	* account.chart.template
+Includes:
+* account.type
+* account.account.template
+* account.tax.template
+* account.tax.code.template
+* account.chart.template
 
 Everything is in English with Spanish translation. Further translations are welcome, please go to
 http://translations.launchpad.net/openerp-costa-rica
@@ -60,7 +60,7 @@
 		'data/account_tax_code_template.xml',
 		'data/account_chart_template.xml',
 		'data/account_tax_template.xml',
-		'l10n_wizard.xml'
+		'l10n_wizard.xml',
 	],
 	'license': 'Other OSI approved licence',
 	'installable': True,

=== modified file 'l10n_it/report/libroIVA_credito.py'
--- l10n_it/report/libroIVA_credito.py	2010-11-11 13:08:05 +0000
+++ l10n_it/report/libroIVA_credito.py	2010-11-12 08:52:11 +0000
@@ -33,9 +33,7 @@
         # Selezione tutte le fatture emesse nel periodo
         self.cr.execute("""
                         SELECT id FROM account_invoice
-                        WHERE 	(state='open' OR state='paid') AND
-                                period_id="""+str(period.id)+"""
-                                AND (type='out_invoice' OR type='out_refund')
+                        WHERE (state='open' OR state='paid') AND period_id="""+str(period.id)+""" AND (type='out_invoice' OR type='out_refund')
         				""")
         ids=self.cr.fetchall()
         #print 'IDS = ',

=== modified file 'l10n_it/report/libroIVA_debito.py'
--- l10n_it/report/libroIVA_debito.py	2010-11-11 13:08:05 +0000
+++ l10n_it/report/libroIVA_debito.py	2010-11-12 08:52:11 +0000
@@ -32,7 +32,7 @@
         # Selezione tutte le fatture emesse nel periodo
         self.cr.execute("""
         				SELECT id FROM account_invoice
-        				WHERE 	(state='open' OR state='paid') AND
+        				WHERE (state='open' OR state='paid') AND
         						period_id="""+str(period.id)+"""
         						AND (type='in_invoice' OR type='in_refund')
         				""")