[Dolibarr-git] [Dolibarr/dolibarr] ecdce9: Merge branch '3.4' of https://github.com/Dolibarr/...

[Juanjo Menent]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ecdce9ddf6586c4f276b0c0f49bf62fc3db0c3d7
      
https://github.com/Dolibarr/dolibarr/commit/ecdce9ddf6586c4f276b0c0f49bf62fc3db0c3d7
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/fiche.php

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


  Commit: edf7af444c346bed6c911b6fbe17dcf20a39ee87
      
https://github.com/Dolibarr/dolibarr/commit/edf7af444c346bed6c911b6fbe17dcf20a39ee87
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  fix margin reports bugs (wrong group by + jquery syntax error)


  Commit: 2e79e750e96604058ae936fb2f8b4c20f4c16b9b
      
https://github.com/Dolibarr/dolibarr/commit/2e79e750e96604058ae936fb2f8b4c20f4c16b9b
  Author: Christophe Battarel <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

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


  Commit: 20d349689d0bdbc28434294a3dc050ee773bef26
      
https://github.com/Dolibarr/dolibarr/commit/20d349689d0bdbc28434294a3dc050ee773bef26
  Author: Juanjo Menent <address@hidden>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php

  Log Message:
  -----------
  Merge pull request #1192 from altairis-fr/3.4

fix margin reports bugs (wrong group by + jquery syntax error)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7e61c3703a7f...20d349689d0b