Merge branch '7653-newly-opened-shelf-removed-from-local-storage-when-loading-shelfs-page' into 'migration-v12'

to avoid unwanted deletion of local storage (by false detection of changed local…

See merge request !281

to avoid unwanted deletion of local storage (by false detection of changed local storage) in shelf inventory app, make sure dates have same format before comparing them

in brinks pos export, use p['journal'] instead of non-informative p['name'] (since v12) to categorize pos session payment method lines and add non_categorisable column so that errors are visible

This reverts commit f89645c8.

Merge branch '6813-marking-parent-gone-when-unpairing-binom-does-not-unsuscribe-parent-from-shift-template' into 'migration-v12'

unsubscribe parent from shift template before marking them gone during binom unpairing process

See merge request !279

in shelfs inventory page, fix empty value in column Debut inventaire en cours (bug introduced after v12 port)

prevent adding shift in a period of time where member benefits from a exempting leave, from member space

prevent cancelling makeup from borne d'accueil in connected mode as point decrementation does not work and therefore leads to bugs

fix bug preventing salarie from validating new member created as suppleant (+ fix default country ID)

really pass shift_type with proper format to create_coop_shift_subscription (where is bug actually is)

This reverts commit 9104a788.

Merge branch 'migration-v12' of ssh://gl.cooperatic.fr:4321/cooperatic-foodcoops/third-party into migration-v12

hide warning "deletion of this shift is a makeup this action will add a point" if line is not a makeup

in js update members makeup method, fix a bug by not updating makeups_to_do global js variable unless request is successful