Skip to content

T
third-party
Commit 2c4b1bed by François C.
Options

Merge branch 'ticket_0821' into 'dev_principale' 

ticket_821 - Arréter d'imprimer automatiquement les étiquettes rayon des fruits et legumes

See merge request !15
parents 545658d7 d7726103
dev_cooperatic … #5673_bug_calendrier_echange_service 3832-makeups-and-member-status-update 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 7848-cannot-validate-qty-with-decimal-on-kg-product adaptation_supercafoutch adaptation_supercoop adaptation_supercoop_supercafoutch adpatation_chouette assistance_import_article coop_dev_necessitant_modules_bdm_odoo_modifies correctif_nb_rattrapages_creation_binome_avec_ajout_automatique_au_point_negatif dev_lgds dev_principale dev_principale_clean docker export_capital_detenu fix_bug_process_picking fusion_custom_graoucoop graoucoop_backup graoucoop_prod graoucoop_tmp hot_fix_shelf_labels_auto_print howto impression_etiquettes_rayons integration_lien_precommandes_dans_espace_membre lacagette_prod local_branch master meal-voucher-and-label-printer-software-bug migration-v12 pour_graoucoop_prod pour_version_prod_cagette refonte_espace_membre_sc retouches_tickets_supercoop sc-setup-stock-app supercafoutch-preprod supercafoutch-prod-20221003 supercafoutch_prod ticket_4146 20210701 20210603 supercafoutch_20250120_151258 supercafoutch_20250120_150340 supercafoutch_20240909_080630 supercafoutch_20240609_115709 supercafoutch_20240212_082431 supercafoutch_20240107_181851 supercafoutch_prod_until_240107 supercafoutch-prod-20221003 supercafoutch-230911 supercafoutch-230824 supercafoutch-230823 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
1 merge request!24Cooperatic and LGDS improvements
Pipeline #950 passed with stage
in 21 seconds
Showing with 105 additions and 96 deletions
reception/views.py
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
from outils.common_imports import * from outils.common_imports import *
from outils.for_view_imports import * from outils.for_view_imports import *
from django.views.generic import View from django.views.generic import View
from django.http import HttpResponse
from django.http import JsonResponse
import os import os
from datetime import date from datetime import date
...@@ -14,6 +16,9 @@ from outils.common import OdooAPI ...@@ -14,6 +16,9 @@ from outils.common import OdooAPI
from members.models import CagetteUser from members.models import CagetteUser
from products.models import CagetteProduct from products.models import CagetteProduct
# create temp directory if needed
if not os.path.exists("temp"):
os.mkdir("temp")
def as_text(value): def as_text(value):
""" Utils """ """ Utils """
...@@ -135,7 +140,7 @@ def save_order_group(request): ...@@ -135,7 +140,7 @@ def save_order_group(request):
order_ids = json.loads(request.body.decode()) order_ids = json.loads(request.body.decode())
try: try:
try: try:
# Check if any of the orders attempted to be grouped is already in a group # Check if any of the orders attempted to be grouped is already in a group
with open('temp/grouped_order.json', 'r') as json_file: with open('temp/grouped_order.json', 'r') as json_file:
saved_groups = json.load(json_file) saved_groups = json.load(json_file)
...@@ -165,6 +170,9 @@ def update_orders(request): ...@@ -165,6 +170,9 @@ def update_orders(request):
import requests import requests
# don't print barcode which begin with these codes
noprint_list = ["0493", "0492", "0499"]
rep = HttpResponse("Not") rep = HttpResponse("Not")
if request.is_ajax(): if request.is_ajax():
if request.method == 'PUT': if request.method == 'PUT':
...@@ -212,8 +220,8 @@ def update_orders(request): ...@@ -212,8 +220,8 @@ def update_orders(request):
except Exception as e: except Exception as e:
errors.append('error registering shortage on p'+order_line['id']+':'+str(e)) errors.append('error registering shortage on p'+order_line['id']+':'+str(e))
# Print etiquette with new price if update if successful # Print etiquette with new price if update if successful and barcode is authorized
if (print_labels is True) and (update is True) and (data['update_type'] == 'br_valid') and order_line['new_shelf_price']: if (print_labels is True) and (update is True) and (data['update_type'] == 'br_valid') and order_line['new_shelf_price'] and order_line['barcode'][:4] not in noprint_list:
try: try:
tools_url = settings.TOOLS_SERVER + '/products/label_print/' tools_url = settings.TOOLS_SERVER + '/products/label_print/'
tools_url += str(order_line['product_tmpl_id']) + '/' tools_url += str(order_line['product_tmpl_id']) + '/'
...@@ -235,17 +243,18 @@ def update_orders(request): ...@@ -235,17 +243,18 @@ def update_orders(request):
# Remove order's group # Remove order's group
try: try:
with open('temp/grouped_order.json', 'r') as json_file: if os.path.exists('temp/grouped_order.json'):
saved_groups = json.load(json_file) with open('temp/grouped_order.json', 'r') as json_file:
saved_groups = json.load(json_file)
for oi in order_ids:
for i, group in enumerate(saved_groups): for oi in order_ids:
if oi in group: for i, group in enumerate(saved_groups):
saved_groups.pop(i) if oi in group:
break saved_groups.pop(i)
break
with open('temp/grouped_order.json', 'w') as json_file:
json.dump(saved_groups, json_file) with open('temp/grouped_order.json', 'w') as json_file:
json.dump(saved_groups, json_file)
except Exception as e: except Exception as e:
# no saved groups # no saved groups
print(str(e)) print(str(e))
...@@ -292,6 +301,7 @@ def save_error_report(request): ...@@ -292,6 +301,7 @@ def save_error_report(request):
orders_partner = orders_partner + ', ' orders_partner = orders_partner + ', '
orders_partner = orders_partner + order['partner'] + ' du ' + order['date_order'] orders_partner = orders_partner + order['partner'] + ' du ' + order['date_order']
# If group of orders # If group of orders
if len(data['orders']) > 1 : if len(data['orders']) > 1 :
temp_group_file_name = "temp/" + orders_name + "_rapport-reception_temp.xlsx" temp_group_file_name = "temp/" + orders_name + "_rapport-reception_temp.xlsx"
...@@ -309,6 +319,7 @@ def save_error_report(request): ...@@ -309,6 +319,7 @@ def save_error_report(request):
data['orders'].append(group_order) data['orders'].append(group_order)
# Save qties & comments after step 1 # Save qties & comments after step 1
if data['update_type'] == 'qty_valid': if data['update_type'] == 'qty_valid':
for order in data['orders']: for order in data['orders']:
...@@ -328,33 +339,32 @@ def save_error_report(request): ...@@ -328,33 +339,32 @@ def save_error_report(request):
# If in group add group name # If in group add group name
if len(data['orders']) > 1 : if len(data['orders']) > 1 :
ws.append( ['group', orders_name] ) ws.append( ['group', orders_name] )
try: try:
for product in order['updated_products']: if 'updated_products' in order:
# Don't store products with same qties for product in order['updated_products']:
if product['old_qty'] != product['product_qty']: # Don't store products with same qties
if 'supplier_code' in product: if product['old_qty'] != product['product_qty']:
supplier_code = str(product['supplier_code']) if 'supplier_code' in product:
else: supplier_code = str(product['supplier_code'])
supplier_code = 'X' else:
supplier_code = 'X'
if 'supplier_shortage' in product:
supplier_shortage = '/!\ Rupture fournisseur' if 'supplier_shortage' in product:
else: supplier_shortage = '/!\ Rupture fournisseur'
supplier_shortage = '' else:
supplier_shortage = ''
ws.append( ['produit',
product['product_id'][1], ws.append( ['produit',
supplier_code, product['product_id'][1],
str(product['barcode']), supplier_code,
product['old_qty'], str(product['barcode']),
product['product_qty'], product['old_qty'],
product['price_unit'], product['product_qty'],
supplier_shortage] ) product['price_unit'],
except: supplier_shortage] )
# no updated products, do nothing except Exception as exp:
pass print("Error while updating products")
print(exp)
if ('user_comments' in data) and data['user_comments'] != "": if ('user_comments' in data) and data['user_comments'] != "":
ws.append( ['commentaire', data['user_comments']] ) ws.append( ['commentaire', data['user_comments']] )
else: else:
...@@ -363,6 +373,8 @@ def save_error_report(request): ...@@ -363,6 +373,8 @@ def save_error_report(request):
# Save file # Save file
wb.save(filename=order['temp_file_name']) wb.save(filename=order['temp_file_name'])
# Create report with data from steps 1 & 2 # Create report with data from steps 1 & 2
else: else:
for order in data['orders']: for order in data['orders']:
...@@ -397,7 +409,6 @@ def save_error_report(request): ...@@ -397,7 +409,6 @@ def save_error_report(request):
os.remove(order['temp_file_name']) os.remove(order['temp_file_name'])
except: except:
data_comment_s1 = "Rapport de la première étape absent !" data_comment_s1 = "Rapport de la première étape absent !"
# Add data from step 2 # Add data from step 2
data_full = [] data_full = []
error_total = 0 error_total = 0
...@@ -409,54 +420,55 @@ def save_error_report(request): ...@@ -409,54 +420,55 @@ def save_error_report(request):
# Concatenate products info from each step # Concatenate products info from each step
try: try:
for product in order['updated_products']: if "updated_products" in order:
if 'supplier_code' in product: for product in order['updated_products']:
supplier_code = str(product['supplier_code']) if 'supplier_code' in product:
else: supplier_code = str(product['supplier_code'])
supplier_code = 'X' else:
supplier_code = 'X'
if 'supplier_shortage' in product:
supplier_shortage = '/!\ Rupture fournisseur' if 'supplier_shortage' in product:
else: supplier_shortage = '/!\ Rupture fournisseur'
supplier_shortage = '' else:
supplier_shortage = ''
item = {
'product_id': product['product_id'][1], item = {
'product_supplier_code': supplier_code, 'product_id': product['product_id'][1],
'product_barcode': product['barcode'], 'product_supplier_code': supplier_code,
'old_price_unit': float(product['old_price_unit']), 'product_barcode': product['barcode'],
'price_unit': float(product['price_unit']), 'old_price_unit': float(product['old_price_unit']),
'supplier_shortage': supplier_shortage 'price_unit': float(product['price_unit']),
} 'supplier_shortage': supplier_shortage
}
# If the product was also modified in step 1
if item['product_id'] in data_qties:
item['old_qty'] = float(data_qties[item['product_id']]['old_qty'])
item['product_qty'] = float(data_qties[item['product_id']]['product_qty'])
item['expected_amount'] = item['old_qty']*item['old_price_unit']
item['error_line'] = (item['old_qty'] - item['product_qty'])*item['price_unit']
# If product was set on supplier shortage in step 1 and not in step 2
if item['supplier_shortage'] == '' and data_qties[item['product_id']]['supplier_shortage'] != '':
item['supplier_shortage'] = data_qties[item['product_id']]['supplier_shortage']
data_qties.pop(item['product_id'])
else:
item['old_qty'] = float(product['product_qty'])
item['product_qty'] = item['old_qty']
item['expected_amount'] = item['old_qty']*item['old_price_unit']
item['error_line'] = 0
if (item['price_unit'] != item['old_price_unit']):
item['error_line'] = (item['price_unit'] - item['old_price_unit']) * item['product_qty']
error_total += item['error_line']
error_total_abs += abs(item['error_line'])
data_full.append(item)
except:
# no updated products, do nothing
pass
# If the product was also modified in step 1
if item['product_id'] in data_qties:
item['old_qty'] = float(data_qties[item['product_id']]['old_qty'])
item['product_qty'] = float(data_qties[item['product_id']]['product_qty'])
item['expected_amount'] = item['old_qty']*item['old_price_unit']
item['error_line'] = (item['old_qty'] - item['product_qty'])*item['price_unit']
# If product was set on supplier shortage in step 1 and not in step 2
if item['supplier_shortage'] == '' and data_qties[item['product_id']]['supplier_shortage'] != '':
item['supplier_shortage'] = data_qties[item['product_id']]['supplier_shortage']
data_qties.pop(item['product_id'])
else:
item['old_qty'] = float(product['product_qty'])
item['product_qty'] = item['old_qty']
item['expected_amount'] = item['old_qty']*item['old_price_unit']
item['error_line'] = 0
if (item['price_unit'] != item['old_price_unit']):
item['error_line'] = (item['price_unit'] - item['old_price_unit']) * item['product_qty']
error_total += item['error_line']
error_total_abs += abs(item['error_line'])
data_full.append(item)
except Exception as exp:
# no updated products, do nothing
print("Error while updating products")
print(exp)
# Add remaining products, the ones edited only in step 1 # Add remaining products, the ones edited only in step 1
for product in data_qties.values(): for product in data_qties.values():
item = { item = {
...@@ -486,7 +498,6 @@ def save_error_report(request): ...@@ -486,7 +498,6 @@ def save_error_report(request):
wb = Workbook() wb = Workbook()
ws = wb.active ws = wb.active
ws.title = "Commande " + order['name'] ws.title = "Commande " + order['name']
# Group # Group
if 'group_ids' in order : if 'group_ids' in order :
ws.append( ['Rapport de réception d\'un groupe de commandes'] ) ws.append( ['Rapport de réception d\'un groupe de commandes'] )
...@@ -528,7 +539,6 @@ def save_error_report(request): ...@@ -528,7 +539,6 @@ def save_error_report(request):
round(product['expected_amount'], 2), round(product['expected_amount'], 2),
round(product['error_line'], 2), round(product['error_line'], 2),
product['supplier_shortage']] ) product['supplier_shortage']] )
ws.append( [] ) ws.append( [] )
ws.append( ['Montant total de l\'erreur :', '', '', '', '', '', '', '', round(error_total, 2)] ) ws.append( ['Montant total de l\'erreur :', '', '', '', '', '', '', '', round(error_total, 2)] )
ws.append( ['Montant total en valeur absolue :', '', '', '', '', '', '', '', round(error_total_abs, 2)] ) ws.append( ['Montant total en valeur absolue :', '', '', '', '', '', '', '', round(error_total_abs, 2)] )
...@@ -563,7 +573,6 @@ def save_error_report(request): ...@@ -563,7 +573,6 @@ def save_error_report(request):
top_left_cell.alignment = Alignment(vertical="top") top_left_cell.alignment = Alignment(vertical="top")
top_left_cell = ws['B'+str(merge_begin)] top_left_cell = ws['B'+str(merge_begin)]
top_left_cell.alignment = Alignment(vertical="top") top_left_cell.alignment = Alignment(vertical="top")
# "Auto fit" columns width to content # "Auto fit" columns width to content
for column_cells in ws.columns: for column_cells in ws.columns:
length = max(len(as_text(cell.value)) for cell in column_cells) length = max(len(as_text(cell.value)) for cell in column_cells)
...@@ -572,23 +581,23 @@ def save_error_report(request): ...@@ -572,23 +581,23 @@ def save_error_report(request):
length = 20 length = 20
ws.column_dimensions[column_cells[3].column_letter].width = length ws.column_dimensions[column_cells[3].column_letter].width = length
# Save file # Save file
fileName = "temp/" + order['name'] + "_rapport-reception.xlsx" fileName = "temp/" + order['name'] + "_rapport-reception.xlsx"
wb.save(filename=fileName) try:
wb.save(filename=fileName)
except Exception as exp:
print("Error while saving file %s"%fileName)
print(str(exp))
#Attach file to order #Attach file to order
if 'group_ids' in order : # group report if 'group_ids' in order : # group report
# Attach group report to each order # Attach group report to each order
for group_item_id in order['group_ids'] : for group_item_id in order['group_ids'] :
m = CagetteReception(group_item_id) m = CagetteReception(group_item_id)
m.attach_file(fileName, False) m.attach_file(fileName, False)
os.remove(fileName) os.remove(fileName)
else: else:
m = CagetteReception(order['id']) m = CagetteReception(order['id'])
m.attach_file(fileName) m.attach_file(fileName)
return JsonResponse("ok", safe=False) return JsonResponse("ok", safe=False)
def reception_FAQ(request): def reception_FAQ(request):
......
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