Merge branch '15.0' into 15.0-l10n_br_automated_payment

README.md

@@ -21,15 +21,24 @@ Odoo Brasil - an easy way to use Odoo
 
 Para dúvidas acesse: [Documentação](http://www.odoo-next.com.br/my/documents/)
 
-[![Build Status](https://travis-ci.org/Trust-Code/odoo-brasil.svg?branch=13.0)](https://travis-ci.org/Trust-Code/odoo-brasil)
-[![Coverage Status](https://coveralls.io/repos/github/Trust-Code/odoo-brasil/badge.svg?branch=13.0)](https://coveralls.io/github/Trust-Code/odoo-brasil?branch=13.0)
+[![Build Status](https://travis-ci.org/Trust-Code/odoo-brasil.svg?branch=15.0)](https://travis-ci.org/Trust-Code/odoo-brasil)
+[![Coverage Status](https://coveralls.io/repos/github/Trust-Code/odoo-brasil/badge.svg?branch=15.0)](https://coveralls.io/github/Trust-Code/odoo-brasil?branch=15.0)
 [![Licence](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)
 
 
 
 ## Introdução
 
-Este repositório adapta o Odoo 13 para ser usado no Brasil
+Este repositório adapta o Odoo 15 para ser usado no Brasil
+
+Procurando pelas outras versões?
+* [Versão 14.0](https://github.com/Trust-Code/odoo-brasil/tree/14.0)
+* [Versão 13.0](https://github.com/Trust-Code/odoo-brasil/tree/13.0)
+* [Versão 12.0](https://github.com/Trust-Code/odoo-brasil/tree/12.0)
+* [Versão 11.0](https://github.com/Trust-Code/odoo-brasil/tree/11.0)
+* [Versão 10.0](https://github.com/Trust-Code/odoo-brasil/tree/10.0)
+
+
 
 <p align="right"><a href="#top">:arrow_up:</a></p>
 

br_coa_me_epp/models/account_tax.py

@@ -21,8 +21,27 @@ class AccountTaxTemplate(models.Model):
                                ('outros', 'Outros')], string="Tipo")
 
     def _get_tax_vals(self, company, tax_template_to_tax):
-        # import pdb; pdb.set_trace()
         res = super(AccountTaxTemplate, self)._get_tax_vals(
             company, tax_template_to_tax)
         res['domain'] = self.domain
         return res
+
+
+class AccountTax(models.Model):
+    _inherit = 'account.tax'
+
+    domain = fields.Selection([('icms', 'ICMS'),
+                               ('icmsst', 'ICMS ST'),
+                               ('pis', 'PIS'),
+                               ('cofins', 'COFINS'),
+                               ('ipi', 'IPI'),
+                               ('iss', 'ISS'),
+                               ('ii', 'II'),
+                               ('icms_inter', 'Difal - Alíquota Inter'),
+                               ('icms_intra', 'Difal - Alíquota Intra'),
+                               ('fcp', 'FCP'),
+                               ('irpj', 'IRPJ'),
+                               ('csll', 'CSLL'),
+                               ('irrf', 'IRRF'),
+                               ('inss', 'INSS'),
+                               ('outros', 'Outros')], string="Tipo")

l10n_br_account/views/account_move.xml

@@ -4,7 +4,7 @@
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form" />
         <field name="arch" type="xml">
-            <field name="amount_by_group" position="after">
+            <field name="tax_totals_json" position="after">
                 <div class="oe_subtotal_footer_separator" />
                 <field name="l10n_br_delivery_amount" />
                 <field name="l10n_br_expense_amount" />

l10n_br_banco_inter/views/payment_transaction.xml

@@ -1,13 +1,13 @@
 <odoo>
 
-    <record id="view_payment_transaction_form" model="ir.ui.view">
+    <!-- <record id="view_payment_transaction_form" model="ir.ui.view">
         <field name="model">payment.transaction</field>
         <field name="inherit_id" ref="payment.transaction_form" />
         <field name="arch" type="xml">
             <field name="date" position="after">
                 <field name="boleto_pdf"/>
             </field>
         </field>
-    </record>
+    </record> -->
 
 </odoo> 

l10n_br_purchase/views/purchase_order.xml

@@ -4,7 +4,7 @@
         <field name="model">purchase.order</field>
         <field name="inherit_id" ref="purchase.purchase_order_form" />
         <field name="arch" type="xml">
-            <field name="amount_tax" position="after">
+            <field name="tax_totals_json" position="after">
                 <div class="oe_subtotal_footer_separator oe_inline o_td_label"></div>
                 <field name="l10n_br_delivery_amount" />
                 <field name="l10n_br_expense_amount" />

l10n_br_sale/views/sale_order.xml

@@ -4,7 +4,7 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <field name="amount_tax" position="after">
+            <field name="tax_totals_json" position="after">
                 <div class="oe_subtotal_footer_separator oe_inline o_td_label"></div>
                 <field name="l10n_br_delivery_amount" />
                 <field name="l10n_br_expense_amount" />

l10n_br_website_sale/__manifest__.py

@@ -17,4 +17,9 @@
         'views/website_sale_view.xml',
         'views/website_portal.xml',
     ],
+    'assets': {
+        'web.assets_frontend': [
+            'l10n_br_website_sale/static/src/js/website_sale.js',
+        ]
+    }
 }

l10n_br_website_sale/views/website_sale_view.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <openerp>
     <data>
-        <template id="assets_frontend" inherit_id="website.assets_frontend" name="Shop BR">
-            <xpath expr="." position="inside">
-                <script type="text/javascript" src="/l10n_br_website_sale/static/src/js/website_sale.js"></script>
-            </xpath>
-        </template>
 
         <template id="br_website_sale_address" inherit_id="website_sale.address"
             name="Website Sale Address">

requirements.txt

@@ -1,3 +1,4 @@
 signxml
 pytrustnfe3
-pysigep
+pysigep
+iugu-trustcode