[Dolibarr-git] [Dolibarr/dolibarr] 8024a6: Add missing label

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8024a613760856d0319fd9556c9740567f6fab3e
      
https://github.com/Dolibarr/dolibarr/commit/8024a613760856d0319fd9556c9740567f6fab3e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M htdocs/comm/action/fiche.php

  Log Message:
  -----------
  Add missing label


  Commit: f5387081e01efbb0ae20704569ca225ac2e395af
      
https://github.com/Dolibarr/dolibarr/commit/f5387081e01efbb0ae20704569ca225ac2e395af
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update doc


  Commit: 1f938e65961d52f4e68216b023d8a20ab1222c20
      
https://github.com/Dolibarr/dolibarr/commit/1f938e65961d52f4e68216b023d8a20ab1222c20
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/fiche.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4


  Commit: b7fe0cec34b104e8271f190312d93c2a52968001
      
https://github.com/Dolibarr/dolibarr/commit/b7fe0cec34b104e8271f190312d93c2a52968001
  Author: Christophe Battarel <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M htdocs/fourn/product/liste.php

  Log Message:
  -----------
  fix bug on filter and sort


  Commit: 7bc39d7601faa4f89aa0f9e6d0e3dfc668ea202f
      
https://github.com/Dolibarr/dolibarr/commit/7bc39d7601faa4f89aa0f9e6d0e3dfc668ea202f
  Author: Christophe Battarel <address@hidden>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  update changelog


  Commit: 4eb4c5f922220ea9aaac3702ab5eaaaab655c15e
      
https://github.com/Dolibarr/dolibarr/commit/4eb4c5f922220ea9aaac3702ab5eaaaab655c15e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M htdocs/install/etape2.php

  Log Message:
  -----------
  Some users report they need more time


  Commit: 7ac70344945251098d806cffcfbe9b6951a311f5
      
https://github.com/Dolibarr/dolibarr/commit/7ac70344945251098d806cffcfbe9b6951a311f5
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-27 (Fri, 27 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/fourn/product/liste.php

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

fix bug on filter and sort


  Commit: b695204259f4f962e091808b65b8d15144825e25
      
https://github.com/Dolibarr/dolibarr/commit/b695204259f4f962e091808b65b8d15144825e25
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-28 (Sat, 28 Sep 2013)

  Changed paths:
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
  Fix: invert parameters


  Commit: 37e47272c77dd5009ac209ca02aa1be311f0bf0e
      
https://github.com/Dolibarr/dolibarr/commit/37e47272c77dd5009ac209ca02aa1be311f0bf0e
  Author: Christophe Battarel <address@hidden>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php

  Log Message:
  -----------
  fix bugs on margin reports


  Commit: c41794ba4c31d3da279fe8146a7169f9ea0ffa3c
      
https://github.com/Dolibarr/dolibarr/commit/c41794ba4c31d3da279fe8146a7169f9ea0ffa3c
  Author: Christophe Battarel <address@hidden>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  update changelog


  Commit: 02278a399cc5e4cfa67a9e0d31034a798fb648ed
      
https://github.com/Dolibarr/dolibarr/commit/02278a399cc5e4cfa67a9e0d31034a798fb648ed
  Author: Christophe Battarel <address@hidden>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  better margin calculation (especially for credit notes)


  Commit: 51dd5cf259b32736e566990b256b1958969c029e
      
https://github.com/Dolibarr/dolibarr/commit/51dd5cf259b32736e566990b256b1958969c029e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-05 (Sat, 05 Oct 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php

  Log Message:
  -----------
  Merge pull request #1250 from altairis-fr/margin1

fix bugs on margin calculation and margin reports


  Commit: 141258f5141a2781c7ae10742195da6a223a47db
      
https://github.com/Dolibarr/dolibarr/commit/141258f5141a2781c7ae10742195da6a223a47db
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/fourn/product/liste.php
    M htdocs/install/etape2.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into develop
and fix syntax errors into sql requests.
Group by must ALWAYS contains fields that are not included into SUM or
COUNT

Conflicts:
        htdocs/fourn/product/liste.php
        htdocs/margin/agentMargins.php
        htdocs/margin/customerMargins.php
        htdocs/margin/productMargins.php
        htdocs/margin/tabs/productMargins.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2e3aad282cc0...141258f5141a