[Dolibarr-git] [Dolibarr/dolibarr] 96215c: Fix bad operator for and

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 96215ccea51feee84d77a7de5b8020015c22bc09
      
https://github.com/Dolibarr/dolibarr/commit/96215ccea51feee84d77a7de5b8020015c22bc09
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M htdocs/admin/tools/export.php
    M htdocs/core/class/rssparser.class.php
    M htdocs/core/filemanagerdol/connectors/php/commands.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
    M htdocs/expedition/card.php

  Log Message:
  -----------
  Fix bad operator for and


  Commit: f865534b4cdda41282891a2735a720b061474ae8
      
https://github.com/Dolibarr/dolibarr/commit/f865534b4cdda41282891a2735a720b061474ae8
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/fichinter/class/fichinter.class.php

  Log Message:
  -----------
  Fix some pdf differences


  Commit: 0b01fa8eb8a5e240dffdc858274f86e775301b89
      
https://github.com/Dolibarr/dolibarr/commit/0b01fa8eb8a5e240dffdc858274f86e775301b89
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/cashjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/langs/en_US/accountancy.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7ac35593e143...0b01fa8eb8a5