Merge lp:~rr.clearcorp/openerp-ccorp-addons/6.1-rent into lp:openerp-ccorp-addons/7.0

[Ronald Rubi]

[FIX] Fix rent invoicing

[lp:~rr.clearcorp/openerp-ccorp-addons/6.1-rent]

744. By Ronald Rubi on 2013-09-02

[MRG] Fix rent invoicing

745. By Launchpad Translations on behalf of clearcorp-drivers on 2013-09-05

Launchpad automatic translations update.

746. By Ronald Rubi on 2013-10-10

[MRG] Delete spaces in hr_payroll_report/report/hr_payroll_report.mako

747. By Launchpad Translations on behalf of clearcorp-drivers on 2013-10-18

Launchpad automatic translations update.

748. By Ronald Rubi on 2013-10-21

[MRG] Fix duplicate in account_moves

749. By Ronald Rubi on 2013-10-28

[MRG] Workaround functional fields in sale_order

750. By Launchpad Translations on behalf of clearcorp-drivers on 2013-10-29

Launchpad automatic translations update.

751. By Ronald Rubi on 2013-10-31

[MRG] Fix account_move_reverse, bad matching lines

752. By Launchpad Translations on behalf of clearcorp-drivers on 2013-11-08

Launchpad automatic translations update.

753. By Ronald Rubi on 2013-11-08

[FIX] Fix invoice_type in account invoice line, rent module

754. By Launchpad Translations on behalf of clearcorp-drivers on 2013-11-16

Launchpad automatic translations update.

755. By Ronald Rubi on 2013-11-20

[FIX] Fix account_invoice_line create when invoice_type='product'

Unmerged revisions

755. By Ronald Rubi on 2013-11-20

[FIX] Fix account_invoice_line create when invoice_type='product'

754. By Launchpad Translations on behalf of clearcorp-drivers on 2013-11-16

Launchpad automatic translations update.

753. By Ronald Rubi on 2013-11-08

[FIX] Fix invoice_type in account invoice line, rent module

752. By Launchpad Translations on behalf of clearcorp-drivers on 2013-11-08

Launchpad automatic translations update.

751. By Ronald Rubi on 2013-10-31

[MRG] Fix account_move_reverse, bad matching lines

750. By Launchpad Translations on behalf of clearcorp-drivers on 2013-10-29

Launchpad automatic translations update.

749. By Ronald Rubi on 2013-10-28

[MRG] Workaround functional fields in sale_order

748. By Ronald Rubi on 2013-10-21

[MRG] Fix duplicate in account_moves

747. By Launchpad Translations on behalf of clearcorp-drivers on 2013-10-18

Launchpad automatic translations update.

746. By Ronald Rubi on 2013-10-10

[MRG] Delete spaces in hr_payroll_report/report/hr_payroll_report.mako

=== modified file 'TODO-6.1/ccorp_account/i18n/es.po'
--- TODO-6.1/ccorp_account/i18n/es.po	2013-02-26 05:22:23 +0000
+++ TODO-6.1/ccorp_account/i18n/es.po	2013-11-20 22:45:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-26 05:22+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
 
 #. module: ccorp_account
 #: model:ir.module.module,description:ccorp_account.module_meta_information

=== added file 'TODO-6.1/ccorp_account/i18n/pt_BR.po'
--- TODO-6.1/ccorp_account/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_account/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,186 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-23 20:49+0000\n"
+"PO-Revision-Date: 2013-07-28 11:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: ccorp_account
+#: model:ir.module.module,description:ccorp_account.module_meta_information
+msgid ""
+"ClearCorp 'account' modifications:\n"
+"    Reports:\n"
+"      * Invoice\n"
+"    "
+msgstr ""
+"'Conta' ClearCorp modificações:\n"
+"    Relatórios:\n"
+"      * Nota Fiscal\n"
+"    "
+
+#. module: ccorp_account
+#: model:ir.module.module,shortdesc:ccorp_account.module_meta_information
+msgid "ClearCorp account module modifications"
+msgstr "Conta ClearCorp modificações módulo"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Electronic Invoice"
+msgstr "Nota Fiscal Eletrônica"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "PRO-FORMA"
+msgstr "Pro-forma"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Draft Invoice"
+msgstr "Projeto Nota Fiscal"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Cancelled Invoice"
+msgstr "Fatura Cancelada"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Supplier Refund"
+msgstr "Reembolso supplier"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Supplier Invoice"
+msgstr "Fatura Fornecedor"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Num.: "
+msgstr "Num.: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Date: "
+msgstr "Data: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "ID Num.: "
+msgstr "Num ID.: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Tel-fax: "
+msgstr "Tel-fax: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Email: "
+msgstr "E-mail: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Web: "
+msgstr "Web: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Address:"
+msgstr "Endereço:"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Phone: "
+msgstr "Telefone: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Fax: "
+msgstr "Fax: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Salesman: "
+msgstr "Vendedor: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Payment tems: "
+msgstr "Tems de pagamento: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Due date: "
+msgstr "Data de vencimento: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Exchange rate: "
+msgstr "Taxa de câmbio: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Page: "
+msgstr "Página: "
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Thank you for choosing us."
+msgstr "Obrigado por nos escolher."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Qty."
+msgstr "Qtde."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Description / (Taxes)"
+msgstr "Descrição / (Impostos)"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Disc."
+msgstr "Desc."
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Unit Price"
+msgstr "Preço unitário"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Discount"
+msgstr "Desconto"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: ccorp_account
+#: rml:account.invoice.layout_ccorp:0
+msgid "TOTAL"
+msgstr "TOTAL"

=== added file 'TODO-6.1/ccorp_purchase/i18n/pt_BR.po'
--- TODO-6.1/ccorp_purchase/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-6.1/ccorp_purchase/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,146 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-10-06 19:16+0000\n"
+"PO-Revision-Date: 2013-07-28 11:41+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: ccorp_purchase
+#: model:ir.module.module,description:ccorp_purchase.module_meta_information
+msgid ""
+"ClearCorp 'sale' modifications:\n"
+"    Reports:\n"
+"      * Sale Order / Quotation\n"
+"    "
+msgstr ""
+"ClearCorp 'venda' modificações:\n"
+"    Relatórios:\n"
+"      * Ordem de Venda / cotação\n"
+"    "
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:87
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:32
+msgid "ID Num."
+msgstr "Num ID."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:78
+msgid "Note"
+msgstr "Nota"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Date Req."
+msgstr "Data Req."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:18
+msgid "Order N°"
+msgstr "Ordem N°"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:47
+msgid "Email"
+msgstr "E-mail"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:35
+msgid "Date Ordered:"
+msgstr "Data do Pedido:"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:42
+msgid "Validated By."
+msgstr "Validado por."
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:39
+msgid "Phone"
+msgstr "Telefone"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:46
+msgid "TVA"
+msgstr "TVA"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "[Code] Description / (Taxes)"
+msgstr "[Código] Descrição / (Impostos)"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:94
+msgid "Order Notes:"
+msgstr "Encomendar Notas:"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:52
+msgid "Shipping address"
+msgstr "Endereço de entrega"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:43
+msgid "Fax"
+msgstr "Fax"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:88
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:52
+msgid "Partner address"
+msgstr "Endereço parceiro"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:89
+msgid "Total"
+msgstr "Total"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Qty"
+msgstr "Qtde"
+
+#. module: ccorp_purchase
+#: model:ir.module.module,shortdesc:ccorp_purchase.module_meta_information
+msgid "ClearCorp sale module modifications"
+msgstr "ClearCorp módulo venda modificações"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:66
+msgid "Unit Price"
+msgstr "Preço unitário"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:26
+msgid "Partnert Order Ref"
+msgstr "Partnert Ordem Ref"
+
+#. module: ccorp_purchase
+#: report:report.purchase.order.layout_ccorp:15
+msgid "Order Ref"
+msgstr "Ref. Ordem"

=== modified file 'TODO-7.0/account_multicompany_relation/account_multicompany_relation.py'
--- TODO-7.0/account_multicompany_relation/account_multicompany_relation.py	2012-11-05 08:26:08 +0000
+++ TODO-7.0/account_multicompany_relation/account_multicompany_relation.py	2013-11-20 22:45:57 +0000
@@ -84,46 +84,48 @@
     _inherit = 'account.move'
 
     def button_cancel(self, cr, uid, ids, context=None):
-        self.pool.get('account.move.reconcile')
+        move_reconcile_obj = self.pool.get('account.move.reconcile')
+        move_line_obj = self.pool.get('account.move.line')
         for move in self.browse(cr, uid, ids, context=context):
             if not move.journal_id.update_posted:
                 raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
 
             #Set user administrator to run this portion of code
-            uid = 1
+            uid_admin = 1
             for line in move.line_id:
                 if line.move_mirror_rel_id:
-                    move_mirror = self.browse(cr, uid, line.move_mirror_rel_id.id, context=context)
+                    move_mirror = self.browse(cr, uid_admin, line.move_mirror_rel_id.id, context=context)
                     if not move_mirror.journal_id.update_posted:
                         raise osv.except_osv(_('Error !'), _('You can not modify a posted multicompany mirror entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
 
-            move_reconcile_obj = self.pool.get('account.move.reconcile')
+            
 
             for line in move.line_id:
                 if line.move_mirror_rel_id:
-                    move_mirror = self.browse(cr, uid, line.move_mirror_rel_id.id, context=context)
+                    move_mirror = self.browse(cr, uid_admin, line.move_mirror_rel_id.id, context=context)
 
                     for line_mirror in move_mirror.line_id:
                         if line_mirror.reconcile_id:
                             reconcile = line_mirror.reconcile_id
                             if len(reconcile.line_id) > 2:
-                                self.pool.get('account.move.line').write(cr,uid,reconcile.line_id,{'reconcile_id': False, 'reconcile_partial_id':reconcile.id})
-                                self.pool.get('account.move.line').write(cr,uid,line_mirror.id,{'reconcile_partial_id': False})
+                                reconcile_line_ids = move_line_obj.search(cr, uid_admin, [('reconcile_id','=',reconcile.id)])
+                                move_line_obj.write(cr,uid_admin,reconcile_line_ids,{'reconcile_id': False, 'reconcile_partial_id':reconcile.id})
+                                move_line_obj.write(cr,uid_admin,line_mirror.id,{'reconcile_partial_id': False})
                             else:
-                                move_reconcile_obj.unlink(cr,uid,[reconcile.id],context=context)
+                                move_reconcile_obj.unlink(cr,uid_admin,[reconcile.id],context=context)
 
                         elif line_mirror.reconcile_partial_id:
                             reconcile = line_mirror.reconcile_partial_id
                             if len(reconcile.line_partial_ids) > 2:
-                                self.pool.get('account.move.line').write(cr,uid,line_mirror.id,{'reconcile_partial_id': False })
+                                move_line_obj.write(cr,uid_admin,line_mirror.id,{'reconcile_partial_id': False })
                             else:
-                                move_reconcile_obj.unlink(cr,uid,[reconcile.id],context=context)
+                                move_reconcile_obj.unlink(cr,uid_admin,[reconcile.id],context=context)
 
                     cr.execute('UPDATE account_move '\
                                'SET state=%s '\
                                'WHERE id IN %s', ('draft', tuple([move_mirror.id]),))
-                    self.button_cancel(cr,uid,[move_mirror.id],context=context)
-                    self.unlink(cr,uid,[move_mirror.id],context=context)
+                    self.button_cancel(cr,uid_admin,[move_mirror.id],context=context)
+                    self.unlink(cr,uid_admin,[move_mirror.id],context=context)
 
         result = super(AccountMove, self).button_cancel(cr, uid, ids, context=context)
         return True
@@ -224,7 +226,7 @@
                             'credit':line_credit,
                             'account_id':targ_account.id,
                             'move_id': move_id,
-                            'amount_currency':line.amount_currency * -1,
+                            'amount_currency':line.amount_currency,
                             'period_id':move_period or False,
                             'journal_id':targ_journal.id,
                             'partner_id':line.partner_id.id,
@@ -249,7 +251,7 @@
                                          'credit':line_debit,
                                          'account_id':move_line_two_account_id.id,
                                          'move_id': move_id,
-                                         'amount_currency':line.amount_currency,
+                                         'amount_currency':line.amount_currency * -1,
                                          'journal_id':targ_journal.id,
                                          'period_id':move_period or False,
                                          'partner_id':line.partner_id.id,

=== added file 'TODO-7.0/account_multicompany_relation/i18n/pt_BR.po'
--- TODO-7.0/account_multicompany_relation/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-7.0/account_multicompany_relation/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,287 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-19 22:21+0000\n"
+"PO-Revision-Date: 2013-07-28 11:43+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,targ_analytic_account:0
+msgid "Target Analytic Account"
+msgstr "Alvo Conta Analitica"
+
+#. module: account_multicompany_relation
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+"Você não pode criar mais do que um movimento por período centralizado em "
+"revista"
+
+#. module: account_multicompany_relation
+#: constraint:account.multicompany.relation:0
+#: sql_constraint:account.multicompany.relation:0
+msgid "A relation exists already"
+msgstr "Existe uma relação já"
+
+#. module: account_multicompany_relation
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Empresa deve ser o mesmo para a sua conta e período relacionado."
+
+#. module: account_multicompany_relation
+#: model:ir.model,name:account_multicompany_relation.model_account_multicompany_relation
+msgid "account.multicompany.relation"
+msgstr "account.multicompany.relation"
+
+#. module: account_multicompany_relation
+#: help:account.multicompany.relation,origin_analytic_account:0
+msgid ""
+"Indicate the original analytic account where the transaction is taking place"
+msgstr "Indique a conta analítica original onde a transação está ocorrendo"
+
+#. module: account_multicompany_relation
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "O código da conta deve ser única por empresa!"
+
+#. module: account_multicompany_relation
+#: help:account.multicompany.relation,name:0
+msgid "Name for the mirror object relation"
+msgstr "Nome para a relação de objeto espelho"
+
+#. module: account_multicompany_relation
+#: code:addons/account_multicompany_relation/account_multicompany_relation.py:94
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+"Você não pode modificar uma entrada postou desta revista! \n"
+"Você deve definir a revista para permitir o cancelamento entradas se você "
+"quiser fazer isso."
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,targ_journal:0
+msgid "Target Journal"
+msgstr "Relatorio Alvo"
+
+#. module: account_multicompany_relation
+#: code:addons/account_multicompany_relation/account_multicompany_relation.py:94
+#: code:addons/account_multicompany_relation/account_multicompany_relation.py:102
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: account_multicompany_relation
+#: model:ir.model,name:account_multicompany_relation.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_multicompany_relation
+#: model:ir.model,name:account_multicompany_relation.model_account_move_line
+msgid "Journal Items"
+msgstr "Itens do Diário"
+
+#. module: account_multicompany_relation
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+"Você não pode criar itens de jornal sobre uma conta do tipo de exibição."
+
+#. module: account_multicompany_relation
+#: model:ir.model,name:account_multicompany_relation.model_account_account
+msgid "Account"
+msgstr "Conta"
+
+#. module: account_multicompany_relation
+#: code:addons/account_multicompany_relation/account_multicompany_relation.py:102
+#, python-format
+msgid ""
+"You can not modify a posted multicompany mirror entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+"Você não pode modificar uma entrada de espelho multiempresa publicado da "
+"revista! \n"
+"Você deve definir a revista para permitir o cancelamento entradas se você "
+"quiser fazer isso."
+
+#. module: account_multicompany_relation
+#: view:account.multicompany.relation:0
+#: model:ir.actions.act_window,name:account_multicompany_relation.action_account_multi_relation_fix
+msgid "Account Multicompany Relation"
+msgstr "Conta multiempresa Relação"
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: account_multicompany_relation
+#: help:account.multicompany.relation,targ_analytic_account:0
+msgid ""
+"Indicate the target analytic account where the transaction of the original "
+"analytic account has to be seen, this is an analytic account from another "
+"company"
+msgstr ""
+"Indique a conta analítica alvo onde a transação da conta analítica original "
+"tem de ser visto, este é um relato analítico de outra empresa"
+
+#. module: account_multicompany_relation
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Você não pode criar itens de jornal por conta fechada."
+
+#. module: account_multicompany_relation
+#: sql_constraint:account.multicompany.relation:0
+msgid "The name must be unique"
+msgstr "O nome deve ser único"
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,origin_journal:0
+msgid "Original Journal"
+msgstr "Relatório originais"
+
+#. module: account_multicompany_relation
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Erro de configuração! A moeda escolhida deve ser compartilhado pelas contas "
+"padrão também."
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,targ_account:0
+msgid "Target Account"
+msgstr "Conta-Alvo"
+
+#. module: account_multicompany_relation
+#: model:ir.ui.menu,name:account_multicompany_relation.account_multi_relation_menu
+msgid "Relation Multicompany"
+msgstr "Multiempresa Relação"
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,origin_account:0
+msgid "Original Account"
+msgstr "Conta Original"
+
+#. module: account_multicompany_relation
+#: help:account.multicompany.relation,origin_journal:0
+msgid "Indicate the original journal where the transaction is taking place"
+msgstr "Indique a revista original onde a transação está ocorrendo"
+
+#. module: account_multicompany_relation
+#: field:account.move.line,move_mirror_rel_id:0
+msgid "Move Multicompany Relation"
+msgstr "Mova Relação multiempresa"
+
+#. module: account_multicompany_relation
+#: help:account.multicompany.relation,origin_account:0
+#: help:account.multicompany.relation,targ_journal:0
+msgid "Indicate the original account where the transaction is taking place"
+msgstr "Indique a conta original onde a transação está ocorrendo"
+
+#. module: account_multicompany_relation
+#: model:ir.model,name:account_multicompany_relation.model_account_move
+msgid "Account Entry"
+msgstr "Lançamento Contábil"
+
+#. module: account_multicompany_relation
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Error ! You can not create recursive accounts."
+
+#. module: account_multicompany_relation
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"Erro de configuração! \n"
+"Você não pode selecionar um tipo de conta com um método de diferimento "
+"diferente de \"Unreconciled\" para contas com tipo interno \"Pagar / "
+"Receber\"! "
+
+#. module: account_multicompany_relation
+#: model:ir.model,name:account_multicompany_relation.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprovante de Contabilidade"
+
+#. module: account_multicompany_relation
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "O nome do periódico deve ser único por empresa!"
+
+#. module: account_multicompany_relation
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"A conta selecionada de suas forças de Lançamentos para fornecer uma moeda "
+"secundária. Você deve remover a moeda secundária na conta ou selecione uma "
+"visão multi-moeda na revista."
+
+#. module: account_multicompany_relation
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"A data de sua entrada de diário não está no período definido! Você deve "
+"alterar a data ou remover essa restrição da revista."
+
+#. module: account_multicompany_relation
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "O código da revista deve ser exclusivo para cada empresa!"
+
+#. module: account_multicompany_relation
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Erro de configuração! \n"
+"Você não pode definir as crianças a uma conta com tipo interno diferente de "
+"\"View\"! "
+
+#. module: account_multicompany_relation
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Valor do crédito errado ou débito na entrada de contabilidade!"
+
+#. module: account_multicompany_relation
+#: field:account.multicompany.relation,origin_analytic_account:0
+msgid "Original Analytic Account"
+msgstr "Conta Analitica Original"
+
+#. module: account_multicompany_relation
+#: help:account.multicompany.relation,targ_account:0
+msgid ""
+"Indicate the target account where the transaction of the original account "
+"has to be seen, this is an account from another company"
+msgstr ""
+"Indique a conta de destino, onde a transação da conta original tem que ser "
+"visto, esta é uma conta de outra empresa"
+
+#~ msgid "Already exist a relation to this diary and account (origins)"
+#~ msgstr "Já existe uma relação com este diário e conta (origens)"

=== modified file 'TODO-7.0/account_webkit_report_library/common_library.py'
--- TODO-7.0/account_webkit_report_library/common_library.py	2013-02-06 22:15:54 +0000
+++ TODO-7.0/account_webkit_report_library/common_library.py	2013-11-20 22:45:57 +0000
@@ -80,7 +80,7 @@
        
         return pevious_period
         
-    def get_move_lines(self, cr, uid, account_ids, filter_type='', filter_data=None, fiscalyear=None, target_move='all', unreconcile = False, historic_strict=False, special_period =False, context=None):
+    def get_move_lines(self, cr, uid, account_ids, filter_type='', filter_data=None, fiscalyear=None, target_move='all', unreconcile = False, historic_strict=False, special_period =False, order_by=None, context=None):
         ''' Get the move lines of the accounts provided and filtered.
         Arguments:
         'account_ids': List of accounts ids.
@@ -91,6 +91,7 @@
         'target_move': Target moves of the report, possibles values: 'all' or 'posted'.
         'unreconcile': If True then get the move lines unreconciled.
         'historic_strict': Used when unreconcile = True, forces to include move lines that where not reconciled at the end date of the filter but are now.
+        'order_by': Used to the lines return order by specific order. asc or desc are the acepted words.  
          
         '''
         #TODO: Translate comments to english
@@ -181,11 +182,11 @@
                 periods_ids = self.pool.get('account.period').search(cr, uid, [('special', '=', False),('fiscalyear_id', '=', fiscalyear.id)], context=context)
             domain_period = ('period_id.id', 'in', periods_ids)
             list_tuples.append(domain_period)
-                
+                    
         #**********************************************************************************************#
         
         if unreconcile == False:
-            move_line_ids = move_line_obj.search(cr, uid, list_tuples, context=context)
+            move_line_ids = move_line_obj.search(cr, uid, list_tuples,order = order_by,context=context)
                 
         else:
             #list_tuples + [domain_unreconciled] -> Con esta sintaxis no se altera la variable 
@@ -419,7 +420,6 @@
         return res
 
     def get_account_child_ids(self, cr, uid, account_ids, context={}):
-        print account_ids
         if isinstance(account_ids, orm.browse_record):
             account_ids = [account_ids.id]
         elif isinstance(account_ids, int):

=== added file 'TODO-7.0/base_partner_merge_ccorp/i18n/pt_BR.po'
--- TODO-7.0/base_partner_merge_ccorp/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-7.0/base_partner_merge_ccorp/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,117 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 05:33+0000\n"
+"PO-Revision-Date: 2013-07-28 11:44+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: base_partner_merge
+#: help:base_partner_address.merge,init,address_id2:0
+msgid "Select second partner address to merge"
+msgstr "Selecione segundo endereço parceiro para fusão"
+
+#. module: base_partner_merge
+#: model:ir.module.module,shortdesc:base_partner_merge.module_meta_information
+msgid "Partner Merger"
+msgstr "Parceiro de Incorporação"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/wizard/merge_partners.py:0
+#: model:ir.actions.wizard,name:base_partner_merge.wizard_base_partner_merge
+#: model:ir.ui.menu,name:base_partner_merge.menu_wizard_base_partner_merge
+#, python-format
+msgid "Merge Partners"
+msgstr "Mesclar Parceiros"
+
+#. module: base_partner_merge
+#: wizard_field:base_partner.merge,init,partner_id2:0
+msgid "Second partner"
+msgstr "Segundo Parceiro"
+
+#. module: base_partner_merge
+#: wizard_view:base_partner.merge,init:0
+msgid "Merge Two Partners"
+msgstr "Mesclar Dois Parceiros"
+
+#. module: base_partner_merge
+#: code:addons/base_partner_merge/wizard/merge_partners_address.py:0
+#, python-format
+msgid "Merge Partner Addresses"
+msgstr "Mesclar Endereços Parceiros"
+
+#. module: base_partner_merge
+#: wizard_field:base_partner_address.merge,init,address_id1:0
+msgid "First address"
+msgstr "Primeiro ENDEREÇO"
+
+#. module: base_partner_merge
+#: wizard_field:base_partner_address.merge,init,address_id2:0
+msgid "Second address"
+msgstr "Segundo ENDEREÇO"
+
+#. module: base_partner_merge
+#: wizard_button:base_partner.merge,init,next:0
+#: wizard_button:base_partner_address.merge,init,next:0
+msgid "Next"
+msgstr "Próximo"
+
+#. module: base_partner_merge
+#: wizard_button:base_partner.merge,next,next_1:0
+msgid "Create And Open Partner"
+msgstr "Criar e abrir Parceiro"
+
+#. module: base_partner_merge
+#: wizard_field:base_partner.merge,init,partner_id1:0
+msgid "First partner"
+msgstr "Primeiro Parceiro"
+
+#. module: base_partner_merge
+#: wizard_button:base_partner_address.merge,next,next_1:0
+msgid "Create And Open Address"
+msgstr "CRIAR e abrir endereco"
+
+#. module: base_partner_merge
+#: help:base_partner.merge,init,partner_id2:0
+msgid "Select second partner to merge"
+msgstr "Selecione o Segundo Parceiro de Fusão"
+
+#. module: base_partner_merge
+#: help:base_partner.merge,init,partner_id1:0
+msgid "Select first partner to merge"
+msgstr "Selecione Primeiro Parceiro de Fusão"
+
+#. module: base_partner_merge
+#: help:base_partner_address.merge,init,address_id1:0
+msgid "Select first partner address to merge"
+msgstr "Selecione Primeiro ENDEREÇO ​​Parceiro parágrafo Fusão"
+
+#. module: base_partner_merge
+#: wizard_button:base_partner.merge,init,end:0
+#: wizard_button:base_partner.merge,next,end:0
+#: wizard_button:base_partner_address.merge,init,end:0
+#: wizard_button:base_partner_address.merge,next,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: base_partner_merge
+#: wizard_view:base_partner_address.merge,init:0
+msgid "Merge Two Partner Address"
+msgstr "Mesclar Dois Parceiro Morada"
+
+#. module: base_partner_merge
+#: model:ir.actions.wizard,name:base_partner_merge.wizard_base_partner_address_merge
+#: model:ir.ui.menu,name:base_partner_merge.menu_wizard_base_partner_address_merge
+msgid "Merge Addresses"
+msgstr "Mesclar Endereços"

=== modified file 'TODO-7.0/base_partner_sequence_ccorp/i18n/es.po'
--- TODO-7.0/base_partner_sequence_ccorp/i18n/es.po	2013-02-26 05:22:23 +0000
+++ TODO-7.0/base_partner_sequence_ccorp/i18n/es.po	2013-11-20 22:45:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-26 05:22+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
 
 #. module: base_partner_sequence
 #: model:ir.module.module,description:base_partner_sequence.module_meta_information

=== added file 'TODO-7.0/base_partner_sequence_ccorp/i18n/pt_BR.po'
--- TODO-7.0/base_partner_sequence_ccorp/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-7.0/base_partner_sequence_ccorp/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,39 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-25 05:34+0000\n"
+"PO-Revision-Date: 2013-07-28 11:35+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: base_partner_sequence
+#: model:ir.module.module,description:base_partner_sequence.module_meta_information
+msgid ""
+"\n"
+"        This module adds the possibility to define a sequence for\n"
+"        the partner code. This code is then set as default when you\n"
+"        create a new partner, using the defined sequence.\n"
+"    "
+msgstr ""
+"\n"
+"        Este módulo adiciona a possibilidade de definir uma sequência de\n"
+"        o código do parceiro. Este código é então definido como padrão "
+"quando você\n"
+"        criar um novo parceiro, usando a seqüência definida.\n"
+"    "
+
+#. module: base_partner_sequence
+#: model:ir.module.module,shortdesc:base_partner_sequence.module_meta_information
+msgid "Add an automatic sequence on partners"
+msgstr "Adicionar uma seqüência automática de parceiros"

=== modified file 'TODO-7.0/base_partner_sequence_ccorp/i18n/sv.po'
--- TODO-7.0/base_partner_sequence_ccorp/i18n/sv.po	2013-02-26 05:22:23 +0000
+++ TODO-7.0/base_partner_sequence_ccorp/i18n/sv.po	2013-11-20 22:45:57 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-26 05:22+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
 
 #. module: base_partner_sequence
 #: model:ir.module.module,description:base_partner_sequence.module_meta_information

=== added file 'TODO-7.0/product_cost_group/i18n/pt_BR.po'
--- TODO-7.0/product_cost_group/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-7.0/product_cost_group/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,33 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-29 21:20+0000\n"
+"PO-Revision-Date: 2013-07-28 11:36+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: product_cost_group
+#: model:res.groups,name:product_cost_group.group_costs_viewer
+msgid " View Costs"
+msgstr " Ver Custos"
+
+#. module: product_cost_group
+#: view:product.product:0
+msgid "Update"
+msgstr "Atualizar"
+
+#. module: product_cost_group
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr "Preço de custo:"

=== added file 'TODO-7.0/purchase_order_archive/i18n/pt_BR.po'
--- TODO-7.0/purchase_order_archive/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ TODO-7.0/purchase_order_archive/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,99 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-02-14 20:34+0000\n"
+"PO-Revision-Date: 2013-07-28 11:38+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: purchase_order_archive
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Referência à ordem deve ser exclusivo por Empresa!"
+
+#. module: purchase_order_archive
+#: view:purchase.order:0
+msgid "Archived"
+msgstr "Arquivada"
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:88
+#, python-format
+msgid "An archived purchase order cannot be deleted!"
+msgstr "Uma ordem de compra arquivados não podem ser apagados!"
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:70
+#, python-format
+msgid "You must first cancel all invoices related to this purchase order."
+msgstr ""
+"Primeiro, você deve cancelar todas as facturas relacionadas com este pedido "
+"de compra."
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:90
+#, python-format
+msgid "In order to delete a purchase order, it must be cancelled first!"
+msgstr ""
+"Para excluir uma ordem de compra, ele deve ser cancelado em primeiro lugar!"
+
+#. module: purchase_order_archive
+#: model:ir.model,name:purchase_order_archive.model_purchase_order
+msgid "Purchase Order"
+msgstr "Ordem de Compra"
+
+#. module: purchase_order_archive
+#: view:purchase.order:0
+msgid "Archived purchase order"
+msgstr "Ordem de compra arquivados"
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:63
+#, python-format
+msgid "You must first cancel all receptions related to this purchase order."
+msgstr ""
+"Primeiro, você deve cancelar todos os eventos relacionados a este pedido de "
+"compra."
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:105
+#, python-format
+msgid "An archived purchase order cannot be edited!"
+msgstr "Uma ordem de compra arquivados não podem ser editados!"
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:88
+#: code:addons/purchase_order_archive/purchase_order_archive.py:90
+#: code:addons/purchase_order_archive/purchase_order_archive.py:105
+#, python-format
+msgid "Invalid action !"
+msgstr "Ação Inválida!"
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:62
+#: code:addons/purchase_order_archive/purchase_order_archive.py:69
+#, python-format
+msgid "Unable to archive this purchase order!"
+msgstr "Incapaz de arquivar este pedido de compra!"
+
+#. module: purchase_order_archive
+#: code:addons/purchase_order_archive/purchase_order_archive.py:76
+#, python-format
+msgid "Purchase order '%s' is archived."
+msgstr "ordem de compra '%s' é arquivado."
+
+#. module: purchase_order_archive
+#: view:purchase.order:0
+msgid "Archive"
+msgstr "Arquivo"

=== modified file 'TODO-7.0/rent/rent.py'
--- TODO-7.0/rent/rent.py	2012-11-07 23:02:15 +0000
+++ TODO-7.0/rent/rent.py	2013-11-20 22:45:57 +0000
@@ -851,6 +851,7 @@
             'uos_id': False,
             'invoice_line_tax_id': [(6, 0, [])],
             'account_analytic_id': False,
+            'invoice_type': 'rent',
             'invoice_rent_id': obj_rent.id or args.get('rent_id', False),
         })
     
@@ -888,7 +889,8 @@
         elif type == 'main':
             if not first_inv:
                 date_due = (obj_rent.rent_main_invoiced_day < obj_rent.rent_main_charge_day and date(today.year,today.month,1) or (today.replace(day=1) + timedelta(days=32)).replace(day=1))
-                date_due = date_due.replace(day=obj_rent.rent_main_charge_day + obj_rent.rent_main_grace_period)
+                #It should remove the first day of the month to avoid altering the date (-1)
+                date_due = date_due + timedelta(days=(obj_rent.rent_main_charge_day + obj_rent.rent_main_grace_period - 1))
             else:
                 date_due = today +  timedelta(days=obj_rent.rent_main_grace_period)
         
@@ -1737,14 +1739,15 @@
         
     def create(self, cr, uid,vals, context=None):
         #Check for the area before creating the object
-        vals2 = vals
         #invoice_line = vals['invoice_line']
-        if 'invoice_type' in vals2 and vals2['invoice_type'] == 'rent':
-            p_invoice_rent_id = vals['invoice_rent_id'][0]
-            vals2['invoice_rent_id'] = p_invoice_rent_id
-            return super(rent_invoice_line,self).create(cr,uid,vals2,context)
-                    
-            
+        if 'invoice_type' in vals and vals['invoice_type'] == 'rent' and 'invoice_rent_id' in vals and vals['invoice_rent_id']:
+            if isinstance(vals['invoice_rent_id'], int):
+                vals['invoice_rent_id'] = vals['invoice_rent_id']
+            else:
+                vals['invoice_rent_id'] = vals['invoice_rent_id'][0]
+        if 'invoice_type' in vals and vals['invoice_type'] == 'product' and 'invoice_rent_id' in vals and vals['invoice_rent_id']:
+            del vals['invoice_rent_id']
+        
             #raise osv.except_osv('Wrong value!', 'The area for the estate has to bee greater than 0')
         return super(rent_invoice_line,self).create(cr,uid,vals,context)
     
@@ -1780,7 +1783,7 @@
         'log_desc' : fields.char('Description',size=200),
         #'log_rent' : fields.many2one('rent.rent','Rent Ref'),
     }
-
+    
 class rent_contract(osv.osv):
     _name = 'rent.contract'
     

=== modified file 'TODO-7.0/rent/rent_view.xml'
--- TODO-7.0/rent/rent_view.xml	2012-11-07 22:56:22 +0000
+++ TODO-7.0/rent/rent_view.xml	2013-11-20 22:45:57 +0000
@@ -1216,6 +1216,7 @@
                 </tree>
             </field>
         </record>
+        
         <!--
         ======================================
                     CONTRACTS

=== added directory 'account_general_ledger_report'
=== renamed directory 'account_general_ledger_report' => 'account_general_ledger_report.moved'
=== added file 'account_general_ledger_report/__init__.py'
--- account_general_ledger_report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/__init__.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,24 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import report
+import wizard
\ No newline at end of file

=== added file 'account_general_ledger_report/__openerp__.py'
--- account_general_ledger_report/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/__openerp__.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,45 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'General Partner Webkit Report',
+    'version': '1.0',
+    'url': 'http://launchpad.net/openerp-ccorp-addons',
+    'author': 'ClearCorp S.A.',
+    'website': 'http://clearcorp.co.cr',
+    'category': 'Accounting & Finance',
+    'complexity': 'normal',
+    'description': """This module modifies the general ledger report""",
+    'depends': [
+        'account',
+        'account_webkit_report_library',
+        'account_financial_report_webkit',
+    ],
+    'init_xml': [],
+    'demo_xml': [],
+    'update_xml': ['report/report.xml',
+                   'wizard/account_general_ledger_report_wizard.xml',
+                   'report_menus.xml',],
+    'license': 'AGPL-3',
+    'installable': True,
+    'active': False,
+}
\ No newline at end of file

=== added directory 'account_general_ledger_report/i18n'
=== added file 'account_general_ledger_report/i18n/es_CR.po'
--- account_general_ledger_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/i18n/es_CR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,158 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_general_ledger_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-17 21:01+0000\n"
+"PO-Revision-Date: 2013-05-17 21:01+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:29
+msgid "Filter by: "
+msgstr "Filtrado por: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:99
+msgid "Label"
+msgstr "Etiqueta"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:104
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:97
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:57
+msgid "Target moves: "
+msgstr "Movimientos destino: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:83
+msgid "No move lines for this account"
+msgstr "No existen líneas de asiento para esta cuenta"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:94
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:157
+msgid "TOTAL"
+msgstr "TOTAL"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:109
+msgid "Curr. Bal."
+msgstr "Bal. M."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:28
+msgid "Fiscal Year: "
+msgstr "Año fiscal: "
+
+#. module: account_general_ledger_report
+#: constraint:general.ledger.webkit:0
+msgid "When no Fiscal year is selected, you must choose to filter by periods or by date."
+msgstr "Cuando no se selecciona ningún año fiscal, se debe elegir para filtrar por períodos o por fecha."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:48
+msgid "Accounts: "
+msgstr "Cuentas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:15
+msgid "General Ledger Report "
+msgstr "Informe del libro mayor"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:108
+msgid "Curr. Am."
+msgstr "Mon. M."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:45
+msgid "No filter"
+msgstr "Sin filtros"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:106
+msgid "Cumul. Bal."
+msgstr "Bal Acumul."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:105
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:42
+msgid "Period: "
+msgstr "Período: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:96
+msgid "Entry"
+msgstr "Asiento"
+
+#. module: account_general_ledger_report
+#: constraint:general.ledger.webkit:0
+msgid "The fiscalyear, periods or chart of account chosen have to belong to the same company."
+msgstr "El año fiscal, períodos o plan contable elegidos deben pertenecer a la misma compañía."
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:54
+msgid "All"
+msgstr "Todo"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:27
+msgid "Chart of Accounts: "
+msgstr "Catálogo de cuentas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:102
+msgid "Reconcile"
+msgstr "Conciliación"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:35
+msgid "Dates: "
+msgstr "Fechas: "
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:95
+msgid "Period"
+msgstr "Períodos"
+
+#. module: account_general_ledger_report
+#: model:ir.actions.act_window,name:account_general_ledger_report.action_general_ledger_report_wizard
+#: model:ir.model,name:account_general_ledger_report.model_general_ledger_webkit
+msgid "General Ledger Report"
+msgstr "Informe del libro mayor"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:98
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_general_ledger_report
+#: report:addons/account_general_ledger_report/report/account_general_ledger_report.mako:79
+msgid "Initial balance:"
+msgstr "Balance inicial:"
+

=== added directory 'account_general_ledger_report/report'
=== added file 'account_general_ledger_report/report/__init__.py'
--- account_general_ledger_report/report/__init__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/__init__.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,23 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import account_general_ledger_report

=== added file 'account_general_ledger_report/report/account_general_ledger_report.mako'
--- account_general_ledger_report/report/account_general_ledger_report.mako	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/account_general_ledger_report.mako	2013-11-20 22:45:57 +0000
@@ -0,0 +1,181 @@
+<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <link rel='stylesheet' href='addons/account_webkit_report_library/webkit_headers/main.css' />
+        <style>
+            ${css}
+        </style>
+    </head>
+    <body>
+        <div class="table header">
+           <div class="table-row">
+               <div class="table-cell logo">${helper.embed_logo_by_name('internal_reports_logo', height=100)|n}</div>
+               <br/>
+               <div class="table-cell text">
+                    <p class="title">${_('General Ledger Report ')}</p>
+               </div>
+           </div>
+        </div>
+        <%
+            chart_account = get_chart_account_id(data)
+            fiscalyear = get_fiscalyear(data)
+            filter = get_filter(data)
+        %>
+        
+        <div class="table list">
+            <div class="table-header">
+                <div class="table-row labels no-wrap">
+                    <div class="table-cell first-column" style="width: 70px">${_('Chart of Accounts: ')}<br/>${chart_account.name}</div>
+                    <div class="table-cell" style="width: 70px">${_('Fiscal Year: ')}<br/>${fiscalyear.name}</div>
+                    <div class="table-cell" style="width: 70px">${_('Filter by: ')}<br/>
+                         %if filter == 'filter_date':
+                             <%
+                                start_date = get_start_date(data)
+                                stop_date = get_stop_date(data)
+                             %>
+                             ${_('Dates: ')}<br/>
+                             ${formatLang(start_date, date=True) if start_date else u'' }&nbsp;-&nbsp;${formatLang(stop_date, date=True) if start_date else u'' }
+                         %elif filter == 'filter_period':
+                             <%
+                                start_period = get_start_period(data)
+                                stop_period = get_end_period(data)
+                             %>
+                             ${_('Period: ')}<br/>
+                             ${start_period.name if start_period else u''}&nbsp;-&nbsp;${stop_period.name if stop_period else u'' }
+                         %else:
+                             ${_('No filter')}
+                        %endif
+                    </div>
+                    <div class="table-cell" style="width: 70px">${_('Accounts: ')}<br/>
+                         %if accounts(data):
+                           %for account in accounts(data):
+                                ${(account.code) + ','}<br/>
+                           %endfor
+                        %else:
+                            ${_('All')}
+                        %endif
+                    </div>
+                    <div class="table-cell" style="width: 70px">${_('Target moves: ')}<br/>${ display_target_move(data) }</div>
+                </div>
+            </div>            
+        </div>
+        <%
+            account_list_obj, account_lines, account_conciliation, account_balance = get_data(cr, uid, data) 
+            cumul_balance_curr = 0.0
+        %> 
+        %for account in account_list_obj:
+           <%
+                cumul_balance = account_balance[account.id]['balance'] or 0.0
+                
+                if 'foreign_balance' in account_balance[account.id].keys():
+                    cumul_balance_curr = account_balance[account.id]['foreign_balance']                
+                
+                amount_total_debit = amount_total_credit = amount_total_curr = 0.0
+                print_column = False
+                move_lines = []
+           %>
+           %if account.type != 'view':
+               <br/><br/>
+               <div class="table header">
+                    <div class="table-row">
+                       <div class="table-cell text">
+                            <p class="subtitle">${account.code +' - ' +account.name}</p>
+                            <p class="subtitle">${_('Initial balance:')}&nbsp;&nbsp;${formatLang(cumul_balance)}&nbsp;&nbsp;
+                                %if account.report_currency_id:
+                                    ${account.report_currency_id.position == 'before' and (account.report_currency_id.symbol+'&nbsp;') or ''}${formatLang(cumul_balance_curr)}${account.report_currency_id.position == 'after' and ('&nbsp;'+account.report_currency_id.symbol) or ''}&nbsp;&nbsp;
+                                %endif   
+                                ${account.id not in account_lines.keys() and _('No move lines for this account') or ''}                                
+                            </p>                           
+                       </div>
+                    </div>
+               </div>
+               %if account.id in account_lines.keys():
+                   <% move_lines = account_lines[account.id] %>                     
+                       
+                    <div class="table list">
+                        <div class="table-header">
+                            <div class="table-row labels no-wrap">                       
+                                <div class="table-cell first-column" style="width: 55px">${_('Date')}</div>
+                                <div class="table-cell" style="width: 70px">${_('Period')}</div>
+                                <div class="table-cell" style="width: 100px">${_('Entry')}</div>
+                                <div class="table-cell" style="width: 70px">${_('Journal')}</div>
+                                <div class="table-cell" style="width: 100px">${_('Partner')}</div>                    
+                                <div class="table-cell" style="width: 100px">${_('Label')}</div>
+                                %if account.reconcile or (account.id in account_conciliation.keys() and account_conciliation[account.id]):
+                                    <% print_column = True %>
+                                    <div class="table-cell" style="width: 75px">${_('Reconcile')}</div>
+                                %endif
+                                <div class="table-cell amount" style="width: 60px">${_('Debit')}</div>
+                                <div class="table-cell amount" style="width: 60px">${_('Credit')}</div>
+                                <div class="table-cell amount" style="width: 60px">${_('Cumul. Bal.')}</div>                        
+                                %if account.report_currency_id:
+                                    <div class="table-cell amount" style="width: 60px">${_('Curr. Am.')}</div>                                                        
+                                    <div class="table-cell amount last-column" style="width: 60px">${_('Curr. Bal.')}</div>                        
+                                %endif
+                            </div>
+                        </div>                        
+                        <div class="table-body"> 
+                            %for line in move_lines:
+                                <% 
+                                    amount_total_debit += line.debit
+                                    amount_total_credit += line.credit
+                                    
+                                    cumul_balance = cumul_balance + line.debit - line.credit      
+                                    if line.amount_currency:                         
+                                        cumul_balance_curr = cumul_balance_curr + line.amount_currency
+                                        amount_total_curr += line.amount_currency
+                                %>
+                                <div class="table-row ${row_even and 'even' or 'odd'}">
+                                    <div class="table-cell first-column">${formatLang(line.date, date=True)}</div>
+                                    <div class="table-cell">${line.period_id.name or ''}</div>
+                                    <div class="table-cell">${line.move_id.name or ''}</div>                                    
+                                    <div class="table-cell">${line.journal_id.name}</div>    
+                                    <div class="table-cell">${line.partner_id.name or ''}</div>
+                                    <div class="table-cell">${line.name or ''}</div> 
+                                    %if print_column:
+                                        <div class="table-cell">
+                                            ${line.id in account_conciliation[account.id].keys() and account_conciliation[account.id][line.id] or ''}
+                                        </div>
+                                    %endif 
+                                    <div class="table-cell amount">${formatLang(line.debit)}</div>
+                                    <div class="table-cell amount">&nbsp;${formatLang(line.credit)}</div>                                  
+                                    <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance)}</div> 
+                                    %if account.report_currency_id:
+                                        <div class="table-cell amount">&nbsp;${line.amount_currency and formatLang(line.amount_currency) or ''}</div>                                                        
+                                        <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance_curr)}</div>                        
+                                    %endif  
+                               </div>
+                           %endfor                   
+                           <div class="table-row spacer">
+                                <div class="table-cell">&nbsp;</div>
+                           </div>
+                            <div class="table-row subtotal">
+                                <div class="table-cell first-column">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                <div class="table-cell">&nbsp;</div>
+                                %if print_column:
+                                    <div class="table-cell">&nbsp;</div>
+                                %endif
+                                <div class="table-cell">${_('TOTAL')}</div>
+                                <div class="table-cell amount" >${formatLang(amount_total_debit)}</div>
+                                <div class="table-cell amount" >&nbsp;${formatLang(amount_total_credit)}</div>
+                                %if account.report_currency_id:                                
+                                    <div class="table-cell amount">&nbsp;${formatLang(cumul_balance)}</div>
+                                    <div class="table-cell amount">&nbsp;${formatLang(amount_total_curr)}</div>
+                                    <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance_curr)}</div>
+                                %else:
+                                    <div class="table-cell amount last-column">&nbsp;${formatLang(cumul_balance)}</div>                                    
+                                %endif
+                            </div>
+                            <% 
+                               amount_total_debit = amount_total_credit = 0.0
+                            %>
+                        </div>                    
+                    </div>    
+                %endif                             
+            %endif
+        %endfor 
+    </body>
+</html>

=== added file 'account_general_ledger_report/report/account_general_ledger_report.py'
--- account_general_ledger_report/report/account_general_ledger_report.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/account_general_ledger_report.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,177 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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 openerp.addons.account_financial_report_webkit.report.common_reports import CommonReportHeaderWebkit
+import pooler
+from report import report_sxw
+
+class GeneralLedgerReportWebkit(report_sxw.rml_parse, CommonReportHeaderWebkit):
+
+    def __init__(self, cursor, uid, name, context):
+        super(GeneralLedgerReportWebkit, self).__init__(cursor, uid, name, context=context)
+        self.pool = pooler.get_pool(self.cr.dbname)
+        self.cursor = self.cr
+
+        self.localcontext.update({
+            'cr': cursor,
+            'uid': uid,
+            'get_data':self.get_data,  
+            'get_chart_account_id':self._get_chart_account_id_br,
+            'get_fiscalyear':self.get_fiscalyear_br,      
+            'get_filter': self._get_filter,   
+            'get_start_period':self.get_start_period_br,
+            'get_end_period':self.get_end_period_br,
+            'get_start_date':self._get_date_from,
+            'get_stop_date':self._get_date_to,
+            'accounts': self._get_accounts_br,
+            'display_target_move': self._get_display_target_move,
+        })
+
+    def get_data(self, cr, uid, data):
+        filter_data = []
+        account_list = []        
+        account_selected = []
+        
+        account_lines = {}
+        account_balance = {}
+        account_conciliation = {}
+                
+        library_obj = self.pool.get('account.webkit.report.library')
+        
+        filter_type = self._get_form_param('filter', data, default='filter_no')
+        chart_account = self._get_chart_account_id_br(data)
+        
+        if filter_type == 'filter_date':
+            start_date = self._get_form_param('date_from', data)
+            stop_date = self._get_form_param('date_to', data)
+            
+            filter_data.append(start_date)
+            filter_data.append(stop_date)
+            
+        elif filter_type == 'filter_period':
+            
+            start_period = self.get_start_period_br(data) #return the period object
+            stop_period = self.get_end_period_br(data)
+            
+            filter_data.append(start_period)
+            filter_data.append(stop_period)
+            
+        else:
+            filter_type = ''
+        
+        fiscalyear = self.get_fiscalyear_br(data)
+        target_move = self._get_form_param('target_move', data, default='all')
+        
+        #From the wizard can select specific account, extract this accounts
+        account_selected = data['form']['account_ids']
+        
+        if account_selected == []:
+            account_selected = [chart_account.id]
+        
+        account_list_ids = library_obj.get_account_child_ids(cr, uid, account_selected) #get all the accounts in the chart_account_id
+        account_list_obj = self.pool.get('account.account').browse(cr, uid, account_list_ids)
+          
+        #Get the move_lines for each account.
+        move_lines = library_obj.get_move_lines(cr, 1,
+                                                account_list_ids, 
+                                                filter_type=filter_type, 
+                                                filter_data=filter_data, 
+                                                fiscalyear=fiscalyear, 
+                                                target_move=target_move,
+                                                order_by='account_id asc, date asc, ref asc')
+        
+       
+        #Reconcile -> show reconcile in the mako.
+        '''
+        First, if the account permit reconcile (reconcile == True), add to the dictionary.
+        If the account don't allow the reconcile, search if the lines have reconcile_id or partial_reconcile_id
+        If the account allow the reconcile or the lines have reconcile_id or partial_reconcile_id, add in the dictionary
+        and show in the mako the column "Reconcile"
+        
+        the final result is:
+           {account_id: {line.id: [conciliation_name]}}
+        '''        
+        #Search if the move_lines have partial or reconcile id
+        for line in move_lines:           
+            #If the account have reconcile, add to the dictionary              
+            if line.account_id.id not in account_conciliation:
+                account_conciliation[line.account_id.id] = {}
+            
+            if line.reconcile_id and line.reconcile_id.name != '':
+                 account_conciliation[line.account_id.id][line.id] = line.reconcile_id.name
+             
+            elif line.reconcile_partial_id and line.reconcile_partial_id.name != '':
+                str_name = 'P: ' + line.reconcile_partial_id.name
+                #conciliation_lines.append(str_name)
+                account_conciliation[line.account_id.id][line.id] = str_name             
+            
+            if line.account_id.id not in account_lines:
+                account_lines[line.account_id.id] = []
+            
+            account_lines[line.account_id.id].append(line)
+        
+        fields = ['balance']            
+        if self._get_amount_currency(data):
+            fields.append('foreign_balance')
+        
+        if filter_type == 'filter_date':
+            account_balance = library_obj.get_account_balance(cr, uid, 
+                                                              account_list_ids,
+                                                              fields,
+                                                              initial_balance=True,
+                                                              company_id=chart_account.company_id.id,
+                                                              fiscal_year_id = fiscalyear.id,
+                                                              state = target_move,
+                                                              start_date = start_date,
+                                                              end_date = stop_date,
+                                                              chart_account_id = chart_account.id,
+                                                              filter_type=filter_type)
+        elif filter_type == 'filter_period':
+            account_balance = library_obj.get_account_balance(cr, uid, 
+                                                              account_list_ids,
+                                                              fields,
+                                                              initial_balance=True,
+                                                              company_id=chart_account.company_id.id,
+                                                              fiscal_year_id = fiscalyear.id,
+                                                              state = target_move,
+                                                              start_period_id = start_period.id,
+                                                              end_period_id = stop_period.id,
+                                                              chart_account_id = chart_account.id,
+                                                              filter_type=filter_type)
+        else:
+            account_balance = library_obj.get_account_balance(cr, uid, 
+                                                              account_list_ids,
+                                                              fields,
+                                                              initial_balance=True,
+                                                              company_id=chart_account.company_id.id,
+                                                              fiscal_year_id = fiscalyear.id,
+                                                              state = target_move,
+                                                              chart_account_id = chart_account.id,
+                                                              filter_type=filter_type)
+        
+        
+        return account_list_obj, account_lines, account_conciliation, account_balance
+    
+report_sxw.report_sxw('report.account_general_ledger_webkit',
+                             'account.account',
+                             'addons/account_general_ledger_report/report/account_general_ledger_report.mako',
+                             parser=GeneralLedgerReportWebkit)
\ No newline at end of file

=== added file 'account_general_ledger_report/report/report.xml'
--- account_general_ledger_report/report/report.xml	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report/report.xml	2013-11-20 22:45:57 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+       <record id="account_financial_report_webkit.account_report_general_ledger_webkit" model="ir.actions.report.xml">
+            <field name="report_type">webkit</field>
+            <field name="report_name">account_general_ledger_webkit</field>
+            <field eval="[(6,0,[])]" name="groups_id"/>
+            <field name="model">account.account</field>
+            <field name="type">ir.actions.report.xml</field>
+            <field name="name">General Ledger Webkit</field>
+            <field name="report_rml">account_general_ledger_report/report/account_general_ledger_report.mako</field>
+            <field name="report_file">account_general_ledger_report/report/account_general_ledger_report.mako</field>
+        </record> 
+    </data>
+</openerp>

=== added file 'account_general_ledger_report/report_menus.xml'
--- account_general_ledger_report/report_menus.xml	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/report_menus.xml	2013-11-20 22:45:57 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+          <menuitem icon="STOCK_PRINT" 
+            name="General Ledger"
+            parent="account.final_accounting_reports" 
+            action="action_general_ledger_report_wizard"
+            groups="account.group_account_manager,account.group_account_user" 
+            id="account.menu_general_ledger"/>
+        
+    </data>
+</openerp>

=== added directory 'account_general_ledger_report/wizard'
=== added file 'account_general_ledger_report/wizard/__init__.py'
--- account_general_ledger_report/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/wizard/__init__.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,23 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    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/>.
+#
+##############################################################################
+
+import account_general_ledger_report_wizard
\ No newline at end of file

=== added file 'account_general_ledger_report/wizard/account_general_ledger_report_wizard.py'
--- account_general_ledger_report/wizard/account_general_ledger_report_wizard.py	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/wizard/account_general_ledger_report_wizard.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,40 @@
+# -*- 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 AccountReportGeneralLedgerWizard(osv.osv_memory):
+    
+    _inherit = "general.ledger.webkit"
+    _name = "general.ledger.webkit"
+    _description = "General Ledger Report Wizard"
+    
+    def _print_report(self, cursor, uid, ids, data, context=None):
+        context = context or {}
+        
+        # we update form with display account value
+        data = self.pre_print_report(cursor, uid, ids, data, context=context)
+        
+        return {'type': 'ir.actions.report.xml',
+                'report_name': 'account_general_ledger_webkit',
+                'datas': data}
+    
\ No newline at end of file

=== added file 'account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml'
--- account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_general_ledger_report/wizard/account_general_ledger_report_wizard.xml	2013-11-20 22:45:57 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id ="account_report_general_ledger_report_inherit" model="ir.ui.view">
+            <field name="name">General Ledger Report </field>
+            <field name="model">general.ledger.webkit</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account_financial_report_webkit.account_report_general_ledger_view_webkit"/>
+            <field name="arch" type="xml">
+                <data>
+                    <field name="fiscalyear_id" position="attributes">
+                        <attribute name="required">True</attribute>
+                    </field>
+                </data>
+            </field>
+        </record>
+        
+        <record id="action_general_ledger_report_wizard" model="ir.actions.act_window">
+            <field name="name">General Ledger Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">general.ledger.webkit</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_report_general_ledger_report_inherit"/>
+            <field name="target">new</field>
+        </record>
+    </data>
+</openerp>

=== modified file 'account_invoice_global_discount/i18n/ar.po'
--- account_invoice_global_discount/i18n/ar.po	2013-02-26 05:22:23 +0000
+++ account_invoice_global_discount/i18n/ar.po	2013-11-20 22:45:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-26 05:22+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
 
 #. module: account_invoice_global_discount
 #: view:account.invoice:0

=== modified file 'account_invoice_global_discount/i18n/es.po'
--- account_invoice_global_discount/i18n/es.po	2013-02-26 05:22:23 +0000
+++ account_invoice_global_discount/i18n/es.po	2013-11-20 22:45:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-26 05:22+0000\n"
-"X-Generator: Launchpad (build 16506)\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
 
 #. module: account_invoice_global_discount
 #: view:account.invoice:0

=== added file 'account_invoice_global_discount/i18n/pt_BR.po'
--- account_invoice_global_discount/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ account_invoice_global_discount/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,92 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-15 05:20+0000\n"
+"PO-Revision-Date: 2013-07-21 01:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: account_invoice_global_discount
+#: view:account.invoice:0
+msgid "Compute Totals"
+msgstr "Calcule Totais"
+
+#. module: account_invoice_global_discount
+#: view:account.invoice:0
+msgid "Discounted amount"
+msgstr "Valor descontado"
+
+#. module: account_invoice_global_discount
+#: wizard_field:invoice.discount,init,discount:0
+msgid "Discount percentage"
+msgstr "Percentual de desconto"
+
+#. module: account_invoice_global_discount
+#: model:ir.module.module,shortdesc:account_invoice_global_discount.module_meta_information
+msgid "Global invoice discount"
+msgstr "Desconto da fatura global"
+
+#. module: account_invoice_global_discount
+#: model:ir.module.module,description:account_invoice_global_discount.module_meta_information
+msgid ""
+"Adds a discount feature for invoice.\n"
+"    With it one can add a discount percent to all invoice lines on an "
+"invoice.\n"
+"    It adds the discounted and undiscounted amounts on the invoice totals.\n"
+"    "
+msgstr ""
+"Adiciona um recurso desconto da fatura.\n"
+"    Com ele pode-se adicionar um por cento de desconto para todas as linhas "
+"da fatura em uma fatura.\n"
+"    Ele adiciona os valores descontados e não descontado sobre o total da "
+"fatura.\n"
+"    "
+
+#. module: account_invoice_global_discount
+#: field:account.invoice,amount_discounted:0
+#: model:ir.actions.wizard,name:account_invoice_global_discount.invoice_discount
+msgid "Discount"
+msgstr "Desconto"
+
+#. module: account_invoice_global_discount
+#: wizard_view:invoice.discount,init:0
+msgid "Discount:"
+msgstr "Desconto:"
+
+#. module: account_invoice_global_discount
+#: view:account.invoice:0
+msgid "Untaxed amount"
+msgstr "Montante não tributado"
+
+#. module: account_invoice_global_discount
+#: wizard_button:invoice.discount,init,end:0
+msgid "Cancel"
+msgstr "Cancel"
+
+#. module: account_invoice_global_discount
+#: view:account.invoice:0
+#: wizard_button:invoice.discount,init,apply_discount:0
+msgid "Apply Discount"
+msgstr "Aplicar desconto"
+
+#. module: account_invoice_global_discount
+#: field:account.invoice,amount_untaxed_not_discounted:0
+#: field:account.invoice.line,price_subtotal_not_discounted:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: account_invoice_global_discount
+#: field:account.invoice,invoice_discount:0
+msgid "Discount (%)"
+msgstr "Desconto (%)"

=== added directory 'account_journal_period_report/i18n'
=== renamed directory 'account_journal_period_report/i18n' => 'account_journal_period_report/i18n.moved'
=== added file 'account_journal_period_report/i18n/es_CR.po'
--- account_journal_period_report/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ account_journal_period_report/i18n/es_CR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,110 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_journal_period_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-19 21:51+0000\n"
+"PO-Revision-Date: 2013-03-19 21:51+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:63
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:71
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:105
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:115
+msgid "TOTAL"
+msgstr "TOTAL"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:31
+msgid "Chart of Accounts: "
+msgstr "Plan contable: "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:33
+msgid "Selected period: "
+msgstr "Período seleccionado: "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:34
+msgid "Entries Sorted By:"
+msgstr "Entradas ordenadas por:"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:61
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:69
+msgid "Move"
+msgstr "Asiento"
+
+#. module: account_journal_period_report
+#: constraint:account.print.journal:0
+msgid "The fiscalyear, periods or chart of account chosen have to belong to the same company."
+msgstr "El año fiscal, periodos y árbol de cuentas escogido deben pertenecer a la misma compañía."
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:62
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:70
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:67
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:75
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:76
+msgid "Amount Currency"
+msgstr "Divisa"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:24
+msgid "Journal Report "
+msgstr "Reporte de Diarios "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:35
+msgid "Target Moves: "
+msgstr "Movimientos destino: "
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:66
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:74
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_journal_period_report
+#: model:ir.model,name:account_journal_period_report.model_account_print_journal
+msgid "Account Print Journal"
+msgstr "Contabilidad. Imprimir diario"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:64
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:72
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:65
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:73
+msgid "Label"
+msgstr "Nombre"
+
+#. module: account_journal_period_report
+#: report:addons/account_journal_period_report/report/account_journal_period_report.mako:32
+msgid "Fiscal Year: "
+msgstr "Año fiscal: "
+

=== modified file 'account_journal_period_report/report/account_journal_period_report.mako'
--- account_journal_period_report/report/account_journal_period_report.mako	2013-05-15 20:03:28 +0000
+++ account_journal_period_report/report/account_journal_period_report.mako	2013-11-20 22:45:57 +0000
@@ -53,6 +53,7 @@
            </div>
            <% 
               journal_move_lines = lines(period_id, journal.id)  
+              move_names = extract_name_move(cr, uid, journal_move_lines)
            %>
            <div class="table list">
                 <div class="table-header">
@@ -77,14 +78,10 @@
                        %endif
                     </div>
                 </div>
-                <div class="table-body">                    
+                <div class="table-body"> 
                     %for line in journal_move_lines:
                         <div class="table-row ${row_even and 'even' or 'odd'}">
-                            %if line.move_id.name:
-                                <div class="table-cell first-column">${line.move_id.name} </div>
-                            %else:
-                                <div class="table-cell first-column">${line.move_id.id} </div>
-                            %endif
+                            <div class="table-cell first-column">${move_names[line.id]} </div>
                             <div class="table-cell">${formatLang(line.date,date=True)}</div>
                             <div class="table-cell">${line.account_id.code}</div>
                             <div class="table-cell">${line.partner_id.name or ''}</div>

=== modified file 'account_journal_period_report/report/account_journal_period_report.py'
--- account_journal_period_report/report/account_journal_period_report.py	2013-01-17 19:12:32 +0000
+++ account_journal_period_report/report/account_journal_period_report.py	2013-11-20 22:45:57 +0000
@@ -25,6 +25,8 @@
 from report import report_sxw
 import locale
 from account.report.account_journal import journal_print
+from wadllib.application import Parameter
+from symbol import parameters
 
 #la herencia se debe hacer de journal_print (clase original del reporte)
 #para que se llame el init y el set context, y se puedan usar las variables y métodos.
@@ -39,13 +41,34 @@
 
         self.localcontext.update({
             'get_journal_list': self.get_journal_list,  
-            'get_format_lang_currency': self.pool.get('account.webkit.report.library').format_lang_currency,      
+            'get_format_lang_currency': self.pool.get('account.webkit.report.library').format_lang_currency,  
+            'extract_name_move':self.extract_name_move,  
+            'cr': cr,  
+            'uid': uid,
         })
             
     #Receive the journal_ids and return the full object
     def get_journal_list(self, journal_ids):
         return self.pool.get('account.journal').browse(self.cr, self.uid, journal_ids)     
-
+    
+    ''''
+    This method is created to solve the error when extracting the name move_id (line.move_id.name) fails because of read permissions
+    parameter move_lines are the move_lines that match with the journal and period. Pass from mako. 
+    ''' 
+    def extract_name_move(self, cr, uid, move_lines):
+        move_temp = self.pool.get('account.move')
+        dict_name = {} #dict_name keys is the line id. 
+        
+        for line in move_lines:
+            move_id = move_temp.search(cr, uid, [('id', '=', line.move_id.id)])
+            move_obj = move_temp.browse(cr, uid, move_id)
+            if move_obj[0].name:
+                dict_name[line.id] = move_obj[0].name
+            else:
+                 dict_name[line.id] = move_obj[0].id
+        
+        return dict_name
+            
 #the parameters are the report name and module name 
 report_sxw.report_sxw( 'report.account_journal_period_print_inherit', 
                        'account.print.journal',

=== modified file 'account_move_reverse/account_move_reverse.py'
--- account_move_reverse/account_move_reverse.py	2013-11-01 18:03:56 +0000
+++ account_move_reverse/account_move_reverse.py	2013-11-20 22:45:57 +0000
@@ -149,7 +149,7 @@
                     #The move don't support write this line
                     cr.execute('UPDATE account_move_line '\
                                'SET reconcile_id=%s '\
-                               'WHERE id IN %s', (reconcile_id, tuple([line.id]),))
+                               'WHERE id IN %s', (reconcile_id, tuple([line.id]),))                    
                     #self.pool.get('account.move.line').write(cr,uid,[line.id],{'reconcile_id': reconcile_id})
                     self.pool.get('account.move.line').write(cr,uid,[line_created_id],{'reconcile_id': reconcile_id})
 

=== added file 'account_move_reverse/i18n/pt_BR.po'
--- account_move_reverse/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ account_move_reverse/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,105 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-19 22:20+0000\n"
+"PO-Revision-Date: 2013-07-28 11:34+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: account_move_reverse
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+"Você não pode criar mais do que um movimento por período centralizado em "
+"revista"
+
+#. module: account_move_reverse
+#: code:addons/account_move_reverse/account_move_reverse.py:42
+#: code:addons/account_move_reverse/account_move_reverse.py:46
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
+
+#. module: account_move_reverse
+#: model:ir.model,name:account_move_reverse.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_move_reverse
+#: field:account.move,move_reverse_id:0
+msgid "Move Reverse"
+msgstr "Mova Reverso"
+
+#. module: account_move_reverse
+#: field:account.journal,update_reversed:0
+msgid "Allow Cancelling Reversed Entries"
+msgstr "Permitir cancelamento de entradas invertidas"
+
+#. module: account_move_reverse
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "O nome do periódico deve ser único por empresa!"
+
+#. module: account_move_reverse
+#: code:addons/account_move_reverse/account_move_reverse.py:46
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling reversed entries if you want "
+"to do that."
+msgstr ""
+"Você não pode modificar uma entrada postou desta revista! \n"
+"Você deve definir a revista para permitir o cancelamento entradas "
+"invertidas, se você quiser fazer isso."
+
+#. module: account_move_reverse
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Erro de configuração! A moeda escolhida deve ser compartilhado pelas contas "
+"padrão também."
+
+#. module: account_move_reverse
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "O código da revista deve ser exclusivo para cada empresa!"
+
+#. module: account_move_reverse
+#: model:ir.model,name:account_move_reverse.model_account_move
+msgid "Account Entry"
+msgstr "Conta Lançamento"
+
+#. module: account_move_reverse
+#: help:account.journal,update_reversed:0
+msgid ""
+"Check this box if you want to allow the cancellation of the reversed entries "
+"related to this journal or of the invoice related to this journal"
+msgstr ""
+"Marque esta caixa se você deseja permitir o cancelamento das entradas "
+"invertidas relacionadas a este jornal ou da factura relativa a este jornal"
+
+#. module: account_move_reverse
+#: code:addons/account_move_reverse/account_move_reverse.py:42
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+"Você não pode modificar uma entrada postou desta revista! \n"
+"Você deve definir a revista para permitir o cancelamento entradas se você "
+"quiser fazer isso."

=== added file 'account_voucher_reverse/i18n/pt_BR.po'
--- account_voucher_reverse/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ account_voucher_reverse/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,38 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-19 22:18+0000\n"
+"PO-Revision-Date: 2013-07-28 11:35+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: account_voucher_reverse
+#: view:account.voucher:0
+msgid "Journal Items"
+msgstr "Itens do Diário"
+
+#. module: account_voucher_reverse
+#: model:ir.model,name:account_voucher_reverse.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprovante de Contabilidade"
+
+#. module: account_voucher_reverse
+#: view:account.voucher:0
+msgid "Reverse"
+msgstr "Reverter"
+
+#. module: account_voucher_reverse
+#: view:account.voucher:0
+msgid "Are you sure to reverse this record ?"
+msgstr "Tem certeza que deseja reverter este registro?"

=== modified file 'base_import_exchange_rates/__init__.py'
--- base_import_exchange_rates/__init__.py	2013-11-06 20:20:50 +0000
+++ base_import_exchange_rates/__init__.py	2013-11-20 22:45:57 +0000
@@ -27,7 +27,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-
 import currency_rate_update
 import company
 import wizard

=== modified file 'base_import_exchange_rates/__openerp__.py'
--- base_import_exchange_rates/__openerp__.py	2013-11-06 20:20:50 +0000
+++ base_import_exchange_rates/__openerp__.py	2013-11-20 22:45:57 +0000
@@ -8,17 +8,17 @@
 #    Inspired directly from Camp2Camp module c2c_currency_rate_update
 #    The module was copied and modified in order to provide enough flexibility to extend it
 #    to use as a generic WebService XML data importer into OpenERP.
-#    
+#
 #    Redistribution and use in source and binary forms, with or without modification, are
 #    permitted provided that the following conditions are met:
-#    
+#
 #       1. Redistributions of source code must retain the above copyright notice, this list of
 #          conditions and the following disclaimer.
-#    
+#
 #       2. Redistributions in binary form must reproduce the above copyright notice, this list
 #          of conditions and the following disclaimer in the documentation and/or other materials
 #          provided with the distribution.
-#    
+#
 #    THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY EXPRESS OR IMPLIED
 #    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
 #    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
@@ -28,11 +28,11 @@
 #    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 #    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#    
+#
 #    The views and conclusions contained in the software and documentation are those of the
 #    authors and should not be interpreted as representing official policies, either expressed
 #    or implied, of ClearCorp S.A..
-#    
+#
 ##############################################################################
 
 {
@@ -43,6 +43,7 @@
     'website': 'http://clearcorp.co.cr',
     'category': 'Generic Modules/Base',
     'description': """Import exchange rates from XML web service.
+<<<<<<< TREE
         Configuration:
         1) Install the module.
         2) Go to Administration > Company, open the company you want to syncronize.
@@ -53,6 +54,18 @@
     
     
     
+=======
+        Configuration:
+        1) Install the module.
+        2) Go to Administration > Company, open the company you want to syncronize.
+        3) in the page ´Currency auto update configuration´ you can configure wich webservice you wan to use
+           the company the currency is related to, and the currecy.
+        4) You have to go to Administration>Configuration>Planification , and configure the interval you want for the method to syncronize.
+
+
+
+
+>>>>>>> MERGE-SOURCE
     """,
     'depends': [
         'account',

=== modified file 'base_import_exchange_rates/currency_rate_update.py'
--- base_import_exchange_rates/currency_rate_update.py	2013-11-06 20:20:50 +0000
+++ base_import_exchange_rates/currency_rate_update.py	2013-11-20 22:45:57 +0000
@@ -2,8 +2,8 @@
 ##############################################################################
 #
 # Copyright (c) 2009 Camptocamp SA
-# @author Nicolas Bessi 
-# @source JBA and AWST inpiration 
+# @author Nicolas Bessi
+# @source JBA and AWST inpiration
 # @contributor Grzegorz Grzelak ([e-mail]),
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -42,17 +42,17 @@
 
 
 class res_currency_rate_update_service(osv.osv):
-    """Class thats tell for wich services wich currencies 
+    """Class thats tell for wich services wich currencies
     have to be updated"""
     _name = "res.currency.rate.update.service"
     _description = "Currency Rate Update"
     _columns = {
-        ##list of webservicies the value sould be a class name 
-        'service' : fields.selection( 
+        ##list of webservicies the value sould be a class name
+        'service' : fields.selection(
             [
                 #('Admin_ch_getter','Admin.ch'),
                 #('ECB_getter','European Central Bank'),
-                #('NYFB_getter','Federal Reserve Bank of NY'),                                                    
+                #('NYFB_getter','Federal Reserve Bank of NY'),
                 #('Google_getter','Google Finance'),
                 #('Yahoo_getter','Yahoo Finance '),
                 #('PL_NBP_getter','Narodowy Bank Polski'),  # Added for polish rates
@@ -61,7 +61,7 @@
             "Webservice to use",
             required = True
                                                 ),
-                     ##list of currency to update                           
+                     ##list of currency to update
                     'currency_to_update' : fields.many2many(
                                                             'res.currency',
                                                             'res_curreny_auto_udate_rel',
@@ -69,7 +69,7 @@
                                                             'currency_id',
                                                             'currency to update with this service',
                                                             ),
-                    #back ref 
+                    #back ref
                     'company_id' : fields.many2one(
                                                     'res.company',
                                                     'linked company',
@@ -79,8 +79,8 @@
                 }
     _sql_constraints = [
                             (
-                                'curr_service_unique', 
-                                'unique (service, company_id)', 
+                                'curr_service_unique',
+                                'unique (service, company_id)',
                                 _('You can use a service one time per company !')
                             )
                         ]
@@ -88,7 +88,7 @@
 res_currency_rate_update_service()
 
 class Currency_rate_update(osv.osv):
-    """Class that handle an ir cron call who will 
+    """Class that handle an ir cron call who will
     update currencies based on a web url"""
     _name = "currency.rate.update"
     _description = "Currency Rate Update"
@@ -103,7 +103,7 @@
             'doall'           : True,
             'model'           : 'currency.rate.update',
             'function'        : 'run_currency_update',
-            'args'            : '()',    
+            'args'            : '()',
     }
     logger2 = logging.getLogger('currency.rate.update')
     logger = netsvc.Logger()
@@ -111,45 +111,45 @@
     MOD_NAME = 'c2c_currency_rate_update: '
     def get_cron_id(self, cr, uid, context):
         """return the updater cron's id. Create one if the cron does not exists """
-        
+
         cron_id = 0
         cron_obj = self.pool.get('ir.cron')
-        try: 
+        try:
             #find the cron that send messages
             cron_id = cron_obj.search(
-                                        cr, 
-                                        uid,  
+                                        cr,
+                                        uid,
                                         [
-                                            ('function', 'ilike', self.cron['function']), 
+                                            ('function', 'ilike', self.cron['function']),
                                             ('model', 'ilike', self.cron['model'])
-                                        ], 
+                                        ],
                                         context={
                                                     'active_test': False
-                                                } 
+                                                }
                                     )
             cron_id = int(cron_id[0])
         except Exception,e :
             self.logger.notifyChannel(
-                                        self.LOG_NAME, 
-                                        netsvc.LOG_INFO, 
+                                        self.LOG_NAME,
+                                        netsvc.LOG_INFO,
                                         'warning cron not found one will be created'
                                      )
             print 'warning cron not found one will be created'
             pass # ignore if the cron is missing cause we are going to create it in db
-        
+
         #the cron does not exists
         if not cron_id :
             #translate
             self.cron['name'] = _('Currency Rate Update')
             cron_id = cron_obj.create(cr, uid, self.cron, context)
-        
+
         return cron_id
-        
+
     def save_cron(self, cr, uid, datas, context={}):
         """save the cron config data should be a dict"""
         #modify the cron
-        cron_id = self.get_cron_id(cr, uid, context)        
-        result = self.pool.get('ir.cron').write(cr, uid, [cron_id], datas)    
+        cron_id = self.get_cron_id(cr, uid, context)
+        result = self.pool.get('ir.cron').write(cr, uid, [cron_id], datas)
 
     def run_currency_update(self, cr, uid):
         "update currency at the given frequence"
@@ -161,7 +161,7 @@
         res_currency_base = curr_obj.browse(cr, uid, res_currency_base_id)[0]
         companies = self.pool.get('res.company').search(cr, uid, [])
         for comp in self.pool.get('res.company').browse(cr, uid, companies):
-            ##the multi company currency can beset or no so we handle 
+            ##the multi company currency can beset or no so we handle
             ##the two case
             if not comp.auto_currency_up :
                 continue
@@ -183,7 +183,7 @@
                     for curr in service.currency_to_update :
                         if curr.name not in res:
                             continue
-                            
+
                         for name, rate in res[curr.name].iteritems():
                             rate_ids = rate_obj.search(cr, uid, [('currency_id','=',curr.id),('name','=',name)])
                             if not len(rate_ids):
@@ -193,7 +193,7 @@
 
                                 vals = {'currency_id': curr.id, 'rate': rate, 'name': name}
                                 rate_obj.create(cr, uid, vals)
-                     
+
                     note = note + "\n currency updated at %s "\
                        %(str(datetime.today()))
                     note = note + (log_info or '')
@@ -203,10 +203,10 @@
                         %(str(datetime.today()), str(e))
                     self.logger.notifyChannel(self.LOG_NAME, netsvc.LOG_INFO, str(e))
                     service.write({'note':error_msg})
-    
+
     def get_next_date(self, cr, uid, context=None):
         tomorrow=datetime.date.today() + datetime.timedelta(days=1)
-        pday= tomorrow.day 
+        pday= tomorrow.day
         pmonth = tomorrow.month
         pyear = tomorrow.year
         phour = "02:00:00"
@@ -220,12 +220,12 @@
 
 
 
-           
-                
+
+
 Currency_rate_update()
 
 ### Error Definition as specified in python 2.6 PEP
-class AbstractClassError(Exception): 
+class AbstractClassError(Exception):
     def __str__(self):
         return 'Abstract Class'
     def __repr__(self):
@@ -237,25 +237,25 @@
     def __repr__(self):
         return 'Abstract Method'
 
-class UnknowClassError(Exception): 
+class UnknowClassError(Exception):
     def __str__(self):
         return 'Unknown Class'
     def __repr__(self):
         return 'Unknown Class'
-class UnsuportedCurrencyError(Exception): 
+class UnsuportedCurrencyError(Exception):
     def __init__(self, value):
            self.curr = value
     def __str__(self):
         return 'Unsupported currency '+self.curr
     def __repr__(self):
         return 'Unsupported currency '+self.curr
-        
-### end of error definition        
+
+### end of error definition
 class Currency_getter_factory():
-    """Factory pattern class that will return 
+    """Factory pattern class that will return
     a currency getter class base on the name passed
     to the register method"""
-    def register(self, class_name): 
+    def register(self, class_name):
         allowed = [
                           'Admin_ch_getter',
                           'PL_NBP_getter',
@@ -270,60 +270,60 @@
             return class_def()
         else :
             raise UnknowClassError
-        
+
 
 class Curreny_getter_interface(object) :
     "Abstract class of currency getter"
-    
+
     #remove in order to have a dryer code
     # def __init__(self):
-    #    raise AbstractClassError  
-    
+    #    raise AbstractClassError
+
     log_info = " "
-    
+
     supported_currency_array = \
 ['AFN', 'ALL', 'DZD', 'USD', 'USD', 'USD', 'EUR', 'AOA', 'XCD', 'XCD', 'ARS',
-'AMD', 'AWG', 'AUD', 'EUR', 'AZN', 'EUR', 'BSD', 'BHD', 'EUR', 'BDT', 'BBD', 
-'XCD', 'BYR', 'EUR', 'BZD', 'XOF', 'BMD', 'BTN', 'INR', 'BOB', 'ANG', 'BAM', 
-'BWP', 'NOK', 'BRL', 'GBP', 'USD', 'USD', 'BND', 'BGN', 'XOF', 'MMK', 'BIF', 
-'XOF', 'USD', 'KHR', 'XAF', 'CAD', 'EUR', 'CVE', 'KYD', 'XAF', 'XAF', 'CLP', 
-'CNY', 'AUD', 'AUD', 'COP', 'XAF', 'KMF', 'XPF', 'XAF', 'CDF', 'NZD', 'CRC', 
-'HRK', 'CUP', 'ANG', 'EUR', 'CYP', 'CZK', 'DKK', 'DJF', 'XCD', 'DOP', 'EUR', 
-'XCD', 'IDR', 'USD', 'EGP', 'EUR', 'SVC', 'USD', 'GBP', 'XAF', 'ETB', 'ERN', 
-'EEK', 'ETB', 'EUR', 'FKP', 'DKK', 'FJD', 'EUR', 'EUR', 'EUR', 'XPF', 'XPF', 
-'EUR', 'XPF', 'XAF', 'GMD', 'GEL', 'EUR', 'GHS', 'GIP', 'XAU', 'GBP', 'EUR', 
-'DKK', 'XCD', 'XCD', 'EUR', 'USD', 'GTQ', 'GGP', 'GNF', 'XOF', 'GYD', 'HTG', 
-'USD', 'AUD', 'BAM', 'EUR', 'EUR', 'HNL', 'HKD', 'HUF', 'ISK', 'INR', 'IDR', 
-'XDR', 'IRR', 'IQD', 'EUR', 'IMP', 'ILS', 'EUR', 'JMD', 'NOK', 'JPY', 'JEP', 
-'JOD', 'KZT', 'AUD', 'KES', 'AUD', 'KPW', 'KRW', 'KWD', 'KGS', 'LAK', 'LVL', 
-'LBP', 'LSL', 'ZAR', 'LRD', 'LYD', 'CHF', 'LTL', 'EUR', 'MOP', 'MKD', 'MGA', 
-'EUR', 'MWK', 'MYR', 'MVR', 'XOF', 'EUR', 'MTL', 'FKP', 'USD', 'USD', 'EUR', 
-'MRO', 'MUR', 'EUR', 'AUD', 'MXN', 'USD', 'USD', 'EUR', 'MDL', 'EUR', 'MNT', 
-'EUR', 'XCD', 'MAD', 'MZN', 'MMK', 'NAD', 'ZAR', 'AUD', 'NPR', 'ANG', 'EUR', 
-'XCD', 'XPF', 'NZD', 'NIO', 'XOF', 'NGN', 'NZD', 'AUD', 'USD', 'NOK', 'OMR', 
-'PKR', 'USD', 'XPD', 'PAB', 'USD', 'PGK', 'PYG', 'PEN', 'PHP', 'NZD', 'XPT', 
-'PLN', 'EUR', 'STD', 'USD', 'QAR', 'EUR', 'RON', 'RUB', 'RWF', 'STD', 'ANG', 
-'MAD', 'XCD', 'SHP', 'XCD', 'XCD', 'EUR', 'XCD', 'EUR', 'USD', 'WST', 'EUR', 
-'SAR', 'SPL', 'XOF', 'RSD', 'SCR', 'SLL', 'XAG', 'SGD', 'ANG', 'ANG', 'EUR', 
-'EUR', 'SBD', 'SOS', 'ZAR', 'GBP', 'GBP', 'EUR', 'XDR', 'LKR', 'SDG', 'SRD', 
-'NOK', 'SZL', 'SEK', 'CHF', 'SYP', 'TWD', 'RUB', 'TJS', 'TZS', 'THB', 'IDR', 
-'TTD', 'XOF', 'NZD', 'TOP', 'TTD', 'TND', 'TRY', 'TMM', 'USD', 'TVD', 'UGX', 
-'UAH', 'AED', 'GBP', 'USD', 'USD', 'UYU', 'USD', 'UZS', 'VUV', 'EUR', 'VEB', 
+'AMD', 'AWG', 'AUD', 'EUR', 'AZN', 'EUR', 'BSD', 'BHD', 'EUR', 'BDT', 'BBD',
+'XCD', 'BYR', 'EUR', 'BZD', 'XOF', 'BMD', 'BTN', 'INR', 'BOB', 'ANG', 'BAM',
+'BWP', 'NOK', 'BRL', 'GBP', 'USD', 'USD', 'BND', 'BGN', 'XOF', 'MMK', 'BIF',
+'XOF', 'USD', 'KHR', 'XAF', 'CAD', 'EUR', 'CVE', 'KYD', 'XAF', 'XAF', 'CLP',
+'CNY', 'AUD', 'AUD', 'COP', 'XAF', 'KMF', 'XPF', 'XAF', 'CDF', 'NZD', 'CRC',
+'HRK', 'CUP', 'ANG', 'EUR', 'CYP', 'CZK', 'DKK', 'DJF', 'XCD', 'DOP', 'EUR',
+'XCD', 'IDR', 'USD', 'EGP', 'EUR', 'SVC', 'USD', 'GBP', 'XAF', 'ETB', 'ERN',
+'EEK', 'ETB', 'EUR', 'FKP', 'DKK', 'FJD', 'EUR', 'EUR', 'EUR', 'XPF', 'XPF',
+'EUR', 'XPF', 'XAF', 'GMD', 'GEL', 'EUR', 'GHS', 'GIP', 'XAU', 'GBP', 'EUR',
+'DKK', 'XCD', 'XCD', 'EUR', 'USD', 'GTQ', 'GGP', 'GNF', 'XOF', 'GYD', 'HTG',
+'USD', 'AUD', 'BAM', 'EUR', 'EUR', 'HNL', 'HKD', 'HUF', 'ISK', 'INR', 'IDR',
+'XDR', 'IRR', 'IQD', 'EUR', 'IMP', 'ILS', 'EUR', 'JMD', 'NOK', 'JPY', 'JEP',
+'JOD', 'KZT', 'AUD', 'KES', 'AUD', 'KPW', 'KRW', 'KWD', 'KGS', 'LAK', 'LVL',
+'LBP', 'LSL', 'ZAR', 'LRD', 'LYD', 'CHF', 'LTL', 'EUR', 'MOP', 'MKD', 'MGA',
+'EUR', 'MWK', 'MYR', 'MVR', 'XOF', 'EUR', 'MTL', 'FKP', 'USD', 'USD', 'EUR',
+'MRO', 'MUR', 'EUR', 'AUD', 'MXN', 'USD', 'USD', 'EUR', 'MDL', 'EUR', 'MNT',
+'EUR', 'XCD', 'MAD', 'MZN', 'MMK', 'NAD', 'ZAR', 'AUD', 'NPR', 'ANG', 'EUR',
+'XCD', 'XPF', 'NZD', 'NIO', 'XOF', 'NGN', 'NZD', 'AUD', 'USD', 'NOK', 'OMR',
+'PKR', 'USD', 'XPD', 'PAB', 'USD', 'PGK', 'PYG', 'PEN', 'PHP', 'NZD', 'XPT',
+'PLN', 'EUR', 'STD', 'USD', 'QAR', 'EUR', 'RON', 'RUB', 'RWF', 'STD', 'ANG',
+'MAD', 'XCD', 'SHP', 'XCD', 'XCD', 'EUR', 'XCD', 'EUR', 'USD', 'WST', 'EUR',
+'SAR', 'SPL', 'XOF', 'RSD', 'SCR', 'SLL', 'XAG', 'SGD', 'ANG', 'ANG', 'EUR',
+'EUR', 'SBD', 'SOS', 'ZAR', 'GBP', 'GBP', 'EUR', 'XDR', 'LKR', 'SDG', 'SRD',
+'NOK', 'SZL', 'SEK', 'CHF', 'SYP', 'TWD', 'RUB', 'TJS', 'TZS', 'THB', 'IDR',
+'TTD', 'XOF', 'NZD', 'TOP', 'TTD', 'TND', 'TRY', 'TMM', 'USD', 'TVD', 'UGX',
+'UAH', 'AED', 'GBP', 'USD', 'USD', 'UYU', 'USD', 'UZS', 'VUV', 'EUR', 'VEB',
 'VEF', 'VND', 'USD', 'USD', 'USD', 'XPF', 'MAD', 'YER', 'ZMK', 'ZWD']
 
     ##updated currency this arry will contain the final result
     updated_currency = {}
-    
+
     def get_updated_currency(self, currency_array, main_currency) :
         """Interface method that will retriev the currency
            This function has to be reinplemented in child"""
         raise AbstractMethodError
-    
+
     def validate_cur(self, currency) :
         """Validate if the currency to update is supported"""
         if currency not in self.supported_currency_array :
-            raise UnsuportedCurrencyError(currency)        
-        
+            raise UnsuportedCurrencyError(currency)
+
     def get_url(self, url):
         """Return a string of a get url query"""
         try:
@@ -336,12 +336,12 @@
             raise osv.except_osv('Error !', self.MOD_NAME+'Unable to import urllib !')
         except IOError:
             raise osv.except_osv('Error !', self.MOD_NAME+'Web Service does not exist !')
-            
-#Yahoo ###################################################################################     
+
+#Yahoo ###################################################################################
 class Yahoo_getter(Curreny_getter_interface) :
     """Implementation of Currency_getter_factory interface
     for Yahoo finance service"""
-        
+
     def get_updated_currency(self, currency_array, main_currency):
         """implementation of abstract method of Curreny_getter_interface"""
         self.validate_cur(main_currency)
@@ -356,15 +356,15 @@
                 self.updated_currency[curr] = val
             else :
                 raise Exception('Could not update the %s'%(curr))
-        
+
         return self.updated_currency, self.log_info  # empty string added by polish changes
-##Admin CH ############################################################################    
+##Admin CH ############################################################################
 class Admin_ch_getter(Curreny_getter_interface) :
     """Implementation of Currency_getter_factory interface
     for Admin.ch service"""
-        
+
     def rate_retrieve(self, node) :
-        """ Parse a dom node to retrieve 
+        """ Parse a dom node to retrieve
         currencies data"""
         res = {}
         if isinstance(node, list) :
@@ -383,7 +383,7 @@
             currency_array.remove(main_currency)
         from xml.dom.minidom import parseString
         from xml import xpath
-        rawfile = self.get_url(url)        
+        rawfile = self.get_url(url)
         dom = parseString(rawfile)
         #we dynamically update supported currencies
         self.supported_currency_array = []
@@ -391,7 +391,7 @@
         for el in xpath.Evaluate("/wechselkurse/devise/@code", dom):
             self.supported_currency_array.append(el.value.upper())
         self.validate_cur(main_currency)
-        #The XML give the value in franc for 1 XX if we are in CHF 
+        #The XML give the value in franc for 1 XX if we are in CHF
         #we want to have the value for 1 xx in chf
         #if main currency is not CHF we have to apply a computation on it
         if main_currency != 'CHF':
@@ -401,7 +401,7 @@
             main_rate = tmp_data['rate_currency'] / tmp_data['rate_ref']
         for curr in currency_array :
             curr_xpath = "/wechselkurse/devise[@code='%s']"%(curr.lower())
-            for node  in xpath.Evaluate(curr_xpath, dom):    
+            for node  in xpath.Evaluate(curr_xpath, dom):
                 tmp_data = self.rate_retrieve(node)
                 #Source is in CHF, so we transform it into reference currencies
                 if main_currency == 'CHF' :
@@ -412,13 +412,13 @@
                 self.updated_currency[curr] = rate
         return self.updated_currency, self.log_info # empty string added by polish changes
 
-## ECB getter ############################################################################    
+## ECB getter ############################################################################
 class ECB_getter(Curreny_getter_interface) :
     """Implementation of Currency_getter_factory interface
     for ECB service"""
-        
+
     def rate_retrieve(self, node) :
-        """ Parse a dom node to retrieve 
+        """ Parse a dom node to retrieve
         currencies data"""
         res = {}
         if isinstance(node, list) :
@@ -435,7 +435,7 @@
             currency_array.remove(main_currency)
         from xml.dom.minidom import parseString
         from xml import xpath
-        rawfile = self.get_url(url)        
+        rawfile = self.get_url(url)
         dom = parseString(rawfile)
         #we dynamically update supported currencies
         self.supported_currency_array = []
@@ -445,18 +445,18 @@
         self.validate_cur(main_currency)
         for curr in currency_array :
             curr_xpath = "//Cube/Cube/Cube[@currency='%s']"%(curr.upper())
-            for node  in xpath.Evaluate(curr_xpath, dom):    
+            for node  in xpath.Evaluate(curr_xpath, dom):
                 tmp_data = self.rate_retrieve(node)
                 self.updated_currency[curr] = tmp_data['rate_currency']
         return self.updated_currency, self.log_info # empty string added by polish changes
 
-##PL NBP ############################################################################    
+##PL NBP ############################################################################
 class PL_NBP_getter(Curreny_getter_interface) :   # class added according to polish needs = based on class Admin_ch_getter
     """Implementation of Currency_getter_factory interface
     for PL NBP service"""
-        
+
     def rate_retrieve(self, node) :
-        """ Parse a dom node to retrieve 
+        """ Parse a dom node to retrieve
         currencies data"""
         res = {}
         if isinstance(node, list) :
@@ -477,12 +477,12 @@
             currency_array.remove(main_currency)
         from xml.dom.minidom import parseString
         from xml import xpath
-        rawfile = self.get_url(url)        
+        rawfile = self.get_url(url)
         dom = parseString(rawfile)
         node = xpath.Evaluate("/tabela_kursow", dom) # BEGIN Polish - rates table name
         if isinstance(node, list) :
             node = node[0]
-        self.log_info = node.getElementsByTagName('numer_tabeli')[0].childNodes[0].data   
+        self.log_info = node.getElementsByTagName('numer_tabeli')[0].childNodes[0].data
         self.log_info = self.log_info + " " + node.getElementsByTagName('data_publikacji')[0].childNodes[0].data    # END Polish - rates table name
 
         #we dynamically update supported currencies
@@ -493,19 +493,19 @@
         self.validate_cur(main_currency)
         for curr in currency_array :
             curr_xpath = "/tabela_kursow/pozycja[kod_waluty='%s']"%(curr.upper())
-            for node  in xpath.Evaluate(curr_xpath, dom):    
+            for node  in xpath.Evaluate(curr_xpath, dom):
                 tmp_data = self.rate_retrieve(node)
                 #Source is in PLN, so we transform it into reference currencies
                 rate = 1 / (tmp_data['rate_currency'] / tmp_data['rate_ref'])
                 self.updated_currency[curr] = rate
         return self.updated_currency, self.log_info
 
-##PL NBP ############################################################################    
+##PL NBP ############################################################################
 class bccr_getter(Curreny_getter_interface) :   # class added for CR rates
     """Implementation of Currency_getter_factory interface
     for PL NBP service"""
 
-    
+
     def get_updated_currency(self, cr, uid, currency_array, main_currency):
         logger2 = logging.getLogger('bccr_getter')
         """implementation of abstract method of Curreny_getter_interface"""
@@ -521,12 +521,12 @@
             # Get the last rate for the selected currency
             currency_obj = pooler.get_pool(cr.dbname).get('res.currency')
             currency_rate_obj = pooler.get_pool(cr.dbname).get('res.currency.rate')
-            
+
             currency_id = currency_obj.search(cr, uid, [('name','=',curr)])
 
             if not currency_id:
                 continue
-                
+
             last_rate_id = currency_rate_obj.search(cr, uid, [('currency_id','in',currency_id)], order='name DESC', limit=1)
             last_rate = currency_rate_obj.browse(cr, uid, last_rate_id)
             if len(last_rate):
@@ -536,12 +536,12 @@
                 last_rate_date = today
 
             url = url1 + last_rate_date + url2
-            
+
             if curr.upper() == 'CRC':
                 url = url + '318'    #318: indicator number for CRC sale rate
             elif curr.upper() == 'EUR':
                 url = url + '333'    #333: indicator number for EUR rate
-                
+
             if url:
                 #debug(url)
                 logger2.info(url)

=== added directory 'cic_payroll'
=== added directory 'cic_payroll/i18n'
=== added file 'cic_payroll/i18n/pt_BR.po'
--- cic_payroll/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ cic_payroll/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,35 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-06 21:19+0000\n"
+"PO-Revision-Date: 2013-07-28 11:36+0000\n"
+"Last-Translator: Claudio de Araujo Santos <[e-mail]>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: cic_payroll
+#: model:ir.model,name:cic_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr "Lotes holerite"
+
+#. module: cic_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Erro! contrato data de início deve ser inferior, em seguida, contrato data "
+"final."
+
+#. module: cic_payroll
+#: model:ir.model,name:cic_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Contrato"

=== modified file 'hr_payroll_report/report/hr_payroll_report.mako'
--- hr_payroll_report/report/hr_payroll_report.mako	2013-08-27 14:38:30 +0000
+++ hr_payroll_report/report/hr_payroll_report.mako	2013-11-20 22:45:57 +0000
@@ -50,7 +50,7 @@
                     </div>
                 </div>   
             </div>        
-            <br></br><br></br>
+            <br></br>
             ##Worked days
             <% worked_lines_ids = get_worked_lines(cr,uid,payslip.id,payslip.contract_id.schedule_pay) %>
             <div style="font-size: 16px; font-weight: bold; text-align: left;"> ${_('Quantity of hours')} </div>
@@ -93,7 +93,7 @@
                     %endif
                 </div> 
             </div>
-            <br></br><br></br>
+            <br></br>
             ##Salary Computation
             <div style="font-size: 16px; font-weight: bold; text-align: left;">${_('Salary Computation')} </div>
             <div class="table list">
@@ -121,10 +121,17 @@
                     %endfor
                 </div>  
             </div>    
+<<<<<<< TREE
             <br></br> <br></br> <br></br>
             <div class="table list" style="margin-top:30px">
                 <div class="table-body">            
                     <div class="table-row" style="vertical-align: bottom">
+=======
+            <br></br> <br></br></br>
+            <div class="act_as_table data_table" style="margin-top:30px">
+                <div class="act_as_tbody">            
+                    <div class="act_as_row" style="vertical-align: bottom">
+>>>>>>> MERGE-SOURCE
                        <div style="padding-bottom:5px">___________________________________________________________</div>
                     </div>
                     <div class="table-row" style="vertical-align: bottom">
@@ -133,8 +140,13 @@
                     <div class="table-row" style="vertical-align: bottom">
                         <div style="padding-bottom:5px">${_('ID card: ')}${payslip.employee_id.ssnid or ''}</div>
                     </div>
+<<<<<<< TREE
                     <br></br> <br></br><br></br><br></br>
                     <div class="table-row" style="text-align:justify;text-justify:inter-word;">
+=======
+                    <br></br> <br></br><br>
+                    <div class="act_as_row" style="text-align:justify;text-justify:inter-word;">
+>>>>>>> MERGE-SOURCE
                         <div style="padding-bottom:5px">${company.payslip_footer or ''}</div>
                     </div>
                 </div>

=== modified file 'purchase_order_report/report/purchase_order_report.mako'
--- purchase_order_report/report/purchase_order_report.mako	2013-08-26 22:40:10 +0000
+++ purchase_order_report/report/purchase_order_report.mako	2013-11-20 22:45:57 +0000
@@ -9,43 +9,56 @@
     <% setLang(purchase_order.partner_id.lang) %>
     <div id="wrapper">
         <table width = "100%" class = "document_data">
-            <tr class = "title">
+             <tr class = "title">
                 <td class = "document_data">
                     %if purchase_order.state =='draft' :
-                    <span class="title">${_("Quotation N°")} ${purchase_order.name or ''|entity}</span><br/>
+                    <span class="title">${_("Quotation N° ")} ${purchase_order.name or ''|entity}</span><br/>
                     %endif
                     %if purchase_order.state != 'draft' :
-                    <span class="title">${_("Order N°")} ${purchase_order.name or ''|entity}</span><br/>   
+                    <span class="title">${_("Order N° ")} ${purchase_order.name or ''|entity}</span><br/>   
                     %endif
-                </td>               
+                </td>    
+                <td>${_("Purchase Order")}</td>           
             </tr>
-            <tr>
+             <tr>
                 <td>${_("Order date: ")}${(purchase_order.date_order and formatLang(purchase_order.date_order,date=True)) or '-'|entity} </td>                    
-            </tr>
-            %if purchase_order.state != 'draft' :
-                <tr>
-                    <td>${_("Validated by: ")}:${purchase_order.validator.name or ''|entity}</td>
-                </tr>
-            %endif
-            <tr>
-                 <td>${_("Ref.")}: ${purchase_order.partner_ref != "" and purchase_order.partner_ref or '-'|entity}</td>
-            </tr>
-            <tr>                
-                <td>${_("Email")}: ${purchase_order.partner_id.email or '-'|entity}</td>
-                <td>&nbsp;</td><td>&nbsp;</td>
-            </tr>
+                <td>${purchase_order.partner_id.name or ''}</td>
+            </tr>
+            <tr>  
+                %if purchase_order.state != 'draft' :             
+                    <td>${_("Validated by: ")}${purchase_order.validator.name or ''|entity}</td>               
+                    <td>${purchase_order.partner_address_id.street or '-'}</td>
+                %elif purchase_order.state == 'draft':
+                    <td></td>
+                    <td>${purchase_order.partner_address_id.street2 or '-'}</td>
+                %endif
+            </tr>  
+            <tr>
+                <td>${_("Ref.")}: ${purchase_order.partner_ref != "" and purchase_order.partner_ref or '-'|entity}</td>
+                <td>${purchase_order.partner_address_id.city or '-'}</td>
+            </tr>
+            <tr>
+                <td>${_("Email")}: ${purchase_order.validator.user_email or '-'|entity}</td>
+                <td>${purchase_order.partner_address_id.country_id.name or '-'}</td>      
+            </tr>
+            <tr>
+                <td></td>
+                <td>${purchase_order.partner_address_id.email or '-'}</td>
+            </tr>       
             <tr class = "zone_break"><td>&nbsp;</td><td>&nbsp;</td></tr>
             <tr class = "title">
-                <td>${_("Purchase Order")}</td>
                 <td>${_("Delivery and Invoincing")}</td>
-            </tr>
-            <tr>
-                <td>${purchase_order.partner_id.name or ''}</td>
+            </tr> 
+              <tr>                
                 <td>${_("Expected date: ")}${(purchase_order.minimum_planned_date and formatLang(purchase_order.minimum_planned_date,date=True)) or ''}</td>
             </tr>
             <tr>
+<<<<<<< TREE
                 <td>${purchase_order.partner_id.street or ''}</td>
+=======
+>>>>>>> MERGE-SOURCE
                 <td>${_("Date approved: ")}${(purchase_order.date_approve and formatLang(purchase_order.date_approve,date=True)) or ''}</td>
+<<<<<<< TREE
             </tr>
             
             <tr>   
@@ -63,6 +76,10 @@
                 <td>${(purchase_order.dest_address_id.state_id and format(purchase_order.dest_address_id.state_id.name) + (purchase_order.dest_address_id.country_id and ', ' or '') or '') + (purchase_order.dest_address_id.country_id and format(purchase_order.dest_address_id.country_id.name) or '')}</td>
             </tr>
       </table>      
+=======
+            </tr>           
+        </table>
+>>>>>>> MERGE-SOURCE
         <table id="data-table" cellspacing="3">
             %if purchase_order.state =='draft':
                 <thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Date Order")}</th></thead>

=== modified file 'purchase_order_report/report/purchase_order_report.py'
--- purchase_order_report/report/purchase_order_report.py	2013-08-27 15:17:28 +0000
+++ purchase_order_report/report/purchase_order_report.py	2013-11-20 22:45:57 +0000
@@ -31,7 +31,7 @@
         self.localcontext.update({
             'time': time,
         })
-
+        
 #the parameters are the report name and module name 
 report_sxw.report_sxw('report.purchase_order_report_inherit',
                       'purchase.order',

=== added directory 'res_currency_sequence'
=== renamed directory 'res_currency_sequence' => 'res_currency_sequence.moved'
=== added file 'res_currency_sequence/__init__.py'
--- res_currency_sequence/__init__.py	1970-01-01 00:00:00 +0000
+++ res_currency_sequence/__init__.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,23 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import res_currency_sequence

=== added file 'res_currency_sequence/__openerp__.py'
--- res_currency_sequence/__openerp__.py	1970-01-01 00:00:00 +0000
+++ res_currency_sequence/__openerp__.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,46 @@
+# -*- 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/>.
+#
+##############################################################################
+
+
+{
+    "name" : 'ResCurrencySequence',
+    "version" : '1.0',
+    "author" : 'CLEARCORP S.A.',
+    #easy, normal, expert
+    'complexity': 'normal',
+    "description": """
+        res_currency_sequence
+    """,
+    "category": 'Accounting & Finance',
+    "sequence": 4,
+    "website" : "http://clearcorp.co.cr",
+    "images" : [],
+    "icon" : False,
+    "depends" : ["base",],
+    "init_xml" : [],
+    "update_xml" : ["res_currency_sequence_view.xml",],
+    "test" : [],
+    "auto_install": False,
+    "application": False,
+    "installable": True,
+    'license': 'AGPL-3',
+}

=== added directory 'res_currency_sequence/i18n'
=== added symlink 'res_currency_sequence/i18n/es.po'
=== target is u'es_CR.po'
=== added file 'res_currency_sequence/i18n/es_CR.po'
--- res_currency_sequence/i18n/es_CR.po	1970-01-01 00:00:00 +0000
+++ res_currency_sequence/i18n/es_CR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,42 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* res_currency_sequence
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-07-25 21:04+0000\n"
+"PO-Revision-Date: 2013-07-25 21:04+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: res_currency_sequence
+#: model:ir.model,name:res_currency_sequence.model_res_currency
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: res_currency_sequence
+#: sql_constraint:res.currency:0
+msgid "Sequence must be unique per currency!"
+msgstr "La secuencia debe ser única por moneda!"
+
+#. module: res_currency_sequence
+#: help:res.currency,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr "Se utiliza para organizar la secuencia de cálculo"
+
+#. module: res_currency_sequence
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "¡El código de moneda debe ser único por compañía!"
+
+#. module: res_currency_sequence
+#: field:res.currency,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+

=== added file 'res_currency_sequence/res_currency_sequence.py'
--- res_currency_sequence/res_currency_sequence.py	1970-01-01 00:00:00 +0000
+++ res_currency_sequence/res_currency_sequence.py	2013-11-20 22:45:57 +0000
@@ -0,0 +1,68 @@
+# -*- 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 osv, fields
+from tools.translate import _
+
+class ResCurrency(osv.osv):
+    _name = "res.currency"
+    _inherit = "res.currency"
+        
+    _columns = {
+        'sequence': fields.integer('Sequence', required=True, help='Use to arrange calculation sequence', select=True),
+    }
+    
+    _defaults = {
+        'sequence': 0,
+    }
+     
+    _sql_constraints = [
+        ('res_currency_sequence', 'unique(sequence)', 'Sequence must be unique per currency!'),
+    ]
+    
+    _order = 'sequence'
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default.update({
+            'sequence': None,
+        })
+        return super(ResCurrency, self).copy(cr, uid, id, default, context)
+    
+    def get_exchange_rate(self, cr, uid, res_currency_initial, res_currency_finally, name, context=None):
+        """
+        :param name: date of exchange rate
+        """
+        res_currency_rate_obj = self.pool.get('res.currency.rate')
+        result = 0.00
+        
+        res_currency_base_id = self.search(cr, uid, [('base', '=', True)])
+        res_currency_base = self.browse(cr, uid, res_currency_base_id)[0]
+        
+        if res_currency_initial.id == res_currency_base.id:
+            exchange_rate_dict = self.pool.get('res.currency')._current_rate(cr, uid, [res_currency_finally.id], name, arg=None, context=context)
+            result = exchange_rate_dict[res_currency_finally.id]
+        else:
+            currency_rate_initial = self.pool.get('res.currency')._current_rate(cr, uid, [res_currency_initial.id], name, arg=None, context=context)[res_currency_initial.id]
+            currency_rate_finally = self.pool.get('res.currency')._current_rate(cr, uid, [res_currency_finally.id], name, arg=None, context=context)[res_currency_finally.id]
+            result = currency_rate_initial * currency_rate_finally
+        return result

=== added file 'res_currency_sequence/res_currency_sequence_view.xml'
--- res_currency_sequence/res_currency_sequence_view.xml	1970-01-01 00:00:00 +0000
+++ res_currency_sequence/res_currency_sequence_view.xml	2013-11-20 22:45:57 +0000
@@ -0,0 +1,41 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<openerp>
+    <data>
+
+        <!--
+        ======================================
+        Res Currency
+        ======================================
+        -->
+        
+        <record model = "ir.ui.view" id = "view_currency_tree_sequence">
+            <field name = "name">view.currency.tree.sequence</field>
+            <field name = "model">res.currency</field>
+            <field name = "type">tree</field>
+            <field name="inherit_id" ref="base.view_currency_tree"/>
+            <field name = "arch" type = "xml">
+                <data>
+                    <field name = "active" position = "after">
+                        <field name = "sequence" invisible="1"/>
+                    </field>
+                </data>
+            </field>
+        </record>
+        
+        <record model = "ir.ui.view" id = "view_currency_form_sequence">
+            <field name = "name">view.currency.form.sequence</field>
+            <field name = "model">res.currency</field>
+            <field name = "type">form</field>
+            <field name="inherit_id" ref="base.view_currency_form"/>
+            <field name = "arch" type = "xml">
+                <data>
+                    <field name = "active" position = "after">
+                        <field name = "sequence" />
+                    </field>
+                </data>
+            </field>
+        </record>
+        
+    </data>
+</openerp>
+

=== added directory 'sale_order_ccorp_report'
=== added directory 'sale_order_ccorp_report/i18n'
=== added file 'sale_order_ccorp_report/i18n/es.po.OTHER'
--- sale_order_ccorp_report/i18n/es.po.OTHER	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/i18n/es.po.OTHER	2013-11-20 22:45:57 +0000
@@ -0,0 +1,118 @@
+# Spanish translation for openerp-ccorp-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-14 17:23+0000\n"
+"PO-Revision-Date: 2012-06-25 08:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: ccorp_sale
+#: report:sale_order.layout_ccorp:0
+msgid "Order Nº "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Quotation Nº "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Date: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "ID Num.: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Tel-fax: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Email: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Web: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Address:"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Phone: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Page: "
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Thank you for choosing us."
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Qty."
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "[Code] Description / (Taxes)"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Disc."
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Total Price"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Discount"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Taxes"
+msgstr ""
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "TOTAL"
+msgstr ""

=== added file 'sale_order_ccorp_report/i18n/es_CR.po.OTHER'
--- sale_order_ccorp_report/i18n/es_CR.po.OTHER	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/i18n/es_CR.po.OTHER	2013-11-20 22:45:57 +0000
@@ -0,0 +1,192 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale_order_ccorp_report
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-25 21:17+0000\n"
+"PO-Revision-Date: 2013-04-25 21:17+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:117
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:124
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:132
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:136
+msgid "Sub Total"
+msgstr "Subtotal"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:58
+msgid "Invoice address"
+msgstr "Dirección factura"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:32
+msgid "Date:"
+msgstr "Fecha:"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:109
+msgid "Note"
+msgstr "Nota"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:19
+msgid "Order N°"
+msgstr "N° Orden"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:54
+msgid "Email"
+msgstr "Correo electrónico"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:40
+msgid "Expiration date"
+msgstr "Fecha vencimiento"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:50
+msgid "Fax"
+msgstr "Fax"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:118
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:125
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:148
+msgid "Method of payment"
+msgstr "Forma de pago"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:46
+msgid "Phone"
+msgstr "Tel."
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:41
+msgid "Job"
+msgstr "Puesto"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:119
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:126
+msgid "Sub Total with discount"
+msgstr "Sub Total con descuento"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:154
+msgid "Realized by"
+msgstr "Realizado por"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
+msgid "[Code] Description / (Taxes)"
+msgstr "[Cod] Descripción / (Imp.)"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:154
+msgid "Authorized by"
+msgstr "Autorizado por"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:58
+msgid "Shipping address"
+msgstr "Dirección envío"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:28
+msgid "Sale Order"
+msgstr "Orden de compra"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:120
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:127
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:133
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:137
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+msgid "Delay"
+msgstr "Tiempo de entrega."
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:29
+msgid "Contact name"
+msgstr "Nombre del contacto"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:145
+msgid "Order Notes"
+msgstr "Nota Orden"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:97
+msgid "days"
+msgstr "día(s)"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:74
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:76
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:80
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:82
+msgid "Qty"
+msgstr "Cant."
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:16
+msgid "Quotation N°"
+msgstr "N° Cotización"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:121
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:128
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:134
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:138
+msgid "Total"
+msgstr "Total"
+
+#. module: sale_order_ccorp_report
+#: report:addons/sale_order_ccorp_report/report/sale_order.mako:37
+msgid "Client code"
+msgstr "Código cliente"
+

=== added file 'sale_order_ccorp_report/i18n/pt_BR.po'
--- sale_order_ccorp_report/i18n/pt_BR.po	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/i18n/pt_BR.po	2013-11-20 22:45:57 +0000
@@ -0,0 +1,118 @@
+# Brazilian Portuguese translation for openerp-ccorp-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-ccorp-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-ccorp-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-03-14 17:23+0000\n"
+"PO-Revision-Date: 2013-07-28 11:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:20+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+
+#. module: ccorp_sale
+#: report:sale_order.layout_ccorp:0
+msgid "Order Nº "
+msgstr "Ordem N º "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Quotation Nº "
+msgstr "Cotação N º "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Date: "
+msgstr "Data: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "ID Num.: "
+msgstr "Num ID.: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Tel-fax: "
+msgstr "Tel-fax: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Email: "
+msgstr "E-mail: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Web: "
+msgstr "Web: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Address:"
+msgstr "Endereço:"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Phone: "
+msgstr "Telefone: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Page: "
+msgstr "Página: "
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Thank you for choosing us."
+msgstr "Obrigado por nos escolher."
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Qty."
+msgstr "Qtde."
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "[Code] Description / (Taxes)"
+msgstr "[Código] Descrição / (Impostos)"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Disc."
+msgstr "Desc."
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Unit Price"
+msgstr "Preço unitário"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Discount"
+msgstr "Desconto"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: ccorp_sale
+#: report:sale.order.layout_ccorp:0
+msgid "TOTAL"
+msgstr "TOTAL"

=== added directory 'sale_order_ccorp_report/report'
=== added file 'sale_order_ccorp_report/report/sale_order.mako.OTHER'
--- sale_order_ccorp_report/report/sale_order.mako.OTHER	1970-01-01 00:00:00 +0000
+++ sale_order_ccorp_report/report/sale_order.mako.OTHER	2013-11-20 22:45:57 +0000
@@ -0,0 +1,166 @@
+<html>
+<head>
+	<style type="text/css">
+		${css}
+	</style>
+</head>
+<body class = "data">
+	%for so in objects :
+	<% setLang(so.partner_id.lang) %>
+	<br></br>
+	<div id="wrapper">
+		<table width = "100%" class = "document_data">
+			<tr class = "title">
+                <td class = "document_data">
+                    %if so.state =='draft' :
+                    <span class="title">${_("Quotation N°")} ${so.name or ''|entity}</span><br/>
+                    %endif
+                    %if so.state != 'draft' :
+                    <span class="title">${_("Order N°")} ${so.name or ''|entity}</span><br/>   
+                    %endif
+                </td>
+                <td>
+                    ${so.partner_id.name}
+                </td>
+            </tr>
+            <tr>
+                
+                <td>${_("Sale Order")} : ${so.client_order_ref != "" and so.client_order_ref or '-'|entity}</td>
+                <td>${_("Contact name")}: ${so.partner_order_id.name or '-'|entity}</td>
+            </tr>
+            <tr>
+                <td>${_("Date:")}
+                    %if so.date_order:
+                        ${formatLang(so.date_order, date=True)|entity}
+                    %endif
+                </td>
+                <td>${_("Client code")}: ${so.partner_id.ref or '-'|entity}</td>
+            </tr>
+            <tr>
+                <td>${_("Expiration date")}: ${(so.expiration_date and formatLang(so.expiration_date,date=True)) or '-'|entity}</td>
+                <td>${_("Job")}: ${so.partner_order_id.function or '-'|entity}</td>
+               
+            </tr>
+            <tr>
+                <td></td>
+                <td>${_("Phone")}:${so.partner_order_id.phone or '-'|entity}</td>                
+            </tr>
+            <tr>
+                <td></td>
+                <td>${_("Fax")}:${so.partner_order_id.fax or '-'|entity}</td>
+            </tr>
+            <tr>
+                <td></td>
+                <td>${_("Email")}: ${so.partner_order_id.email or '-'|entity}</td>                
+                <td>&nbsp;</td><td>&nbsp;</td>
+            </tr>
+            <tr class = "zone_break"><td>&nbsp;</td><td>&nbsp;</td></tr>
+            <tr class = "title"><td>${_("Invoice address")}</td><td>${_("Shipping address")}</td></tr>
+            <tr><td>${so.partner_invoice_id.street or ''}</td><td>${so.partner_shipping_id.street or ''}</td></tr>
+            <tr><td>${so.partner_invoice_id.street2 or ''}</td><td>${so.partner_shipping_id.street2 or ''}</td></tr>
+            <tr>
+                <td>${(so.partner_invoice_id.zip and format(so.partner_invoice_id.zip) + ((so.partner_invoice_id.city or so.partner_invoice_id.state_id or so.partner_invoice_id.country_id) and ' ' or '') or '') + (so.partner_invoice_id.city and format(so.partner_invoice_id.city) or '')}</td>
+                <td>${(so.partner_shipping_id.zip and format(so.partner_shipping_id.zip) + ((so.partner_shipping_id.city or so.partner_shipping_id.state_id or so.partner_shipping_id.country_id) and ' ' or '') or '') + (so.partner_shipping_id.city and format(so.partner_shipping_id.city) or '')}</td>
+            </tr>
+            <tr>
+                <td>${(so.partner_invoice_id.state_id and format(so.partner_invoice_id.state_id.name) + (so.partner_invoice_id.country_id and ', ' or '') or '') + (so.partner_invoice_id.country_id and format(so.partner_invoice_id.country_id.name) or '')}</td>
+                <td>${(so.partner_shipping_id.state_id and format(so.partner_shipping_id.state_id.name) + (so.partner_shipping_id.country_id and ', ' or '') or '') + (so.partner_shipping_id.country_id and format(so.partner_shipping_id.country_id.name) or '')}</td>
+            </tr>
+		</table>
+		
+		<table id="data-table" cellspacing="3">
+			%if company.show_sale_order_footer :	
+				%if discount(so) != 0:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Delay")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%else:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Delay")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%endif
+			%else:
+				%if discount(so) != 0:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Disc.(%)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%else:
+					<thead><th>${_("Qty")}</th><th>${_("[Code] Description / (Taxes)")}</th><th>${_("Unit Price")}</th><th>${_("Total Price")}</th></thead>
+				%endif
+			%endif
+		
+		<tbody>
+		<%i = 0%>
+		%for line in so.order_line :
+			%if i% 2 == 0:
+				<tr class = "even">
+			%else:
+				<tr class = "odd">
+			%endif
+				    <td valign = "top">${formatLang(line.product_uom_qty)}&nbsp;${format(line.product_uom.name)}</td>
+				    <td valign = "top" id="desc_col">${line.name}&nbsp;${line.tax_id != [] and (' / (' + (', '.join([ lt.description for lt in line.tax_id ])) + ')') or ''|entity}
+    				%if company.show_sale_order_footer:
+    					<td valign = "top" style="text-align:right;">${int(line.delay)}&nbsp;${_("days")}</td>
+    				%endif    					
+				    </td>
+    				%if discount(so) != 0:
+    					<td valign = "top">${line.discount and formatLang(line.discount) + '%' or '-'}</td>
+    				%endif
+    				<td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity }&nbsp;${formatLang(line.price_unit)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+    				<td valign = "top" style="text-align:right;">${so.pricelist_id.currency_id.symbol_prefix or ''|entity }&nbsp;${formatLang(line.price_subtotal_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity }</td>
+			    </tr>
+			    %if line.notes :
+    		         <tr>
+    		             <td valign = "top"></td>
+    		             <td valign = "top" id="desc_col">${_("Note")}: ${format(line.notes)}</td>                        
+    		         </tr>
+			    %endif
+		<%i +=1%>
+		%endfor		
+		%if discount(so) != 0:
+			%if company.show_sale_order_footer :
+			    <% amount_discount = (so.amount_untaxed_not_discounted - so.amount_discounted) %>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			    <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_discounted)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Sub Total with discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(amount_discount)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>                
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_tax)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_total)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%else:
+			    <% amount_discount = (so.amount_untaxed_not_discounted - so.amount_discounted) %>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_untaxed_not_discounted)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_discounted)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+                <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Sub Total with discount")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(amount_discount)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_tax)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_total)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%endif
+		%else:
+			%if company.show_sale_order_footer :
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_untaxed_not_discounted)} ${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_tax)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_total)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%else:
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>${_("Sub Total")}:</b></td><td style="border-top:2px solid;text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity}&nbsp;${formatLang(so.amount_untaxed_not_discounted)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Taxes")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_tax)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+				<tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>${_("Total")}:</b></td><td style="text-align:right">${so.pricelist_id.currency_id.symbol_prefix or ''|entity} ${formatLang(so.amount_total)}&nbsp;${so.pricelist_id.currency_id.symbol_suffix or ''|entity}</td></tr>
+			%endif
+		%endif
+		</tbody>
+		</table>
+		<table id="notes_table">
+			%if so.note:
+				<tr><td><b>${_("Order Notes")}:</b>${format(so.note)}</td></tr>
+			%endif
+			%if so.payment_term and so.payment_term.note:
+				<tr><td><b>${_("Method of payment")}:</b>${format(so.payment_term and so.payment_term.note)}</td></tr>
+			%endif
+		</table>
+		<br>
+		<br>
+		<table id="responsibles_table">
+			<tr><td style="border-top:1px solid"><b>${_("Realized by")}:</b> ${so.user_id.name}</td><td style="border-style:none"/><td style="border-top:1px solid"><b>${_("Authorized by")}:_________________</b></td></tr>	
+			<!--<tr><td style="border-style:none"> ${company.sale_order_footer}</td><td style="border-style:none"/></tr>-->
+		</table>
+		%if company.show_sale_order_footer :
+			<div id="custom_footer">
+				<p>${company.sale_order_footer}</p>
+			<div/>
+		%endif
+	</div>
+	<p style="page-break-after:always"></p>
+%endfor
+</body>
+</html>

=== modified file 'sale_order_global_discount/sale_order_global_discount.py'
--- sale_order_global_discount/sale_order_global_discount.py	2013-07-19 17:09:25 +0000
+++ sale_order_global_discount/sale_order_global_discount.py	2013-11-20 22:45:57 +0000
@@ -30,6 +30,8 @@
 import decimal_precision as dp
 import netsvc
 
+from openerp.addons.sale.sale import sale_order_line as sale_order_line_parent
+
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _description = 'Order Line'
@@ -46,7 +48,7 @@
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
-
+        
     _columns = {
         'price_subtotal_not_discounted': fields.function(_amount_line_no_discount, digits_compute= dp.get_precision('Sale Price'), string='Subtotal',
             store = {
@@ -54,6 +56,7 @@
             }),
     }
     
+<<<<<<< TREE
     def button_dummy(self, cr, uid, ids, context=None):
         #To recalculate function fields
         for line in self.browse(cr, uid, ids, context=context):
@@ -63,25 +66,48 @@
 class SaleOrder(osv.osv):
     _inherit = 'sale.order'
     _description = 'Sales Order'
+=======
+    def button_dummy(self, cr, uid, ids, context=None):
+        #To recalculate function fields
+        for line in self.browse(cr, uid, ids, context=context):
+            self.write(cr, uid, [line.id], {'id': line.id}, context=context)
+        return True
+    
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+    _description = "Sales Order"
+>>>>>>> MERGE-SOURCE
     
     def _amount_line_tax_no_discount(self, cr, uid, line, context=None):
         val = 0.0
         for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
             val += c.get('amount', 0.0)
         return val
-
-    def _amount_all_ccorp(self, cr, uid, ids, field_name, arg, context=None):
+        
+    def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
+        ###Workaround, functional fields###
+        ###See sale.order###
         cur_obj = self.pool.get('res.currency')
         res = {}
         for order in self.browse(cr, uid, ids, context=context):
             res[order.id] = {
+                'amount_untaxed': 0.0,
+                'amount_tax': 0.0,
+                'amount_total': 0.0,
                 'order_discount': 0.0,
                 'amount_discounted': 0.0,
                 'amount_untaxed_not_discounted': 0.0,
             }
+            val = val1 = 0.0
+            cur = order.pricelist_id.currency_id
             for line in order.order_line:
+                val1 += line.price_subtotal
+                val += self._amount_line_tax(cr, uid, line, context=context)
                 res[order.id]['amount_untaxed_not_discounted'] += line.price_subtotal_not_discounted
                 res[order.id]['amount_discounted'] += line.price_subtotal_not_discounted - line.price_subtotal
+            res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
+            res[order.id]['amount_untaxed'] = cur_obj.round(cr, uid, cur, val1)
+            res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']                
             if res[order.id]['amount_untaxed_not_discounted'] == 0:
                 res[order.id]['order_discount'] = 0
             else:
@@ -92,25 +118,44 @@
         return self.pool.get('sale.order')._get_order(cr, uid, ids, context)
         
     _columns = {
-        'order_discount': fields.function(_amount_all_ccorp, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
-            store = {
-                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
-                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
-            },
-            multi='sums'),
-        'amount_discounted': fields.function(_amount_all_ccorp, digits_compute= dp.get_precision('Sale Price'), string='Discount',
-            store = {
-                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
-                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
-            },
-            multi='sums'),
-        'amount_untaxed_not_discounted': fields.function(_amount_all_ccorp, digits_compute= dp.get_precision('Sale Price'), string='Subtotal',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums', help="The amount without tax."),
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums', help="The tax amount."),
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Total',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums', help="The total amount."),
+        'order_discount': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), required=True, string='Untaxed Amount',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums'),
+        'amount_discounted': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), required=True, string='Discount',
+            store = {
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
+                'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
+            },
+            multi='sums'),
+        'amount_untaxed_not_discounted': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), required=True, string='Subtotal',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order_ccorp, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums'),
                 }
+<<<<<<< TREE
         
     def button_dummy(self, cr, uid, ids, context={}):
         if context is None:
@@ -137,3 +182,29 @@
         else:
             del context['second_time']
         return super(SaleOrder, self).write(cr, uid, ids, vals, context=context)
+=======
+        
+    def button_dummy(self, cr, uid, ids, context={}):
+        if context is None:
+            context = {}
+        #To recalculate function fields
+        if isinstance(ids, int):
+            ids = [ids]
+        for sale in self.browse(cr, uid, ids, context=context):
+            context.update({'second_time': True})
+            self.write(cr, uid, [sale.id], {}, context=context)
+        super(sale_order, self).button_dummy(cr, uid, ids, context=context)
+        return True
+    
+    def create(self, cr, uid, vals, context=None):
+        sale_id = super(sale_order, self).create(cr, uid, vals, context=context)
+        self.button_dummy(cr, uid, [sale_id], context=context)
+        return sale_id
+    
+    def write(self, cr, uid, ids, vals, context={}):
+        if 'second_time' not in context:
+             self.button_dummy(cr, uid, ids, context=context)
+        else:
+            del context['second_time']
+        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
+>>>>>>> MERGE-SOURCE