Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,786 Commits 36 Branches 189 Tags
061e675b51abc72e9ecfcaaca69d46d5e64df3b4
Commit Graph

55 Commits

Author SHA1 Message Date
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
 2015-05-31 03:30:38 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Alexis Algoud
bc672c2c23 FIX event for restricted user was restricted if company null 2015-05-21 11:49:10 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00
jfefe
46ce77c571 Refactor function to use it into API 
New function checkUserAccessToObject() is a piece of restrictedArea() function.
 2015-05-03 14:41:51 +02:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Laurent Destailleur
cbbe909bc5 Fix: Pb in management of "or" ("|") for permission check. 2014-10-12 15:22:07 +02:00
Laurent Destailleur
166853dd56 Fix: miscellaneous bugs 2014-10-03 12:15:21 +02:00
Marcos García de La Fuente
7e7958cf73 Removed SQL errors as they are logged by the database handler 2014-06-12 13:49:05 +02:00
Laurent Destailleur
1557d8973f Fix: [ bug #1403 ] suppression d'une fiche produit impossible 2014-05-26 23:12:47 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
 2014-04-02 11:33:47 +02:00
Marcos García de La Fuente
09e02f807f Even better improvement 2014-03-22 19:01:19 +01:00
Marcos García de La Fuente
e2f51d0df2 Removed duplicate line 2014-03-22 19:00:37 +01:00
Marcos García de La Fuente
c8c77dbdcf Fix: Agenda and Banks module were not working with multicompany module 2014-03-22 18:59:48 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
4d379e572a Fix: Bugs into permissions for module category 2014-01-07 15:35:26 +01:00
Laurent Destailleur
89c772459f Fix: Bugs into permissions for module category 2014-01-07 14:55:03 +01:00
Laurent Destailleur
4a29431b69 New: Add hidden option MAIN_SECURITY_HASH_ALGO to choose hash function 2013-11-06 16:32:25 +01:00
Laurent Destailleur
32983b79ee Sec: Add option to salt password 2013-11-04 10:47:24 +01:00
Laurent Destailleur
e5fd19ffc0 Add option to salt hash passwords 2013-11-04 10:45:43 +01:00
Laurent Destailleur
890c96355d Check parameter to make bug detection seasier 2013-09-23 19:53:21 +02:00
fhenry
3b6efd569d Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-05-01 17:09:08 +02:00
Regis Houssin
d25687276e Fix: bypass the second test if the first is ok 2013-04-26 16:29:29 +02:00
Regis Houssin
3684271627 Fix: avoid error 2013-04-26 16:21:48 +02:00
Regis Houssin
34036c2a5c Fix: big security problem with multicompany 2013-04-26 16:07:35 +02:00
Laurent Destailleur
4e029bf2ca Fix: Security does not need special case 2013-03-24 21:06:45 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
15db85bc86 Fix: prepare external extended ged 2012-09-03 21:00:46 +02:00
Regis Houssin
1abc87f642 Fix: can delete an import file with dialog confirm 2012-09-03 17:14:33 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Laurent Destailleur
77e4b088ac Doc 2012-07-29 18:27:53 +02:00
Regis Houssin
66b2f630ac Fix: big avoid strict mode errors 2012-07-09 12:31:21 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
0bb3aced2f Fix: access problem if thirdparty module is disable 2012-07-02 20:04:28 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
7e46ddd5b0 Fix: Permissions for click2dial tab 2012-06-16 00:07:24 +02:00
Laurent Destailleur
1fec3b56d9 Fix: Permissions to see project 
Conflicts:
	htdocs/projet/fiche.php
 2012-05-23 14:34:44 +02:00
Regis Houssin
1b350fafd1 Fix: missing entity field in contract 
Fix: multicompany compatibility
 2012-05-03 18:42:46 +02:00
Laurent Destailleur
5759523c7a Qual: removed useless tests 2012-03-19 16:16:04 +01:00
Laurent Destailleur
d7cc1bdc88 Uniformize code 2012-02-19 19:14:17 +01:00
Laurent Destailleur
447922c218 More phpunit tests 2012-02-12 18:30:50 +01:00
Laurent Destailleur
036e578e0f Move security function into security.lib.php 
Split security.lib.php into 2 files: One always loaded, the other for
rare functions.
 2012-02-12 17:41:28 +01:00
Regis Houssin
72304505cb Fix: add htmlname parameter 2012-01-12 04:18:25 +08:00
Regis Houssin
199e22fd70 Fix: remove useless code 2012-01-11 23:02:01 +08:00
Regis Houssin
033b290ed3 Qual: add $mc global object (multicompany) 2012-01-11 17:41:46 +08:00