[Dolibarr-git] [Dolibarr/dolibarr] 98b2e8: Fix localtaxes type not retrieved in proposals. Fi...

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 98b2e83bfb657b3528c028c31f8945afd56e4062
      
https://github.com/Dolibarr/dolibarr/commit/98b2e83bfb657b3528c028c31f8945afd56e4062
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  Fix localtaxes type not retrieved in proposals. Fixes Dolibarr/dolibarr/#6786


  Commit: f63f28c7febedd41e200c5274d2925494f7b1935
      
https://github.com/Dolibarr/dolibarr/commit/f63f28c7febedd41e200c5274d2925494f7b1935
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Fix vat_src_code propagation between post types


  Commit: b93df2d6b5af7d0e7c5d185e62a27ef0a418dc8b
      
https://github.com/Dolibarr/dolibarr/commit/b93df2d6b5af7d0e7c5d185e62a27ef0a418dc8b
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fixes localtax propagation to new invoice


  Commit: 421843e693c5c948c86bfb1d214c3cdee7dd4cdb
      
https://github.com/Dolibarr/dolibarr/commit/421843e693c5c948c86bfb1d214c3cdee7dd4cdb
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-03 (Wed, 03 May 2017)

  Changed paths:
    M htdocs/commande/class/commande.class.php

  Log Message:
  -----------
  Fix missing localtaxes lines in "commande" PDF


  Commit: 909b489d1f9fb74f4c9680e6a9fb0ff46c8797e8
      
https://github.com/Dolibarr/dolibarr/commit/909b489d1f9fb74f4c9680e6a9fb0ff46c8797e8
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  More fixes regarding localtaxes not being diplayed in generated PDF and 
vat_src_code not being propagating properly when generating posts from type to 
type.


  Commit: 85bf4b742b15ca267431530cb8eb3ab932002d18
      
https://github.com/Dolibarr/dolibarr/commit/85bf4b742b15ca267431530cb8eb3ab932002d18
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  Fix typo


  Commit: 24a2fb57ea3359d0dc6f04731149c41ab813b3e1
      
https://github.com/Dolibarr/dolibarr/commit/24a2fb57ea3359d0dc6f04731149c41ab813b3e1
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/class/api_proposals.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/product/admin/product_tools.php
    M htdocs/societe/soc.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php

  Log Message:
  -----------
  Resolved merge conflict


  Commit: a1e92467947074c5feef8d2199b6177be4c7cb4b
      
https://github.com/Dolibarr/dolibarr/commit/a1e92467947074c5feef8d2199b6177be4c7cb4b
  Author: Laurent Dinclaux <address@hidden>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php

  Log Message:
  -----------
  Resolved merge conflict [2]


  Commit: 4b8cda2070818bf450b5f1eceae1385b1792fdb3
      
https://github.com/Dolibarr/dolibarr/commit/4b8cda2070818bf450b5f1eceae1385b1792fdb3
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #6791 from Gecka-Apps/5.0

Fix major issues with local taxes


Compare: 
https://github.com/Dolibarr/dolibarr/compare/382fcb53fa2d...4b8cda207081