2
0
forked from Wavyzz/dolibarr
Commit Graph

2013 Commits

Author SHA1 Message Date
Florian HENRY
27c32560c6 Merge develop 2021-01-05 14:46:50 +01:00
Laurent Destailleur
a93227ac2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Regis Houssin
ec6c14beb8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-05 09:41:52 +01:00
Florian HENRY
86075a4db9 review code 2021-01-04 20:00:57 +01:00
Florian HENRY
88ff52a82b Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-04 19:20:34 +01:00
Laurent Destailleur
07a3367f52 Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline
Create/Edit extra-field computed value with multi-line text area
2021-01-04 15:57:50 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Florian HENRY
b6d91526ee Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr 2021-01-02 17:58:34 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Laurent Destailleur
b88ee6eff4 Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
e4600b2091 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-31 15:17:03 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Florian HENRY
b3dae016af fix sticker 2020-12-28 21:38:17 +01:00
Florian HENRY
1e438b686e fix stickler 2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Laurent Destailleur
1546805b9e Merge pull request #15500 from frederic34/patch-10
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
8e839a34e2 FIX for php 8 2020-12-23 19:14:47 +01:00
Florian HENRY
0c8939f46c modifié : htdocs/core/tpl/objectline_create.tpl.php
modifié :         htdocs/core/tpl/objectline_edit.tpl.php
2020-12-22 22:00:51 +01:00
Florian HENRY
fefc9040ab NEW : Display extrafields (for lines/det into line tr instead of ugly other tr 2020-12-22 12:52:01 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Stephane Lesage
695eacf099 Create/Edit extra-field with multi-line text area for computed value 2020-12-15 19:52:55 +01:00
Laurent Destailleur
8114e86cf9 Fix phpcs 2020-12-14 13:40:30 +01:00
Laurent Destailleur
107e58403a Fix position of captcha 2020-12-14 12:54:54 +01:00
Laurent Destailleur
fa05982a8b Fix CSS v13 2020-12-12 18:37:51 +01:00
Laurent Destailleur
10a0c98f94 Debug v13 2020-12-09 19:26:41 +01:00
Frédéric FRANCE
a2eab824c1 Merge remote-tracking branch 'upstream/develop' into patch-10 2020-12-04 20:42:22 +01:00
Laurent Destailleur
dd54d28dc6 Debug v13 2020-12-03 10:13:13 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
2707c0b89b Look and feel v13 2020-11-30 20:13:42 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Frédéric FRANCE
1704de39bb Merge remote-tracking branch 'upstream/develop' into patch-10 2020-11-27 11:18:04 +01:00
Laurent Destailleur
3588781180 Debug v13 2020-11-26 14:15:20 +01:00
Laurent Destailleur
74605cec12 Fix warning 2020-11-25 18:07:52 +01:00
Frédéric FRANCE
66ad0e5b13 add note on ecm files 2020-11-24 18:54:59 +01:00
Laurent Destailleur
5fb3564bc0 Merge pull request #15467 from hregis/develop_bug2
FIX missing "enabled" value of extrafield after update
2020-11-23 22:18:02 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Regis Houssin
fe5dfab4be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_bug2 2020-11-22 09:16:33 +01:00
Laurent Destailleur
a30e842521 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-21 23:48:34 +01:00
Laurent Destailleur
73a3a03398 Fix for smartphone 2020-11-21 23:36:20 +01:00
Regis Houssin
bd8faae9c1 FIX missing "enabled" value of extrafield after update 2020-11-20 15:59:50 +01:00