2
0
forked from Wavyzz/dolibarr
Commit Graph

108518 Commits

Author SHA1 Message Date
Laurent Destailleur
3056635aaf css 2022-03-24 14:04:03 +01:00
Laurent Destailleur
8f25477db6 Debug v16 2022-03-24 13:41:11 +01:00
Laurent Destailleur
a22d66b021 css 2022-03-24 13:31:03 +01:00
Laurent Destailleur
38439603be Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 13:23:04 +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
27d8691fcc Use default to null 2022-03-24 12:30:26 +01:00
Laurent Destailleur
793407a87d Merge pull request #20443 from defrance/patch-181
New holliday field for store nb_open_day  complex compute
2022-03-24 12:28:11 +01:00
Laurent Destailleur
8661902bfa Update llx_holiday.sql 2022-03-24 12:26:31 +01:00
Laurent Destailleur
d952419fac Update llx_holiday.sql 2022-03-24 12:25:42 +01:00
GregM
6302e11471 update GRH redirection position 2022-03-24 12:24:33 +01:00
Laurent Destailleur
35822370ec Merge pull request #20449 from atm-greg/FIX_develop_missing_hooks_for_dictionaryadmin
add more specific context and doAction hook
2022-03-24 12:08:37 +01:00
Laurent Destailleur
cd969449f2 Replaced duplicated code with extends of CommonObjectLine 2022-03-24 12:07:04 +01:00
Laurent Destailleur
6ea5708f97 Merge pull request #20450 from atm-jpb/FIX_trigger_expensereport_det
Fix trigger expensereport det
2022-03-24 12:04:22 +01:00
Laurent Destailleur
ea4b842c86 Update card.php 2022-03-24 12:01:53 +01:00
Laurent Destailleur
fdfbf05705 Update card.php 2022-03-24 12:00:11 +01:00
Laurent Destailleur
5a947a9e71 Merge pull request #20447 from bb2a/FIX---Lang-PaymentMode
FIX - Lang PaymentMode
2022-03-24 11:54:38 +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
6c99a75abe Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-24 11:53:09 +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
Thomas Negre
6dfad5d69f facture/card.php: replace redirection by = '' 2022-03-24 11:09:39 +01:00
Thomas Negre
2709e69a32 rename $form into $formcategory 2022-03-24 11:00:37 +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
stickler-ci
671ab9a412 Fixing style errors. 2022-03-24 08:55:18 +00:00
jpb
71c1f2de3c add class td 2022-03-24 09:51:12 +01:00
jpb
7be3c8b64d ajout de class pour les <td> 2022-03-24 09:51:00 +01:00
jpb
4bc75f6487 ajout class name on create det <td> 2022-03-24 09:50:44 +01:00
jpb
a577956b73 ajout de nom de class dans les entes de ligne det en affichage 2022-03-24 09:50:30 +01:00
jpb
37e589807d add trigger create on expensereportdet 2022-03-24 09:50:16 +01:00
atm-greg
07b0a4e516 Merge branch 'FIX_develop_missing_hooks_for_dictionaryadmin' of github.com:atm-greg/dolibarr into FIX_develop_missing_hooks_for_dictionaryadmin 2022-03-24 09:42:50 +01:00
atm-greg
7fb343b3ef add context 2022-03-24 09:42:02 +01:00
stickler-ci
efbaf030ec Fixing style errors. 2022-03-24 08:41:13 +00:00
atm-greg
f70ceb9398 add more specific context and doAction hook 2022-03-24 09:34:11 +01:00
BB2A Anthony Berton
1266da05ef Lang fr 2022-03-23 19:43:34 +01:00
BB2A Anthony Berton
958b6abdaa pdf_path 2022-03-23 17:31:54 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +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
161e795759 Look and feel 2022-03-23 17:12:25 +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
ee611e8517 Hide not important options 2022-03-23 16:56:07 +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