Skip to content

T
third-party
Commit 70ac02d7 by François C.
Options

Merge branch '7731-third-party-side-brinks-pos-export-not-working' into migration-v12

parents 987c1533 45a8e720
Pipeline #4148 failed with stage
Showing with 22 additions and 14 deletions
outils/views.py
...@@ -199,27 +199,33 @@ class ExportPOS(View): ...@@ -199,27 +199,33 @@ class ExportPOS(View):
'CB_DEJ': 0, 'CB_DEJ': 0,
'CHQ_DEJ': 0, 'CHQ_DEJ': 0,
'MonA': 0, 'MonA': 0,
'NON_CATEGORISABLE': 0,
'TOTAL': 0} 'TOTAL': 0}
sub_total = 0 sub_total = 0
cb = chq = csh = cbd = chqd = mona = 0 cb = chq = csh = cbd = chqd = mona = nocat = 0
coop_logger.info("payments : %s", s['payments']) coop_logger.info("payments : %s", s['payments'])
for p in s['payments']: for p in s['payments']:
# p['name'] is a sequence generated string # p['name'] does not contain information about payment method
# Test order is important as CHEQDEJ contains CHEQ for ex. # therefore, we use p['journal'], despite it's risky because
# p['journal'] could be used but easier to change in Odoo interface # it's easy to change in Odoo interface
# adding NON_CATEGORISABLE column allows at least to show potential errors
# Test order is important.
sub_amount = round(float(p['total_amount']), 2) if p['total_amount'] else 0.00 sub_amount = round(float(p['total_amount']), 2) if p['total_amount'] else 0.00
if 'CSH' in p['name']: if 'Espèces' in p['journal']:
csh = sub_amount csh = sub_amount
elif 'CHEQDEJ' in p['name']: elif 'Chèques Déj' in p['journal']:
chqd = sub_amount chqd = sub_amount
elif 'CHEQ' in p['name']: elif 'Chèques' in p['journal']:
chq = sub_amount chq = sub_amount
elif 'CBDEJ' in p['name']: elif 'CB Déj' in p['journal']:
cbd = sub_amount cbd = sub_amount
elif 'CB' in p['name']: #for CB, first is v9 syntax used for la cagette and second is v12 syntax used for la cagette
elif 'Carte Bancaire' in p['journal'] or 'Cartes bancaires' in p['journal']:
cb = sub_amount cb = sub_amount
elif 'MonA' in p['name'] or 'MonA' in p['journal']: elif 'MonA' in p['journal']:
mona = sub_amount mona = sub_amount
else:
nocat = sub_amount
sub_total += sub_amount sub_total += sub_amount
totals[key]['CB'] += cb totals[key]['CB'] += cb
totals[key]['CSH'] += csh totals[key]['CSH'] += csh
...@@ -227,13 +233,14 @@ class ExportPOS(View): ...@@ -227,13 +233,14 @@ class ExportPOS(View):
totals[key]['CB_DEJ'] += cbd totals[key]['CB_DEJ'] += cbd
totals[key]['CHQ_DEJ'] += chqd totals[key]['CHQ_DEJ'] += chqd
totals[key]['MonA'] += mona totals[key]['MonA'] += mona
totals[key]['NON_CATEGORISABLE'] += nocat
totals[key]['TOTAL'] += round(sub_total, 2) totals[key]['TOTAL'] += round(sub_total, 2)
details_lines.append([mois, s['mm_dates']['min'], s['mm_dates']['max'], s['caisse'], s['name'], details_lines.append([mois, s['mm_dates']['min'], s['mm_dates']['max'], s['caisse'], s['name'],
cb, csh, chq, cbd, chqd, mona, sub_total]) cb, csh, chq, cbd, chqd, mona, nocat, sub_total])
wb = Workbook() wb = Workbook()
ws1 = wb.create_sheet("Totaux " + mois, 0) ws1 = wb.create_sheet("Totaux " + mois, 0)
ws2 = wb.create_sheet("Détails " + mois, 1) ws2 = wb.create_sheet("Détails " + mois, 1)
ws1.append(['date', 'CB', 'CSH', 'CHQ', 'CB_DEJ', 'CHQ_DEJ', 'MonA', 'Total']) ws1.append(['date', 'CB', 'CSH', 'CHQ', 'CB_DEJ', 'CHQ_DEJ', 'MonA', 'NON_CATEGORISABLE', 'Total'])
for day in sorted(totals): for day in sorted(totals):
cb = totals[day]['CB'] cb = totals[day]['CB']
csh = totals[day]['CSH'] csh = totals[day]['CSH']
...@@ -241,9 +248,10 @@ class ExportPOS(View): ...@@ -241,9 +248,10 @@ class ExportPOS(View):
cbd = totals[day]['CB_DEJ'] cbd = totals[day]['CB_DEJ']
chqd = totals[day]['CHQ_DEJ'] chqd = totals[day]['CHQ_DEJ']
mona = totals[day]['MonA'] mona = totals[day]['MonA']
nocat = totals[day]['NON_CATEGORISABLE']
total = totals[day]['TOTAL'] total = totals[day]['TOTAL']
ws1.append([day, cb, csh, chq, cbd, chqd, mona, total]) ws1.append([day, cb, csh, chq, cbd, chqd, mona, nocat, total])
ws2.append(['mois', 'min_date', 'max_date', 'Caisse', 'session', 'CB', 'CSH','CHQ', 'CB_DEJ', 'CHQ_DEJ', 'MonA', 'total']) ws2.append(['mois', 'min_date', 'max_date', 'Caisse', 'session', 'CB', 'CSH','CHQ', 'CB_DEJ', 'CHQ_DEJ', 'MonA', 'NON_CATEGORISABLE', 'total'])
for row in details_lines: for row in details_lines:
ws2.append(row) ws2.append(row)
wb_name = 'export_sessions__' + mois + '.xlsx' wb_name = 'export_sessions__' + mois + '.xlsx'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment