Commit Graph

374 Commits

Author SHA1 Message Date
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
fe06a0a021 Merge pull request #9365 from frederic34/patch-23
Update categorie.class.php
2018-09-01 13:31:42 +02:00
Philippe GRAND
7354e485b0 precise label comment 2018-09-01 13:22:08 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Frédéric FRANCE
5833e6c5d8 Update categorie.class.php 2018-08-31 08:56:00 +02:00
Philippe GRAND
9681dfca1b Fix white spaces 2018-08-29 12:23:03 +02:00
Philippe Grand
405f3ca858 Update categorie.class.php 2018-08-28 10:40:03 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe GRAND
449ef9c464 Update and standardize code 2018-08-22 18:12:44 +02:00
Frédéric FRANCE
6b6daf178f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
7bb781eea8 function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
3210181a3d rule for private function is different 2018-08-14 10:21:34 +02:00
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Laurent Destailleur
363eaf0d72 FIX Parameters to triggers must be set into $this->context array. 2018-05-05 13:44:49 +02:00
Laurent Destailleur
bdf4c0704b Removed depreaceted not used method Categorie::get_nb_categories() 2018-05-05 13:40:45 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
4c9ccb163c Remove deprecated way of working. Use context array instead. 2018-03-27 17:58:24 +02:00
Laurent Destailleur
e2cbf903ba Remove deprecated code 2018-03-16 10:33:23 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Regis Houssin
0f574579eb Fix: avoid error if type is not numeric 2018-03-07 12:27:13 +01:00
Laurent Destailleur
82ae65b18d NEW Can get template of email from its label 2018-02-23 11:23:36 +01:00
Laurent Destailleur
d8f8e76bee Provide context to trigger 2018-02-23 10:39:39 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
60a848de5a Fix bad list of id for supplier categories 2018-02-12 04:09:15 +01:00
Laurent Destailleur
f637269a27 Fix bad list of id for supplier categories 2018-02-12 04:05:13 +01:00
Laurent Destailleur
d6317a26d2 Fix for multicompany 2018-01-30 15:48:09 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
77509ee37a Removed deprecated apis 2017-11-25 13:14:28 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
a72703d316 Fix deprecated code 2017-11-03 17:29:25 +01:00
Laurent Destailleur
c6e5115d34 Set default limit to 100 on all rest api that list 2017-10-22 15:42:19 +02:00
Laurent Destailleur
87814af7b6 Move function colorIsLight into functions.lib.php
Fix scrutinizer bugs.
2017-10-16 09:29:10 +02:00
Laurent Destailleur
6540bc0061 Fix doxygen 2017-10-04 19:48:11 +02:00
Regis Houssin
4537e5472b Fix: refactorization of "getListForItem" function 2017-10-03 19:01:54 +02:00
Regis Houssin
f8f4ff6d21 Fix: missing include api_categories class 2017-10-03 13:07:07 +02:00
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