Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
d972fa8bcb
|
Fix pb with model_pdf
|
2019-11-05 20:20:57 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Laurent Destailleur
|
ce1dec253f
|
FIX #11364
|
2019-11-05 12:47:38 +01:00 |
|
Laurent Destailleur
|
31936a0ffe
|
Merge pull request #12304 from frederic34/patch-3
css
|
2019-11-04 20:54:02 +01:00 |
|
Laurent Destailleur
|
11500fb8d9
|
FIX confusion between permto... and permisstionto...
|
2019-11-04 15:33:49 +01:00 |
|
Frédéric FRANCE
|
bdcc33c194
|
css
|
2019-11-02 17:36:54 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
58ffb73627
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-11-02 12:59:49 +01:00 |
|
Laurent Destailleur
|
45c77b4560
|
Renaming some libelle into label
|
2019-11-02 12:59:38 +01:00 |
|
Laurent Destailleur
|
25e64b0610
|
Merge branch 'develop' into socid
|
2019-11-02 12:01:06 +01:00 |
|
Laurent Destailleur
|
68691ddd8a
|
Merge pull request #12265 from grandoc/new_branch_30_10_2019
add comment
|
2019-11-02 11:49:28 +01:00 |
|
Laurent Destailleur
|
68c971a2b5
|
All properties 'type_libelle' were renamed into 'type_label'.
|
2019-11-02 11:12:57 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
8c90c80107
|
Clean code
|
2019-11-02 01:30:51 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +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
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Laurent Destailleur
|
e684c1c450
|
Look and feel v11
|
2019-11-01 12:11:29 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
stickler-ci
|
ed9a136211
|
Fixing style errors.
|
2019-10-30 08:58:19 +00:00 |
|
Philippe GRAND
|
2fc09b3530
|
add comment
|
2019-10-30 09:52:25 +01:00 |
|
Laurent Destailleur
|
c2e630ac49
|
Merge pull request #12231 from frederic34/patch-14
make graph bigger and combine small value
|
2019-10-30 03:08:13 +01:00 |
|
Laurent Destailleur
|
66a288a343
|
Merge pull request #12235 from frederic34/scopeindent
clean indent
|
2019-10-30 02:57:59 +01:00 |
|
Laurent Destailleur
|
4eedf4a113
|
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-10-29 11:48:36 +01:00 |
|
Laurent Destailleur
|
9483e367ca
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:48:11 +01:00 |
|
Laurent Destailleur
|
e58ecaaa64
|
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
htdocs/product/stock/replenishorders.php
|
2019-10-29 11:43:35 +01:00 |
|
Laurent Destailleur
|
21d15c3bcb
|
FIX Set unpaid of expense report
|
2019-10-29 11:35:33 +01:00 |
|
Frédéric FRANCE
|
8f6d38ee82
|
clean indent
|
2019-10-27 17:01:23 +01:00 |
|
Frédéric FRANCE
|
64568fc792
|
Update index.php
|
2019-10-25 23:23:43 +02:00 |
|
Laurent Destailleur
|
8768c553b1
|
Debug modulebuilder
|
2019-10-24 11:16:06 +02:00 |
|
Laurent Destailleur
|
5ad7ca5620
|
Code more generic around setting projet on a card
|
2019-10-22 13:43:24 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
7b81ffe3fe
|
Update list.php
|
2019-10-11 16:29:16 +02:00 |
|
Laurent Destailleur
|
fc9c343af9
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/class/link.class.php
|
2019-10-11 16:12:01 +02:00 |
|
Laurent Destailleur
|
2a07ecf659
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-10-11 15:53:30 +02:00 |
|
Frédéric FRANCE
|
6bb14bdb0c
|
Update list.php
|
2019-10-09 22:07:52 +02:00 |
|
Laurent Destailleur
|
43a70e5548
|
Clean code to use the new $extrafields->attributes array
|
2019-10-08 09:28:50 +02:00 |
|
Laurent Destailleur
|
76aef85ee4
|
Merge pull request #12015 from atm-maxime/new_validators
NEW expense request and holiday validator fields
|
2019-10-07 13:31:20 +02:00 |
|
Frédéric FRANCE
|
37f6aa3395
|
Update list.php
|
2019-10-06 15:52:33 +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 |
|
Frédéric FRANCE
|
55410a55ef
|
Update list.php
|
2019-10-04 00:45:57 +02:00 |
|
Laurent Destailleur
|
02af9b8fa4
|
Update card.php
|
2019-10-03 17:56:55 +02:00 |
|
Maxime Kohlhaas
|
6d4f3f308e
|
NEW expense request and holiday validator fields
|
2019-10-02 08:43:40 +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 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Laurent Destailleur
|
138b494b98
|
Merge pull request #11936 from aspangaro/11.0_translation
Translate and some fix
|
2019-09-27 12:15:50 +02:00 |
|