Commit Graph

6564 Commits

Author SHA1 Message Date
Frédéric FRANCE
9c7d698cc7 Create index.html 2020-11-12 18:40:34 +01:00
Frédéric FRANCE
9e59a9aa8c Create index.html 2020-11-12 18:39:50 +01:00
Laurent Destailleur
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Frédéric FRANCE
ad05451427 Fix missing getpost for scandir odt path 2020-11-12 11:23:03 +01:00
Laurent Destailleur
a804ad4914 css 2020-11-11 16:15:06 +01:00
Laurent Destailleur
741806f47e Clean code 2020-11-11 16:08:00 +01:00
Laurent Destailleur
ad04646c05 Fix must use json_encode/decode instead of dol_json_encode/decode 2020-11-11 15:56:19 +01:00
Laurent Destailleur
e221e19212 Update doc 2020-11-11 13:20:17 +01:00
Alexandre SPANGARO
82d1f99010 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-11-10 04:09:00 +01:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01:00
Laurent Destailleur
779566ef30 Clean page with security summary 2020-11-05 10:03:53 +01:00
Laurent Destailleur
60f55c81bf Fix error if module xml not loaded 2020-11-04 17:45:10 +01:00
Laurent Destailleur
38d88ced0b Debug the security page 2020-11-04 16:07:59 +01:00
Laurent Destailleur
0dce2c45d9 Trans 2020-11-02 10:15:33 +01:00
Frédéric FRANCE
fcddf03164 fix 2020-11-01 14:13:39 +01:00
Frédéric FRANCE
f0d6029d60 Merge remote-tracking branch 'upstream/develop' into emailsubscription 2020-11-01 14:02:18 +01:00
Frédéric FRANCE
cdc0b8a7d7 add models 2020-11-01 13:59:43 +01:00
Frédéric FRANCE
c2202e10eb add missing pictos 2020-11-01 13:48:32 +01:00
Frédéric FRANCE
d9bf49c5dc phpcs 2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
stickler-ci
284c9bc6a8 Fixing style errors. 2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
8d6fa350b9 Clean code 2020-10-31 12:41:26 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4 Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1 More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 15:06:16 +01:00
Laurent Destailleur
4adaf67d47 Hide setup we don't need if email are disabled globally
CSS
2020-10-27 11:40:30 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225 Merge pull request #15124 from frederic34/retrieve
retrieve the spelling
2020-10-25 14:48:51 +01:00
Laurent Destailleur
335d1db3a6 Update dict.php 2020-10-25 14:43:33 +01:00
bahfir abbes
3f03b678e9 fix:rowid is string in currencies table 2020-10-24 03:47:10 +01:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
e22760e8d5 Merge pull request #15113 from frederic34/patch-8
code field for product nature must be numeric
2020-10-23 04:08:39 +02:00
Frédéric FRANCE
78ec68e2cf code field for product nature must be numeric 2020-10-23 00:04:55 +02:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2020-10-22 17:55:38 +02:00
Laurent Destailleur
b45c99faec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5 FIX #14995 2020-10-22 15:03:12 +02:00
Laurent Destailleur
7605cb1871 Update facture_situation.php 2020-10-21 19:54:28 +02:00
John Botella
d9074e70e1 FIX admin conf selected 2020-10-21 13:27:37 +02:00
Laurent Destailleur
4ec4801c77 FIX Only template of enabled modules visible 2020-10-20 15:54:08 +02:00