[Dolibarr-git] [Dolibarr/dolibarr] 265ef4: Merge menu "System info" with "System tools"

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 265ef489a660bf7b149ba70f135a909ce0077267
      
https://github.com/Dolibarr/dolibarr/commit/265ef489a660bf7b149ba70f135a909ce0077267
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M htdocs/admin/system/database.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang

  Log Message:
  -----------
  Merge menu "System info" with "System tools"


  Commit: 1280499110aec84a8386451272c0fb3dceb8e356
      
https://github.com/Dolibarr/dolibarr/commit/1280499110aec84a8386451272c0fb3dceb8e356
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

  Changed paths:
    M htdocs/admin/boxes.php
    M htdocs/admin/external_rss.php
    M htdocs/admin/fckeditor.php
    M htdocs/admin/mailing.php
    M htdocs/admin/syslog.php
    M htdocs/comm/action/fiche.php
    M htdocs/contact/fiche.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/ajax/box.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/mailings/xinputuser.modules.php
    M htdocs/core/modules/modHoliday.class.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_add.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/document.php
    A htdocs/ecm/ajax/ecmdatabase.php
    M htdocs/ecm/index.php
    A htdocs/ecm/tpl/builddatabase.tpl.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/fiche.php
    M htdocs/holiday/index.php
    M htdocs/holiday/month_report.php
    M htdocs/holiday/view_log.php
    M htdocs/install/etape5.php
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/install/mysql/tables/llx_boxes.key.sql
    M htdocs/install/mysql/tables/llx_boxes.sql
    M htdocs/install/mysql/tables/llx_ecm_directories.sql
    M htdocs/install/mysql/tables/llx_ecm_documents.sql
    M htdocs/install/upgrade.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/product/admin/product_tools.php
    M htdocs/product/ajax/products.php
    M htdocs/product/class/product.class.php
    M htdocs/public/members/new.php
    M htdocs/theme/bureau2crea/tpl/login.tpl.php
    M htdocs/theme/bureau2crea/tpl/passwordforgotten.tpl.php
    M htdocs/user/passwordforgotten.php

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


  Commit: 7c27cfa88e8ec6448e17a0910557bd061ed9c46c
      
https://github.com/Dolibarr/dolibarr/commit/7c27cfa88e8ec6448e17a0910557bd061ed9c46c
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

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

  Log Message:
  -----------
  Fix: br at wrong place (a different fix that should be ok in all cases)


  Commit: d0528740c2eafecdc84c3da189b75d427f842658
      
https://github.com/Dolibarr/dolibarr/commit/d0528740c2eafecdc84c3da189b75d427f842658
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-09-07 (Fri, 07 Sep 2012)

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

  Log Message:
  -----------
  Fix: We must not show date range for a product line type (only
service line)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c98e456ba911...d0528740c2ea