Laurent Destailleur
|
21a1e0d7b3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/categories/index.php
htdocs/comm/action/list.php
htdocs/comm/action/rapport/index.php
htdocs/compta/paiement.php
htdocs/compta/sociales/document.php
htdocs/compta/tva/document.php
htdocs/core/actions_massactions.inc.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/facture/paiement.php
htdocs/loan/document.php
htdocs/main.inc.php
|
2019-06-04 19:03:27 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Laurent Destailleur
|
cafb3840b7
|
Fix look and feel v10
|
2019-05-29 12:56:11 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Philippe GRAND
|
728381e6e6
|
FIX : bug #11018
|
2019-04-15 15:10:44 +02:00 |
|
Laurent Destailleur
|
76567b1d07
|
NEW Can filter on the date of period for social contributions
|
2019-04-12 12:51:48 +02:00 |
|
Florent Peyraud
|
7672fd7cf0
|
Fix redirection on social tax deletion
|
2019-04-08 09:05:51 +02:00 |
|
Laurent Destailleur
|
ec9fdc1321
|
Fix regression with class="right". Style of amount lost.
|
2019-03-31 11:25:29 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Frédéric FRANCE
|
3dd4f0bfff
|
do not trim int
|
2019-03-07 22:17:48 +01:00 |
|
Frédéric FRANCE
|
62501b11e8
|
add visibility
|
2019-03-02 00:14:22 +01:00 |
|
Frédéric FRANCE
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Philippe GRAND
|
fd6eaf8c3d
|
update with html5 compliant code
|
2019-02-12 14:53:35 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Frédéric FRANCE
|
b766204690
|
wip
|
2019-01-30 22:53:47 +01:00 |
|
Frédéric FRANCE
|
f83ee43a19
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 22:15:22 +01:00 |
|
Laurent Destailleur
|
a23fd6f090
|
Fix phpcs
|
2019-01-30 20:55:55 +01:00 |
|
Laurent Destailleur
|
01f1f6162f
|
Fix phpcs
|
2019-01-30 20:06:21 +01:00 |
|
Laurent Destailleur
|
15bd99acf4
|
Fix phpcs
|
2019-01-30 20:06:05 +01:00 |
|
Laurent Destailleur
|
2882f45bca
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-30 18:55:01 +01:00 |
|
Laurent Destailleur
|
f67937c59d
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-30 18:54:29 +01:00 |
|
Laurent Destailleur
|
ae1c4e065b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-30 18:53:56 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
John BOTELLA
|
6f12cdf236
|
Fix travis
|
2019-01-28 11:58:16 +01:00 |
|
John BOTELLA
|
5dbc9ddae0
|
fix travis
|
2019-01-28 11:56:20 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +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 |
|
John BOTELLA
|
624d17c96a
|
Fix missing no trigger arg
|
2019-01-23 17:32:49 +01:00 |
|
John BOTELLA
|
1c51716997
|
Fix missing trigger
|
2019-01-23 17:02:20 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Philippe GRAND
|
539660a45d
|
update with html5 compliant code
|
2019-01-18 10:13:05 +01:00 |
|
ldestailleur
|
451b3e30cc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
|
2019-01-04 19:36:20 +01:00 |
|
Alexandre SPANGARO
|
a2075b9d2c
|
V9 look & Feel, etc
|
2018-12-30 20:32:44 +01:00 |
|
Regis Houssin
|
8f4c452075
|
FIX replace deprecated "print_fiche_titre" with "load_fiche_titre"
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
|
2018-12-25 08:34:26 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
976516a796
|
Fix look and feel v8
|
2018-11-08 09:51:46 +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 |
|
Philippe GRAND
|
52369bcb2b
|
Standardize and update code
|
2018-10-09 15:46:10 +02:00 |
|
Frédéric FRANCE
|
126e5ae3ad
|
remove not needed require
|
2018-09-18 20:05:48 +02:00 |
|
Frédéric FRANCE
|
032f9729a5
|
correct trimParameters
|
2018-09-18 19:05:00 +02:00 |
|
Laurent Destailleur
|
61f5a2e899
|
Merge pull request #9533 from frederic34/trimParameters
trimParameters function
|
2018-09-18 15:04:32 +02:00 |
|
Laurent Destailleur
|
e65ec9f4ef
|
Merge pull request #9530 from frederic34/patch-15
reduce complexity of cchargesociales class
|
2018-09-18 15:02:44 +02:00 |
|