Commit Graph

105701 Commits

Author SHA1 Message Date
Laurent Destailleur
24de82859e Debug v15 2022-01-16 20:22:09 +01:00
Laurent Destailleur
372b583e50 Debug template of warehouse 2022-01-16 19:21:59 +01:00
Laurent Destailleur
5070a40fa4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/list.php
2022-01-15 20:28:04 +01:00
Laurent Destailleur
2b19bcef54 Fix responsive 2022-01-15 13:08:15 +01:00
Laurent Destailleur
8cb5264928 Fix css 2022-01-15 12:56:19 +01:00
Laurent Destailleur
b3b1e82100 Change on column Assigned to on projet and task. 2022-01-15 12:30:41 +01:00
Laurent Destailleur
fe79218571 Change on column Assigned to on projet and task. 2022-01-15 12:26:08 +01:00
Laurent Destailleur
ecde594a15 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/card.php
2022-01-14 20:28:44 +01:00
Laurent Destailleur
6acf59fe20 Fix responsive 2022-01-14 20:26:56 +01:00
Laurent Destailleur
22ef83ab67 Fix responsive 2022-01-14 20:05:43 +01:00
Laurent Destailleur
8c165aced2 Fix responsive 2022-01-14 20:05:39 +01:00
Laurent Destailleur
3d98d62889 Prepare v16 2022-01-14 18:14:05 +01:00
Laurent Destailleur
57692ba556 Fix responsive 2022-01-14 17:51:19 +01:00
Laurent Destailleur
35a1b06c44 Fix responsive 2022-01-14 17:48:15 +01:00
Laurent Destailleur
4200f2f195 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 14:02:30 +01:00
Laurent Destailleur
77c286b769 Fix permission 2022-01-14 14:01:50 +01:00
Laurent Destailleur
744296a43a FIX Permission on holiday and expensereport. 2022-01-14 13:52:08 +01:00
Laurent Destailleur
f04a07b6a7 FIX Pb with permission on holiday and expense report 2022-01-14 13:42:38 +01:00
Laurent Destailleur
02fc420c2a FIX #19817 2022-01-14 11:37:13 +01:00
Laurent Destailleur
1ae01ba2fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-14 10:38:38 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
e223fb1e7c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-14 10:36:56 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
2022-01-14 10:30:39 +01:00
Laurent Destailleur
490f17d5a2 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:24:00 +01:00
Laurent Destailleur
62ae0361f7 Merge pull request #19818 from DATUC/patch-24
Update companies.lang
2022-01-14 10:19:48 +01:00
Laurent Destailleur
5b6133ad62 Merge pull request #19821 from marc-dll/12.0_FIX_shipment_all_lines
FIX: order to shipment: debug hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS
2022-01-14 10:19:28 +01:00
Laurent Destailleur
256b4fb06b Merge pull request #19834 from dolibarr95/patch-59
Update extrafields.class.php
2022-01-14 10:16:32 +01:00
Laurent Destailleur
5881e36ba6 Code comment 2022-01-14 10:15:46 +01:00
stickler-ci
2b64f69def Fixing style errors. 2022-01-14 09:12:30 +00:00
dolibarr95
5b3fcc5e43 Update extrafields.class.php 2022-01-14 10:10:10 +01:00
Laurent Destailleur
e365975b2f Merge pull request #19820 from frederic34/patch-1
fix warning
2022-01-14 10:04:42 +01:00
Laurent Destailleur
7d5c36ad02 Merge pull request #19823 from harrywinner/15.0
FIX Solving non-blocking bug in user login
2022-01-14 10:03:10 +01:00
Laurent Destailleur
71e470eb6c Merge pull request #19826 from atm-gauthier/FIX_hrm
FIX : several adaptations rank => rankorder and langs correction for HRM
2022-01-14 10:01:14 +01:00
Laurent Destailleur
b7aa152464 Fix trans 2022-01-14 09:55:13 +01:00
Laurent Destailleur
90c3c90864 Merge pull request #19829 from OPEN-DSI/v12-fix-supplier-order-list-search-user
FIX search by user in supplier order list
2022-01-14 09:45:06 +01:00
Laurent Destailleur
b29438167e Changlog 2022-01-14 09:29:16 +01:00
dolibarr95
e53d9d4320 Update extrafields.class.php
fix #19739
2022-01-14 08:52:04 +01:00
Laurent Destailleur
f51554fd4d Fix missing token 2022-01-13 20:40:42 +01:00
Laurent Destailleur
cb45f79ab0 Fix scrutinizer 2022-01-13 20:16:12 +01:00
Laurent Destailleur
fccddd7805 Fix property missing 2022-01-13 20:11:18 +01:00
Laurent Destailleur
965703e04a Fix missing var 2022-01-13 20:09:40 +01:00
Laurent Destailleur
3aea037889 FIX Debug level 3 of accounting account was using wront field 2022-01-13 19:49:38 +01:00
Laurent Destailleur
240958ace6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 19:21:28 +01:00
Laurent Destailleur
dbc2631d6a Fix scrutinizer warnings 2022-01-13 19:19:36 +01:00
Laurent Destailleur
b6dc7a3f19 Doc 2022-01-13 19:09:34 +01:00
Laurent Destailleur
7ccb1c94a1 Fix var not defined 2022-01-13 19:07:05 +01:00
Laurent Destailleur
f35fee0081 Prepare 16 dev 2022-01-13 18:55:49 +01:00
Laurent Destailleur
b82b89d519 Prepare 15.0 2022-01-13 18:54:46 +01:00
Laurent Destailleur
979b0a7b93 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	test/phpunit/CodingPhpTest.php
2022-01-13 18:48:14 +01:00