[Dolibarr-git] [Dolibarr/dolibarr] f7acd0: Fix: Bad path for instal.lock

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f7acd0f5c3bc66668a8aedecf401aefa8e4b6a53
      
https://github.com/Dolibarr/dolibarr/commit/f7acd0f5c3bc66668a8aedecf401aefa8e4b6a53
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M htdocs/admin/tools/update.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Fix: Bad path for instal.lock


  Commit: 48542b8625d8583739b54514f797849c7524a22f
      
https://github.com/Dolibarr/dolibarr/commit/48542b8625d8583739b54514f797849c7524a22f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M htdocs/fourn/commande/index.php

  Log Message:
  -----------
  Fix: Must use tms date


  Commit: 9e0cd530bc11b89fb8cd3b840bbc69efaa245a30
      
https://github.com/Dolibarr/dolibarr/commit/9e0cd530bc11b89fb8cd3b840bbc69efaa245a30
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

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

  Log Message:
  -----------
  New: Add date approve into log view.


  Commit: 9114fec4edc855335b5255f0e770efc327a3c28b
      
https://github.com/Dolibarr/dolibarr/commit/9114fec4edc855335b5255f0e770efc327a3c28b
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M htdocs/admin/propal.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/doxygen.php
    M htdocs/core/lib/barcode.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/commande/doc/pdf_edison.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_jaune.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/fourn/class/fournisseur.product.class.php
    M htdocs/product/admin/product.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/public/emailing/mailing-read.php
    M htdocs/public/emailing/mailing-unsubscribe.php

  Log Message:
  -----------
  Doxygen


  Commit: 66531ea539f51a264ff1ee26377199de8d512424
      
https://github.com/Dolibarr/dolibarr/commit/66531ea539f51a264ff1ee26377199de8d512424
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-04-16 (Mon, 16 Apr 2012)

  Changed paths:
    M htdocs/fourn/commande/index.php
    M htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/install/mysql/tables/llx_mailing.sql
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M test/phpunit/AllTests.php
    M test/phpunit/CoreTest.php

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

Conflicts:
        htdocs/fourn/commande/index.php


Compare: https://github.com/Dolibarr/dolibarr/compare/6c3e88e...66531ea