[Dolibarr-git] [Dolibarr/dolibarr] a0fb27: FIX : Can create Proposal on close thridparty #352...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a0fb27bd80dcd528ee740f514166e82e97dddda8
      
https://github.com/Dolibarr/dolibarr/commit/a0fb27bd80dcd528ee740f514166e82e97dddda8
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M htdocs/comm/card.php
    M htdocs/comm/propal.php

  Log Message:
  -----------
  FIX : Can create Proposal on close thridparty #3526


  Commit: 4e19500ccea71817e02868f5785ad3968d76c471
      
https://github.com/Dolibarr/dolibarr/commit/4e19500ccea71817e02868f5785ad3968d76c471
  Author: Juanjo Menent <address@hidden>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M htdocs/comm/card.php
    M htdocs/comm/propal.php

  Log Message:
  -----------
  Merge pull request #3527 from FHenry/3.7

FIX : Must not be able to create Proposal on thridparty with "close" status  
#3526


  Commit: 8fd9d2a7cefc5b932ea2c908258207776036b920
      
https://github.com/Dolibarr/dolibarr/commit/8fd9d2a7cefc5b932ea2c908258207776036b920
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  FIX : #3530


  Commit: cb31ab3e2b925a0feabdd511b78da063c7e22b3b
      
https://github.com/Dolibarr/dolibarr/commit/cb31ab3e2b925a0feabdd511b78da063c7e22b3b
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M build/debian/apache/dolibarr.conf

  Log Message:
  -----------
  FIX Syntax error in Debian Apache configuration

This issue prevented Apache from starting after dolibarr deb package
installation with the following error:
Syntax error on line 30 of /etc/apache2/conf.d/dolibarr.conf:
order takes one argument, 'allow,deny', 'deny,allow', or 'mutual-failure'


  Commit: 30ccd28d01a5bb6b984e7b914233c1bac6ab9c42
      
https://github.com/Dolibarr/dolibarr/commit/30ccd28d01a5bb6b984e7b914233c1bac6ab9c42
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M build/debian/apache/dolibarr.conf

  Log Message:
  -----------
  Merge pull request #3535 from GPCsolutions/3.7-debian

FIX Syntax error in Debian Apache configuration


  Commit: 82518074084bb58facada90bbc72aaa1edf0bc2f
      
https://github.com/Dolibarr/dolibarr/commit/82518074084bb58facada90bbc72aaa1edf0bc2f
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-16 (Wed, 16 Sep 2015)

  Changed paths:
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Merge pull request #3532 from FHenry/3.7

FIX : #3530


  Commit: 8dd843ab8f7e1947cabc359cf0ebcc41fde634c7
      
https://github.com/Dolibarr/dolibarr/commit/8dd843ab8f7e1947cabc359cf0ebcc41fde634c7
  Author: AlainRnet <address@hidden>
  Date:   2015-09-17 (Thu, 17 Sep 2015)

  Changed paths:
    M htdocs/categories/categorie.php

  Log Message:
  -----------
  Update categorie.php

voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu 
dans quelle branche j'étais)


  Commit: f9973d13b471831f28c8cb0984dc8ace94a8de1a
      
https://github.com/Dolibarr/dolibarr/commit/f9973d13b471831f28c8cb0984dc8ace94a8de1a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-18 (Fri, 18 Sep 2015)

  Changed paths:
    M htdocs/categories/categorie.php

  Log Message:
  -----------
  Merge pull request #3550 from AlainRnet/patch-2

Update categorie.php


  Commit: c125ba0d6656d88323368183c3d8f6a6b972a726
      
https://github.com/Dolibarr/dolibarr/commit/c125ba0d6656d88323368183c3d8f6a6b972a726
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/.gitignore

  Log Message:
  -----------
  Update ignore to secure 

Conflicts:
        htdocs/.gitignore


  Commit: 90b78702e51a5b9311a755b9191168abc12fcc2a
      
https://github.com/Dolibarr/dolibarr/commit/90b78702e51a5b9311a755b9191168abc12fcc2a
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M htdocs/theme/.gitignore

  Log Message:
  -----------
  Update ignore to secure packaging


  Commit: 077c696c09e3f4f90a410216ad210cdc9b859447
      
https://github.com/Dolibarr/dolibarr/commit/077c696c09e3f4f90a410216ad210cdc9b859447
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-09-22 (Tue, 22 Sep 2015)

  Changed paths:
    M build/debian/apache/dolibarr.conf
    M htdocs/.gitignore
    M htdocs/categories/categorie.php
    M htdocs/comm/card.php
    M htdocs/comm/propal.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/theme/.gitignore

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

Conflicts:
        htdocs/.gitignore
        htdocs/theme/.gitignore


Compare: 
https://github.com/Dolibarr/dolibarr/compare/75daddbbe290...077c696c09e3