[Dolibarr-git] [Dolibarr/dolibarr] bdafcb: Fix: Bad parameters

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bdafcb680f869deadcec9ea1d43407a47e612204
      
https://github.com/Dolibarr/dolibarr/commit/bdafcb680f869deadcec9ea1d43407a47e612204
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

  Changed paths:
    M htdocs/comm/action/fiche.php

  Log Message:
  -----------
  Fix: Bad parameters

Conflicts:
        htdocs/comm/action/fiche.php


  Commit: 06f36fbfabb44992e8187efa8a2e84bc4d1f3443
      
https://github.com/Dolibarr/dolibarr/commit/06f36fbfabb44992e8187efa8a2e84bc4d1f3443
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M htdocs/core/boxes/box_members.php

  Log Message:
  -----------
  Fix: Bad permission check


  Commit: b6d5ebf81d477d026020e56b80723c0aeae3c61b
      
https://github.com/Dolibarr/dolibarr/commit/b6d5ebf81d477d026020e56b80723c0aeae3c61b
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M htdocs/comm/action/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.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/rapport/pdf_paiement.class.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 branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4


  Commit: a674af5bcd071b8f8e2c1b4d9a024478ebb31c37
      
https://github.com/Dolibarr/dolibarr/commit/a674af5bcd071b8f8e2c1b4d9a024478ebb31c37
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M htdocs/comm/action/contact.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/info.php

  Log Message:
  -----------
  Fix: Permission check on event tabs


  Commit: 2088eaa6fde69dbfb8f5e393bc8cff7357aa67c3
      
https://github.com/Dolibarr/dolibarr/commit/2088eaa6fde69dbfb8f5e393bc8cff7357aa67c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M htdocs/comm/action/contact.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/info.php
    M htdocs/core/boxes/box_members.php

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

Conflicts:
        htdocs/comm/action/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/99de8b22a33a...2088eaa6fde6