lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,762 Commits 43 Branches 150 Tags 886 MiB
af2df62aaa
Commit Graph

906 Commits

Author SHA1 Message Date
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Philippe GRAND
1501ce2c9f update with html5 compliant code 2019-01-31 13:34:32 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
4c281f4ff3 update with html5 compliant code 2019-01-22 13:56:14 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
fab6dde593 Close #9825 2018-12-14 10:51:32 +01:00
Laurent Destailleur
eefcf4b708
Merge pull request #9822 from bafbes/abb80034 
NEW Grant right to child classes to use Category methods
 2018-12-13 20:21:05 +01:00
Laurent Destailleur
8d4db1d085 Fix phpcs 2018-11-19 16:35:37 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
John BOTELLA
c6cf748ba7 Fix envent message on upload category picture 2018-11-13 14:44:10 +01:00
Laurent Destailleur
84983140b6
Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug 
FIX missing field "visible"
 2018-11-10 12:19:35 +01:00
Regis Houssin
ee06f36f4c FIX missing field "visible" 2018-11-09 11:36:20 +01:00
Regis Houssin
5d1d77a966 FIX missing action "edit" for the hook 2018-11-09 10:32:08 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
0171301543
code comment categories class 2018-10-21 19:19:35 +02:00
Abbes Bahfir
bfadd39e8c Fix: Grant right to child classes to use Category methods 2018-10-19 17:27:38 +01:00
Frédéric FRANCE
db732ddedd
code comment 2018-10-17 20:36:45 +02:00
Laurent Destailleur
dfe9c05d2f Merge menu entry for tags/categories as submenu of element. 2018-10-09 15:26:15 +02:00
Laurent Destailleur
a2a53a32f1 FIX Look and feel v8. Missing button "Create category" 2018-10-09 14:34:25 +02:00
Philippe GRAND
af0bcb2631 Standardize code 2018-10-09 09:40:00 +02:00
Laurent Destailleur
09a41fd757 Look and feel v8 2018-09-19 17:33:50 +02:00
Laurent Destailleur
0b02673ba5
Merge pull request #9487 from frederic34/patch-5 
Update categorie.class.php
 2018-09-12 22:03:18 +02:00
Laurent Destailleur
b5b4410e75
Duplicate delete 2018-09-12 22:02:50 +02:00
Frédéric FRANCE
04d3c7f43b
Update categorie.class.php 2018-09-12 21:07:54 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore 2018-09-02 11:12:07 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
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
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Laurent Destailleur
982a1ffbaf NEW Automatic position of scroll when creating an extrafield 2018-06-30 14:22:05 +02:00
Frédéric FRANCE
a0055174c4
loadlangs 2018-05-27 09:58:23 +02:00
Laurent Destailleur
c9d23d3930
Merge pull request #8783 from grandoc/new_branch_12_05_2018 
Clean and update code
 2018-05-18 08:56:06 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Philippe GRAND
29c735d8bd Clean and update code 2018-05-12 10:46:17 +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
8aab183567 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-19 14:00:18 +02:00
Laurent Destailleur
6b3e5e2085 FIX sanitize setup params 2018-04-18 12:19:23 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
1feee6378f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-11 14:45:52 +02:00
atm-arnaud
0e66d26d06 FIX #7730 2018-04-10 16:46:36 +02:00
atm-arnaud
d24b36f768 FIX #8359 2018-04-10 14:10:40 +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
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +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
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +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
5512e279ca
Merge pull request #8165 from atm-quentin/6.0 
NEW doActions on categorycard
 2018-02-12 02:55:31 +01:00
atm-quentin
6fb08dcc53 NEW doActions on categorycard 2018-02-09 11:50:33 +01:00
Laurent Destailleur
7f9d6a5458 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-01-31 20:25:24 +01:00
Laurent Destailleur
d6317a26d2 Fix for multicompany 2018-01-30 15:48:09 +01:00
Laurent Destailleur
34140ca3f0
Merge pull request #7983 from AlainRnet/patch-6 
NEW Show total number of records by category
 2018-01-26 18:04:18 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
AlainRnet
e308124ed6
Show total number of records by category 
There is so much information missing in these categories and it is also not possible to sort or display other information than currently displayed.
Here is a small hack to display the total number of record(s) in the list header of each category.
 2017-12-20 17:41:26 +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