Frédéric FRANCE
|
8cff0222cd
|
Update commondocgenerator.class.php
|
2020-11-15 23:58:35 +01:00 |
|
Frédéric FRANCE
|
35653bb855
|
fix dir for member photo in odt tag
|
2020-11-15 23:45:13 +01:00 |
|
Laurent Destailleur
|
e2ea25fd78
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-11-15 17:29:31 +01:00 |
|
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
|
2480079153
|
Merge pull request #15420 from frederic34/patch-27
fix warnings
|
2020-11-15 17:14:07 +01:00 |
|
Laurent Destailleur
|
6d57d8a3dd
|
Merge pull request #15419 from frederic34/patch-8
add translation for admin odt for members
|
2020-11-15 17:13:35 +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
|
6cfc045abe
|
Merge pull request #15417 from frederic34/patch-26
doxygen
|
2020-11-15 17:06:55 +01:00 |
|
Laurent Destailleur
|
8e87729040
|
Merge pull request #15416 from frederic34/patch-25
doxygen
|
2020-11-15 17:06:34 +01:00 |
|
Laurent Destailleur
|
acfee5a0e1
|
Merge pull request #15415 from frederic34/patch-24
doxygen
|
2020-11-15 17:05:55 +01:00 |
|
Laurent Destailleur
|
041de0843a
|
Merge pull request #15414 from frederic34/patch-23
doxygen
|
2020-11-15 17:05:39 +01:00 |
|
Laurent Destailleur
|
27f3287ac4
|
Merge pull request #15413 from frederic34/patch-22
doxygen
|
2020-11-15 17:05:22 +01:00 |
|
Laurent Destailleur
|
c4094357c2
|
Merge pull request #15412 from frederic34/patch-21
doxygen
|
2020-11-15 17:05:03 +01:00 |
|
Laurent Destailleur
|
a1bdce06f5
|
Merge pull request #15411 from frederic34/patch-20
doxygen
|
2020-11-15 17:04:45 +01:00 |
|
Laurent Destailleur
|
db357da9a7
|
Merge pull request #15410 from frederic34/patch-19
doxygen
|
2020-11-15 17:04:17 +01:00 |
|
Laurent Destailleur
|
31c73403c0
|
Update pdf_eratosthene.modules.php
|
2020-11-15 17:04:07 +01:00 |
|
Laurent Destailleur
|
d0cf558604
|
Merge pull request #15409 from frederic34/patch-18
doxygen
|
2020-11-15 17:02:54 +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
|
ed6204183d
|
Merge pull request #15408 from frederic34/patch-17
doxygen
|
2020-11-15 17:00:54 +01:00 |
|
Laurent Destailleur
|
011e786996
|
Update pdf_sepamandate.modules.php
|
2020-11-15 17:00:37 +01:00 |
|
Laurent Destailleur
|
0db18136a5
|
Merge pull request #15407 from frederic34/patch-15
doxygen
|
2020-11-15 16:59:47 +01:00 |
|
Laurent Destailleur
|
c0ce41dc0d
|
Merge pull request #15406 from frederic34/patch-14
doxygen
|
2020-11-15 16:59:25 +01:00 |
|
Laurent Destailleur
|
b1e4e8721f
|
Merge pull request #15405 from frederic34/patch-10
doxygen
|
2020-11-15 16:58:59 +01:00 |
|
Frédéric FRANCE
|
c96fd8c727
|
fix warnings
|
2020-11-15 16:58:40 +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 |
|
Frédéric FRANCE
|
894e586669
|
add translation
|
2020-11-15 13:39:48 +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 |
|
Frédéric FRANCE
|
52b4e2fbc5
|
doxygen
|
2020-11-14 22:25:25 +01:00 |
|
Frédéric FRANCE
|
41906fb5ee
|
Update pdf_cyan.modules.php
|
2020-11-14 22:15:05 +01:00 |
|
Frédéric FRANCE
|
92c28efe42
|
doxygen
|
2020-11-14 22:12:05 +01:00 |
|
Frédéric FRANCE
|
da0bdd0907
|
doxygen
|
2020-11-14 22:04:14 +01:00 |
|
Frédéric FRANCE
|
b994d0d84b
|
doxygen
|
2020-11-14 21:26:18 +01:00 |
|
Frédéric FRANCE
|
518ad097d0
|
Update pdf_sponge.modules.php
|
2020-11-14 21:21:58 +01:00 |
|
Frédéric FRANCE
|
9075e30a94
|
doxygen
|
2020-11-14 21:19:28 +01:00 |
|
Frédéric FRANCE
|
d6afdda8fe
|
Update pdf_rouget.modules.php
|
2020-11-14 21:09:02 +01:00 |
|
Frédéric FRANCE
|
0b097c74fa
|
Update pdf_merou.modules.php
|
2020-11-14 21:07:34 +01:00 |
|
Frédéric FRANCE
|
84ea018d81
|
doxygen
|
2020-11-14 21:05:53 +01:00 |
|