Commit Graph

8476 Commits

Author SHA1 Message Date
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
e52559783f Look and feel v13 2020-09-21 13:54:26 +02:00
Laurent Destailleur
6380a294fc FIX Restore multiselect (selection of prospect level) 2020-09-21 12:16:22 +02:00
Laurent Destailleur
d5e6273b45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-20 18:06:04 +02:00
Laurent Destailleur
acf28e28af Label 2020-09-20 18:01:17 +02:00
Laurent Destailleur
ab94224d0c Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
2020-09-20 17:56:23 +02:00
Laurent Destailleur
cd8ebd9500 Fix warnings 2020-09-20 16:57:53 +02:00
Laurent Destailleur
b3dd51b790 Fix warnings 2020-09-20 16:46:29 +02:00
Laurent Destailleur
667fb1098c Fix 2020-09-20 16:06:53 +02:00
Laurent Destailleur
1a494542c6 Fix static 2020-09-20 14:40:49 +02:00
Laurent Destailleur
3f2220bd6f Fix 2020-09-20 14:34:19 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
99c05f0923 Fix rss 2020-09-19 00:51:09 +02:00
Laurent Destailleur
f62d52f89a Fix tooltip for linkto object.
Fix security of ajax selectobject.php
2020-09-19 00:44:47 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
4630887591 Fix css 2020-09-16 20:09:40 +02:00
Laurent Destailleur
d0c02f3714 FIX #yogosha4426 2020-09-16 14:51:46 +02:00
Laurent Destailleur
ffa91451eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 02:50:36 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
2da4838141 Merge pull request #14730 from ptibogxiv/patch-358
NEW get state dictionnary by REST API
2020-09-16 01:12:08 +02:00
Laurent Destailleur
6dd1f522eb CSS 2020-09-14 22:30:22 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
stickler-ci
75a9678086 Fixing style errors. 2020-09-14 08:48:04 +00:00
ptibogxiv
e98ae029e3 Update cstate.class.php 2020-09-14 10:46:19 +02:00
kkhelifa-opendsi
1f5f784b75 Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
kamel
2a5b31da2d CORE smtps: Corrections 2020-09-14 10:22:05 +02:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-14 02:30:04 +00:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
2020-09-14 02:49:19 +02:00
Laurent Destailleur
0d9d9498e2 Update commonobjectline.class.php 2020-09-14 00:13:12 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
2020-09-13 07:44:30 +02:00
Cédric
acc995a553 Update commoninvoice.class.php 2020-09-12 19:05:33 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
bahfir abbes
e89bfe5ac1 fix: unuseful truncations in extrafield select lists 2020-09-11 22:44:08 +01:00
Laurent Destailleur
009c7eaf31 Standardize code with module builder 2020-09-11 16:16:04 +02:00
Laurent Destailleur
8d93b76258 Clean code 2020-09-10 17:49:05 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
08ab4855f2 Merge branch 'develop' into 13a11 2020-09-09 19:12:08 +02:00
Laurent Destailleur
12fba9e679 Fix label 2020-09-09 15:19:12 +02:00
Laurent Destailleur
1c8e02df3b Doc 2020-09-09 15:16:03 +02:00
Laurent Destailleur
230b6cdfd4 Add method isLoaded($domain) 2020-09-09 15:14:52 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00