Commit Graph

99909 Commits

Author SHA1 Message Date
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Laurent Destailleur
ad8e0a3be5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:36 +02:00
Laurent Destailleur
6e4ed58be1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-01 14:36:26 +02:00
Laurent Destailleur
89b0a7b2b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-04-01 14:34:15 +02:00
Laurent Destailleur
497117416b Update mails_templates.php 2022-04-01 14:32:32 +02:00
Laurent Destailleur
02d1bd2868 Merge branch 'develop' into develop 2022-04-01 14:32:05 +02:00
Laurent Destailleur
88e6c67c10 Look and feel v16 of media manager 2022-04-01 14:29:11 +02:00
jpb
1cdf55fea0 remove empty line 2022-04-01 14:21:13 +02:00
jpb
f2480b6443 fix : remove tds add by mistake 2022-04-01 13:56:10 +02:00
Laurent Destailleur
05e1957627 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-01 13:30:31 +02:00
Laurent Destailleur
7031995820 Merge pull request #20505 from atm-jpb/NEW_add_hook_in_expensereport_rule
add hook doactions on expensereport_rule
2022-04-01 13:26:03 +02:00
Laurent Destailleur
de28cb5d78 Merge pull request #20501 from ralf1070/develop
Allow anonymous LDAP user lookups
2022-04-01 13:23:50 +02:00
Laurent Destailleur
4c150d85c9 Doc 2022-04-01 13:23:45 +02:00
Laurent Destailleur
86e9a24eb3 Merge pull request #20507 from FHenry/14_fix_action_reminders
FIX on update with action reminder in future there is user key error
2022-04-01 13:21:05 +02:00
Laurent Destailleur
106e3072dc Update card.php 2022-04-01 13:20:40 +02:00
Laurent Destailleur
27a49af4d7 Merge pull request #20498 from andreubisquerra/develop
Avoid grouping lines with ordered lines
2022-04-01 13:18:40 +02:00
Laurent Destailleur
0948a88d52 Merge pull request #20508 from FHenry/15.0_fix_message_inventories_lot_series
fix: Show error message on inventory input line for serial num product #Evarisk
2022-04-01 13:16:37 +02:00
Laurent Destailleur
e14d91dbd9 Merge pull request #20511 from FHenry/dev_20510
new: Add rank column into contract line
2022-04-01 13:10:24 +02:00
Laurent Destailleur
a3dbcd0c27 Clean language files 2022-04-01 13:09:11 +02:00
Florian HENRY
cbf89df591 new: add hidden option on contract PDF line 2022-04-01 11:54:16 +02:00
Florian HENRY
a9faf5fb54 feat: Add rank column into contract line 2022-04-01 11:29:38 +02:00
Laurent Destailleur
9be7bae765 Fix menu entry invalid 2022-04-01 11:24:58 +02:00
Laurent Destailleur
8349e48559 Reponsive 2022-04-01 11:24:45 +02:00
stickler-ci
d188f44a4c Fixing style errors. 2022-04-01 07:58:41 +00:00
Gauthier PC portable 024
fa0e7a641c FIX : Missing unset fields after updateline expensereport 2022-04-01 09:52:16 +02:00
Florian HENRY
0c44f164c7 fix: Show error message on inventory input line for serial num product 2022-04-01 09:38:06 +02:00
Laurent Destailleur
113af78a9c Add column for private widgets 2022-04-01 09:35:45 +02:00
Florian Mortgat
5df5050418 Apply suggestions from code review
replace spaces with tabs
2022-04-01 09:14:04 +02:00
andreubisquerra
7f4e71f66f Comments 2022-03-31 21:43:48 +02:00
Florian HENRY
e7db103b57 fix: on update with action reminder in future there is user key error 2022-03-31 18:55:54 +02:00
Laurent Destailleur
867883e9b1 Clean code for kanban view 2022-03-31 18:06:39 +02:00
atm-florian
ce83fa9f7e FIX missing call to executeHooks() 2022-03-31 17:34:24 +02:00
Laurent Destailleur
e10f9b4435 css 2022-03-31 17:07:13 +02:00
Laurent Destailleur
5b86476f0b Link of country not defined, jump on country setup line 2022-03-31 16:57:15 +02:00
stickler-ci
63b8c126d0 Fixing style errors. 2022-03-31 14:52:41 +00:00
jpb
be82fd73ed remove var_dump 2022-03-31 16:47:06 +02:00
jpb
5fe9a4404a add hook doactions on expensereport_rule 2022-03-31 16:43:37 +02:00
Laurent Destailleur
bbcfc4b9f9 Fix condition on table creation 2022-03-31 16:39:36 +02:00
Laurent Destailleur
af15e3ae9e Fix condition on table creation 2022-03-31 16:34:24 +02:00
Laurent Destailleur
ea8bc86c9f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-31 16:26:36 +02:00
Laurent Destailleur
3ba9916be2 Fix default value used on install after a first failed try 2022-03-31 16:23:36 +02:00
Laurent Destailleur
5f7abc0f8c Merge pull request #19703 from atm-maxime/fix_mysql8_createuser
Fix #19662 : mysql8 user creation in 2 steps
2022-03-31 16:06:53 +02:00
Laurent Destailleur
cd81312b6a Update mysqli.class.php 2022-03-31 16:04:28 +02:00
Laurent Destailleur
643a3b1740 Merge pull request #20484 from atm-jpb/NEW_Trigger_expense_report_udpate_delete
add trigger update and delete on expense report det
2022-03-31 15:58:30 +02:00
Laurent Destailleur
9b206f9224 Can retreive some param of install from url 2022-03-31 15:51:48 +02:00
Laurent Destailleur
df4e5fe84d Fix missing param 2022-03-31 13:28:19 +02:00
Laurent Destailleur
7b84b3e92d css 2022-03-31 13:27:14 +02:00
Laurent Destailleur
ca55bd157a Look and feel v16 2022-03-31 11:47:18 +02:00
Laurent Destailleur
5062064e9a css 2022-03-31 11:38:40 +02:00