Laurent Destailleur
|
cbe9fec51d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/ticket/list.php
|
2020-11-15 17:29:19 +01:00 |
|
Laurent Destailleur
|
b9192744cc
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-11-15 17:16:05 +01:00 |
|
Laurent Destailleur
|
30681f9179
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-11-15 17:15:56 +01:00 |
|
Laurent Destailleur
|
f101b3e43d
|
Merge pull request #15402 from BlueGarm/BlueGarm-Order-Partially-and-Delay
Add orders received partially and delay icons
|
2020-11-15 17:13:07 +01:00 |
|
Laurent Destailleur
|
dff5b13700
|
Merge pull request #15418 from atm-maxime/fix_ticket_list_filter
Fix #15377 ticket list filter on author
|
2020-11-15 17:01:47 +01:00 |
|
Laurent Destailleur
|
89a77fad2c
|
Fix warning
|
2020-11-15 16:56:30 +01:00 |
|
Laurent Destailleur
|
5c15162c40
|
Fix warning
|
2020-11-15 15:10:15 +01:00 |
|
Laurent Destailleur
|
2e0e42e918
|
Fix warning
|
2020-11-15 14:37:21 +01:00 |
|
Laurent Destailleur
|
0bcc4bf9bd
|
Travis
|
2020-11-15 14:33:07 +01:00 |
|
Laurent Destailleur
|
8eab783796
|
Fix travis
|
2020-11-15 14:30:36 +01:00 |
|
Laurent Destailleur
|
8ac7c420c8
|
Test
|
2020-11-15 14:24:37 +01:00 |
|
Laurent Destailleur
|
993741e33c
|
Test for vendor dir
|
2020-11-15 14:23:21 +01:00 |
|
Laurent Destailleur
|
3442f881d6
|
Test
|
2020-11-15 14:15:14 +01:00 |
|
Laurent Destailleur
|
bea2ce6cca
|
Test
|
2020-11-15 14:14:17 +01:00 |
|
Laurent Destailleur
|
d8a0d85cc8
|
Add log
|
2020-11-15 13:51:08 +01:00 |
|
Laurent Destailleur
|
9fe8c003a4
|
Merge pull request #15398 from frederic34/odtformembers
Add odt for members
|
2020-11-15 13:19:43 +01:00 |
|
Laurent Destailleur
|
496e3c1bda
|
Merge pull request #15404 from frederic34/patch-8
remove hirak/prestissimo
|
2020-11-15 13:16:06 +01:00 |
|
Maxime Kohlhaas
|
44c5988853
|
Fix #15377 ticket list filter on author
|
2020-11-15 10:42:15 +01:00 |
|
Laurent Destailleur
|
b3e03c6991
|
Fix css for public pages
|
2020-11-14 18:11:46 +01:00 |
|
Frédéric FRANCE
|
f209059d82
|
Update .travis.yml
|
2020-11-14 16:45:52 +01:00 |
|
BlueGarm
|
2425cf82d3
|
Add Partially Received Order and Delay
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
|
2020-11-14 13:25:02 +01:00 |
|
Mikaël MARTIN
|
0c37d31e04
|
Update box_supplier_orders_awaiting_reception.php
|
2020-11-14 13:01:36 +01:00 |
|
Frédéric FRANCE
|
0a5e041775
|
Merge remote-tracking branch 'upstream/develop' into odtformembers
|
2020-11-14 00:56:21 +01:00 |
|
Laurent Destailleur
|
98b227bdc9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-14 00:52:25 +01:00 |
|
Laurent Destailleur
|
fd50f27d5d
|
Removed temporary warning
|
2020-11-14 00:52:13 +01:00 |
|
Laurent Destailleur
|
b285ddf62b
|
Merge pull request #15394 from frederic34/patch-15
doxygen
|
2020-11-14 00:51:28 +01:00 |
|
Laurent Destailleur
|
34beb995f2
|
Update card.php
|
2020-11-14 00:51:01 +01:00 |
|
Laurent Destailleur
|
a64d907b2d
|
Merge pull request #15393 from frederic34/patch-14
doxygen
|
2020-11-14 00:49:46 +01:00 |
|
Laurent Destailleur
|
7da2d6cda2
|
Merge pull request #15391 from frederic34/patch-8
doxygen
|
2020-11-14 00:48:52 +01:00 |
|
Laurent Destailleur
|
50065c7c18
|
Merge pull request #15395 from frederic34/patch-17
display link with photo
|
2020-11-14 00:48:35 +01:00 |
|
Frédéric FRANCE
|
4ca3c0aa95
|
Add odt for members
|
2020-11-14 00:48:13 +01:00 |
|
Laurent Destailleur
|
c7b2577bb2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-14 00:47:42 +01:00 |
|
Laurent Destailleur
|
3c5ef18b36
|
FIX #15390
|
2020-11-14 00:47:28 +01:00 |
|
Laurent Destailleur
|
ea23d328c3
|
Merge pull request #15396 from frederic34/patch-18
fix member status in box
|
2020-11-14 00:39:59 +01:00 |
|
Laurent Destailleur
|
8970fbca79
|
Merge pull request #15397 from frederic34/patch-19
can upload odt model for user
|
2020-11-14 00:39:44 +01:00 |
|
Laurent Destailleur
|
313cc6cfea
|
Merge pull request #15392 from frederic34/patch-10
The variable $obj does not seem to be defined
|
2020-11-14 00:39:26 +01:00 |
|
Frédéric FRANCE
|
70f1ed53f8
|
can upload odt model for user
|
2020-11-13 22:51:10 +01:00 |
|
Frédéric FRANCE
|
cce6afbeea
|
fix member status in box
|
2020-11-13 22:22:51 +01:00 |
|
Frédéric FRANCE
|
5c159c6344
|
Update card.php
|
2020-11-13 21:57:46 +01:00 |
|
Frédéric FRANCE
|
dd2ab6f360
|
Update card.php
|
2020-11-13 21:56:17 +01:00 |
|
Frédéric FRANCE
|
10bdb1f787
|
Update opensurveysondage.class.php
|
2020-11-13 21:21:48 +01:00 |
|
Frédéric FRANCE
|
894f1e8215
|
Update card.php
|
2020-11-13 21:20:17 +01:00 |
|
Frédéric FRANCE
|
fd14ce4ea4
|
Update opensurveysondage.class.php
|
2020-11-13 21:16:58 +01:00 |
|
Frédéric FRANCE
|
0448a76df5
|
doxygen
|
2020-11-13 21:13:00 +01:00 |
|
Frédéric FRANCE
|
c4b13b154e
|
doxygen
|
2020-11-13 21:00:23 +01:00 |
|
Frédéric FRANCE
|
2f3ff6628d
|
The variable $obj does not seem to be defined
The variable $obj does not seem to be defined for all execution paths leading up to this point.
|
2020-11-13 20:51:48 +01:00 |
|
Frédéric FRANCE
|
42ddf7e27b
|
doxygen
|
2020-11-13 20:45:03 +01:00 |
|
Laurent Destailleur
|
1f69f4ed5d
|
Fix deprecated
|
2020-11-13 19:39:59 +01:00 |
|
Laurent Destailleur
|
283a42c086
|
Fix bad key
|
2020-11-13 19:38:44 +01:00 |
|
Laurent Destailleur
|
b9f1f6d909
|
Merge pull request #15387 from frederic34/patch-6
doxygen
|
2020-11-13 17:08:25 +01:00 |
|