openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00409
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
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/713
Thank you,
ara
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/40624
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_br/__openerp__.py'
--- l10n_br/__openerp__.py 2010-11-11 06:11:02 +0000
+++ l10n_br/__openerp__.py 2010-11-11 13:16:27 +0000
@@ -19,26 +19,22 @@
#################################################################################
{
- 'name' : 'Brazilian Localization',
- 'description' : 'Brazilian Localization',
- 'category' : 'Localisation/Account Charts',
- 'author' : 'OpenERP Brasil',
- 'website' : 'http://openerpbrasil.org',
- 'version' : '0.6',
- 'depends' : [
- 'account',
- 'account_chart',
- ],
- 'init_xml': [
- ],
- 'update_xml' : [
+ 'name': 'Brazilian Localization',
+ 'description': 'Brazilian Localization',
+ 'category': 'Localisation/Account Charts',
+ 'author': 'OpenERP Brasil',
+ 'website': 'http://openerpbrasil.org',
+ 'version': '0.6',
+ 'depends': ['account','account_chart'],
+ 'init_xml': [],
+ 'update_xml': [
'data/account.account.type.csv',
'data/account.tax.code.template.csv',
'data/account.account.template.csv',
'data/l10n_br_account_chart_template.xml',
- 'data/account_tax_template.xml',
+ 'data/account_tax_template.xml'
],
- 'installable': True
+ 'installable': True,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'l10n_cr/__openerp__.py'
--- l10n_cr/__openerp__.py 2010-11-11 06:11:02 +0000
+++ l10n_cr/__openerp__.py 2010-11-11 13:16:27 +0000
@@ -40,17 +40,17 @@
'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
+Everything is in English with Spanish translation. Further translations are welcome, please go to
+http://translations.launchpad.net/openerp-costa-rica
""",
- 'depends': ['account','account_chart', 'base'],
+ 'depends': ['account', 'account_chart', 'base'],
'init_xml': [],
'demo_xml': [],
'update_xml': [
@@ -61,7 +61,7 @@
'data/account_chart_template.xml',
'data/account_tax_template.xml',
'l10n_wizard.xml'
- ],
+ ],
'license': 'Other OSI approved licence',
'installable': True,
'active': False,
=== modified file 'l10n_it/__openerp__.py'
--- l10n_it/__openerp__.py 2010-11-11 06:11:02 +0000
+++ l10n_it/__openerp__.py 2010-11-11 13:16:27 +0000
@@ -38,21 +38,22 @@
"author": "Servabit srl",
"website": "http://www.servabit.it";,
"category": "Localisation/Account Charts",
- "description": "This is a module to manage the accounting chart for Italy (CC2424 Profile) for a service company.",
+ "description": """This is a module to manage the accounting chart for Italy (CC2424 Profile) for a service company.""",
"depends": ["account", "base_iban", "base_vat", "account_chart"],
"demo_xml": [],
- "update_xml": ['tipoconti_servabit.xml',
- 'pianoconti_servabit.xml',
- 'account_tax_template.xml',
- 'journals.xml',
- 'default_accounts.xml',
- 'anno_fiscale.xml',
- 'l10n_chart_it_servabit_wizard.xml',
- 'report.xml',
- 'libroIVA_view.xml',
- 'libroIVA_menu.xml',
- 'security/ir.model.access.csv',
- ],
+ "update_xml": [
+ 'tipoconti_servabit.xml',
+ 'pianoconti_servabit.xml',
+ 'account_tax_template.xml',
+ 'journals.xml',
+ 'default_accounts.xml',
+ 'anno_fiscale.xml',
+ 'l10n_chart_it_servabit_wizard.xml',
+ 'report.xml',
+ 'libroIVA_view.xml',
+ 'libroIVA_menu.xml',
+ 'security/ir.model.access.csv'
+ ],
"active": False,
"installable": True,
}
=== modified file 'l10n_it/libroIVA.py'
--- l10n_it/libroIVA.py 2010-11-11 06:11:02 +0000
+++ l10n_it/libroIVA.py 2010-11-11 13:16:27 +0000
@@ -37,15 +37,12 @@
_columns = {
'name': fields.char('Fiscal year',size=64),
- 'company_id': fields.many2one('res.company', 'Company'),
+ 'company_id': fields.many2one('res.company', 'Company'),
}
def init (self, cr) :
cr.execute("""DROP VIEW IF EXISTS account_report_libroiva""")
- cr.execute("""
- CREATE VIEW account_report_libroiva AS (
- SELECT id, name, company_id FROM account_fiscalyear
- )""")
+ cr.execute("""CREATE VIEW account_report_libroiva AS (SELECT id, name, company_id FROM account_fiscalyear)""")
l10n_chart_it_servabit_report_libroIVA()
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'l10n_it/report/libroIVA_credito.py'
--- l10n_it/report/libroIVA_credito.py 2010-11-11 06:11:02 +0000
+++ l10n_it/report/libroIVA_credito.py 2010-11-11 13:16:27 +0000
@@ -8,70 +8,67 @@
def __init__(self, cr, uid, name, context):
super(l10n_chart_it_servabit_report_libroIVA_credito,self).__init__(cr,uid,name,context)
self.localcontext.update({
- 'time' : time,
- 'get_company' : self.get_company,
- 'get_periods' : self.get_periods,
- 'get_lines' : self.get_lines,
+ 'time': time,
+ 'get_company': self.get_company,
+ 'get_periods': self.get_periods,
+ 'get_lines': self.get_lines,
})
-
def get_company(self,fiscal_year):
- #print 'COMP = ',fiscal_year
+ #print 'COMP = ',fiscal_year
return ""
def get_periods(self,fiscal_year):
- #print 'Fiscal year id:',fiscal_year.id
- obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
- fy=obj.browse(self.cr,self.uid,fiscal_year.id)
- #print 'Periods = ',fy.period_ids
- res=[rec for rec in fy.period_ids]
- #return fy.periods => non funziona?!? bool object !?!?
- return res
+ #print 'Fiscal year id:',fiscal_year.id
+ obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+ fy=obj.browse(self.cr,self.uid,fiscal_year.id)
+ #print 'Periods = ',fy.period_ids
+ res=[rec for rec in fy.period_ids]
+ #return fy.periods => non funziona?!? bool object !?!?
+ return res
def get_invoices(self,period):
- #print 'PERIOD = ',period.name
- obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
- # 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')
- """)
- ids=self.cr.fetchall()
- #print 'IDS = ',
- if ids:
- ids=[id[0] for id in ids ]
- invoices=obj.browse(self.cr,self.uid,ids)
- #print 'INVOICES = ',invoices
- return invoices
+ #print 'PERIOD = ',period.name
+ obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
+ # 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')
+ """)
+ ids=self.cr.fetchall()
+ #print 'IDS = ',
+ if ids:
+ ids=[id[0] for id in ids ]
+ invoices=obj.browse(self.cr,self.uid,ids)
+ #print 'INVOICES = ',invoices
+ return invoices
def get_lines(self,fiscal_year):
- res=[]
- obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
- fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
- for period in fy.period_ids:
- invoices=self.get_invoices(period)
- for invoice in invoices:
- d={'periodo': period.name}
- d['protocollo']=invoice.number
- #print 'PARTNER ',invoice.partner_id.name
- causale=invoice.partner_id.name
- #print 'CAUSALE = ',causale
- d['causale']=causale
- d['numero']=invoice.reference
- d['data_doc']=invoice.date_invoice
- for tax in invoice.tax_line:
- #print '\tTAX: ',tax
- d['aliquota']=tax.tax_code_id.name
- d['imponibile']=tax.base
- d['imposta']=tax.amount
- res.append(d)
- d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
- return res
+ res=[]
+ obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+ fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
+ for period in fy.period_ids:
+ invoices=self.get_invoices(period)
+ for invoice in invoices:
+ d={'periodo': period.name}
+ d['protocollo']=invoice.number
+ #print 'PARTNER ',invoice.partner_id.name
+ causale=invoice.partner_id.name
+ #print 'CAUSALE = ',causale
+ d['causale']=causale
+ d['numero']=invoice.reference
+ d['data_doc']=invoice.date_invoice
+ for tax in invoice.tax_line:
+ #print '\tTAX: ',tax
+ d['aliquota']=tax.tax_code_id.name
+ d['imponibile']=tax.base
+ d['imposta']=tax.amount
+ res.append(d)
+ d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
+ return res
-report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva',
- 'l10n_it/report/libroIVA_credito.rml',
- parser=l10n_chart_it_servabit_report_libroIVA_credito,header=False)
+report_sxw.report_sxw('report.l10n_it.report.libroIVA_credito','account.report_libroiva', 'l10n_it/report/libroIVA_credito.rml', parser=l10n_chart_it_servabit_report_libroIVA_credito,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== modified file 'l10n_it/report/libroIVA_debito.py'
--- l10n_it/report/libroIVA_debito.py 2010-11-11 06:11:02 +0000
+++ l10n_it/report/libroIVA_debito.py 2010-11-11 13:16:27 +0000
@@ -2,77 +2,72 @@
from report import report_sxw
import pooler
-
class l10n_chart_it_servabit_report_libroIVA_debito(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
super(l10n_chart_it_servabit_report_libroIVA_debito,self).__init__(cr,uid,name,context)
self.localcontext.update({
- 'time' : time,
- 'get_company' : self.get_company,
- 'get_periods' : self.get_periods,
- 'get_lines' : self.get_lines,
+ 'time': time,
+ 'get_company': self.get_company,
+ 'get_periods': self.get_periods,
+ 'get_lines': self.get_lines,
})
-
def get_company(self,fiscal_year):
- #print 'COMP = ',fiscal_year
+ #print 'COMP = ',fiscal_year
return ""
-
def get_periods(self,fiscal_year):
- #print 'Fiscal year id:',fiscal_year.id
- obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
- fy=obj.browse(self.cr,self.uid,fiscal_year.id)
- #print 'Periods = ',fy.period_ids
- res=[rec for rec in fy.period_ids]
- #return fy.periods => non funziona?!? bool object !?!?
- return res
+ #print 'Fiscal year id:',fiscal_year.id
+ obj=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+ fy=obj.browse(self.cr,self.uid,fiscal_year.id)
+ #print 'Periods = ',fy.period_ids
+ res=[rec for rec in fy.period_ids]
+ #return fy.periods => non funziona?!? bool object !?!?
+ return res
def get_invoices(self,period):
- #print 'PERIOD = ',period.name
- obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
- # 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='in_invoice' OR type='in_refund')
- """)
- ids=self.cr.fetchall()
- #print 'IDS = ',
- if ids:
- ids=[id[0] for id in ids ]
- invoices=obj.browse(self.cr,self.uid,ids)
- #print 'INVOICES = ',invoices
- return invoices
+ #print 'PERIOD = ',period.name
+ obj=pooler.get_pool(self.cr.dbname).get('account.invoice')
+ # 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='in_invoice' OR type='in_refund')
+ """)
+ ids=self.cr.fetchall()
+ #print 'IDS = ',
+ if ids:
+ ids=[id[0] for id in ids ]
+ invoices=obj.browse(self.cr,self.uid,ids)
+ #print 'INVOICES = ',invoices
+ return invoices
def get_lines(self,fiscal_year):
- res=[]
- obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
- fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
- for period in fy.period_ids:
- invoices=self.get_invoices(period)
- for invoice in invoices:
- d={'periodo': period.name}
- d['protocollo']=invoice.number
- #print 'PARTNER ',invoice.partner_id.name
- causale=invoice.partner_id.name
- #print 'CAUSALE = ',causale
- d['causale']=causale
- d['numero']=invoice.reference
- d['data_doc']=invoice.date_invoice
- for tax in invoice.tax_line:
- #print '\tTAX: ',tax
- d['aliquota']=tax.tax_code_id.name
- d['imponibile']=tax.base
- d['imposta']=tax.amount
- res.append(d)
- d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
- return res
+ res=[]
+ obj_fy=pooler.get_pool(self.cr.dbname).get('account.fiscalyear')
+ fy=obj_fy.browse(self.cr,self.uid,fiscal_year.id)
+ for period in fy.period_ids:
+ invoices=self.get_invoices(period)
+ for invoice in invoices:
+ d={'periodo': period.name}
+ d['protocollo']=invoice.number
+ #print 'PARTNER ',invoice.partner_id.name
+ causale=invoice.partner_id.name
+ #print 'CAUSALE = ',causale
+ d['causale']=causale
+ d['numero']=invoice.reference
+ d['data_doc']=invoice.date_invoice
+ for tax in invoice.tax_line:
+ #print '\tTAX: ',tax
+ d['aliquota']=tax.tax_code_id.name
+ d['imponibile']=tax.base
+ d['imposta']=tax.amount
+ res.append(d)
+ d={'periodo':'', 'protocollo':'', 'causale':'', 'numero':'', 'data_doc':'', }
+ return res
-report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva',
- 'l10n_it/report/libroIVA_debito.rml',
- parser=l10n_chart_it_servabit_report_libroIVA_debito,header=False)
+report_sxw.report_sxw('report.l10n_it.report.libroIVA_debito','account.report_libroiva', 'l10n_it/report/libroIVA_debito.rml', parser=l10n_chart_it_servabit_report_libroIVA_debito,header=False)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
Follow ups
