← Back to branch summary

~mileo/openerp.pt-br-localiz/openerp-pt-br-frete-em-linhas

« back to all changes in this revision

Viewing changes to l10n_br_account/invoice.py

  • Committer: renatonlima at gmail
  • Date: 2011-06-03 18:18:58 UTC
  • Revision ID: renatonlima@gmail.com-20110603181858-pnfgi8ialmkbtoow
Adicionado os módulos l10n_br_account_payment e l10n_br_account_payment_extension para extender funções do finaneiro (contas a pagar e contas a receber)

Show diffs side-by-side

added added

removed removed

Lines of Context:
l10n_br_account/invoice.py
99
99
            context = {}
100
100
        
101
101
        if not 'fiscal_type' in context.keys():
102
 
            return res
103
 
        
104
 
        journal_obj = self.pool.get('account.journal')
 
102
            return res        
105
103
 
106
104
        ui_view_ids = self.pool.get('ir.ui.view').search(cr,uid,[('name', '=', 'account.invoice.form')])
107
105
        field_names = ['service_type_id']
177
175
    <separator colspan="4" string="Informação Adicional"/>
178
176
                            <field colspan="4" name="comment" nolabel="1"/>
179
177
                        </page>
180
 
                        <page string="Pagamentos">
 
178
                        <page string="l10n br - Vencimentos">
 
179
                            <field colspan="4" nolabel="1" name="move_line_receivable_id"/>
 
180
                         </page>
 
181
                         <page string="Pagamentos">
181
182
                            <field name="payment_ids" colspan="4" nolabel="1">
182
 
                                </field>
 
183
                            </field>
183
184
                        </page>
184
 
                    <page position="inside" string="l10n br - Vencimentos">
185
 
 <field colspan="4" nolabel="1" name="move_line_receivable_id"/>
186
 
 </page>
187
185
<page position="inside" string="l10n br - NF">
188
186
<separator colspan="4" string="Dados Adicionais da NF" />
189
187
                <field name="service_type_id" colspan="4" />
220
218
            res[id] = []
221
219
            if not invoice.move_id:
222
220
                continue
223
 
            data_lines = [x for x in invoice.move_id.line_id if x.account_id.id == invoice.account_id.id and x.account_id.type in ('receivable', 'payable') and invoice.fiscal_operation_category_id.revenue]
 
221
            data_lines = [x for x in invoice.move_id.line_id if x.account_id.id == invoice.account_id.id and x.account_id.type in ('receivable', 'payable') and invoice.journal_id.revenue_expense]
224
222
            New_ids = []
225
223
            for line in data_lines:
226
224
                New_ids.append(line.id)
1201
1199
 
1202
1200
            StrFile += StrX26
1203
1201
 
1204
 
            if inv.fiscal_operation_category_id.revenue:
 
1202
            if inv.journal_id.revenue_expense:
1205
1203
            
1206
1204
                StrY = 'Y|\n'
1207
1205