Commit Graph

97670 Commits

Author SHA1 Message Date
UT from dolibit
81437473c2
Create index.html 2021-03-29 22:46:46 +02:00
Laurent Destailleur
ce5bea7b34 FIX #yogosha5751 2021-03-29 22:43:39 +02:00
UT from dolibit
9586aea96b
Create index.html 2021-03-29 22:40:15 +02:00
UT from dolibit
77f0bc7141
Create index.html 2021-03-29 22:39:37 +02:00
UT from dolibit
3087ba0581
Update about.php
http://  ->  https://
2021-03-29 22:37:03 +02:00
stickler-ci
a01403c4de Fixing style errors. 2021-03-29 20:16:58 +00:00
daraelmin
57b15c1821 use dol_getIdFromCode for TE_PRIVATE 2021-03-29 22:15:28 +02:00
UT from dolibit
f46dadcd89
Update llx_holiday_extrafields.sql
LICENSE 
https
2021-03-29 22:12:09 +02:00
Laurent Destailleur
41ec8893e4 Fix get mode 2021-03-29 22:05:04 +02:00
UT from dolibit
da0aa0f828
Update note.php
$helpurl  ->  $help_url

$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
2021-03-29 21:48:02 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
UT from dolibit
9f6028104a
Update list.php
$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';

llxHeader('', $langs->trans("Donations"), $help_url);
2021-03-29 21:46:08 +02:00
UT from dolibit
390932d2a5
Update info.php
$helpurl  ->  $help_url

$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
2021-03-29 21:44:19 +02:00
UT from dolibit
31442f30c4
Update index.php
DE:Modul_Spenden
2021-03-29 21:42:38 +02:00
UT from dolibit
9b10f4ab5c
Update document.php
$helpurl => $help_url

$help_url = 'EN:Module_Donations|FR:Module_Dons|ES:Módulo_Donaciones|DE:Modul_Spenden';
2021-03-29 21:41:13 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
2021-03-29 21:39:53 +02:00
UT from dolibit
1453bf6daa
Update card.php
add => DE:Modul_Spenden
2021-03-29 21:38:59 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/login.tpl.php
2021-03-29 21:37:21 +02:00
Laurent Destailleur
eabe5ae616 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:54 +02:00
Laurent Destailleur
8c08b3945b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-03-29 21:35:46 +02:00
Laurent Destailleur
c4a8dca4ab FIX #yogosha5756 2021-03-29 21:35:19 +02:00
Laurent Destailleur
dc0922c8f0 Clean file not used 2021-03-29 21:33:01 +02:00
Laurent Destailleur
1d87f060dc Fix #yogosha5756 2021-03-29 21:30:26 +02:00
Laurent Destailleur
d93fbcd00b Fix sql error 2021-03-29 21:17:41 +02:00
Laurent Destailleur
0d5c613008 Complete fix 2021-03-29 21:10:21 +02:00
Laurent Destailleur
adf15e4e64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-29 21:04:49 +02:00
Laurent Destailleur
ae0468e107 FIX #yogosha5765 2021-03-29 21:04:33 +02:00
Laurent Destailleur
0740633ec8
Update facture-rec.class.php 2021-03-29 20:42:59 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Florian HENRY
1f08e37a03 more feature 2021-03-29 20:28:29 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27
NEW: Add a sub table to manage accountancy on product/company
2021-03-29 20:11:02 +02:00
Laurent Destailleur
92e479955f
Merge pull request #16969 from dolibit-ut/patch-168
Update llx_20_c_departements.sql
2021-03-29 19:24:32 +02:00
Laurent Destailleur
9183c73846
Merge pull request #16968 from dolibit-ut/patch-167
Update llx_10_c_regions.sql
2021-03-29 19:23:58 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Christophe Battarel
bbc263f4b3 llx_product batch_mask definition 2021-03-29 18:39:22 +02:00
Laurent Destailleur
93627012cd
Merge pull request #16995 from atm-gauthier/fix_list_uniformization
FIX : display debug if !$conf->banque->enabled
2021-03-29 18:02:58 +02:00
Laurent Destailleur
f4b0723f30
Update list.php 2021-03-29 17:41:19 +02:00
Laurent Destailleur
b732a82c3d
Update list.php 2021-03-29 17:40:36 +02:00
Laurent Destailleur
a23a2a0119
Merge pull request #16988 from daraelmin/daraelmin-patch-excluded
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
2021-03-29 17:39:58 +02:00
Laurent Destailleur
64b925a5d8
Update index.php 2021-03-29 17:39:11 +02:00
Laurent Destailleur
cdc1ae6f59
Update adherent.class.php 2021-03-29 17:38:37 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
stickler-ci
e1e3bcbf28 Fixing style errors. 2021-03-29 15:26:24 +00:00
Gauthier PC portable 024
139a1ba70d FIX : if $conf->banque->enabled 2021-03-29 17:22:19 +02:00
Laurent Destailleur
36dfcc0646
Merge pull request #16976 from atm-florianm/NEW_14.0_hooks_on_CA_by_product_report
WIP: NEW 14.0 - SQL-altering hooks in the turnover by product report
2021-03-29 17:18:17 +02:00
Laurent Destailleur
66ca619669
Merge pull request #16986 from asolslk/patch-6
Update contact.php
2021-03-29 17:13:52 +02:00
Laurent Destailleur
f985a7df3f
Merge pull request #16979 from atm-gauthier/fix_list_uniformization
Fix list uniformization
2021-03-29 17:09:22 +02:00
Laurent Destailleur
96363b3913
Merge pull request #16974 from ksar-ksar/develop
FIX #16940
2021-03-29 17:07:19 +02:00