# Conflicts:
#   members/static/js/admin/manage_makeups.js

admin makups, display shift type in column

See merge request !250

fix added columns in export comptable by removing semicolons if found in coop name

See merge request !247

This reverts merge request !244

add btn and trigger visibility and computation of shelf_value on click

See merge request !243

meet new specs for normal barcodes while keeping existing special barcode logic

See merge request !244

detect odoo api not initialized so that po_in_process is deleted

See merge request !245

Merge branch '5021-reset-makeups-to-do-when-changing-from-std-to-non-std-shift' into 'dev_cooperatic'

extract method, create method to simulate bdm lowering all makeups_to_do and…

See merge request !237

fix exception

See merge request !241

Revert "Revert "Hot fix : start shelf labels auto print only is RECEPTION_SHELF_LABEL_PRINT set to TRUE""

This reverts commit 7556d561.

This reverts commit 535002df.

sales: fix limited number of export lines

See merge request !240

Sc setup stock app

See merge request !238

This reverts commit a60fe1ad.

This reverts commit fb9b7349.

This reverts commit e5fa1b8c.

make meal_voucher module compatible with old version of logiciel impression etiquettes produits

See merge request !232

add losses and autoconso ids to set stock_picking location_dest (stock_location) and picking_type (stock_picking_type)

extract method, create method to simulate bdm lowering all makeups_to_do and update display with updated nbr of makeups

template_created must be set to false to fully transform the shift registration…

See merge request !236