Commit Graph

106387 Commits

Author SHA1 Message Date
Laurent Destailleur
f21e3364dd Code comment 2022-03-29 14:27:22 +02:00
Laurent Destailleur
b6b20ac818 Code comment 2022-03-29 14:23:47 +02:00
Laurent Destailleur
4d77c97c43 css 2022-03-29 12:01:31 +02:00
Laurent Destailleur
13d0701351 FIX filter into the list of product lots 2022-03-29 11:20:39 +02:00
Laurent Destailleur
bf86f0ceb4 Fix color 2022-03-29 10:56:15 +02:00
Laurent Destailleur
e300f270fe FIX bad status of member on widget by type and status 2022-03-29 10:54:35 +02:00
Laurent Destailleur
301805f383 More log 2022-03-29 10:28:44 +02:00
Laurent Destailleur
b3f0681d7c Fix price2num when $langs not defined 2022-03-29 10:22:03 +02:00
Laurent Destailleur
8236a8e846 Fix bad test for button to show / hide canceled orders 2022-03-25 15:37:15 +01:00
Laurent Destailleur
488b35d096
Merge pull request #20232 from hregis/fix_missing_advanced_perms
FIX missing advanced perms
2022-03-24 20:32:58 +01:00
Laurent Destailleur
a6134f9e36 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-24 13:22:15 +01:00
Laurent Destailleur
ef204b2620 Fix column conditions 2022-03-24 12:52:04 +01:00
Laurent Destailleur
ddfcbf6e2c
Merge pull request #20452 from frederic34/patch-4
replace debug
2022-03-24 11:54:21 +01:00
Laurent Destailleur
a5757efd72
Merge pull request #20451 from frederic34/patch-1
remove debug
2022-03-24 11:54:02 +01:00
Laurent Destailleur
e85fef5012 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-24 11:52:05 +01:00
Laurent Destailleur
cd66203983 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-24 11:51:44 +01:00
Laurent Destailleur
154069179b Fix php syntax 2022-03-24 11:51:06 +01:00
Laurent Destailleur
6c28426b3a Fix tab 2022-03-24 11:49:34 +01:00
Laurent Destailleur
6438a99960 Fix php syntax 2022-03-24 11:48:51 +01:00
Laurent Destailleur
6108cf3ac2 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-24 11:48:34 +01:00
Laurent Destailleur
6abeb2804e Fix phpcs 2022-03-24 11:47:12 +01:00
Frédéric FRANCE
e157dc117d
replace debug 2022-03-24 10:51:01 +01:00
Frédéric FRANCE
5f6437cbde
remove debug 2022-03-24 10:46:30 +01:00
Laurent Destailleur
289c32b880 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-23 17:23:35 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Laurent Destailleur
947b6008c8
Merge pull request #20308 from frederic34/patch-1
Fix do not modify entity on group edit
2022-03-23 16:55:55 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management
FIX: better error management at product selling price update
2022-03-23 16:48:15 +01:00
Laurent Destailleur
5f522c9087
Merge pull request #20388 from atm-john/15.0_fix_missing_lang_trad
Fix missing lang trad
2022-03-23 16:19:14 +01:00
Laurent Destailleur
61ed36e181
Update other.lang 2022-03-23 16:19:06 +01:00
Laurent Destailleur
01396cc07a Code comment 2022-03-23 15:58:55 +01:00
Laurent Destailleur
d92ed35447
Merge pull request #20424 from marc-dll/13.0_FIX_propal_mass_action
FIX: propal list mass action translations and error management
2022-03-23 15:53:28 +01:00
Laurent Destailleur
b104047365
Merge pull request #20426 from marc-dll/14.0_FIX_propal_mass_actions
FIX: propal list mass action translations and error management (v14 edition)
2022-03-23 15:52:44 +01:00
Laurent Destailleur
c4e58ab4c0
Merge pull request #20428 from Easya-Solutions/13.0_fix-reception-pmp-with-discount-price
FIX include discount price for PMP after a reception (Issue #20029)
2022-03-23 15:51:22 +01:00
Laurent Destailleur
8dcddde982
Merge pull request #20431 from fmarcet/15.0
Fix: The origin of the stock movement is not being recorded
2022-03-23 15:40:13 +01:00
Laurent Destailleur
c44cfb0885
Merge pull request #20435 from marc-dll/13.0_FIX_medias_access_multicompany
FIX: permit access to medias when logged in a different entity
2022-03-23 15:37:20 +01:00
Laurent Destailleur
8ad310c8a0 FIX Bad filter on date on salary list 2022-03-23 13:01:24 +01:00
Marc de Lima Lucio
100c48372b FIX: permit access to medias when logged in a different entity 2022-03-22 17:13:48 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Marc de Lima Lucio
344c29ae15 FIX: trans 2022-03-22 11:35:37 +01:00
lvessiller
5914f2ac65 FIX include discount price for PMP after a reception (Issue #20029) 2022-03-22 11:17:27 +01:00
Marc de Lima Lucio
3aae8cc3bb FIX: propal list: bad error management for set not ssigned mass action 2022-03-22 10:54:04 +01:00
Marc de Lima Lucio
cf64fc288d FIX: propal list: missing not signed massaction translation keys for transifex 2022-03-22 10:49:03 +01:00
Marc de Lima Lucio
d4f55ae116 FIX: propal list: bad error management in mass actions 2022-03-22 10:11:10 +01:00
Marc de Lima Lucio
8ef55eae07 FIX: propal list: missing translation keys for transifex 2022-03-22 10:04:05 +01:00
Laurent Destailleur
dd38f6c35b Prepare 15.0.2 2022-03-21 12:53:03 +01:00
Laurent Destailleur
bf7c707d05 Doc 2022-03-21 11:11:36 +01:00
Laurent Destailleur
6c0e333c7d Fix we must user relative timezone of date. 2022-03-20 16:33:35 +01:00
Laurent Destailleur
3293a6f8b8 Fix position of table on new page of PDF 2022-03-19 19:40:20 +01:00
Laurent Destailleur
d5dc29e794 Fix position of image on line 2022-03-19 19:26:58 +01:00