[Dolibarr-git] [Dolibarr/dolibarr] 453ed8: FIX error in SQL due to a previous fix

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 453ed8a05e757cfc38d308abe8d8c9da526738a1
      
https://github.com/Dolibarr/dolibarr/commit/453ed8a05e757cfc38d308abe8d8c9da526738a1
  Author: Alexis ALGOUD <address@hidden>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M htdocs/core/lib/security.lib.php

  Log Message:
  -----------
  FIX error in SQL due to a previous fix


  Commit: 0b7305d21a6053f3c5d57593ed16fa01f05c69e1
      
https://github.com/Dolibarr/dolibarr/commit/0b7305d21a6053f3c5d57593ed16fa01f05c69e1
  Author: arnaud <address@hidden>
  Date:   2015-09-28 (Mon, 28 Sep 2015)

  Changed paths:
    M htdocs/compta/facture/class/facturestats.class.php

  Log Message:
  -----------
  FIX facturestat bad sql when customer view is limited


  Commit: 34adc60d267a39c596eef3dffdb3a91723ab3dd3
      
https://github.com/Dolibarr/dolibarr/commit/34adc60d267a39c596eef3dffdb3a91723ab3dd3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M htdocs/core/lib/security.lib.php

  Log Message:
  -----------
  Merge pull request #3618 from 
atm-alexis/fix_event_for_user_restricted_if_no_company

FIX error in SQL due to a previous fix


  Commit: 1907e5da545e55ea8b0d7a397c95b457f5b234d4
      
https://github.com/Dolibarr/dolibarr/commit/1907e5da545e55ea8b0d7a397c95b457f5b234d4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M htdocs/compta/facture/class/facturestats.class.php

  Log Message:
  -----------
  Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat

FIX facturestat bad sql when customer view is limited


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

  Changed paths:
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facturestats.class.php

  Log Message:
  -----------
  Add comment


  Commit: 72c31c0fa9b63934bc37c96396a05d3795b35214
      
https://github.com/Dolibarr/dolibarr/commit/72c31c0fa9b63934bc37c96396a05d3795b35214
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M htdocs/compta/facture/class/facturestats.class.php
    M htdocs/core/lib/security.lib.php

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


  Commit: 076f2ed9d1c47636de1fe6566d94b9f1df9552d7
      
https://github.com/Dolibarr/dolibarr/commit/076f2ed9d1c47636de1fe6566d94b9f1df9552d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-01 (Thu, 01 Oct 2015)

  Changed paths:
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facturestats.class.php

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

Conflicts:
        htdocs/core/lib/security.lib.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9c28894ec32d...076f2ed9d1c4