openerp-brazil-team team mailing list archive

["Renato Lima - http://www.akretion.com" <renatonlima@xxxxxxxxx>]

Renato Lima - http://www.akretion.com has proposed merging lp:~openerp-brazil-team/openerp.pt-br-localiz/openerp.pt-br-localiz6-1 into lp:openerp.pt-br-localiz.

Requested reviews:
  Renato Lima - http://www.akretion.com (renatonlima)

For more details, see:
https://code.launchpad.net/~openerp-brazil-team/openerp.pt-br-localiz/openerp.pt-br-localiz6-1/+merge/90800

Correção das visões operação fiscal e categoria de operação fiscal.
-- 
https://code.launchpad.net/~openerp-brazil-team/openerp.pt-br-localiz/openerp.pt-br-localiz6-1/+merge/90800
Your team OpenERP Brazil Team is subscribed to branch lp:openerp.pt-br-localiz.

=== modified file 'l10n_br_account/account_invoice.py'
--- l10n_br_account/account_invoice.py	2012-01-27 04:11:01 +0000
+++ l10n_br_account/account_invoice.py	2012-01-30 22:24:38 +0000
@@ -1830,7 +1830,7 @@
             for line in inv.invoice_line:
                     line.cfop_id = obj_foperation.cfop_id.id
 
-        return result        
+        return result
 
 account_invoice()
 

=== modified file 'l10n_br_account/l10n_br_account.py'
--- l10n_br_account/l10n_br_account.py	2011-11-28 22:07:59 +0000
+++ l10n_br_account/l10n_br_account.py	2012-01-30 22:24:38 +0000
@@ -115,8 +115,7 @@
                 'name': fields.char('Descrição', size=64),
                 'type': fields.selection([('input', 'Entrada'), ('output', 'Saida')], 'Tipo'),
                 'journal_ids': fields.many2many('account.journal', 'l10n_br_account_fiscal_operation_category_rel',
-                                                'fiscal_operation_category_id', 'journal_id', 'Consolidated Children',
-                                                domain="[('company_id','=',user.company_id)]" ),
+                                                'fiscal_operation_category_id', 'journal_id', 'Consolidated Children'),
                 'use_sale' : fields.boolean('Usado em Vendas'),
                 'use_invoice' : fields.boolean('Usado nas Notas Fiscais'),
                 'use_purchase' : fields.boolean('Usado nas Compras'),

=== modified file 'l10n_br_account/l10n_br_account_view.xml'
--- l10n_br_account/l10n_br_account_view.xml	2011-11-26 04:17:49 +0000
+++ l10n_br_account/l10n_br_account_view.xml	2012-01-30 22:24:38 +0000
@@ -131,8 +131,8 @@
 							<field name="name" select="1"/>
 							<field name="type" select="1"/>
 							<field name="fiscal_operation_category_id" select="1"/>
-							<field name="cfop_id" attrs="{'invisible': [('fiscal_type', '!=', 'product')], 'required': [('own_invoice', '!=', 'product')]}" domain="[('internal_type','=','normal'),('type','=',type)]" select="1"/>
-							<field name="service_type_id" attrs="{'invisible': [('fiscal_type', '!=', 'service')], 'required': [('own_invoice', '!=', 'service')]}" domain="[('internal_type','=','normal')]" select="1"/>
+							<field name="cfop_id" attrs="{'invisible': [('fiscal_type', '!=', 'product')], 'required': [('fiscal_type', '=', 'product')]}" domain="[('internal_type','=','normal'),('type','=',type)]" select="1"/>
+							<field name="service_type_id" attrs="{'invisible': [('fiscal_type', '!=', 'service')], 'required': [('fiscal_type', '=', 'service')]}" domain="[('internal_type','=','normal')]" select="1"/>
 							<field name="fiscal_document_id"/>
 							<field name="refund_fiscal_operation_id" domain="[('type','!=',type)]"/>
 							<field name="fiscal_type"/>