[Dolibarr-git] [Dolibarr/dolibarr] 0bb02b: Merge remote branch 'dolibarr/develop' into develo...

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 0bb02b46e037dfe11ec4a07c05759105aac4998a
      
https://github.com/Dolibarr/dolibarr/commit/0bb02b46e037dfe11ec4a07c05759105aac4998a
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-24 (Sat, 24 Sep 2011)

  Changed paths:
    M dev/codesniffer/ruleset.xml
  M htdocs/admin/perms.php
  M htdocs/cashdesk/affIndex.php
  M htdocs/cashdesk/class/Auth.class.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/class/dolgraph.class.php
  M htdocs/filefunc.inc.php
  R htdocs/includes/artichow/php4/AntiSpam.class.php
  R htdocs/includes/artichow/php4/BarPlot.class.php
  R htdocs/includes/artichow/php4/Component.class.php
  R htdocs/includes/artichow/php4/Graph.class.php
  R htdocs/includes/artichow/php4/Image.class.php
  R htdocs/includes/artichow/php4/LinePlot.class.php
  R htdocs/includes/artichow/php4/MathPlot.class.php
  R htdocs/includes/artichow/php4/Pattern.class.php
  R htdocs/includes/artichow/php4/Pie.class.php
  R htdocs/includes/artichow/php4/Plot.class.php
  R htdocs/includes/artichow/php4/ScatterPlot.class.php
  R htdocs/includes/artichow/php4/common.php
  R htdocs/includes/artichow/php4/inc/Axis.class.php
  R htdocs/includes/artichow/php4/inc/Border.class.php
  R htdocs/includes/artichow/php4/inc/Color.class.php
  R htdocs/includes/artichow/php4/inc/Drawer.class.php
  R htdocs/includes/artichow/php4/inc/Font.class.php
  R htdocs/includes/artichow/php4/inc/Gradient.class.php
  R htdocs/includes/artichow/php4/inc/Grid.class.php
  R htdocs/includes/artichow/php4/inc/Label.class.php
  R htdocs/includes/artichow/php4/inc/Legend.class.php
  R htdocs/includes/artichow/php4/inc/Mark.class.php
  R htdocs/includes/artichow/php4/inc/Math.class.php
  R htdocs/includes/artichow/php4/inc/Shadow.class.php
  R htdocs/includes/artichow/php4/inc/Text.class.php
  R htdocs/includes/artichow/php4/inc/Tick.class.php
  R htdocs/includes/artichow/php4/inc/Tools.class.php
  M htdocs/includes/login/functions_dolibarr.php
  M htdocs/includes/login/functions_empty.php
  M htdocs/includes/login/functions_forceuser.php
  M htdocs/includes/login/functions_http.php
  M htdocs/includes/login/functions_ldap.php
  M htdocs/includes/login/functions_myopenid.php
  M htdocs/includes/modules/security/generate/modGeneratePassNone.class.php
  M htdocs/includes/modules/security/generate/modGeneratePassStandard.class.php
  M htdocs/includes/modules/security/generate/modules_genpassword.php
  M htdocs/langs/en_US/other.lang
  M htdocs/lib/antispamimage.php
  M htdocs/lib/files.lib.php
  M htdocs/lib/functions.lib.php
  M htdocs/lib/security.lib.php
  M htdocs/lib/ws.lib.php
  M htdocs/main.inc.php
  M htdocs/user/class/user.class.php
  M htdocs/user/passwordforgotten.php
  M test/phpunit/AdherentTest.php
  M test/phpunit/BuildDocTest.php
  M test/phpunit/CMailFileTest.php
  M test/phpunit/CategorieTest.php
  M test/phpunit/ChargeSocialesTest.php
  M test/phpunit/CommandeFournisseurTest.php
  M test/phpunit/CommandeTest.php
  M test/phpunit/CommonObjectTest.php
  M test/phpunit/CompanyBankAccountTest.php
  M test/phpunit/ContratTest.php
  M test/phpunit/DateLibTest.php
  M test/phpunit/DiscountTest.php
  M test/phpunit/ExportTest.php
  M test/phpunit/FactureFournisseurTest.php
  M test/phpunit/FactureTest.php
  M test/phpunit/FunctionsTest.php
  M test/phpunit/ImportTest.php
  M test/phpunit/ModulesTest.php
  M test/phpunit/PropalTest.php
  M test/phpunit/SecurityTest.php
  M test/phpunit/SocieteTest.php
  M test/phpunit/UserGroupTest.php
  M test/phpunit/UserTest.php
  M test/phpunit/WebservicesTest.php

  Log Message:
  -----------
  Merge remote branch 'dolibarr/develop' into develop


  Commit: 3a35ef50f5b133ca23ed90b3b210c75373239cea
      
https://github.com/Dolibarr/dolibarr/commit/3a35ef50f5b133ca23ed90b3b210c75373239cea
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-24 (Sat, 24 Sep 2011)

  Changed paths:
    M htdocs/contact/canvas/actions_contactcard_common.class.php
  M htdocs/contact/canvas/default/actions_contactcard_default.class.php
  M htdocs/contact/fiche.php
  M htdocs/core/class/canvas.class.php
  M htdocs/includes/modules/modBanque.class.php
  M htdocs/societe/canvas/actions_card_common.class.php
  M htdocs/societe/canvas/company/actions_card_company.class.php
  M htdocs/societe/canvas/individual/actions_card_individual.class.php
  M htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php
  M htdocs/societe/class/societe.class.php
  M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: broken canvas


Compare: https://github.com/Dolibarr/dolibarr/compare/40c7d13...3a35ef5