[Dolibarr-git] [Dolibarr/dolibarr] b01369: Error management

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b01369a32ea5c89d212149d2551f19caf412b743
      
https://github.com/Dolibarr/dolibarr/commit/b01369a32ea5c89d212149d2551f19caf412b743
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-03 (Fri, 03 Apr 2015)

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

  Log Message:
  -----------
  Error management


  Commit: 2dfaf08f6188400038fb6ee32f7d6f67eeba545c
      
https://github.com/Dolibarr/dolibarr/commit/2dfaf08f6188400038fb6ee32f7d6f67eeba545c
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M ChangeLog
    A htdocs/theme/amarok/img/object_margin.png

  Log Message:
  -----------
  Closes #2545 Bug: Missing object_margin.png in Amarok theme

Conflicts:
        ChangeLog


  Commit: 1ab70a70869575a9aa5a874ce46c781b0c353dfb
      
https://github.com/Dolibarr/dolibarr/commit/1ab70a70869575a9aa5a874ce46c781b0c353dfb
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Solves #2542 Bug: Contracts store localtax preferences

Conflicts:
        htdocs/compta/facture.php


  Commit: d7ba9b3312ae22df2b7f0b4fbabdf38e3d948714
      
https://github.com/Dolibarr/dolibarr/commit/d7ba9b3312ae22df2b7f0b4fbabdf38e3d948714
  Author: Juanjo Menent <address@hidden>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Fix: Bad permission assignments for stock movements actions

Conflicts:
        htdocs/core/menus/standard/eldy.lib.php
        htdocs/product/stock/mouvement.php


  Commit: aaef3a41c015667ff58d4e3cd6d39dcc4b159467
      
https://github.com/Dolibarr/dolibarr/commit/aaef3a41c015667ff58d4e3cd6d39dcc4b159467
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M htdocs/langs/en_US/productbatch.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/product/stock/mouvement.php

  Log Message:
  -----------
  Short label into table


  Commit: 091420f8aefb3b1eaa9bb3712a4a0ccec7945b84
      
https://github.com/Dolibarr/dolibarr/commit/091420f8aefb3b1eaa9bb3712a4a0ccec7945b84
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  Close #2568


  Commit: efb43a7015e5e928e89496355ef9097e6b7b9ecb
      
https://github.com/Dolibarr/dolibarr/commit/efb43a7015e5e928e89496355ef9097e6b7b9ecb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/product.php
    A htdocs/theme/amarok/img/object_margin.png

  Log Message:
  -----------
  Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7


  Commit: ca7a7a9038f4025a0b4f56557ac566eb1990c64c
      
https://github.com/Dolibarr/dolibarr/commit/ca7a7a9038f4025a0b4f56557ac566eb1990c64c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/core/class/stats.class.php
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.7' into develop

Conflicts:
        htdocs/compta/facture.php
        htdocs/product/stock/product.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1bbecc091297...ca7a7a9038f4