[Dolibarr-git] [Dolibarr/dolibarr] 37e472: fix bugs on margin reports

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  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: 123beb1e348b9c9f74ab673696a62ad3ef20fd95
      
https://github.com/Dolibarr/dolibarr/commit/123beb1e348b9c9f74ab673696a62ad3ef20fd95
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M htdocs/theme/auguria/style.css.php

  Log Message:
  -----------
  Fix: Bad property


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

  Changed paths:
    M htdocs/contact/fiche.php
    M htdocs/opensurvey/class/opensurveysondage.class.php

  Log Message:
  -----------
  Fix: security sql injection


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

  Changed paths:
    M htdocs/comm/address.php
    M htdocs/societe/class/address.class.php

  Log Message:
  -----------
  Fix: security sql injection


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

  Changed paths:
    M ChangeLog
    M htdocs/comm/address.php
    M htdocs/contact/fiche.php
    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
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/societe/class/address.class.php
    M htdocs/theme/auguria/style.css.php

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

Conflicts:
        ChangeLog


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

  Changed paths:
    M htdocs/comm/propal/list.php
    M htdocs/compta/facture/list.php

  Log Message:
  -----------
  Add ref_customer into list

Conflicts:
        htdocs/compta/facture/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/810c2827af96...3b9ce9af66b8