Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,474 Commits 36 Branches 190 Tags
5e34b121dd0445c908f37fa42e901b7af025dcaa
Commit Graph

251 Commits

Author SHA1 Message Date
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
2cdea7e37c Fix bug reported by scrutinizer 2017-09-12 19:21:26 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
florian HENRY
1a389b6faf fix upload photo for categ 2017-09-08 10:36:45 +02:00
florian HENRY
34f08ce082 fix travis 2017-09-08 10:36:11 +02:00
florian HENRY
20ed279489 better fix 2017-09-08 10:34:38 +02:00
florian HENRY
da2f971345 fix upload images on category 2017-09-08 10:33:00 +02:00
Laurent Destailleur
502ac19a0a Fix regression on categories 2017-08-27 12:28:59 +02:00
Laurent Destailleur
dac0b6c2a7 Fix regression 2017-07-26 13:46:27 +02:00
Laurent Destailleur
6fcb54b2d6 FIX #7072 2017-07-25 19:57:51 +02:00
Laurent Destailleur
43f6eab2ea FIX #7146 2017-07-13 15:16:17 +02:00
fappels
f85fcbd216 Fix categorie navigation 2017-07-10 12:47:21 +02:00
Laurent Destailleur
00e1fab1af Fix bad var 2017-07-08 19:01:09 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
Laurent Destailleur
e7e4252244 Fix deletion of category 2017-07-05 01:23:42 +02:00
Laurent Destailleur
e199864fce Better log 2017-07-05 00:09:35 +02:00
Laurent Destailleur
c7a6a67e20 Fix remove warnings 2017-06-22 11:04:29 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
1a8884bbbe NEW Can filter on year and product tags on the product statistic page 2017-05-22 15:20:52 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
a0e75d0af0 Work on look and feel v6 2017-04-07 18:38:55 +02:00
Laurent Destailleur
6e0918dded Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-31 18:31:54 +02:00
phf
2dc721c538 Fix picture with jpeg extension are not visible 2017-03-29 16:10:59 +02:00
Laurent Destailleur
9a9887f482 Fix deletion of bank category/tag 2017-02-27 12:14:32 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Gustavo Novaro
a321ab5f31 var to public 
Update deprecated code style
 2016-12-17 03:27:32 -03:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
 2016-10-16 19:02:36 +02:00
Laurent Destailleur
3d1ddbb923 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:20 +02:00
Juanjo Menent
ffd486e3d6 Fix #5843 best way fixing 2016-10-07 22:54:08 +02:00
Juanjo Menent
45dfb8ca62 Fix #5843 best way fixing 2016-10-07 22:32:11 +02:00
Juanjo Menent
298e5cee61 Fix #5843 best way fixing 2016-10-07 22:21:50 +02:00
Juanjo Menent
b7b18e3355 FIX: Error when CATEGORIE_RECURSIV_ADD is enabled and new category is daughter of an already linked to object 2016-10-07 10:12:25 +02:00
Laurent Destailleur
c49c23df3d Fix debug project categories 2016-08-29 17:30:54 +02:00
florian HENRY
cd1f78cd52 continur working 2016-08-29 10:41:14 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
philippe grand
770da29de4 internationalization of code comment 2016-07-05 17:20:32 +02:00
Laurent Destailleur
d23a8a56ea Fix must use the constant, not hard coded value. 2016-06-25 21:40:45 +02:00
philippe grand
0c5eaddf7a internationalization of code comment 2016-06-23 19:56:17 +02:00
Laurent Destailleur
6317cb53f2 FIX Merge of 2 thirdparties when there is one common tag. 2016-06-20 15:42:16 +02:00
Laurent Destailleur
97278c254e Doc comment 2016-05-26 21:12:36 +02:00
Laurent Destailleur
b410aa57b9 Fix: Fetching category on label is not enough. We must introduce type 2016-05-25 15:36:48 +02:00
Laurent Destailleur
3119d77565 Add warning on deprecated param 2016-05-22 16:36:48 +02:00
frederic34
17463b4927 categories account like other categories 2016-04-30 14:45:24 +02:00
Laurent Destailleur
935327d911 Fix scrutinizer warning 2016-04-09 16:00:24 +02:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +02:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
e63ab857d8 FIX #4583 Incorrect call of Categories::containing throws a DoliDB error 
Close #4583
 2016-03-02 11:21:56 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00