[Dolibarr-git] [Dolibarr/dolibarr] c61f7b:

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c61f7b63903996573fb9b4b602dc23262d5b2ac6
      
https://github.com/Dolibarr/dolibarr/commit/c61f7b63903996573fb9b4b602dc23262d5b2ac6
  Author: Florian Henry <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_fichinterdet.sql

  Log Message:
  -----------
  
Fix [ bug #911 ] Reorder intervention do not work


  Commit: 557756058f9015cff05128c8350f3ec9eb5488ea
      
https://github.com/Dolibarr/dolibarr/commit/557756058f9015cff05128c8350f3ec9eb5488ea
  Author: Florian Henry <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/contrat/fiche.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/install/mysql/tables/llx_societe_address.sql
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

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

Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41


  Commit: f239ec2aee082c6da4338562738b18b500aa238d
      
https://github.com/Dolibarr/dolibarr/commit/f239ec2aee082c6da4338562738b18b500aa238d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-05-25 (Sat, 25 May 2013)

  Changed paths:
    M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
    M htdocs/install/mysql/tables/llx_fichinterdet.sql

  Log Message:
  -----------
  Merge pull request #986 from FHenry/3.4

Fix [ bug #911 ] Reorder intervention do not work


Compare: 
https://github.com/Dolibarr/dolibarr/compare/15402b9286a7...f239ec2aee08