Commit Graph

6396 Commits

Author SHA1 Message Date
Laurent Destailleur
9da84f68c7 Bad language file for civility order 2019-03-13 14:23:27 +01:00
Laurent Destailleur
fa4467fb5f FIX Tooltip on click was ko on smartphone 2019-03-09 18:37:07 +01:00
gauthier
598d1fc914 FIX : extrafields always visible on view mode 2019-03-05 16:53:36 +01:00
Laurent Destailleur
cbaa57b1e2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 02:25:42 +01:00
Laurent Destailleur
86e2ffe323 Merge pull request #10390 from glu000/8.0
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4 Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
Laurent Destailleur
e0c7c32fae Fix preselection when key is '0' 2019-02-26 11:44:44 +01:00
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802 FIX Mark credit note as available for credit note in other currency 2019-02-18 18:27:06 +01:00
Frédéric FRANCE
b017213131 selectMulticurrency avoid malformed empty value 2019-02-17 20:59:39 +01:00
Laurent Destailleur
2d4ccec309 Fix document generation of modulebuilder 2019-02-09 14:12:36 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/filefunc.inc.php
2019-02-08 10:44:45 +01:00
florian HENRY
95cc9faf7e fix php warning 2019-02-06 09:01:24 +01:00
Laurent Destailleur
ebe30f7a0e FIX error report not returned 2019-02-01 19:19:23 +01:00
Laurent Destailleur
ae81bbac93 Better var name 2019-02-01 13:49:07 +01:00
Laurent Destailleur
b14a16a119 Code comment 2019-02-01 13:48:09 +01:00
Laurent Destailleur
849b3b640b Code comment 2019-02-01 13:41:23 +01:00
Laurent Destailleur
c1f3f4c2b5 Fix: text for empty line not visible in select 2019-01-30 20:03:04 +01:00
Laurent Destailleur
3d218cadb7 FIX last_main_doc var not saved
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-01-29 19:03:45 +01:00
Laurent Destailleur
e33f102dc2 FIX Edit of virtualhost 2019-01-23 14:57:43 +01:00
Günter Lukas
1cf786acff Fix #10278
Fix #10278
2019-01-22 00:09:36 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
wdammak
191900d258 Update stats.class.php
Fix div/0 warnings
2019-01-19 11:35:16 +01:00
wdammak
13e7d18291 Update stats.class.php
Fix div/0 warnings
2019-01-19 11:33:56 +01:00
Laurent Destailleur
acc665a9f1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/html.form.class.php
2019-01-08 14:16:23 +01:00
Laurent Destailleur
1ee0d42408 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-01-08 14:08:22 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Laurent Destailleur
c9e6074551 Code clean 2019-01-05 15:14:06 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
8b380489f2 Update commonobject.class.php
Conflicts:
	htdocs/core/class/commonobject.class.php
2019-01-02 19:55:51 +01:00
ldestailleur
7b91c14cb3 FIX sql error when resetting payment mode / term 2018-12-28 23:14:41 +01:00
ldestailleur
c0eef25b31 FIX Can set payment mode to empty on thirdparty page 2018-12-28 23:14:36 +01:00
Laurent Destailleur
64de31ef67 Clean log 2018-12-27 06:09:27 +01:00
Laurent Destailleur
deba3249f8 FIX Bad trigger name 2018-12-27 06:09:03 +01:00
Laurent Destailleur
8ab2ef0cf0 Add log 2018-12-27 06:08:48 +01:00
Laurent Destailleur
0f76279a03 FIX Missing token and style 2018-12-27 03:46:14 +01:00
Laurent Destailleur
6557dcfb81 CSS 2018-12-23 00:49:26 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
94ee18a20a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-22 19:00:15 +01:00
Laurent Destailleur
8d39edf430 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
2018-12-22 18:59:49 +01:00
Laurent Destailleur
33564ddafc Fix css 2018-12-22 16:45:57 +01:00
Regis Houssin
9b215e117a FIX check if "entity" is already defined in "$param" 2018-12-21 11:23:44 +01:00
Laurent Destailleur
2978522006 Merge pull request #10251 from ATM-Marc/FIX_7.0_contact_change
FIX: contact/address tab issue when changing company
2018-12-19 12:59:32 +01:00
Laurent Destailleur
89068ffef1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/product/stock/product.php
	htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
4b6ae9d424 FIX Error reported when creation of thirdparty from member fails
Conflicts:
	htdocs/adherents/subscription.php
	htdocs/core/class/commonobject.class.php
2018-12-18 21:32:41 +01:00
Laurent Destailleur
f2318716ec FIX Error reported when creation of thirdparty from member fails 2018-12-18 21:27:16 +01:00
Marc de Lima Lucio
7e2eca661b FIX: contact/adress tab: when changing company ajax combo, the first contact change is not taken into account 2018-12-18 09:40:58 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Laurent Destailleur
af5b63954a Clean code 2018-12-10 12:49:20 +01:00