Laurent Destailleur
|
740105ae08
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
|
2020-12-23 11:59:14 +01:00 |
|
Laurent Destailleur
|
bac2ae0d5f
|
Fix warnings
|
2020-12-22 17:33:17 +01:00 |
|
Laurent Destailleur
|
093817833f
|
Add travis on 13.0 for test on php8
|
2020-12-22 17:24:36 +01:00 |
|
Laurent Destailleur
|
4fcf606d04
|
Error management on emailcollector edition
|
2020-12-22 17:22:24 +01:00 |
|
Laurent Destailleur
|
083b6a8c87
|
Fix emailcollector edition
|
2020-12-22 17:03:57 +01:00 |
|
Laurent Destailleur
|
6fad9c2d3b
|
Fix edition of operation into email collector
|
2020-12-22 16:59:59 +01:00 |
|
Laurent Destailleur
|
ef2bd563e2
|
trans
|
2020-12-22 16:55:51 +01:00 |
|
Laurent Destailleur
|
0068c1fb78
|
Trans
|
2020-12-22 16:29:53 +01:00 |
|
Laurent Destailleur
|
193d231d4c
|
Fix edition of operation into email collector
|
2020-12-22 16:29:21 +01:00 |
|
Laurent Destailleur
|
7b15197ded
|
Trans
|
2020-12-22 10:56:27 +01:00 |
|
Laurent Destailleur
|
ea745c89c7
|
Merge pull request #15801 from ptibogxiv/patch-403
Fix edit variant v13+
|
2020-12-21 19:30:32 +01:00 |
|
Laurent Destailleur
|
58b4de8bc3
|
More complete fix for #15712
|
2020-12-21 19:27:42 +01:00 |
|
stickler-ci
|
0e629204f2
|
Fixing style errors.
|
2020-12-21 17:49:49 +00:00 |
|
ptibogxiv
|
196fb07830
|
Fix edit variant v13+
after add, edit have same mistakes
|
2020-12-21 18:47:43 +01:00 |
|
Laurent Destailleur
|
9efc70b284
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2020-12-21 18:42:27 +01:00 |
|
Laurent Destailleur
|
cfbf59ff43
|
Merge pull request #15788 from andreubisquerra/master
FIX Open Drawer with new TakePOS connector
|
2020-12-21 18:34:59 +01:00 |
|
Laurent Destailleur
|
15c0773de7
|
Merge pull request #15791 from frederic34/patch-8
Remove no more needed file
|
2020-12-21 18:21:51 +01:00 |
|
Laurent Destailleur
|
e2c192813e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2020-12-21 18:21:36 +01:00 |
|
Laurent Destailleur
|
5252aa42b2
|
Trans
|
2020-12-21 18:20:13 +01:00 |
|
Laurent Destailleur
|
a04ee0897d
|
Merge pull request #15789 from frederic34/api_setup
fix unknown variable
|
2020-12-21 18:16:56 +01:00 |
|
Laurent Destailleur
|
48ce5c5499
|
Update api_setup.class.php
|
2020-12-21 18:16:16 +01:00 |
|
Laurent Destailleur
|
04d249cef0
|
Merge pull request #15792 from frederic34/notifications
simplify notications class
|
2020-12-21 18:14:04 +01:00 |
|
Laurent Destailleur
|
373ef45af5
|
Merge pull request #15793 from fappels/13_fix-reception_movement_list
FIX missing reception link in stock movement list.
|
2020-12-21 18:10:21 +01:00 |
|
Laurent Destailleur
|
88837df442
|
Merge pull request #15790 from frederic34/fixphpcs_2020_12
fix phpcs
|
2020-12-21 18:10:01 +01:00 |
|
Laurent Destailleur
|
6d1799eb25
|
Merge branch 'develop' into fixphpcs_2020_12
|
2020-12-21 18:08:20 +01:00 |
|
Laurent Destailleur
|
afc3528376
|
Merge pull request #15796 from ptibogxiv/patch-400
FIX: variants v13+
|
2020-12-21 18:07:00 +01:00 |
|
Laurent Destailleur
|
48dfc90c8b
|
Update create.php
|
2020-12-21 18:06:02 +01:00 |
|
Laurent Destailleur
|
189c0be00b
|
Merge pull request #15797 from FHenry/dev_fix_reslter_explorer_api_thirdparty
Dev fix reslter explorer api thirdparty
|
2020-12-21 18:02:37 +01:00 |
|
Laurent Destailleur
|
e6d56a533f
|
Merge pull request #15799 from ptibogxiv/patch-402
FIX variant api code v13+
|
2020-12-21 18:00:52 +01:00 |
|
Laurent Destailleur
|
dfb632f2d5
|
Fix phpunit
|
2020-12-21 17:56:31 +01:00 |
|
Laurent Destailleur
|
4bc0b46556
|
css
|
2020-12-21 17:33:57 +01:00 |
|
ptibogxiv
|
4ca6e38f5f
|
FIX variant api code v13+
Better clean code
|
2020-12-21 16:07:46 +01:00 |
|
Laurent Destailleur
|
8d901d03fd
|
Fix link
|
2020-12-21 16:01:47 +01:00 |
|
ptibogxiv
|
94cf393f7f
|
Update combinations.php
|
2020-12-21 15:43:45 +01:00 |
|
Florian HENRY
|
4d32529e66
|
include
|
2020-12-21 15:25:15 +01:00 |
|
Florian HENRY
|
3deed4678c
|
fix: reslter API need to have correct params as comment
|
2020-12-21 15:23:04 +01:00 |
|
ptibogxiv
|
cba10bbd4d
|
FIX: create form variant
https://github.com/Dolibarr/dolibarr/issues/15759
|
2020-12-21 15:18:55 +01:00 |
|
Laurent Destailleur
|
14223d74bd
|
Fix css
|
2020-12-21 15:00:29 +01:00 |
|
Laurent Destailleur
|
13deb1b1d3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-21 14:54:40 +01:00 |
|
Laurent Destailleur
|
eebdd0bd7a
|
Fix missing date value
|
2020-12-21 14:54:20 +01:00 |
|
Laurent Destailleur
|
fa9d195ede
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-21 14:44:07 +01:00 |
|
Laurent Destailleur
|
d05f9c42f5
|
Fix bad dir
|
2020-12-21 14:43:23 +01:00 |
|
Laurent Destailleur
|
7d0e71165a
|
Clean code
|
2020-12-21 14:40:27 +01:00 |
|
Laurent Destailleur
|
0195c11437
|
Add missing field required for real funnel of prospection.
|
2020-12-21 12:58:03 +01:00 |
|
Francis Appels
|
abbe340723
|
FIX missing reception link in stock movement list.
|
2020-12-21 12:24:45 +01:00 |
|
Laurent Destailleur
|
6937ab75fa
|
Fix test
|
2020-12-21 02:31:19 +01:00 |
|
Laurent Destailleur
|
0a19f3cf5b
|
css
|
2020-12-21 02:27:05 +01:00 |
|
Laurent Destailleur
|
f8ff8c63b6
|
Update init demo
|
2020-12-21 01:50:16 +01:00 |
|
Laurent Destailleur
|
67de45b8d7
|
Fix responsive
|
2020-12-21 01:40:15 +01:00 |
|
Laurent Destailleur
|
5dc6f5b89f
|
Prepare 13.0
|
2020-12-21 01:33:06 +01:00 |
|