Commit Graph

84 Commits

Author SHA1 Message Date
Frédéric FRANCE
ae48571135 use user->hasRight 2023-02-14 22:56:12 +01:00
Lamrani Abdel
8b2bf7e76e Fixe issue in htdocs/core/boxes/box_services_contracts.php 2022-11-08 15:11:30 +01:00
Laurent Destailleur
3e5273d83b NEW Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone) 2022-10-21 11:14:28 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Laurent Destailleur
941245c5e2 Debug v16 2022-06-28 12:26:49 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
97154f8267 Fix timezone into widgets 2021-05-25 00:29:32 +02:00
Regis Houssin
43e1dbb9ef FIX avoid php8 warning with multicompany 2021-03-19 11:27:31 +01:00
Frédéric FRANCE
e1ad7013d9 fix php8 2021-03-16 17:47:24 +01:00
Frédéric FRANCE
554e449e40 code syntax core directory 2021-02-23 22:03:23 +01: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
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
2020-10-26 18:17:23 +01:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Regis Houssin
c0981128ff FIX wrong object name 2020-10-19 17:10:38 +02:00
Laurent Destailleur
a1913995df Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
2020-10-15 21:05:00 +02:00
Laurent Destailleur
e7992131ec Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
2020-10-15 21:00:49 +02:00
Laurent Destailleur
6277422115 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/boxes/box_services_contracts.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/class/expensereport.class.php
2020-10-15 20:38:32 +02:00
Laurent Destailleur
3d68ab4059 Update box_services_contracts.php 2020-10-15 20:28:27 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type
This bug is produced because the ContratLigne class gives a property type instead of a product_type
2020-10-14 22:17:50 -05:00
Laurent Destailleur
ead320642e Fix removed some non used sql requests on widgets 2020-09-12 00:58:06 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
florian HENRY
03ae31eced remove warning when date end contract line empty 2020-07-04 16:37:50 +02:00
florian HENRY
335a767f22 remove warning when date end contract line empty 2020-07-04 16:37:11 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
2020-06-23 11:38:20 +02:00
Laurent Destailleur
4d2cbf7006 Fix alert picto of expired services not visible
Fix CSS
2020-06-23 11:27:40 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
68512e0281 Look and feel v12 2020-05-14 14:56:15 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
8ebc157316 Test color magenta for titles 2020-02-24 06:55:08 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
8f41e0f9fe clean code 2019-09-23 18:39:21 +02:00
Laurent Destailleur
43e0655dd5 Fix code style and var type 2019-08-31 01:54:21 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
8ef209bc04 Fix responsive 2019-06-03 16:30:49 +02:00
Frédéric FRANCE
ba4ca5d7c2 add visibility 2019-02-28 00:15:32 +01:00
Frédéric FRANCE
529354718b replace html align by class in boxes 2019-02-09 15:24:21 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
16496218d3 css 2018-12-18 13:21:00 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
868caa4991 Missing ref_customer in popup 2018-10-21 12:05:31 +02:00
Laurent Destailleur
f6b3bc3bdb Fix thirdparty popup 2018-10-21 12:03:22 +02:00