Commit Graph

262 Commits

Author SHA1 Message Date
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
fc9b3e3d70 Factorize code into a function dolJSToSetRandomPassword() 2022-07-27 13:42:43 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
bagtaib
c4754d56a9 assetmodel doesn't have socid but user does 2022-06-13 16:56:37 +02:00
Frédéric FRANCE
38b18a68d7 Merge branch 'develop' into useismodenabled 2022-06-10 10:07:41 +02:00
Frédéric France
400afc937f use isModEnabled function 2022-06-09 22:16:48 +02:00
Laurent Destailleur
cd041c9ea1 Clean code 2022-06-03 02:41:00 +02:00
Alexandre SPANGARO
7b919f1513 Field fk_pays don't exist & fix sql error 2022-05-22 07:08:39 +02:00
Alexandre SPANGARO
977907c07b Asset module - Fix advanced rights 2022-05-22 06:47:28 +02:00
Laurent Destailleur
b14c04a8f0 Fix regression 2022-05-21 15:02:14 +02:00
Laurent Destailleur
0cb9fe25a8 Merge pull request #20922 from homer8173/patch-31
Fix scrutinizer
2022-05-21 10:39:06 +02:00
Laurent Destailleur
e36c6f2268 Merge pull request #20923 from homer8173/patch-32
FIX scrutinizer
2022-05-21 10:38:41 +02:00
Norbert Penel
2a22a530e9 FIX scrutinizer
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/asset/model/depreciation_options.php?orderField=path&order=asc&honorSelectedPaths=0
2022-05-20 19:27:15 +02:00
stickler-ci
5c01db353a Fixing style errors. 2022-05-20 17:26:17 +00:00
Norbert Penel
877b487298 Fix scrutinizer
https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/asset/card.php?selectedLabels%5B0%5D=9&orderField=path&order=asc&honorSelectedPaths=0
2022-05-20 19:25:46 +02:00
Philippe GRAND
58a2e9c389 fix : The property supplier_invoice_id does not seem to exist on Asset 2022-05-20 16:55:50 +02:00
Laurent Destailleur
e1c2968ae7 Look and feel v16 2022-05-18 23:11:59 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
John Livingston
1ece554c92 Fix: typo in template name
There was a typo in generated HTML comment.
2022-03-01 17:39:38 +01:00
Laurent Destailleur
54bef2e34f Fix phpcs 2022-03-01 01:57:38 +01:00
Alexandre SPANGARO
546b3dd4d5 Fix travis 2022-02-20 05:17:06 +01:00
Alexandre SPANGARO
96fcd7cae2 Fix travis 2022-02-17 05:41:37 +01:00
Alexandre SPANGARO
33af0eb0fb Fix travis 2022-02-17 05:21:48 +01:00
Alexandre SPANGARO
0f51fadf38 Merge branch 'develop' into 16a12_assets_code 2022-02-17 04:15:03 +01:00
Alexandre SPANGARO
ccbbc98f7a Fix travis 2022-02-17 04:13:02 +01:00
Alexandre SPANGARO
453449324e Fix travis 2022-02-16 18:09:32 +01:00
Alexandre SPANGARO
948f20c2b6 Add a graphical option to define duration per year for depreciation 2022-02-16 05:18:29 +01:00
Frédéric FRANCE
935482ee22 uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
dad73b755e fix merge 2022-02-15 18:46:41 +01:00
Frédéric FRANCE
a613553f37 Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
Frédéric FRANCE
c8640f329e add missing global 2022-02-15 18:31:05 +01:00
Frédéric FRANCE
0ba912b1e5 add missing global 2022-02-15 18:14:44 +01:00
Frédéric FRANCE
ed4622790e Update asset.class.php 2022-02-15 11:10:02 +01:00
Alexandre SPANGARO
a17ac09fd0 Resolve stickler-ci 2022-02-14 11:03:44 +01:00
stickler-ci
2d9e303abf Fixing style errors. 2022-02-14 04:18:50 +00:00
Alexandre SPANGARO
d869adb370 Asser 2022-02-14 05:15:28 +01:00
Laurent Destailleur
dbc2631d6a Fix scrutinizer warnings 2022-01-13 19:19:36 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
69cd7ae2ab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/card.php
	htdocs/public/test/badges.php
	htdocs/public/test/test_exec.php
2021-12-08 18:27:03 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Frédéric FRANCE
c01cc0c212 can modify tooltip by reference 2021-11-22 20:06:51 +01:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-10-25 20:07:31 +00:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
0cae464bfa Debug v15 2021-10-19 16:47:43 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00