[Dolibarr-git] [Dolibarr/dolibarr] a0fb27: FIX : Can create Proposal on

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a0fb27: FIX : Can create Proposal on

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] a0fb27: FIX : Can create Proposal on close thridparty #352...
Date:	Sun, 04 Oct 2015 08:20:41 -0700
  Branch: refs/heads/3.7_backported
  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: 1454d942ef466171bfaed624b4ad35fea7e955e6
      
https://github.com/Dolibarr/dolibarr/commit/1454d942ef466171bfaed624b4ad35fea7e955e6
  Author: philippe <address@hidden>
  Date:   2015-09-27 (Sun, 27 Sep 2015)

  Changed paths:
    M htdocs/core/modules/modContrat.class.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  missing translation


  Commit: 6f128907fee670348dccfdfafd5624623d7d7ce1
      
https://github.com/Dolibarr/dolibarr/commit/6f128907fee670348dccfdfafd5624623d7d7ce1
  Author: Grand Philippe <address@hidden>
  Date:   2015-09-27 (Sun, 27 Sep 2015)

  Changed paths:
    M htdocs/exports/export.php

  Log Message:
  -----------
  fix :  Missing argument 1 for CommonDocGenerator::__construct()


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

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  FIX : When delete actioncomm also delete actioncomm_resources


  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: 4f5e207f08e68958184febd18882160f22bed143
      
https://github.com/Dolibarr/dolibarr/commit/4f5e207f08e68958184febd18882160f22bed143
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  review


  Commit: 766b8535ae87a434d5438c4422fb75863ee777cc
      
https://github.com/Dolibarr/dolibarr/commit/766b8535ae87a434d5438c4422fb75863ee777cc
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  spacing


  Commit: bb0de1dcadc84b7ad492a5c1b9925a7e277c843f
      
https://github.com/Dolibarr/dolibarr/commit/bb0de1dcadc84b7ad492a5c1b9925a7e277c843f
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M htdocs/install/upgrade2.php

  Log Message:
  -----------
  FIX : update2.php test res befre assign it


  Commit: fecd213bb838e48390eb37e9f3cd9bcfcc6b4b55
      
https://github.com/Dolibarr/dolibarr/commit/fecd213bb838e48390eb37e9f3cd9bcfcc6b4b55
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  FIX: display error on extrafields on ficheinter


  Commit: e209fb23a28d908b0d3d3ebdd7ab40f2c2d3ebdf
      
https://github.com/Dolibarr/dolibarr/commit/e209fb23a28d908b0d3d3ebdd7ab40f2c2d3ebdf
  Author: Florian HENRY <address@hidden>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M htdocs/admin/fichinter.php

  Log Message:
  -----------
  FIX : Admin fiche inter page do not take good action


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

  Changed paths:
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php

  Log Message:
  -----------
  FIX : Email selector contact must not include inactive contact


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

  Changed paths:
    M htdocs/core/modules/modContrat.class.php
    M htdocs/exports/export.php
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Merge pull request #3612 from grandoc/3.7

missing translation


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

  Changed paths:
    M htdocs/admin/fichinter.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/fichinter/card.php
    M htdocs/install/upgrade2.php

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

FIX : When delete actioncomm also delete actioncomm_resources


  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


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

  Changed paths:
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/fr_FR/compta.lang

  Log Message:
  -----------
  FIX #3630 - Wrong balance report when module salaries and donation
disabled


  Commit: 2c87c2e0db7184c0ab30fca1aaa4929ac90e9f2c
      
https://github.com/Dolibarr/dolibarr/commit/2c87c2e0db7184c0ab30fca1aaa4929ac90e9f2c
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-10-04 (Sun, 04 Oct 2015)

  Changed paths:
    M build/debian/apache/dolibarr.conf
    M build/makepack-dolibarr.pl
    M htdocs/.gitignore
    M htdocs/admin/fichinter.php
    M htdocs/categories/categorie.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/card.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propalestats.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facturestats.class.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/modContrat.class.php
    M htdocs/exports/export.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/fr_FR/compta.lang
    M htdocs/theme/.gitignore

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/370b285090cb...2c87c2e0db71
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] a0fb27: FIX : Can create Proposal on close thridparty #352..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] 2a84af: fix dangerous sql injection #3327
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] d54650: FIX debian install when module mysqli is not insta...
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] 2a84af: fix dangerous sql injection #3327
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] d54650: FIX debian install when module mysqli is not insta...
Index(es):
- Date
- Thread