[Dolibarr-git] [Dolibarr/dolibarr] f69086: Fix: Avoid duplicate div error.

[Laurent Destailleur]

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

  Changed paths:
    M htdocs/core/tpl/passwordforgotten.tpl.php

  Log Message:
  -----------
  Fix: Avoid duplicate div error.


  Commit: c174be7100a5173be8e3961c45102790ca5f9299
      
https://github.com/Dolibarr/dolibarr/commit/c174be7100a5173be8e3961c45102790ca5f9299
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M ChangeLog
    M README
    M README-FR
    M README.md
    M build/debian/control
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M dev/initdata/generate-commande.php
    M dev/initdata/generate-facture.php
    M dev/initdata/generate-propale.php
    M htdocs/.gitignore
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/agenda.php
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/index.php
    M htdocs/admin/pdf.php
    M htdocs/admin/system/constall.php
    M htdocs/admin/system/dolibarr.php
    A htdocs/admin/system/perf.php
    M htdocs/admin/system/xdebug.php
    M htdocs/admin/tools/update.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/conf/conf.php.example
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commoninvoice.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/dolgeoip.class.php
    M htdocs/core/class/dolprintipp.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/stats.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/geturl.lib.php
    M htdocs/core/lib/images.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/fiche.php
    A htdocs/includes/jquery/plugins/flot/API.md
    R htdocs/includes/jquery/plugins/flot/API.txt
    A htdocs/includes/jquery/plugins/flot/CONTRIBUTING.md
    A htdocs/includes/jquery/plugins/flot/FAQ.md
    R htdocs/includes/jquery/plugins/flot/FAQ.txt
    M htdocs/includes/jquery/plugins/flot/LICENSE.txt
    M htdocs/includes/jquery/plugins/flot/Makefile
    A htdocs/includes/jquery/plugins/flot/NEWS.md
    R htdocs/includes/jquery/plugins/flot/NEWS.txt
    A htdocs/includes/jquery/plugins/flot/PLUGINS.md
    R htdocs/includes/jquery/plugins/flot/PLUGINS.txt
    A htdocs/includes/jquery/plugins/flot/README.md
    R htdocs/includes/jquery/plugins/flot/README.txt
    M htdocs/includes/jquery/plugins/flot/excanvas.js
    M htdocs/includes/jquery/plugins/flot/excanvas.min.js
    R htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
    A htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.js
    M htdocs/includes/jquery/plugins/flot/jquery.colorhelpers.min.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.canvas.min.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.categories.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.categories.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.crosshair.min.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.errorbars.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.fillbetween.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.image.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.image.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.navigate.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.pie.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.pie.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.resize.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.resize.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.selection.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.selection.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.stack.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.stack.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.symbol.min.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.js
    M htdocs/includes/jquery/plugins/flot/jquery.flot.threshold.min.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.time.js
    A htdocs/includes/jquery/plugins/flot/jquery.flot.time.min.js
    M htdocs/includes/tcpdf/include/tcpdf_fonts.php
    M htdocs/index.php
    M htdocs/install/etape1.php
    M htdocs/install/etape5.php
    M htdocs/install/inc.php
    M htdocs/install/mysql/data/llx_c_action_trigger.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/bills.lang
    M htdocs/langs/ca_ES/boxes.lang
    M htdocs/langs/ca_ES/cashdesk.lang
    M htdocs/langs/ca_ES/errors.lang
    M htdocs/langs/ca_ES/install.lang
    M htdocs/langs/ca_ES/mailmanspip.lang
    M htdocs/langs/ca_ES/mails.lang
    M htdocs/langs/ca_ES/main.lang
    M htdocs/langs/ca_ES/margins.lang
    M htdocs/langs/ca_ES/opensurvey.lang
    M htdocs/langs/ca_ES/paybox.lang
    M htdocs/langs/ca_ES/paypal.lang
    M htdocs/langs/ca_ES/products.lang
    M htdocs/langs/ca_ES/projects.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/bills.lang
    M htdocs/langs/es_ES/boxes.lang
    M htdocs/langs/es_ES/cashdesk.lang
    M htdocs/langs/es_ES/cron.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/install.lang
    M htdocs/langs/es_ES/mailmanspip.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/margins.lang
    M htdocs/langs/es_ES/opensurvey.lang
    M htdocs/langs/es_ES/paybox.lang
    M htdocs/langs/es_ES/paypal.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/es_ES/projects.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/agenda.lang
    M htdocs/langs/fr_FR/projects.lang
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/canvas/product/tpl/card_edit.tpl.php
    M htdocs/product/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/support/inc.php
    M htdocs/theme/amarok/style.css.php
    R htdocs/webservices/demo_wsclient_actioncomm.php
    A htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
    M test/phpunit/AdherentTest.php
    M test/phpunit/CoreTest.php
    M test/phpunit/FactureTestRounding.php
    M test/phpunit/PricesTest.php
    M test/phpunit/PropalTest.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/29759a1cba20...c174be7100a5