[Dolibarr-git] [Dolibarr/dolibarr] 27caa5: Fix auto increment customer code must be done only...

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 27caa586c20066fad6a1bdaff5a47f835be6d398
      
https://github.com/Dolibarr/dolibarr/commit/27caa586c20066fad6a1bdaff5a47f835be6d398
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix auto increment customer code must be done only if error is on
duplicate code


  Commit: 4bce208035259953b39f580063bf2c9908d36a77
      
https://github.com/Dolibarr/dolibarr/commit/4bce208035259953b39f580063bf2c9908d36a77
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  FIX detail of deposit and credit not was not visible into final invoice


  Commit: bc8ccd8ec5f7931e546f3422c6e207e50d82f1d5
      
https://github.com/Dolibarr/dolibarr/commit/bc8ccd8ec5f7931e546f3422c6e207e50d82f1d5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/core/class/discount.class.php

  Log Message:
  -----------
  Fix bad var set


  Commit: 7c638feb3bfa0ae338f9058e7ca5bb4236a9875e
      
https://github.com/Dolibarr/dolibarr/commit/7c638feb3bfa0ae338f9058e7ca5bb4236a9875e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/checkMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Fix label of field


  Commit: 1e78c4c4182906599b464360aa40517d8324b776
      
https://github.com/Dolibarr/dolibarr/commit/1e78c4c4182906599b464360aa40517d8324b776
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  FIX Change the customer code only if error on duplicate


  Commit: e2ce31e1a7ed7dd9023825dd7566c2642c92415f
      
https://github.com/Dolibarr/dolibarr/commit/e2ce31e1a7ed7dd9023825dd7566c2642c92415f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Add code comment


  Commit: c88e63ecc972eafaf70752144c4f5735529ca47e
      
https://github.com/Dolibarr/dolibarr/commit/c88e63ecc972eafaf70752144c4f5735529ca47e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.formmargin.class.php

  Log Message:
  -----------
  FIX #6259


  Commit: 2c07d2df22d08cf7a866323cf667d5ce6278eaaf
      
https://github.com/Dolibarr/dolibarr/commit/2c07d2df22d08cf7a866323cf667d5ce6278eaaf
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Add comments


  Commit: fd90bf466b76a189b23415b2a0b15a6891f3cd7f
      
https://github.com/Dolibarr/dolibarr/commit/fd90bf466b76a189b23415b2a0b15a6891f3cd7f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-01-28 (Sat, 28 Jan 2017)

  Changed paths:
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/societe/soc.php

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

Conflicts:
        htdocs/compta/facture/class/facture.class.php
        htdocs/societe/soc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/63f614d1d50b...fd90bf466b76