[Dolibarr-git] [Dolibarr/dolibarr] a158f5: Doc

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a158f5ab9db752a8d821e4e2bcee7b83083f299d
      
https://github.com/Dolibarr/dolibarr/commit/a158f5ab9db752a8d821e4e2bcee7b83083f299d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Doc


  Commit: d66fac5662b85539469bf9fc3edac6f5ee9f9426
      
https://github.com/Dolibarr/dolibarr/commit/d66fac5662b85539469bf9fc3edac6f5ee9f9426
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare 5.0.7


  Commit: 52986c5c07d1a97188910bd05abc31d31e157f51
      
https://github.com/Dolibarr/dolibarr/commit/52986c5c07d1a97188910bd05abc31d31e157f51
  Author: Jacques83300 <address@hidden>
  Date:   2017-09-04 (Mon, 04 Sep 2017)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php

  Log Message:
  -----------
  Add some missing attributes in Adherent:makeSubstitution (type, phone 
numbers) for use in substitution of tags


  Commit: e599e47e844bf2640c9f30da3402ac6172ff38bf
      
https://github.com/Dolibarr/dolibarr/commit/e599e47e844bf2640c9f30da3402ac6172ff38bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M htdocs/supplier_proposal/list.php

  Log Message:
  -----------
  Missing translation


  Commit: 7648d300b5a01c3105cf0be912f2b8faff64bc55
      
https://github.com/Dolibarr/dolibarr/commit/7648d300b5a01c3105cf0be912f2b8faff64bc55
  Author: Juanjo Menent <address@hidden>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  FIX: Bad link to unpayed suppliers invoices


  Commit: 3393947dbc68db172a9ab95657121b4e8f05a5be
      
https://github.com/Dolibarr/dolibarr/commit/3393947dbc68db172a9ab95657121b4e8f05a5be
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php

  Log Message:
  -----------
  Merge pull request #7329 from Jacques83300/5.0

FIX Add some missing attributes in Adherent:makeSubstitution (type, phone…


  Commit: 863c57558039923bad5c344a6662f9c6c2d41415
      
https://github.com/Dolibarr/dolibarr/commit/863c57558039923bad5c344a6662f9c6c2d41415
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Merge pull request #7342 from simnandez/5.0

FIX: Bad link to unpayed suppliers invoices


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

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  FIX PDF output was sharing 2 different currencies in same total

Conflicts:
        htdocs/core/modules/commande/doc/pdf_einstein.modules.php
        htdocs/core/modules/facture/doc/pdf_crabe.modules.php
        htdocs/core/modules/product/doc/pdf_standard.modules.php
        htdocs/core/modules/propale/doc/pdf_azur.modules.php


  Commit: 9b22f046f5e30205f28445d49ad68269116fe2f2
      
https://github.com/Dolibarr/dolibarr/commit/9b22f046f5e30205f28445d49ad68269116fe2f2
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/price.lib.php

  Log Message:
  -----------
  FIX multicompany better accuracy in rounding and with revenue stamp.


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

  Changed paths:
    M htdocs/core/lib/price.lib.php
    M test/phpunit/PricesTest.php

  Log Message:
  -----------
  Fix regression


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

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/core/lib/price.lib.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/supplier_proposal/list.php
    M test/phpunit/PricesTest.php

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

Conflicts:
        ChangeLog
        htdocs/adherents/class/adherent.class.php
        htdocs/core/lib/price.lib.php
        htdocs/filefunc.inc.php
        htdocs/fourn/class/fournisseur.facture.class.php
        htdocs/supplier_proposal/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/38621b622e79...f2cd96b9c083