[Dolibarr-git] [Dolibarr/dolibarr] e6ec79: FIX #4242 Allow disabling dashes in documents

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e6ec797af8e90ff5ec60135122cdc8561003f425
      
https://github.com/Dolibarr/dolibarr/commit/e6ec797af8e90ff5ec60135122cdc8561003f425
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.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/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.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 #4242 Allow disabling dashes in documents


  Commit: 21f7271e5177316d3ed7779dbafae20ae49d5a00
      
https://github.com/Dolibarr/dolibarr/commit/21f7271e5177316d3ed7779dbafae20ae49d5a00
  Author: fmarcet <address@hidden>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

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

  Log Message:
  -----------
  FIX: Not deleting contrats on element_element table


  Commit: 3d6f1d911a4c183ed15e0b144e2837f7a39f8ff5
      
https://github.com/Dolibarr/dolibarr/commit/3d6f1d911a4c183ed15e0b144e2837f7a39f8ff5
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.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/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.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:
  -----------
  Merge pull request #4247 from GPCsolutions/3.6-4242

FIX #4242 Allow disabling dashes in documents


  Commit: 7af4d91828ede69ea215ce28714c31934cd267d4
      
https://github.com/Dolibarr/dolibarr/commit/7af4d91828ede69ea215ce28714c31934cd267d4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

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

  Log Message:
  -----------
  Merge pull request #4251 from fmarcet/3.6

FIX: Not deleting contracts on element_element table


  Commit: c1c0fa88c22dd5e0d2ee586ba95d550b08046620
      
https://github.com/Dolibarr/dolibarr/commit/c1c0fa88c22dd5e0d2ee586ba95d550b08046620
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M .travis.yml
    A build/travis-ci/apache.conf

  Log Message:
  -----------
  Fix for new travis setup


  Commit: ebf68ecbe07468576ec44767b22d6afe2953b305
      
https://github.com/Dolibarr/dolibarr/commit/ebf68ecbe07468576ec44767b22d6afe2953b305
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-18 (Fri, 18 Dec 2015)

  Changed paths:
    M .travis.yml
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/commande/doc/pdf_proforma.modules.php
    M htdocs/core/modules/expedition/doc/pdf_merou.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/livraison/doc/pdf_typhon.modules.php
    M htdocs/core/modules/project/doc/pdf_baleine.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:
  -----------
  Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
        .travis.yml
        htdocs/contrat/class/contrat.class.php
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
        htdocs/core/modules/project/pdf/pdf_baleine.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b47dc8a394ac...ebf68ecbe074