← Back to branch summary

~akretion-team/new-report-intrastat/8.0-add-intrastat-product

« back to all changes in this revision

Viewing changes to l10n_nl_intrastat/model/l10n_nl_intrastat.py

  • Committer: Alexis de Lattre
  • Date: 2013-08-26 22:03:15 UTC
  • mfrom: (77.2.1 new-report-intrastat)
  • Revision ID: alexis@via.ecp.fr-20130826220315-lbwjmfkg7o889r4a
[MERGE] branch 7.0-UPG-l10n_nl_intrastat
Contribution by Stefan Rijnhart (Therp)
Migration of module l10n_nl_intrastat to OpenERP 7.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
l10n_nl_intrastat/model/l10n_nl_intrastat.py
124
124
                ('period_id', '=', report.period_id.id),
125
125
                ('state', 'in', ('open', 'paid')),
126
126
                ('company_id', '=', report.company_id.id),
127
 
                ('address_invoice_id.country_id.id', '!=',
 
127
                ('partner_id.country_id.id', '!=',
128
128
                 report.company_id.country_id.id),
129
129
                ]
130
130
 
132
132
        invalid_invoice_ids = invoice_obj.search(
133
133
            cr, uid, 
134
134
            invoice_domain + [
135
 
                ('address_invoice_id.country_id', '=', False)],
 
135
                ('partner_id.country_id', '=', False)],
136
136
            context=context)
137
137
        if invalid_invoice_ids:
138
138
            invoices = invoice_obj.read(
149
149
        invoice_ids = invoice_obj.search(
150
150
            cr, uid,
151
151
            invoice_domain + [
152
 
                ('address_invoice_id.country_id.intrastat', '=', True)],
 
152
                ('partner_id.country_id.intrastat', '=', True)],
153
153
            context=context)
154
154
        invoice_line_ids = invoice_line_obj.search(
155
155
            cr, uid, [('invoice_id', 'in', invoice_ids)], context=context)
162
162
                for tax in line.invoice_line_tax_id):
163
163
                continue           
164
164
            localcontext['date'] = line.invoice_id.date_invoice
165
 
            if line.invoice_id.partner_id.id not in partner_amounts_map:
166
 
                partner_amounts_map[line.invoice_id.partner_id.id] = {
 
165
            commercial_partner_id = line.invoice_id.partner_id.commercial_partner_id.id
 
166
            if commercial_partner_id not in partner_amounts_map:
 
167
                partner_amounts_map[commercial_partner_id] = {
167
168
                    'amount_product': 0.0,
168
169
                    'amount_service': 0.0,
169
170
                    }
170
 
            amounts = partner_amounts_map[line.invoice_id.partner_id.id]
 
171
            amounts = partner_amounts_map[commercial_partner_id]
171
172
            if line.product_id and (
172
173
                line.product_id.type == 'service'
173
174
                or line.product_id.is_accessory_cost):