[Dolibarr-git] [Dolibarr/dolibarr] 536e99: fix regex main.inc.php fatal

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 536e99e3c9e3156db98e825384d4793488d9fa84
      
https://github.com/Dolibarr/dolibarr/commit/536e99e3c9e3156db98e825384d4793488d9fa84
  Author: florian HENRY <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  fix regex main.inc.php fatal


  Commit: 3b555797d1e36b0d8a17f93d1cc701c843537df9
      
https://github.com/Dolibarr/dolibarr/commit/3b555797d1e36b0d8a17f93d1cc701c843537df9
  Author: florian HENRY <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  fix regex


  Commit: 575e4d11d0e48efc44baef1f4901526f007bdb04
      
https://github.com/Dolibarr/dolibarr/commit/575e4d11d0e48efc44baef1f4901526f007bdb04
  Author: gauthier <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M htdocs/compta/paiement_charge.php

  Log Message:
  -----------
  FIX : wrong test


  Commit: 26cd418320efd5d79f2e1719e797ef76905a2e1a
      
https://github.com/Dolibarr/dolibarr/commit/26cd418320efd5d79f2e1719e797ef76905a2e1a
  Author: Frédéric FRANCE <address@hidden>
  Date:   2019-09-24 (Tue, 24 Sep 2019)

  Changed paths:
    M htdocs/product/dynamic_price/class/price_parser.class.php

  Log Message:
  -----------
  Update price_parser.class.php


  Commit: ba1275332d17378067a966097eb3b6d23c8ce6e2
      
https://github.com/Dolibarr/dolibarr/commit/ba1275332d17378067a966097eb3b6d23c8ce6e2
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-25 (Wed, 25 Sep 2019)

  Changed paths:
    M htdocs/langs/fr_NC/main.lang

  Log Message:
  -----------
  Fix thousand separator for fr_NC


  Commit: 13f5decdf7be8ba41b94377aea99bf2078272660
      
https://github.com/Dolibarr/dolibarr/commit/13f5decdf7be8ba41b94377aea99bf2078272660
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  FIX: shipping card: missing user error messages when classifying closed or 
billed


  Commit: 99cfea1ff44bade26762502cff194d06c5450dee
      
https://github.com/Dolibarr/dolibarr/commit/99cfea1ff44bade26762502cff194d06c5450dee
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/compta/paiement_charge.php

  Log Message:
  -----------
  Update paiement_charge.php


  Commit: fe15871fe39f8f8516e09cb589f106f3ada9551c
      
https://github.com/Dolibarr/dolibarr/commit/fe15871fe39f8f8516e09cb589f106f3ada9551c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/compta/paiement_charge.php

  Log Message:
  -----------
  Merge pull request #11935 from atm-gauthier/8.0_chargesociale

FIX : wrong test


  Commit: 59a099b17660cb142732b1f9c34c67b52bee2b82
      
https://github.com/Dolibarr/dolibarr/commit/59a099b17660cb142732b1f9c34c67b52bee2b82
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/product/dynamic_price/class/price_parser.class.php

  Log Message:
  -----------
  Merge pull request #11954 from frederic34/patch-18

add missing error code in price parser


  Commit: de1180179242f856df12849bbd0dc84f6de1c79b
      
https://github.com/Dolibarr/dolibarr/commit/de1180179242f856df12849bbd0dc84f6de1c79b
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors

FIX: shipping card: missing user error messages when classifying closed or 
billed


  Commit: 7f9ea2e223c0044b7d838ef034319ae117aea130
      
https://github.com/Dolibarr/dolibarr/commit/7f9ea2e223c0044b7d838ef034319ae117aea130
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge pull request #11929 from atm-florian/9.0

fix regex main.inc.php warning


  Commit: 5d456382488a3f716d39b1de629b727b2e81f3d6
      
https://github.com/Dolibarr/dolibarr/commit/5d456382488a3f716d39b1de629b727b2e81f3d6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/compta/paiement_charge.php
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0


  Commit: 6d1a571aedb5697784d949de52c5baf771b26b83
      
https://github.com/Dolibarr/dolibarr/commit/6d1a571aedb5697784d949de52c5baf771b26b83
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/compta/paiement_charge.php
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0

Conflicts:
        htdocs/product/dynamic_price/class/price_parser.class.php


  Commit: da35e3d7cdd9d85512c1c2abc2409eecc8df8db6
      
https://github.com/Dolibarr/dolibarr/commit/da35e3d7cdd9d85512c1c2abc2409eecc8df8db6
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-09-27 (Fri, 27 Sep 2019)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php

  Log Message:
  -----------
  Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0


Compare: 
https://github.com/Dolibarr/dolibarr/compare/ab33665f7bc3...da35e3d7cdd9