[Dolibarr-git] [Dolibarr/dolibarr] 891dbf: Fix: Not complete renaming

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 891dbf5c60ae7aa3342121bdd98001683b65e5c6
      
https://github.com/Dolibarr/dolibarr/commit/891dbf5c60ae7aa3342121bdd98001683b65e5c6
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-04-11 (Thu, 11 Apr 2013)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_expedition.key.sql
    M htdocs/install/mysql/tables/llx_expedition.sql

  Log Message:
  -----------
  Fix: Not complete renaming


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

  Changed paths:
    M htdocs/core/lib/tax.lib.php

  Log Message:
  -----------
  Fix: not complete renaming


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

  Changed paths:
    M ChangeLog
    M htdocs/comm/fiche.php
    M htdocs/core/class/conf.class.php
    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/fourn/class/fournisseur.commande.class.php
    M htdocs/includes/odtphp/odf.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    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
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

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

Conflicts:
        htdocs/install/mysql/migration/3.3.0-3.4.0.sql
        htdocs/install/mysql/tables/llx_expedition.key.sql
        htdocs/install/mysql/tables/llx_expedition.sql


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c74fb3e3e9f5...fe20f8ae1b76