[Dolibarr-git] [Dolibarr/dolibarr] e0a5f8: Merge remote branch 'dolibarr/3.1-beta' into 3.1-b...

[Regis Houssin]

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

  Commit: e0a5f8441c381a4acbfb0be021c5b791d395c575
      
https://github.com/Dolibarr/dolibarr/commit/e0a5f8441c381a4acbfb0be021c5b791d395c575
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

  Changed paths:
    M build/makepack-dolibarrtheme.pl
  M htdocs/cashdesk/admin/cashdesk.php
  M htdocs/cashdesk/index.php
  M htdocs/categories/class/categorie.class.php
  M htdocs/comm/remise.php
  M htdocs/comm/remx.php
  M htdocs/compta/facture.php
  M htdocs/compta/facture/class/facture.class.php
  M htdocs/compta/facture/impayees.php
  M htdocs/compta/index.php
  M htdocs/compta/paiement.php
  M htdocs/compta/stats/casoc.php
  M htdocs/contrat/services.php
  M htdocs/core/class/discount.class.php
  M htdocs/includes/modules/societe/mod_codeclient_elephant.php
  M htdocs/includes/modules/societe/mod_codeclient_monkey.php
  M htdocs/install/mysql/migration/3.0.0-3.1.0.sql
  M htdocs/install/mysql/tables/llx_societe_prices.sql
  M htdocs/public/paypal/newpayment.php
  M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge remote branch 'dolibarr/3.1-beta' into 3.1-beta


  Commit: 8eb2f17fcc5beea6dd76fdfa0ab84f1660281464
      
https://github.com/Dolibarr/dolibarr/commit/8eb2f17fcc5beea6dd76fdfa0ab84f1660281464
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

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

  Log Message:
  -----------
  Fix: bad value with multi-company module


  Commit: faf972c31fc5c2774fc0229ae225e5837c2ea15a
      
https://github.com/Dolibarr/dolibarr/commit/faf972c31fc5c2774fc0229ae225e5837c2ea15a
  Author: Regis Houssin <address@hidden>
  Date:   2011-09-15 (Thu, 15 Sep 2011)

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

  Log Message:
  -----------
  Merge pull request #7 from hregis/3.1-beta

Fix: bad value with multi-company module


Compare: https://github.com/Dolibarr/dolibarr/compare/712e779...faf972c