[Dolibarr-git] [Dolibarr/dolibarr] 98ddd0: Qual : PHP Code_Sniffer

[Laurent Destailleur]

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

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/opensurvey/adminstuds_preview.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

  Log Message:
  -----------
  Qual : PHP Code_Sniffer


  Commit: 2440513007267d59476f8cc85c0a7c15f6cdf5d0
      
https://github.com/Dolibarr/dolibarr/commit/2440513007267d59476f8cc85c0a7c15f6cdf5d0
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    R dev/phpcheckstyle/README
    R dev/phpcheckstyle/phpstandard.cfg.xml
    R dev/phpcheckstyle/phpstandard.dtd
    M htdocs/categories/categorie.php
    M htdocs/comm/action/fiche.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/fourn/class/fournisseur.product.class.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/mails.lang
    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 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 htdocs/user/class/user.class.php
    M htdocs/webservices/server_user.php
    M scripts/invoices/rebuild_merge_pdf.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:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
        htdocs/fourn/class/fournisseur.product.class.php
        htdocs/opensurvey/fonctions.php
        htdocs/opensurvey/public/choix_date.php
        htdocs/opensurvey/public/create_survey.php
        htdocs/opensurvey/public/exportcsv.php
        htdocs/public/paybox/paymentko.php

Change-Id: I57468f3a0f6bb1115bd48b84517060432102c2ea


  Commit: b3b0c73f319339c8fc4fc3778ef2207ead58cbca
      
https://github.com/Dolibarr/dolibarr/commit/b3b0c73f319339c8fc4fc3778ef2207ead58cbca
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/opensurvey/fonctions.php

  Log Message:
  -----------
  Qual : PHP Code Sniffer


  Commit: db86735fe63607c3b81e1e386f0ae057edcb7ac8
      
https://github.com/Dolibarr/dolibarr/commit/db86735fe63607c3b81e1e386f0ae057edcb7ac8
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/opensurvey/public/create_survey.php
    M htdocs/opensurvey/public/exportcsv.php

  Log Message:
  -----------
  Qual : php code sniffer


  Commit: f837528ad363be8cbbee8b3976cd8a0a9ea8469b
      
https://github.com/Dolibarr/dolibarr/commit/f837528ad363be8cbbee8b3976cd8a0a9ea8469b
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/index.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/theme/eldy/graph-color.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


  Commit: 6335918d72cce20b518c5ae5bcc332d88224a8ce
      
https://github.com/Dolibarr/dolibarr/commit/6335918d72cce20b518c5ae5bcc332d88224a8ce
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php

  Log Message:
  -----------
  Quel : indentation


  Commit: af40d27eb57012a1b04b1560cb17ad7036505145
      
https://github.com/Dolibarr/dolibarr/commit/af40d27eb57012a1b04b1560cb17ad7036505145
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Remove require_once from odf.php because it cause regression.


  Commit: 2f7be8d2c217e966863c964d40b747fde0b8c09d
      
https://github.com/Dolibarr/dolibarr/commit/2f7be8d2c217e966863c964d40b747fde0b8c09d
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php

  Log Message:
  -----------
  Add hook for substitution


  Commit: 629ef78dc82ec6985d848654388b9b495a9996f9
      
https://github.com/Dolibarr/dolibarr/commit/629ef78dc82ec6985d848654388b9b495a9996f9
  Author: fhenry <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Add subtitution inside header and fotter document


  Commit: 616219c99c97d8e61ceb0b148d66a24ff6af2421
      
https://github.com/Dolibarr/dolibarr/commit/616219c99c97d8e61ceb0b148d66a24ff6af2421
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/project/pdf/doc_generic_project_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/opensurvey/adminstuds_preview.php
    M htdocs/opensurvey/fonctions.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

  Log Message:
  -----------
  Merge pull request #822 from FHenry/develop

Qual : PHP Code_Sniffer


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e209959c90dc...616219c99c97