Commit Graph

89109 Commits

Author SHA1 Message Date
Louis Sautier
818a8c7d59
Fix missing form end tag in prelevement 2019-07-03 10:46:32 +02:00
Frans Bosman
9064737930
Update commonobject.class.php 2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add
Update commonobject.class.php 2019-07-03 06:59:52 +02:00
Laurent Destailleur
ff68b110b2 Fix phpcs 2019-07-02 23:14:22 +02:00
ptibogxiv
03938e2123
Update paymentmodes.php 2019-07-02 21:56:50 +02:00
ptibogxiv
126479b5a9
Fix paymentmethod detach 2019-07-02 21:46:00 +02:00
Laurent Destailleur
9d50c67208 FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export 2019-07-02 18:06:51 +02:00
Laurent Destailleur
d9560dbb61 Fix var not initialized 2019-07-02 18:02:06 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
8a25c854e9 Hide sensitive data 2019-07-02 14:38:26 +02:00
John Botella
0288338364 Fix column price display 2019-07-02 14:38:09 +02:00
John Botella
92f6cef00f Fix unit test 2019-07-02 12:07:22 +02:00
Alexandre SPANGARO
ab7cb7bb2e FIX Nowrap on amount 2019-07-02 12:01:50 +02:00
Laurent Destailleur
1b4507f07d Fix on a hidden option 2019-07-02 11:40:05 +02:00
Maxime Kohlhaas
6b43c325c7 Fix wrong column for filters on invoice template list 2019-07-02 10:53:47 +02:00
atm-quentin
8cdb251ca5 FIX product_use_units was set to 0 each time a conf in block other was set 2019-07-02 10:18:03 +02:00
Laurent Destailleur
46f590f0be Add column iplastlogin and ippreviouslogin 2019-07-01 15:44:34 +02:00
Laurent Destailleur
1b1c302e5d Update readme 2019-07-01 13:32:21 +02:00
Laurent Destailleur
c9477f5c4f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:29:33 +02:00
Laurent Destailleur
edd4d0751b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:28:44 +02:00
Laurent Destailleur
ef27e32f53 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/filefunc.inc.php
2019-07-01 13:27:57 +02:00
Laurent Destailleur
3abaecfd77 Prepare 8.0.7 2019-07-01 13:27:18 +02:00
Laurent Destailleur
0259cde0da Typo 2019-07-01 13:26:45 +02:00
fbosman
3e91fdda77
Update commonobject.class.php 2019-07-01 12:34:27 +02:00
atm-florian.m
c45b191330 FIX: when STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set, deleting a "closed" shipment now increases stock as expected 2019-07-01 10:26:03 +02:00
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +02:00
atm-josselin
c24a95b7ad Sanitize at creation of the product instead of the creation of the filepath 2019-07-01 09:31:01 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
a992690c43 Fix missing php-intl 2019-06-30 14:49:51 +02:00
Laurent Destailleur
b31297b712 Add comment for microsoft edge 2019-06-30 14:45:36 +02:00
Laurent Destailleur
fcf3ec3f0e Fix software is uncountable noun 2019-06-30 14:01:02 +02:00
Philippe GRAND
6d625d7d1e Merge remote-tracking branch 'upstream/develop' into develop 2019-06-30 12:04:55 +02:00
Laurent Destailleur
8919eaebab Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 23:27:15 +02:00
Laurent Destailleur
0d6900f870 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	build/makepack-dolibarr.pl
2019-06-29 23:26:55 +02:00
Laurent Destailleur
6537faa35e Fix merge 2019-06-29 23:26:14 +02:00
Laurent Destailleur
0aeb27ba97 Fix merge 2019-06-29 23:25:07 +02:00
Laurent Destailleur
2cefe638ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/prelevement/factures.php
2019-06-29 23:24:04 +02:00
Laurent Destailleur
fb42333b3e Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0 2019-06-29 23:20:07 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
fdc958a172 Fix launch of ISCC.ex if not into path 2019-06-29 23:17:36 +02:00
Laurent Destailleur
09d420307d Fix error "fatal: ni ceci ni aucun de ses répertoires parents n'est un
dépôt git : .git"
2019-06-29 23:16:07 +02:00
Laurent Destailleur
3461a61cbf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 18:35:54 +02:00
Laurent Destailleur
e9c6a10bdd Fix phpcs 2019-06-29 18:35:36 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
2019-06-29 18:28:51 +02:00
Laurent Destailleur
72084f4684 Fix protected 2019-06-29 16:49:32 +02:00
Laurent Destailleur
ce990ff41d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 16:46:25 +02:00
Laurent Destailleur
7de92070d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
2019-06-29 16:46:16 +02:00