Laurent Destailleur
e78b9a421d
Fix sql
2020-11-18 13:14:29 +01:00
Laurent Destailleur
0dbacab68f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-18 13:12:12 +01:00
Laurent Destailleur
17f35e16b9
Merge pull request #15436 from OPEN-DSI/add_extended_infos_on_select_contacts
...
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
2020-11-18 13:12:03 +01:00
Laurent Destailleur
8d8f0026c2
Fix switch date to datetime
2020-11-18 13:06:30 +01:00
Laurent Destailleur
ce173d7b39
Merge pull request #15424 from Tim-Otte/fix-15423
...
Fix for #15423
2020-11-18 12:46:41 +01:00
Laurent Destailleur
a5a7197506
Update extrafields.class.php
2020-11-18 12:45:37 +01:00
Laurent Destailleur
95460e6372
Merge pull request #15422 from frederic34/patch-10
...
add optional tag which list all other tags in odt substitutions
2020-11-18 12:44:25 +01:00
Laurent Destailleur
68df96218f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-18 12:37:33 +01:00
Laurent Destailleur
2529448f1b
Fix path to files
2020-11-18 12:37:18 +01:00
Laurent Destailleur
166bb5cc75
Merge pull request #15421 from frederic34/patch-8
...
fix dir for member photo in odt tag
2020-11-18 12:37:03 +01:00
Laurent Destailleur
889a5d0be1
Update commondocgenerator.class.php
2020-11-18 12:04:41 +01:00
kamel
73b35f334e
NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox)
...
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
2020-11-18 09:41:42 +01:00
Laurent Destailleur
17f78f9cec
FIX Protection to avoid duplicate submit when creating a payment.
2020-11-17 18:39:34 +01:00
Laurent Destailleur
3e4c6b9222
Fix warning
2020-11-17 13:13:11 +01:00
Frédéric FRANCE
3b1f50d5fc
Update functions.lib.php
2020-11-17 11:58:11 +01:00
Frédéric FRANCE
bf390ceb4d
Update doc_generic_member_odt.class.php
2020-11-17 11:56:11 +01:00
Frédéric FRANCE
fcfd630f84
Update doc_generic_user_odt.modules.php
2020-11-17 11:55:05 +01:00
Frédéric FRANCE
fb5385180f
Update functions.lib.php
2020-11-17 11:54:18 +01:00
Laurent Destailleur
6bbeb6d3a0
Fix debug creation of shipment with virtual product.
2020-11-16 16:31:05 +01:00
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
