[Dolibarr-git] [Dolibarr/dolibarr] 1a71e9: FIX add supplierproposaldet without price (new pro...

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1a71e9b4a0377f2c42ebdccd65aa73c5bd73a6cb
      
https://github.com/Dolibarr/dolibarr/commit/1a71e9b4a0377f2c42ebdccd65aa73c5bd73a6cb
  Author: arnaud <address@hidden>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  FIX add supplierproposaldet without price (new product)


  Commit: 3d18c71201bc22c5ff5377418812e66caf774362
      
https://github.com/Dolibarr/dolibarr/commit/3d18c71201bc22c5ff5377418812e66caf774362
  Author: alexis Algoud <address@hidden>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  FIX invoice situation VAT total rounding into PDF crabe


  Commit: 249bfa3412517f30c95f50de9426393ebc9a36ae
      
https://github.com/Dolibarr/dolibarr/commit/249bfa3412517f30c95f50de9426393ebc9a36ae
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  Merge pull request #7117 from atm-arnaud/FIX_insert_supplierpropale_det

Fix add supplierproposaldet without price (new product)


  Commit: b461d24f52c347396f7abcd7777fcf0baff22bd2
      
https://github.com/Dolibarr/dolibarr/commit/b461d24f52c347396f7abcd7777fcf0baff22bd2
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

  Log Message:
  -----------
  Merge pull request #7119 from atm-alexis/FIX_situ_pdf_total_VAT

FIX invoice situation VAT total rounding into PDF crabe


  Commit: f166c96ed5a5065c1fffedaefadee8b5eb972c8f
      
https://github.com/Dolibarr/dolibarr/commit/f166c96ed5a5065c1fffedaefadee8b5eb972c8f
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2017-07-09 (Sun, 09 Jul 2017)

  Changed paths:
    M scripts/product/migrate_picture_path.php

  Log Message:
  -----------
  Fix : script to migrate photo path


  Commit: 715280b03aadf48060165730983039947b4ec434
      
https://github.com/Dolibarr/dolibarr/commit/715280b03aadf48060165730983039947b4ec434
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M scripts/product/migrate_picture_path.php

  Log Message:
  -----------
  Merge pull request #7131 from atm-maxime/4.0

Fix : script to migrate photo path


  Commit: 4e45c7fdbaa114ce867e4093c862b30e918c2005
      
https://github.com/Dolibarr/dolibarr/commit/4e45c7fdbaa114ce867e4093c862b30e918c2005
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M scripts/product/migrate_picture_path.php

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

Conflicts:
        htdocs/supplier_proposal/class/supplier_proposal.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f9b9a9972eba...4e45c7fdbaa1