2
0
forked from Wavyzz/dolibarr
Commit Graph

1613 Commits

Author SHA1 Message Date
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Laurent Destailleur
b540bb29e0 Merge pull request #13617 from atm-quentin/11.0_viewstatut_to_search_status
FIX viewstatut to search status
2020-04-16 00:48:12 +02:00
Laurent Destailleur
86eaa78f1e FIX Use of image into free text for PDF if DOL_DATA_DIR is outside of
DOL_DOCUMENT_DIR.
2020-04-15 20:00:27 +02:00
atm-quentin
5b96066bf4 FIX keep viewstatut for doli 3.5 2020-04-15 15:07:11 +02:00
atm-quentin
f7c07640dd viewstatut to search_status 2020-04-15 15:01:00 +02:00
Laurent Destailleur
f7726cd366 Try to disable a not expected rule 2020-04-10 13:04:30 +02:00
Frédéric FRANCE
fc34b5a4cb compress png with zopflipng 2020-04-06 19:03:48 +02:00
Laurent Destailleur
e0d713bbef Update demo 2020-03-31 12:56:21 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
ead99c5976 Enhance updatedemo 2020-03-30 12:12:23 +02:00
Laurent Destailleur
6d732c9ea4 Update demo 2020-03-30 11:39:02 +02:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
2020-03-18 18:50:55 +01:00
Laurent Destailleur
56e4fa1bb3 Trans 2020-03-18 14:01:11 +01:00
Laurent Destailleur
5ac038419d Merge pull request #13217 from dolibit-ut/patch-14
http -> https:
2020-02-26 16:20:24 +01:00
Laurent Destailleur
f28278d3d4 Merge pull request #13216 from dolibit-ut/patch-13
licence -> license
2020-02-26 16:20:05 +01:00
Laurent Destailleur
7d242b6a40 Merge pull request #13215 from dolibit-ut/patch-12
http to https
2020-02-26 16:19:46 +01:00
Laurent Destailleur
3164857223 Merge pull request #13213 from dolibit-ut/patch-11
Update
2020-02-26 16:19:15 +01:00
UT from dolibit
4c4050c06e http -> https:
add: for Linux OS
2020-02-26 12:35:17 +01:00
UT from dolibit
ec3c3f0165 licence -> license 2020-02-26 12:25:25 +01:00
UT from dolibit
5e51369e64 http to https 2020-02-26 12:22:12 +01:00
UT from dolibit
9be050765d Update
changed Mon organisation to my organisation
2020-02-26 11:42:59 +01:00
UT from dolibit
21f1de2dea update
changed mon organsiation to my organsiation
2020-02-26 11:39:49 +01:00
UT from dolibit
028287d8fa Update erp_comparison_translation.txt 2020-02-25 14:41:18 +01:00
Laurent Destailleur
b995dc87fa NEW Add profile for PSR12 for Eclipse 2020-02-25 12:57:26 +01:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d Fix remove a lot of warnings on Eclipse 2020-02-21 17:31:37 +01:00
Laurent Destailleur
1dd5ba093d Prepare PHP v8 - mktime() and gmmktime() are no more allowed 2020-02-19 12:11:16 +01:00
Laurent Destailleur
4b5cda5cd2 Code comment on OAUth ahtent 2020-02-16 21:16:00 +01:00
Laurent Destailleur
878026ebc5 Fix phpcs 2020-02-11 14:44:53 +01:00
Laurent Destailleur
5533526331 Fix phpcs 2020-02-11 11:48:10 +01:00
Laurent Destailleur
2756dc156d Add tool to convert pgdump into mysql dump 2020-02-10 20:35:18 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
87f84e5b17 FIX #12973 2020-02-03 06:29:40 +01:00
Laurent Destailleur
8957a29990 FIX #12973 2020-02-03 06:28:04 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
a02a2a6def Sync transifex 2020-01-27 16:07:53 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
faf289cd13 Update demo 2020-01-21 11:32:17 +01:00
Laurent Destailleur
62b84810bd Exclude includes in dev 2020-01-15 14:25:16 +01:00
Laurent Destailleur
d771efe37c Fix phpcs 2020-01-15 13:08:29 +01:00
Laurent Destailleur
82757e6d03 Move files 2020-01-15 12:23:14 +01:00
stickler-ci
ece3face5e Fixing style errors. 2020-01-14 14:34:36 +00:00
Norbert Penel
43aa5ec658 Dbf -> Db & import from table
1 Import a BIG DBF (aka excel openoffice) into a new table
    then you can see and search content easily

2 Create thirdparties or products from a table
2020-01-14 15:31:41 +01:00
Laurent Destailleur
a7496c16cb Doc 2020-01-12 22:00:23 +01:00
Laurent Destailleur
a6bae97826 Sync from transifex 2020-01-12 21:28:09 +01:00
Laurent Destailleur
6508ee03bf Fix for en_US 2020-01-12 21:27:43 +01:00
Laurent Destailleur
e52ca6f1b5 Fix script 2020-01-08 13:35:38 +01:00
Laurent Destailleur
027d88d3ce Fix purge script 2020-01-08 13:35:17 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00