← Back to branch summary

~unifield-team/unifield-wm/wm-2418-rw-fix

« back to all changes in this revision

Viewing changes to consumption_calculation/consumption_calculation.py

  • Committer: pierre-marie
  • Date: 2012-07-25 15:04:47 UTC
  • mfrom: (1038 unifield-wm)
  • mto: This revision was merged to the branch mainline in revision 1059.
  • Revision ID: pierre-marie@pierre-marie-laptop-20120725150447-namc1a6lqi455ez2
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
consumption_calculation/consumption_calculation.py
265
265
        
266
266
        outfile = TemporaryFile('w+')
267
267
        writer = csv.writer(outfile, quotechar='"', delimiter=',')
268
 
        writer.writerow(['Product reference', 'Product name', 'Product UoM', 'Batch Number', 'Expiry Date', 'Consumed Qty', 'Remark'])
 
268
        writer.writerow(['Product Code', 'Product Description', 'Product UoM', 'Batch Number', 'Expiry Date', 'Consumed Qty', 'Remark'])
269
269
        
270
270
        for line in rac.line_ids:
271
271
            writer.writerow([line.product_id.default_code and line.product_id.default_code.encode('utf-8'), line.product_id.name and line.product_id.name.encode('utf-8'), line.uom_id.name and line.uom_id.name.encode('utf-8'), line.prodlot_id and line.prodlot_id.name.encode('utf-8') or '', line.expiry_date and strptime(line.expiry_date,'%Y-%m-%d').strftime('%d/%m/%Y') or '',line.consumed_qty, line.remark and line.remark.encode('utf-8') or ''])
678
678
        
679
679
        outfile = TemporaryFile('w+')
680
680
        writer = csv.writer(outfile, quotechar='"', delimiter=',')
681
 
        writer.writerow(['Product reference', 'Product name', 'AMC', 'FMC', 'Valid until'])
 
681
        writer.writerow(['Product Code', 'Product Description', 'AMC', 'FMC', 'Valid until'])
682
682
        
683
683
        for line in fmc.line_ids:
684
684
            writer.writerow([line.name.default_code and line.name.default_code.encode('utf-8'), line.name.name and line.name.name.encode('utf-8'), line.amc, line.fmc, line.valid_until or ''])