Skip to content

T
third-party
Commit 378308c6 by François C.
Options

Add MonA paiement to pos export

parent 5cdce3aa
dev_cooperatic … #5673_bug_calendrier_echange_service 4081 4444_improve_presence_recording 4709 4778-reception-dont-get-finished-orders 4809-remove-shelf-value-col-to-reduce-server-load 4880-rapports-reception-faux 4950-douchage-appli-reception 5474-et-5462-Voir-les-rattrapages-choisis-dans-admin-bdm-et-corrige-lenteur-affichage-admin-rattrapages 5641-reception-trier-a-la-maj-prix-dans-ordre-de-pointage-quantites 6286_bug_encaissement_souscription_cheque_espece 6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template 6832--certaines-absences-engendrent-une-erreur 7723-7559-change-purchase-order-workflow-django-side 7731-third-party-side-brinks-pos-export-not-working 7747-inventaire-par-article 7800-make-test-solution-work 7819-prevent-adding-product-already-in-order 7848-cannot-validate-qty-with-decimal-on-kg-product 7918_bug_quantites_stade_demande_prix adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823-the-true-one migration-v12-tag lacagette_20240310_074751 lacagette_20240107_122554 lacagette_20240107_120916 graoucoop_20240609_122614 cagette_testtag cagette-230814 cagette-230630
2 merge requests!219Add MonA paiement to pos export,!218Ticket 4292
Pipeline #2594 failed with stage
in 1 minute 59 seconds
Showing with 10 additions and 5 deletions
outils/views.py
...@@ -195,9 +195,10 @@ class ExportPOS(View): ...@@ -195,9 +195,10 @@ class ExportPOS(View):
'CHQ': 0, 'CHQ': 0,
'CB_DEJ': 0, 'CB_DEJ': 0,
'CHQ_DEJ': 0, 'CHQ_DEJ': 0,
'MonA': 0,
'TOTAL': 0} 'TOTAL': 0}
sub_total = 0 sub_total = 0
cb = chq = csh = cbd = chqd = 0 cb = chq = csh = cbd = chqd = mona = 0
for p in s['payments']: for p in s['payments']:
# p['name'] is a sequence generated string # p['name'] is a sequence generated string
# Test order is important as CHEQDEJ contains CHEQ for ex. # Test order is important as CHEQDEJ contains CHEQ for ex.
...@@ -213,28 +214,32 @@ class ExportPOS(View): ...@@ -213,28 +214,32 @@ class ExportPOS(View):
cbd = sub_amount cbd = sub_amount
elif 'CB' in p['name']: elif 'CB' in p['name']:
cb = sub_amount cb = sub_amount
elif 'MonA' in p['name']:
mona = 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
totals[key]['CHQ'] += chq totals[key]['CHQ'] += chq
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]['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, sub_total]) cb, csh, chq, cbd, chqd, mona, 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', 'Total']) ws1.append(['date', 'CB', 'CSH', 'CHQ', 'CB_DEJ', 'CHQ_DEJ', 'MonA', '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']
chq = totals[day]['CHQ'] chq = totals[day]['CHQ']
cbd = totals[day]['CB_DEJ'] cbd = totals[day]['CB_DEJ']
chqd = totals[day]['CHQ_DEJ'] chqd = totals[day]['CHQ_DEJ']
mona = totals[day]['MonA']
total = totals[day]['TOTAL'] total = totals[day]['TOTAL']
ws1.append([day, cb, csh, chq, cbd, chqd, total]) ws1.append([day, cb, csh, chq, cbd, chqd, mona, total])
ws2.append(['mois', 'min_date', 'max_date', 'Caisse', 'session', 'CB', 'CSH','CHQ', 'CB_DEJ', 'CHQ_DEJ', 'total']) ws2.append(['mois', 'min_date', 'max_date', 'Caisse', 'session', 'CB', 'CSH','CHQ', 'CB_DEJ', 'CHQ_DEJ', 'MonA', '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