[Dolibarr-git] [Dolibarr/dolibarr] bc0f65: Fix: reorder lines problem

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bc0f65b73c6d81628d9ad7b7e69eae949622dad9
      
https://github.com/Dolibarr/dolibarr/commit/bc0f65b73c6d81628d9ad7b7e69eae949622dad9
  Author: Regis Houssin <address@hidden>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/tpl/objectline_view.tpl.php

  Log Message:
  -----------
  Fix: reorder lines problem

Conflicts:
        htdocs/core/class/commonobject.class.php
        htdocs/core/class/html.form.class.php


  Commit: 8daef9d99fdfd027db22c5018d993300b5287c5f
      
https://github.com/Dolibarr/dolibarr/commit/8daef9d99fdfd027db22c5018d993300b5287c5f
  Author: Regis Houssin <address@hidden>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M build/debian/README.howto
    A dev/iso-normes/vat_number_names.txt
    M htdocs/adherents/fiche.php
    M htdocs/comm/propal/list.php
    M htdocs/compta/bank/search.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/cabyuser.php
    M htdocs/compta/stats/casoc.php
    M htdocs/compta/stats/index.php
    M htdocs/compta/tva/clients.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/report.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_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/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/expedition/fiche.php
    M htdocs/langs/bg_BG/companies.lang
    M htdocs/langs/da_DK/companies.lang
    M htdocs/langs/de_AT/companies.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/el_GR/propal.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/languages.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/propal.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/es_AR/companies.lang
    M htdocs/langs/es_ES/languages.lang
    M htdocs/langs/es_HN/companies.lang
    M htdocs/langs/es_MX/companies.lang
    M htdocs/langs/es_PE/companies.lang
    A htdocs/langs/es_PY/companies.lang
    A htdocs/langs/es_PY/main.lang
    M htdocs/langs/et_EE/companies.lang
    M htdocs/langs/fi_FI/companies.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/categories.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/langs/fr_FR/languages.lang
    M htdocs/langs/fr_FR/stocks.lang
    M htdocs/langs/hu_HU/companies.lang
    M htdocs/langs/is_IS/companies.lang
    M htdocs/langs/nb_NO/companies.lang
    M htdocs/langs/nl_NL/companies.lang
    M htdocs/langs/pl_PL/companies.lang
    M htdocs/langs/pt_PT/companies.lang
    M htdocs/langs/ro_RO/companies.lang
    M htdocs/langs/ru_RU/companies.lang
    M htdocs/langs/sv_SE/companies.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/product/index.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/replenish.php
    M htdocs/product/stock/replenishorders.php
    R htdocs/societe/class/address.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5ee05836b669...8daef9d99fdf