2
0
forked from Wavyzz/dolibarr
Commit Graph

102696 Commits

Author SHA1 Message Date
stickler-ci
adda436dab Fixing style errors. 2022-04-12 12:45:05 +00:00
kevin
c51aff99af Add missing entity on adding new VAT 2022-04-12 14:38:17 +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
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
68d11f2e89 Fix phpunit regression 2022-04-09 02:42:32 +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
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
Gauthier PC portable 024
f1771af53c FIX : originproductline array td identification data-id 2022-04-07 11:03:25 +02:00
Gauthier PC portable 024
9ffe82e259 FIX : originproductline array td identification 2022-04-07 10:32:23 +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
Laurent Destailleur
c3ae63f587 FIX out of memory when more than 100 000 invoices. 2022-04-06 11:34:49 +02:00
Florian HENRY
c4f0c60a11 FIX: Filter on Object Referent page give CRSF page 2022-04-06 09:19:56 +02:00
Laurent Destailleur
f0d163a4ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-04-05 15:28:54 +02:00
Laurent Destailleur
8e4c89673a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2022-04-05 15:28:43 +02:00
Laurent Destailleur
04ece4f792 Merge pull request #20531 from ATM-Consulting/FIX_condition_on_remx
FIX : Bad condition on remx
2022-04-05 14:53:25 +02:00
Laurent Destailleur
3c64965f9c Merge pull request #20535 from altairis-noe/14.0
FIX backport
2022-04-05 14:19:33 +02:00
Laurent Destailleur
b499e5e6ac Merge pull request #20544 from atm-gauthier/fix_invoice_several_orders_fourn
FIX : each time we create a supplier order, we need to give it a ref_supplier
2022-04-05 13:50:18 +02:00
Gauthier PC portable 024
b199234afe FIX : each time we create a supplier order, we need to give it a ref_supplier 2022-04-05 12:01:09 +02:00
Florian HENRY
1fec350ccc fix: Bad dirthday displayed date (d-1) in the Bithday Widget 2022-04-04 22:51:30 +02:00
Laurent Destailleur
71012a7933 FIX #19777 #20281 2022-04-04 15:25:29 +02:00
kamel
6cac982507 FIX - Fix the adding of lines in the create invoice functions 2022-04-04 10:32:17 +02:00
Atm-Gregr
2009cc96e0 clean branch 2022-04-04 10:21:06 +02:00
Atm-Gregr
53b185ce9c fix condition on remx 2022-04-04 10:19:51 +02:00
Atm-Gregr
e34c921f8b Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2022-04-04 10:19:18 +02:00
Laurent Destailleur
440b5350df # WARNING: head commit changed in the meantime
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-04-03 17:19:27 +02:00
Laurent Destailleur
ece9f3037a Merge pull request #19788 from OPEN-DSI/v12-fix-user-card-modify-transverse-rights
FIX user actions rights when multi-company transverse mode is enabled
2022-04-02 18:15:50 +02:00
Laurent Destailleur
06689a3fce Merge pull request #20520 from OPEN-DSI/14.0_fix_default_options_when_generate_pdf_in_massactions
FIX - Fix default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions
2022-04-02 16:32:11 +02:00
Laurent Destailleur
796164d637 Merge pull request #20509 from atm-gauthier/14.0_fix_no_unset_fields_afteer_updateline_expensereport
FIX : Missing unset fields after updateline expensereport
2022-04-02 16:30:38 +02:00
kamel
11d4e85a39 FIX - Fiw default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions 2022-04-01 16:52:59 +02:00
Laurent Destailleur
0c27578e69 Merge pull request #20233 from marc-dll/13.0_FIX_clone_with_unique_extrafields
FIX: object cloning: set unique extrafield values to null to prevent duplicates
2022-04-01 14:49:25 +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
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
fa9fc1c8d0 Merge pull request #20506 from ATM-Consulting/FIX_missing_hook_for_statistics_box
FIX missing call to executeHooks()
2022-04-01 13:11:35 +02:00
stickler-ci
d188f44a4c Fixing style errors. 2022-04-01 07:58:41 +00:00