Commit Graph

106534 Commits

Author SHA1 Message Date
Ferran Marcet
6cbcc54bd9 Fix: The resource dropdown does not show the values 2022-04-12 19:19:41 +02:00
Laurent Destailleur
a006eaecde Fix trans 2022-04-12 13:02:33 +02:00
Laurent Destailleur
4da7883a9a Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-12 10:05:27 +02:00
Laurent Destailleur
cfe554b04c Fix var not defined 2022-04-12 03:08:31 +02:00
Laurent Destailleur
356ef3373f
Merge pull request #20607 from fmarcet/15.0
Fix: Online signature of proposals does not work well with multicompany
2022-04-12 02:57:26 +02:00
Laurent Destailleur
f679392d26 FIX missing picto in combo of mass actions of thirdparties. 2022-04-12 02:26:37 +02:00
Laurent Destailleur
3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 21:14:51 +02:00
Laurent Destailleur
6005f0e08b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-11 20:57:27 +02:00
Laurent Destailleur
b8d1acaff7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/holiday/card.php
	htdocs/user/card.php
2022-04-11 20:57:16 +02:00
Laurent Destailleur
155dfbda94 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-04-11 20:43:50 +02:00
Laurent Destailleur
974fb46fda Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/user/card.php
2022-04-11 20:43:20 +02:00
Ferran Marcet
b8bccd62ef
Update newonlinesign.php 2022-04-11 18:41:36 +02:00
Ferran Marcet
9547b9e7fe Fix: Online signature of proposals does not work well with multicompany 2022-04-11 18:01:25 +02:00
Laurent Destailleur
7ccbd34c2d
Merge pull request #20587 from marc-dll/13.0_FIX_holiday_mails_in_html
FIX: holiday/leave requests: write status change emails in HTML
2022-04-11 16:29:13 +02:00
Laurent Destailleur
8b6ad766d6
Merge pull request #20605 from Easya-Solutions/14.0_fix-replenish-stock-by-warehouse
FIX replenish and manage product stock by warhouse
2022-04-11 16:23:52 +02:00
lvessiller
18488cf1dd FIX replenish and manage product stock by warhouse 2022-04-11 13:53:35 +02:00
Laurent Destailleur
71516ecd3e Clean package.json to avoid false alert of security (not used)
Conflicts:
	package.json
2022-04-09 15:50:26 +02:00
Laurent Destailleur
da0fcb556f Fix css 2022-04-09 15:28:01 +02:00
Laurent Destailleur
1aecff854b Fix missing limit in redirect 2022-04-09 14:40:29 +02:00
Laurent Destailleur
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +02:00
Laurent Destailleur
fef8a3c141 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-09 02:22:54 +02:00
Laurent Destailleur
d6860ca41b FIX bad bank amount in accounting with multicurrency 2022-04-09 02:22:45 +02:00
Laurent Destailleur
0cdc146f5b FIX add tools to fix bad bank amount in accounting with multicurrency 2022-04-09 00:55:40 +02:00
Laurent Destailleur
099e7aaeb5
Merge pull request #20532 from OPEN-DSI/fix_add_line_when_create_invoice
FIX - Fix the adding of lines in the create invoice functions
2022-04-08 15:33:35 +02:00
Laurent Destailleur
75b66eace0
Merge pull request #19417 from atm-adrien/FIX_commandeFourn_Stats
FIX : Supplier order stats
2022-04-07 18:35:10 +02:00
Laurent Destailleur
ee66869c4c
Merge pull request #20584 from marc-dll/14.0_FIX_holiday_list_end_shift
FIX: action comm list: holiday last day not included + handle halfdays
2022-04-07 18:19:56 +02:00
Laurent Destailleur
52120b26a8
Merge pull request #20585 from atm-adrien/FIX_CheckUserAccess_for_recruitment-14.0
FIX: Add 'recruitment' into check array
2022-04-07 18:16:34 +02:00
Marc de Lima Lucio
de737b6b23 FIX: holiday/leave requests: write status change emails in HTML 2022-04-07 18:07:30 +02:00
Marc de Lima Lucio
6e0888ca0e FIX: action comm list: holiday last day not included + handle duration with halfdays 2022-04-07 17:17:20 +02:00
Adrien Raze
41ee9739db FIX: Add 'recruitment' into check array 2022-04-07 17:16:02 +02:00
Laurent Destailleur
37fbe859df FIX country not visible into list of states 2022-04-07 16:33:19 +02:00
Laurent Destailleur
d26c578e97
Merge pull request #20541 from FHenry/14.0_fix_bithday_date_displayed
fix: Bad dirthday displayed date (d-1) in the Bithday Widget
2022-04-07 14:22:15 +02:00
Laurent Destailleur
11b0d7ba6f
Merge pull request #20559 from FHenry/14.0_fix_token_referentObject_page
FIX: Filter on Object Referent page give CRSF page
2022-04-07 11:37:41 +02:00
Laurent Destailleur
9bf6fc41d9
Merge pull request #20576 from atm-gauthier/fix_td_identification
FIX : originproductline array td identification
2022-04-07 11:34:17 +02:00
UT from dolibit
ed9435321f Update societe.class.php
note_public  => NotePublic
note_private => NotePrivate

see #20419
2022-04-07 11:08:30 +02:00
Gauthier PC portable 024
f1771af53c FIX : originproductline array td identification data-id 2022-04-07 11:03:25 +02:00
Laurent Destailleur
cc1ee0258b
Merge pull request #20577 from FHenry/15.0_fix_modulebuilder
fix: bad permission int modulebuilder template
2022-04-07 11:01:59 +02:00
Gauthier PC portable 024
9ffe82e259 FIX : originproductline array td identification 2022-04-07 10:32:23 +02:00
Florian HENRY
291002fe11 fix: bad poermission int modulebuilder template 2022-04-07 10:31:54 +02:00
Laurent Destailleur
afdefad55b FIX bad link to add a customer price (token duplicated) 2022-04-06 21:01:04 +02:00
Laurent Destailleur
32875a1e6c Fix trans 2022-04-06 17:06:49 +02:00
Laurent Destailleur
8f93584f97 Fix trans 2022-04-06 16:56:23 +02:00
Laurent Destailleur
33b5605a72 Code comment 2022-04-06 16:49:59 +02:00
Laurent Destailleur
5a8d5618f2 Fix error message on IBAN/BIC validation 2022-04-06 16:15:34 +02:00
Laurent Destailleur
0b8f4489c8 css 2022-04-06 15:55:43 +02:00
Laurent Destailleur
2e91b0107a Fix missing data in tooltip 2022-04-06 15:35:49 +02:00
Laurent Destailleur
c2f2f98235 css 2022-04-06 15:25:37 +02:00
Laurent Destailleur
1988459aa8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-06 14:54:02 +02:00
Florian HENRY
798c7a8a0b try with tzserver 2022-04-06 14:09:44 +02:00
Florian HENRY
7b36733690 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0_fix_bithday_date_displayed 2022-04-06 13:49:22 +02:00