[Dolibarr-git] [Dolibarr/dolibarr] c45b19: FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set...

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c45b191330951781f18b5fcee91fae7b5a0755f9
      
https://github.com/Dolibarr/dolibarr/commit/c45b191330951781f18b5fcee91fae7b5a0755f9
  Author: atm-florian.m <address@hidden>
  Date:   2019-07-01 (Mon, 01 Jul 2019)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set, deleting a "closed" 
shipment now increases stock as expected


  Commit: 64d1ebf59cd6ee27117cca10fc552257d0e17ea4
      
https://github.com/Dolibarr/dolibarr/commit/64d1ebf59cd6ee27117cca10fc552257d0e17ea4
  Author: atm-florian.m <address@hidden>
  Date:   2019-07-04 (Thu, 04 Jul 2019)

  Changed paths:
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/fr_FR/sendings.lang

  Log Message:
  -----------
  FIX: on shipment delete confirm dialog, a new checkbox allows the user to 
choose if they want their stock re-incremented after the deletion.


  Commit: 8030735ded5f9acd0531fc581c7cd987438ebd5e
      
https://github.com/Dolibarr/dolibarr/commit/8030735ded5f9acd0531fc581c7cd987438ebd5e
  Author: atm-florian.m <address@hidden>
  Date:   2019-07-04 (Thu, 04 Jul 2019)

  Changed paths:
    M ChangeLog
    M build/generate_filelist_xml.php
    M build/makepack-dolibarr.pl
    M htdocs/adherents/class/adherent.class.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/extrafieldsinexport.inc.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/tpl/massactions_pre.tpl.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expensereport/card.php
    M htdocs/fichinter/list.php
    M htdocs/filefunc.inc.php
    M htdocs/holiday/card.php
    M htdocs/langs/fr_FR/sendings.lang

  Log Message:
  -----------
  Merge branch 
'FIX_add_checkbox_on_shipment_delete_confirm_dialog_to_ask_if_stock_should_be_incremented'
 into 
FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set
(taking PR comments into account)


  Commit: 4f0316580672122e1154c148935d5e17264ad433
      
https://github.com/Dolibarr/dolibarr/commit/4f0316580672122e1154c148935d5e17264ad433
  Author: atm-florian.m <address@hidden>
  Date:   2019-07-11 (Thu, 11 Jul 2019)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  FIX: outdated phpdoc


  Commit: 917799914e6f04316a57dbe8d0bae7e7e0f6fbcb
      
https://github.com/Dolibarr/dolibarr/commit/917799914e6f04316a57dbe8d0bae7e7e0f6fbcb
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-07-16 (Tue, 16 Jul 2019)

  Changed paths:
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/fr_FR/sendings.lang

  Log Message:
  -----------
  Merge pull request #11433 from 
atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set

FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE 
is set


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f285bed2ff1f...917799914e6f