Commit Graph

22877 Commits

Author SHA1 Message Date
Laurent Destailleur
548a25b005 Fix use of token 2020-11-16 14:36:23 +01:00
Laurent Destailleur
ca02ac9e45 Remove warning for php8 2020-11-16 13:00:18 +01:00
Laurent Destailleur
ac5fa6c6df Clean code 2020-11-16 12:54:16 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Laurent Destailleur
65144f4d5a fix warning 2020-11-16 11:37:28 +01:00
Tim Otte
4a1f61d759 Fix for #15423 2020-11-16 11:12:43 +01:00
Frédéric FRANCE
8cff0222cd Update commondocgenerator.class.php 2020-11-15 23:58:35 +01:00
Frédéric FRANCE
d114c56672 add a tag which list all other tags in odt user 2020-11-15 23:49:16 +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
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
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
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
9fe8c003a4 Merge pull request #15398 from frederic34/odtformembers
Add odt for members
2020-11-15 13:19:43 +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
Frédéric FRANCE
c12c0a0d2f Update pdf_strato.modules.php 2020-11-14 20:50:15 +01:00
Frédéric FRANCE
9c258b5dd4 Update pdf_eratosthene.modules.php 2020-11-14 20:46:49 +01:00
Frédéric FRANCE
e1c148a994 doxygen 2020-11-14 20:44:44 +01:00
Frédéric FRANCE
1db8afb4a9 doxygen 2020-11-14 20:40:17 +01:00
Frédéric FRANCE
a2fc7ce8c9 doxygen 2020-11-14 20:37:54 +01:00
Frédéric FRANCE
50e3fffbd8 doxygen 2020-11-14 20:35:52 +01:00
Frédéric FRANCE
d5f93e8c35 Update pdf_typhon.modules.php 2020-11-14 20:26:13 +01:00
Frédéric FRANCE
61d72b53be doxygen 2020-11-14 20:24:26 +01:00
Frédéric FRANCE
30f89b1216 doxygen 2020-11-14 18:37:05 +01:00
Laurent Destailleur
b3e03c6991 Fix css for public pages 2020-11-14 18:11:46 +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
7da2d6cda2 Merge pull request #15391 from frederic34/patch-8
doxygen
2020-11-14 00:48:52 +01:00