[Dolibarr-git] [Dolibarr/dolibarr] ad2a8d: Add nl_NL margin translation

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ad2a8d39c5c42a03baa6f40d24cf222eb49fb542
      
https://github.com/Dolibarr/dolibarr/commit/ad2a8d39c5c42a03baa6f40d24cf222eb49fb542
  Author: Florian Henry <address@hidden>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    A htdocs/langs/nl_NL/margins.lang

  Log Message:
  -----------
  Add nl_NL margin translation


  Commit: 55046e2cafd325fdbe407e9590901bb5c02f1e20
      
https://github.com/Dolibarr/dolibarr/commit/55046e2cafd325fdbe407e9590901bb5c02f1e20
  Author: Florian Henry <address@hidden>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_opensuse.spec

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


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

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.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:
  -----------
  fix bad rounding on margin calculation and display


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

  Changed paths:
    A htdocs/langs/nl_NL/margins.lang

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

Add nl_NL margin translation


  Commit: 4d10540600ab69a62f1eb2fed7d78ba278c6b337
      
https://github.com/Dolibarr/dolibarr/commit/4d10540600ab69a62f1eb2fed7d78ba278c6b337
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.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 #1272 from altairis-fr/rounding

fix bad rounding on margin calculation and display


  Commit: ecb1f490aed98b9aa9d4855cbfef97bc1dda76c9
      
https://github.com/Dolibarr/dolibarr/commit/ecb1f490aed98b9aa9d4855cbfef97bc1dda76c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/admin/tools/export.php

  Log Message:
  -----------
  Fix: Option drop tables was broken


  Commit: 84b36d1230c986ca92bb8c0a76a2bc0150e064fc
      
https://github.com/Dolibarr/dolibarr/commit/84b36d1230c986ca92bb8c0a76a2bc0150e064fc
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Prepare for 3.4.2


  Commit: 469dd0367341d6c4754809a40ba5d37182f9b8c8
      
https://github.com/Dolibarr/dolibarr/commit/469dd0367341d6c4754809a40ba5d37182f9b8c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/langs/nl_NL/margins.lang
    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 remote-tracking branch 'origin/3.4' into develop

Conflicts:
        build/debian/changelog
        build/exe/doliwamp/doliwamp.iss
        build/makepack-dolibarr.pl
        build/rpm/dolibarr_fedora.spec
        build/rpm/dolibarr_generic.spec
        build/rpm/dolibarr_mandriva.spec
        build/rpm/dolibarr_opensuse.spec
        htdocs/core/class/commonobject.class.php
        htdocs/core/tpl/objectline_view.tpl.php
        htdocs/filefunc.inc.php
        htdocs/langs/nl_NL/margins.lang


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f8e3a3e38a73...469dd0367341