Commit Graph

84868 Commits

Author SHA1 Message Date
Laurent Destailleur
2b7a167615
Merge pull request #16726 from dolibit-ut/patch-89
Update card.php
2021-03-16 15:12:38 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
2021-03-16 14:50:06 +01:00
Laurent Destailleur
3a3c0bad2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-16 14:46:15 +01:00
Laurent Destailleur
95ede60de2 Fix css 2021-03-16 14:46:00 +01:00
UT from dolibit
6157fd4c79
Update card.php
$help_url   add -> DE:Modul_Geschäftspartner
2021-03-16 13:16:03 +01:00
Laurent Destailleur
9a474602a8 Fix #yogosha5644 2021-03-16 11:58:03 +01:00
Laurent Destailleur
882a9c0792 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-16 10:59:17 +01:00
Laurent Destailleur
1495630254 Fix #yogosha5645 2021-03-16 10:59:01 +01:00
Laurent Destailleur
efaeeb2d06
Merge pull request #16701 from dolibit-ut/patch-82
Update card.php
2021-03-16 10:43:08 +01:00
Laurent Destailleur
017120f017
Merge pull request #16697 from frederic34/patch-3
fix syntax
2021-03-16 10:42:49 +01:00
Laurent Destailleur
7bbcb62795
Merge pull request #16695 from dolibit-ut/patch-79
Update hook_document.php
2021-03-16 10:42:28 +01:00
Laurent Destailleur
9aa72e8c06
Update hook_document.php 2021-03-16 10:42:15 +01:00
Laurent Destailleur
1f4a3dee5f
Merge pull request #16696 from dolibit-ut/patch-80
Update list.php
2021-03-16 10:40:13 +01:00
Laurent Destailleur
57481bdb88
Merge pull request #16699 from dolibit-ut/patch-81
Update index.php
2021-03-16 10:39:43 +01:00
Laurent Destailleur
71e7f10a54 FIX #16698 2021-03-16 10:39:10 +01:00
Laurent Destailleur
9480e15755
Merge pull request #16703 from dolibit-ut/patch-84
Update card.php
2021-03-16 10:37:07 +01:00
Laurent Destailleur
a733275559
Merge pull request #16702 from dolibit-ut/patch-83
Update card.php
2021-03-16 10:36:53 +01:00
Laurent Destailleur
3c3bb67e51
Merge pull request #16704 from dolibit-ut/patch-85
Update card.php
2021-03-16 10:36:39 +01:00
Laurent Destailleur
26931a7e52
Merge pull request #16705 from dolibit-ut/patch-86
Update card.php
2021-03-16 10:36:27 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
2021-03-16 10:34:55 +01:00
Laurent Destailleur
310b03b770
Merge pull request #16710 from frederic34/patch-7
fix php8 warnings
2021-03-16 10:34:15 +01:00
Laurent Destailleur
a357ab0ee7
Merge pull request #16708 from frederic34/patch-4
fix php8 warning
2021-03-16 10:34:02 +01:00
Laurent Destailleur
bcf7fa1fc8
Merge pull request #16711 from frederic34/patch-8
fix php8 warnings
2021-03-16 10:33:21 +01:00
Laurent Destailleur
897f4be033
Merge pull request #16712 from frederic34/patch-9
fix php8 warnings
2021-03-16 10:33:01 +01:00
Laurent Destailleur
401aeb8a7f
Merge pull request #16706 from frederic34/htmlforcc
decompose code
2021-03-16 10:32:44 +01:00
Laurent Destailleur
462164a5a8
Merge pull request #16709 from frederic34/patch-5
fix php8 warnings
2021-03-16 10:31:53 +01:00
Laurent Destailleur
ccedc0f7fb
Merge pull request #16713 from frederic34/patch-10
fix php8 warning
2021-03-16 10:31:37 +01:00
Laurent Destailleur
aa2758d00e
Merge pull request #16714 from frederic34/patch-11
fix php8 warning
2021-03-16 10:31:23 +01:00
Laurent Destailleur
8a23d515e9
Merge pull request #16715 from frederic34/patch-12
fix php8 warning
2021-03-16 10:31:09 +01:00
Laurent Destailleur
c84395281e
Merge pull request #16716 from frederic34/patch-13
fix php8 warning
2021-03-16 10:30:54 +01:00
Laurent Destailleur
a0eb67ade5
Merge pull request #16720 from frederic34/patch-14
Update conferenceorbooth_list.php
2021-03-16 10:30:42 +01:00
Laurent Destailleur
e00e6cfd9a
Merge pull request #16721 from aspangaro/14a25
Translation "Generated documents"
2021-03-16 10:25:31 +01:00
Laurent Destailleur
aba4af85a5
Merge pull request #16722 from aspangaro/14a26
Uniformize translation
2021-03-16 10:24:42 +01:00
Laurent Destailleur
66a820ee15
Merge pull request #16718 from dolibit-ut/patch-88
Update llx_c_tva.sql
2021-03-16 10:24:08 +01:00
Laurent Destailleur
03f79a88c6
Merge pull request #16717 from dolibit-ut/patch-87
Update llx_c_format_cards.sql
2021-03-16 10:23:36 +01:00
Laurent Destailleur
a9b2eeae37 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-16 10:20:30 +01:00
Laurent Destailleur
39849de96e Look and feel v14 2021-03-16 10:19:56 +01:00
Florian HENRY
9d8254eff4 fix price output in commoncard 2021-03-16 09:59:45 +01:00
Alexandre SPANGARO
6960f0dc25 Uniformize translation 2021-03-16 04:22:55 +01:00
Alexandre SPANGARO
03481a0197 Uniformize translation 2021-03-16 04:22:43 +01:00
Alexandre SPANGARO
f8703a0691 Translation "Generated documents" 2021-03-16 04:04:33 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Frédéric FRANCE
4714e03848
Update conferenceorbooth_list.php 2021-03-15 22:37:51 +01:00
UT from dolibit
7d9022b71d
Update llx_c_tva.sql
-- EN:
-- VAT - value-added tax 
-- Source:  https://en.wikipedia.org/wiki/Value-added_tax
2021-03-15 21:56:21 +01:00
UT from dolibit
dcce376f4c
Update llx_c_format_cards.sql 2021-03-15 21:50:43 +01:00
Frédéric FRANCE
89219fe7fa
fix php8 warning 2021-03-15 21:13:15 +01:00
Frédéric FRANCE
50cd8274a5
fix php8 warning 2021-03-15 21:07:30 +01:00
Frédéric FRANCE
2d741a33f0
fix php8 warning 2021-03-15 21:03:54 +01:00
Frédéric FRANCE
0b1e31e7a7
fix php8 warning 2021-03-15 20:58:35 +01:00