Commit Graph

1609 Commits

Author SHA1 Message Date
Laurent Destailleur
84b83229d6
Merge branch 'develop' into patch-6 2019-11-07 11:20:47 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent
100% centpercent
2019-11-07 10:39:09 +01:00
Laurent Destailleur
b3feb6b095 Fix lang not defined 2019-11-06 00:42:29 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Frédéric FRANCE
f3154566a4
Update index.php 2019-11-05 19:03:28 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
20f97807ce
clean indent 2019-10-27 10:07:47 +01:00
Frédéric FRANCE
635306c084
restore original rules to be mergeable without errors 2019-10-26 18:23:51 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
5056d7220b Fix multicurrency not yet supported on contracts 2019-10-14 15:36:28 +02:00
Frédéric FRANCE
ae62d3d60a
Update list.php 2019-10-08 18:43:22 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Frédéric FRANCE
0b9213f4f1
Update contrat.class.php 2019-10-07 08:11:23 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-18 21:23:26 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
f12a012932
Update card.php 2019-09-06 23:25:40 +02:00
Regis Houssin
369961b376 FIX avoid Warning: A non-numeric value encountered 2019-09-06 11:55:41 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
4a19f510fd Fix scrutinizer reports 2019-09-05 13:58:35 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
a5c43b42c3 Add a protection when we have several records 2019-08-23 13:28:26 +02:00
VESSILLER
ae87b33e81 NEW add entity in fetch method for contract 2019-08-20 17:04:41 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00