[Dolibarr-git] [Dolibarr/dolibarr] e2e956: FIX Search supplier ref on contract

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e2e95641a3198d527fe1b39667dd3eb803aca3b8
      
https://github.com/Dolibarr/dolibarr/commit/e2e95641a3198d527fe1b39667dd3eb803aca3b8
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M htdocs/contrat/list.php

  Log Message:
  -----------
  FIX Search supplier ref on contract


  Commit: 24d7c6aae77f81c7013d3ec6ed273e966982b537
      
https://github.com/Dolibarr/dolibarr/commit/24d7c6aae77f81c7013d3ec6ed273e966982b537
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M htdocs/opensurvey/wizard/choix_date.php

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


  Commit: 1ce91bac06f445c955e710d061caab0bb038d0ce
      
https://github.com/Dolibarr/dolibarr/commit/1ce91bac06f445c955e710d061caab0bb038d0ce
  Author: gauthier <address@hidden>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  FIX : same page added several times on mergepropal option


  Commit: 71ee941cf84f3954b69bd0a6927cc6eb575dc02e
      
https://github.com/Dolibarr/dolibarr/commit/71ee941cf84f3954b69bd0a6927cc6eb575dc02e
  Author: gauthier <address@hidden>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  FIX : SQL error function on getAvailableDiscounts function, on bill create 
mode if socid is empty


  Commit: 3f49f0df3372bcb4d1c9312d2151900f8b6cc5d7
      
https://github.com/Dolibarr/dolibarr/commit/3f49f0df3372bcb4d1c9312d2151900f8b6cc5d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Merge pull request #5245 from atm-gauthier/3.8_fix_sql_error_on_facture_create

FIX : SQL error function on getAvailableDiscounts function, on bill c…


  Commit: c2d8bd99dc47d3dffb1915440ba45832bb3913e6
      
https://github.com/Dolibarr/dolibarr/commit/c2d8bd99dc47d3dffb1915440ba45832bb3913e6
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  Merge pull request #5244 from atm-gauthier/3.8_fix_mergepropal

FIX : same page added several times on mergepropal option


  Commit: ab44adc6d5b7d7fe6d8c926fbe9d45ed225e6cac
      
https://github.com/Dolibarr/dolibarr/commit/ab44adc6d5b7d7fe6d8c926fbe9d45ed225e6cac
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M htdocs/commande/class/commandestats.class.php

  Log Message:
  -----------
  Fix SQL error on order stats


  Commit: fde6909530f1b947f599c79aee4086493b84c6d5
      
https://github.com/Dolibarr/dolibarr/commit/fde6909530f1b947f599c79aee4086493b84c6d5
  Author: Juanjo Menent <address@hidden>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M htdocs/commande/class/commandestats.class.php

  Log Message:
  -----------
  Merge pull request #5258 from atm-maxime/3.8

Fix SQL error on order stats


  Commit: 778b05c3416f9ba7c89792ce7e97a00229280f8f
      
https://github.com/Dolibarr/dolibarr/commit/778b05c3416f9ba7c89792ce7e97a00229280f8f
  Author: phf <address@hidden>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix #4632


  Commit: c9c7045a6f0ed6d925ac89635a45eeccd492b077
      
https://github.com/Dolibarr/dolibarr/commit/c9c7045a6f0ed6d925ac89635a45eeccd492b077
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix access to project task time spent creation #5249


  Commit: d20d88e1af27233520d8673cc22d71cf181fe034
      
https://github.com/Dolibarr/dolibarr/commit/d20d88e1af27233520d8673cc22d71cf181fe034
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge pull request #5265 from atm-ph/fix_3.8_soc.php_with_wrong_id

Fix #4632


  Commit: 8b0b3b1a9dc1ac1db0b0d70a14005c9043945a1d
      
https://github.com/Dolibarr/dolibarr/commit/8b0b3b1a9dc1ac1db0b0d70a14005c9043945a1d
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M htdocs/fourn/ajax/getSupplierPrices.php

  Log Message:
  -----------
  PMP available only if stock module enabled


  Commit: b9feae0883add134ca5520e6867f9fc01b3c0a81
      
https://github.com/Dolibarr/dolibarr/commit/b9feae0883add134ca5520e6867f9fc01b3c0a81
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/fourn/ajax/getSupplierPrices.php

  Log Message:
  -----------
  Merge pull request #5270 from atm-maxime/fix_pmp_when_stock_enabled

Fix pmp when stock enabled


  Commit: b47db3e9e16d5685b680eecedc5875fd5a1fb83b
      
https://github.com/Dolibarr/dolibarr/commit/b47db3e9e16d5685b680eecedc5875fd5a1fb83b
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Merge pull request #5266 from atm-maxime/fix_project_time_spent_access

Fix access to project task time spent creation #5249


  Commit: 085fa6902ba774b03ea36b7e144636faa7ba4387
      
https://github.com/Dolibarr/dolibarr/commit/085fa6902ba774b03ea36b7e144636faa7ba4387
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture.php
    M htdocs/contrat/list.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/fourn/ajax/getSupplierPrices.php
    M htdocs/projet/tasks/time.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.8' into 3.9

Conflicts:
        htdocs/contrat/list.php
        htdocs/fourn/ajax/getSupplierPrices.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/609cc1dd70c2...085fa6902ba7