← Back to branch summary

~openbig/bigconsulting/milestone1

« back to all changes in this revision

Viewing changes to account_invoice_cash_discount/account_invoice_cash_discount.py

  • Committer: gpa
  • Date: 2010-07-26 12:24:39 UTC
  • Revision ID: gpa@tinyerp.com-20100726122439-46wdkoxt1krmrk4x
added message in the milestone1 on partial payment and full paymentn

Show diffs side-by-side

added added

removed removed

Lines of Context:
account_invoice_cash_discount/account_invoice_cash_discount.py
112
112
                                    res = resudial_amonut
113
113
                            amount = res
114
114
                        dis = payment_line.days
 
115
        else:
 
116
            amount = resudial_amonut
115
117
                        
116
118
        return {'amount':amount,'tol_days':tol_days,'found':payment_line_found}
117
119
     
341
343
        if 'discount_move_ids' in context and context['discount_move_ids']: 
342
344
            move_line = context['discount_move_ids']
343
345
            for move_line_id in move_line:
344
 
                move_line_data = move_line_obj_memory.browse(cr, uid,move_line_id)
 
346
                move_line_data = move_line_obj_memory.browse(cr, uid, move_line_id)
345
347
                l4 = {
346
348
                        'debit': move_line_data.debit,
347
349
                        'credit':move_line_data.credit,
359
361
 
360
362
        else:
361
363
            if amount_discount>0:
 
364
                account_id = False
362
365
                if 'account_id' in context and context['account_id']:
363
 
                    account_id = context['account_id']  
364
 
                if tax_total_amount>0:
365
 
                    amount_discount = (amount_discount - tax_total_amount)
366
 
                else:
367
 
                    amount_discount = amount_discount
368
 
                l4 = {
369
 
                    'debit': direction * amount_discount<0 and - direction * amount_discount,
370
 
                    'credit': direction * amount_discount>0 and  direction * amount_discount,
371
 
                    'account_id': account_id,
372
 
                    'partner_id': invoice.partner_id.id,
373
 
                    'ref':ref,
374
 
                    'date': date,
375
 
                    'currency_id':currency_id,
376
 
                    'amount_currency':amount_currency and direction * amount_currency or 0.0,
377
 
                }
378
 
                l4['name'] = name
379
 
                lines.append((0, 0, l4))
380
 
        
 
366
                    account_id = context['account_id']
 
367
#                if tax_total_amount>0:
 
368
#                    amount_discount = (amount_discount - tax_total_amount)
 
369
#                else:
 
370
#                    amount_discount = amount_discount
 
371
                for line in invoice.invoice_line:
 
372
                    line_tax_amount = 0.0
 
373
                    tax_amount = 0.0
 
374
                    discount = 0.0
 
375
                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, line.price_subtotal, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
 
376
                        line_tax_amount = tax['amount']
 
377
    
 
378
                    line_total = line.price_subtotal + line_tax_amount
 
379
                    invoice_res_amount = invoice.amount_total
 
380
                    line_ratio = line_total / invoice_res_amount
 
381
                    
 
382
                    discount = amount_discount * line_ratio
 
383
                    
 
384
                    for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, amount_discount, line.quantity, invoice.address_invoice_id.id, line.product_id, invoice.partner_id):    
 
385
                        tax_amount = tax['amount']
 
386
                    
 
387
                    l4 = {
 
388
                        'debit': direction * (discount - tax_amount)<0 and - direction * (discount - tax_amount),
 
389
                        'credit': direction * (discount - tax_amount)>0 and  direction * (discount - tax_amount),
 
390
                        'account_id': account_id,
 
391
                        'partner_id': invoice.partner_id.id,
 
392
                        'ref':ref,
 
393
                        'date': date,
 
394
                        'currency_id':currency_id,
 
395
                        'amount_currency':amount_currency and direction * amount_currency or 0.0,
 
396
                    }
 
397
                    l4['name'] = name
 
398
                    lines.append((0, 0, l4))
 
399
                    
381
400
        move = {'ref': ref, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
382
401
        move_id = move_obj.create(cr, uid, move, context=context)
383
402
        
402
421
    
403
422
account_invoice()
404
423
 
 
424
class account_bank_statement_reconcile(osv.osv):
 
425
    _inherit='account.bank.statement.reconcile'
 
426
    def name_get(self, cursor, user, ids, context=None):
 
427
        res = []
 
428
        res = super(account_bank_statement_reconcile, self).name_get(cursor, user, ids, context)   
 
429
        for o in self.browse(cursor, user, ids, context=context):
 
430
            data = res[0][1]  + o.name
 
431
            res.append((o.id,data))
 
432
        return res
 
433
account_bank_statement_reconcile()    
 
434
 
405
435
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
406
436