Merge pull request #358 from akretion/8.0-fix-pep8-invoice-report

PEP8
OCA · Jul 27, 2016 · 582e0c4 · 582e0c4
2 parents 66d577e + d56e006
commit 582e0c4
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 67 deletions.
diff --git a/l10n_br_account/data/l10n_br_account.fiscal.document.csv b/l10n_br_account/data/l10n_br_account.fiscal.document.csv
@@ -1,2 +1,2 @@
 "id","code","name","electronic"
-"fiscal_document_service","XX","Nota Fiscal de Serviço Municipal","False"
+"fiscal_document_service","XX","Nota Fiscal de Serviço Municipal","False"
diff --git a/l10n_br_account/models/account_invoice.py b/l10n_br_account/models/account_invoice.py
@@ -352,7 +352,8 @@ def _compute_price(self):
         'account.fiscal.position', u'Posição Fiscal',
         domain="[('fiscal_category_id', '=', fiscal_category_id)]")
     price_tax_discount = fields.Float(
-        string='Price Tax discount', store=True, digits=dp.get_precision('Account'),
+        string='Price Tax discount', store=True,
+        digits=dp.get_precision('Account'),
         readonly=True, compute='_compute_price')
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False,

diff --git a/l10n_br_account/report/account_invoice_report.py b/l10n_br_account/report/account_invoice_report.py
@@ -21,10 +21,9 @@
 from ..models.l10n_br_account import PRODUCT_FISCAL_TYPE
 
 
-
 class AccountInvoiceReport(models.Model):
 
-    _inherit = "account.invoice.report"
+    _inherit = 'account.invoice.report'
 
     fiscal_category_id = fields.Many2one(
         'l10n_br_account.fiscal.category',
@@ -37,8 +36,8 @@ class AccountInvoiceReport(models.Model):
             ('sefaz_denied', u'Denegada no Sefaz'),
         ])
     issuer = fields.Selection(
-            [('0', u'Emissão própria'),
-             ('1', 'Terceiros')],
+        [('0', u'Emissão própria'),
+         ('1', 'Terceiros')],
         string='Emitente',
         readonly=True
     )
@@ -83,7 +82,8 @@ def _select(self):
             ", sub.fiscal_type as fiscal_type"
             ", sub.fiscal_document_electronic as fiscal_document_electronic"
             ", sub.document_serie_id as document_serie_id"
-            ", CASE WHEN sub.revenue_expense = 't' THEN 'Gera Financeiro' ELSE 'Não Gera Financeiro' end as revenue_expense"
+            ", CASE WHEN sub.revenue_expense = 't' THEN 'Gera Financeiro' "
+            "ELSE 'Não Gera Financeiro' end as revenue_expense"
             ", sub.l10n_br_city_id as l10n_br_city_id"
             ", sub.state_id as state_id"
         )

diff --git a/l10n_br_account/views/account_invoice_view.xml b/l10n_br_account/views/account_invoice_view.xml
@@ -4,7 +4,7 @@
         <record id="view_l10n_br_account_partner_filter" model="ir.ui.view">
             <field name="name">l10n_br_account.partner.filter</field>
             <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.view_account_invoice_filter" />
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="before">
                     <field name="internal_number" string="Número Exato de Fatura" filter_domain="[('internal_number','=ilike', self)]"/>
@@ -145,7 +145,6 @@
                 </field>
                 <field name="partner_id" position="attributes">
                     <attribute name="context_br">{'fiscal_category_id': fiscal_category_id}</attribute>
-<<<<<<< HEAD
                 </field>
                 <field position="replace" name="internal_number">
                 </field>
@@ -165,66 +164,12 @@
                 <xpath expr="//tree[@string='Invoice lines']" position="attributes">
                     <attribute name="editable"></attribute>
                 </xpath>
-                <xpath expr="//field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="replace">
-                    <field name="price_total" />
-                </xpath>
                 <xpath expr="//field[@name='invoice_line']/tree/field[@name='invoice_line_tax_id']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
             </field>
         </record>
 
-        <record id="view_l10n_br_account_invoice_supplier_form3" model="ir.ui.view">
-            <field name="name">l10n_br_account.invoice.supplier.form3</field>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form" />
-            <field name="arch" type="xml">
-                <field name="name" position="after">
-                    <field name="price_total" />
-                </field>
-            </field>
-        </record>
-=======
-				</field>
-				<field position="replace" name="internal_number">
-				</field>
-				<field position="attributes" name="company_id">
-					<attribute name="on_changes">onchange_company_id(company_id, partner_id, type, invoice_line, currency_id, fiscal_category_id)</attribute>
-				</field>
-				<field name="date_invoice" position="before">
-					<field name="internal_number" attrs="{'readonly': [('issuer', '=', '0')], 'required': [('issuer', '=', '1')]}" />
-					<field name="vendor_serie" attrs="{'invisible': [('issuer', '=', '0')], 'required': [('issuer', '=', '1')]}" />
-					<field name="issuer" attrs="{'invisible': [('type', '=', 'out_invoice')]}" />
-				</field>
-				<field position="replace" name="fiscal_position">
-					<field name="fiscal_category_id" on_change="onchange_fiscal_category_id(partner_id, partner_id, company_id, fiscal_category_id)" domain="[('journal_type','in',('purchase',)),('fiscal_type','=','service')]" required="1" />
-					<field name="fiscal_position" required="1" domain="[('fiscal_category_id', '=', fiscal_category_id)]" groups="base.group_extended,base.group_user" />
-					<field name="fiscal_type" invisible="1"/>
-				</field>
-				<xpath expr="//tree[@string='Invoice lines']" position="attributes">
-					<attribute name="editable"></attribute>
-				</xpath>
-				<!--<xpath expr="//field[@name='invoice_line']/tree/field[@name='price_subtotal']" position="replace">-->
-					<!--<field name="price_total" />-->
-				<!--</xpath>-->
-				<xpath expr="//field[@name='invoice_line']/tree/field[@name='invoice_line_tax_id']" position="attributes">
-					<attribute name="invisible">1</attribute>
-				</xpath>
-			</field>
-		</record>
-
-		<!--<record id="view_l10n_br_account_invoice_supplier_form3" model="ir.ui.view">-->
-			<!--<field name="name">l10n_br_account.invoice.supplier.form3</field>-->
-			<!--<field name="model">account.invoice</field>-->
-			<!--<field name="inherit_id" ref="account.invoice_supplier_form" />-->
-			<!--<field name="arch" type="xml">-->
-				<!--<field name="name" position="after">-->
-					<!--<field name="price_total" />-->
-				<!--</field>-->
-			<!--</field>-->
-		<!--</record>-->
->>>>>>> 686d632c6989a2ff67278c4e9c60d76092a985cb
-
         <record id="l10n_br_account_invoice_line_form" model="ir.ui.view">
             <field name="name">l10n_br_account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>

diff --git a/l10n_br_account/views/res_config_view.xml b/l10n_br_account/views/res_config_view.xml
@@ -25,4 +25,4 @@
         </record>
 
     </data>
-</openerp>
+</openerp>
diff --git a/l10n_br_account_product/models/__init__.py b/l10n_br_account_product/models/__init__.py
@@ -18,13 +18,10 @@
 ###############################################################################
 
 from . import res_partner
-from . import res_company
 from . import l10n_br_account_product
 from . import res_company
 from . import l10n_br_account
 from . import account_product_fiscal_classification
 from . import account_invoice
 from . import account
 from . import product
-from . import res_country
-from . import account_fiscal_position_rule