[Dolibarr-git] [Dolibarr/dolibarr] ba8754: FIX #5640 Prices of a predefined product/service w...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ba87549124c4579b4fd6736655d4abd5720ab0aa
      
https://github.com/Dolibarr/dolibarr/commit/ba87549124c4579b4fd6736655d4abd5720ab0aa
  Author: Marcos García <address@hidden>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

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

  Log Message:
  -----------
  FIX #5640 Prices of a predefined product/service were incorrect under certain 
circumstances


  Commit: eaaee59f92abba096890ee867d968c0dfe20e3fd
      
https://github.com/Dolibarr/dolibarr/commit/eaaee59f92abba096890ee867d968c0dfe20e3fd
  Author: Marcos García <address@hidden>
  Date:   2017-06-19 (Mon, 19 Jun 2017)

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

  Log Message:
  -----------
  FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working


  Commit: fd197c5780c9e34ff18fbf92b48f3a509c6f1389
      
https://github.com/Dolibarr/dolibarr/commit/fd197c5780c9e34ff18fbf92b48f3a509c6f1389
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

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

  Log Message:
  -----------
  Merge pull request #7041 from marcosgdf/bug-6541

FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working


  Commit: dbeb31cad3b9be9785524993427692cfcdb047a1
      
https://github.com/Dolibarr/dolibarr/commit/dbeb31cad3b9be9785524993427692cfcdb047a1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

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

  Log Message:
  -----------
  Merge pull request #7039 from marcosgdf/bug-5640

FIX #5640 Prices of a predefined product/service were incorrect under certain 
circumstances


  Commit: d8b0199ba23724a9861a1f5bca42a056eb329c32
      
https://github.com/Dolibarr/dolibarr/commit/d8b0199ba23724a9861a1f5bca42a056eb329c32
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

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

  Log Message:
  -----------
  FIX #7040


  Commit: 6d42922839c41bf205f985b69b7cc83cab167be4
      
https://github.com/Dolibarr/dolibarr/commit/6d42922839c41bf205f985b69b7cc83cab167be4
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php

  Log Message:
  -----------
  FIX #7012


  Commit: d572bd4f34e6ab85718a035d0300ea48dfe53cef
      
https://github.com/Dolibarr/dolibarr/commit/d572bd4f34e6ab85718a035d0300ea48dfe53cef
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M htdocs/projet/ganttchart.inc.php

  Log Message:
  -----------
  FIX #7003


  Commit: a7fb411a42183e830ac4fe21ed8af865bdbb4a70
      
https://github.com/Dolibarr/dolibarr/commit/a7fb411a42183e830ac4fe21ed8af865bdbb4a70
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

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

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


  Commit: 3ec0e6f7efc965da8991a17541e20e1c28cf6b0d
      
https://github.com/Dolibarr/dolibarr/commit/3ec0e6f7efc965da8991a17541e20e1c28cf6b0d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-20 (Tue, 20 Jun 2017)

  Changed paths:
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  FIX #6885


  Commit: ecae2fc6b681a67bc7c85373bf87a9b610d257da
      
https://github.com/Dolibarr/dolibarr/commit/ecae2fc6b681a67bc7c85373bf87a9b610d257da
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fix translation


  Commit: 45004493e0cb17248fbd0fc5211d30526e407a46
      
https://github.com/Dolibarr/dolibarr/commit/45004493e0cb17248fbd0fc5211d30526e407a46
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/expedition/class/expedition.class.php

  Log Message:
  -----------
  Fix multicurrency and vat_src_code not propaged on invoice from
shipment.


  Commit: 693b2fe3b4ebb488b3c94649a9b0a85ac47a3358
      
https://github.com/Dolibarr/dolibarr/commit/693b2fe3b4ebb488b3c94649a9b0a85ac47a3358
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-23 (Fri, 23 Jun 2017)

  Changed paths:
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/projet/ganttchart.inc.php
    M htdocs/supplier_proposal/card.php

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

Conflicts:
        htdocs/compta/facture.php
        htdocs/core/ajax/ajaxdirpreview.php
        htdocs/core/class/conf.class.php
        htdocs/core/class/html.formfile.class.php
        htdocs/core/lib/functions.lib.php
        htdocs/core/tpl/objectline_create.tpl.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a05bbd651cc2...693b2fe3b4eb