[Dolibarr-git] [Dolibarr/dolibarr] ba93a4: Fix: Codesniffer

[Laurent Destailleur]

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

  Changed paths:
    R dev/phpcheckstyle/README
    R dev/phpcheckstyle/phpstandard.cfg.xml
    R dev/phpcheckstyle/phpstandard.dtd
    M htdocs/commande/class/commande.class.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/opensurvey/adminstuds_preview.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/fonctions.php
    M htdocs/opensurvey/public/choix_date.php
    M htdocs/opensurvey/public/create_survey.php
    M htdocs/opensurvey/public/exportcsv.php
    M htdocs/public/paybox/paymentko.php
    M htdocs/public/paybox/paymentok.php
    M htdocs/public/paypal/paymentko.php
    M htdocs/public/paypal/paymentok.php
    M test/phpunit/WebservicesInvoicesTest.php
    M test/phpunit/WebservicesOrdersTest.php
    M test/phpunit/WebservicesOtherTest.php
    M test/phpunit/WebservicesThirdpartyTest.php
    M test/phpunit/WebservicesUserTest.php

  Log Message:
  -----------
  Fix: Codesniffer


  Commit: 792341a4b82dc90ad40242ac8261845542d532e3
      
https://github.com/Dolibarr/dolibarr/commit/792341a4b82dc90ad40242ac8261845542d532e3
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-10 (Wed, 10 Apr 2013)

  Changed paths:
    M htdocs/categories/categorie.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/admin_extrafields.inc.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/invoice2.lib.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/societe/note.php
    M htdocs/societe/notify/fiche.php
    M htdocs/societe/soc.php
    M htdocs/theme/amarok/style.css.php
    M scripts/invoices/rebuild_merge_pdf.php

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

Conflicts:
        htdocs/core/modules/mailings/thirdparties_services_expired.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5c4c7519fd24...792341a4b82d