[Dolibarr-git] [Dolibarr/dolibarr] 83daa6: FIX Description of contract line was not visible.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 83daa67cc630cf3d8569a08534c7ecf7ef445fb0
      
https://github.com/Dolibarr/dolibarr/commit/83daa67cc630cf3d8569a08534c7ecf7ef445fb0
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M htdocs/contrat/card.php

  Log Message:
  -----------
  FIX Description of contract line was not visible.


  Commit: 060d8a1a38fb01b763c6c49bbf9bd91f46826875
      
https://github.com/Dolibarr/dolibarr/commit/060d8a1a38fb01b763c6c49bbf9bd91f46826875
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  FIX Ref/label of product on contract line was not visible, nor into
page, nor into PDF.


  Commit: 6b3c060d9c44514a2db8c5c70bf218d514286809
      
https://github.com/Dolibarr/dolibarr/commit/6b3c060d9c44514a2db8c5c70bf218d514286809
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

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

  Log Message:
  -----------
  Fix doxygen


  Commit: afc582a3696d33653c1324e0c11552d9eee69404
      
https://github.com/Dolibarr/dolibarr/commit/afc582a3696d33653c1324e0c11552d9eee69404
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M htdocs/core/modules/modAdherent.class.php

  Log Message:
  -----------
  Fixed SQL table reference for members types in export

FIX #2712


  Commit: 0808de9a1e12fa54a30f3669de6f9aabb912ed84
      
https://github.com/Dolibarr/dolibarr/commit/0808de9a1e12fa54a30f3669de6f9aabb912ed84
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M htdocs/core/modules/modAdherent.class.php

  Log Message:
  -----------
  Merge pull request #2738 from GPCsolutions/dolibarr-2712

Fixed SQL table reference for members types in export


  Commit: 93937fe7f3cb4ad097830fdca590f4b7ec9058d2
      
https://github.com/Dolibarr/dolibarr/commit/93937fe7f3cb4ad097830fdca590f4b7ec9058d2
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-05-01 (Fri, 01 May 2015)

  Changed paths:
    M htdocs/core/modules/modProjet.class.php

  Log Message:
  -----------
  Allow exporting projects without a third party

FIX #2729


  Commit: 0479bd5a59b967afe32e87ad5e58860f3130a350
      
https://github.com/Dolibarr/dolibarr/commit/0479bd5a59b967afe32e87ad5e58860f3130a350
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-05-03 (Sun, 03 May 2015)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
        htdocs/contrat/card.php
        htdocs/contrat/class/contrat.class.php
        htdocs/core/class/extrafields.class.php
        htdocs/core/modules/modAdherent.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6b9d5be3c25c...0479bd5a59b9