Commit Graph

112767 Commits

Author SHA1 Message Date
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Alexandre SPANGARO
2eef38e44a Fix PR 2021-09-10 09:12:11 +02:00
Alexandre SPANGARO
4bb612650b NEW Survey - Add a clickable link in email send 2021-09-10 09:09:39 +02:00
Alexandre SPANGARO
12eb16b8b6 Merge branch '15a12' of https://github.com/aspangaro/dolibarr into 15a12 2021-09-09 22:24:42 +02:00
Alexandre SPANGARO
3ea6314494 Remove $year 2021-09-09 22:24:24 +02:00
stickler-ci
dfe1576b8d Fixing style errors. 2021-09-09 20:18:47 +00:00
Alexandre SPANGARO
f31b7fa3c4 NEW Social Contributions - Add from/to on list 2021-09-09 22:14:26 +02:00
Laurent Destailleur
5a87d94b3c Add missing fields into llx_holiday 2021-09-09 20:38:25 +02:00
Laurent Destailleur
77247ec43a Add date valid/approval 2021-09-09 20:35:57 +02:00
Laurent Destailleur
f4786c8a0a Include ref into label of log history
Conflicts:
	htdocs/holiday/card.php
2021-09-09 19:50:39 +02:00
Laurent Destailleur
6465e8aa36 Include ref into label of log history 2021-09-09 19:47:51 +02:00
Laurent Destailleur
b8b5b97d78 Code comment 2021-09-09 19:47:15 +02:00
Laurent Destailleur
22c77e0ff9 Include ref into label of log history 2021-09-09 19:46:40 +02:00
Laurent Destailleur
b7f5b5f7ed
Merge pull request #18509 from aspangaro/15a8
NEW IHM - Include new options to manage dashboard
2021-09-09 19:26:24 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +02:00
Laurent Destailleur
520ce4c3ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 19:21:45 +02:00
Laurent Destailleur
ffd7f60830 FIX #18589 #18617 2021-09-09 19:21:32 +02:00
Laurent Destailleur
e43d91ee6e
Merge pull request #18665 from FHenry/14_fix_cat_icon_perms
fix: do not display icon to edit/delete tags if user not authorize
2021-09-09 19:00:04 +02:00
Laurent Destailleur
647fa49202
Merge pull request #18667 from lainwir3d/fix_order_shipment_list_duplicates
FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary.
2021-09-09 18:59:28 +02:00
Laurent Destailleur
fba9567003
Merge pull request #18664 from Fyroeo/develop
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification.
2021-09-09 18:58:11 +02:00
Laurent Destailleur
caf0559985
Merge pull request #18624 from Hystepik/develop#1
Close #18584 : Code enhancement of MO
2021-09-09 18:54:34 +02:00
lainwir3d
63abe2f1ff FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary. 2021-09-09 19:56:28 +04:00
Florian HENRY
45ad23206a fix: do not display icon to edit/delete tags if not perms 2021-09-09 17:41:40 +02:00
Mazaud Thomas
2091f915b5
Fix the provided URL
I made a typo in the URL.
2021-09-09 16:38:45 +02:00
Mazaud Thomas
512aa92b7e
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification.
Changing the default provider for SIREN verification by making the Government Owned "L'annuaire des Entreprises" the default one.
2021-09-09 16:31:39 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
Laurent Destailleur
a80950b96d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 16:06:28 +02:00
Laurent Destailleur
5406e3d34e Fix phpcs 2021-09-09 16:06:16 +02:00
Laurent Destailleur
478918bd45 Fix phpunit 2021-09-09 15:59:43 +02:00
lainwir3d
20e2eb1d9a Merge remote-tracking branch 'origin/develop' into fix_rest_api_fix_self_user_info_read 2021-09-09 17:46:59 +04:00
lainwir3d
ad7a5eaf70 Merge remote-tracking branch 'origin/develop' into fix_rest_api_fix_self_user_info_read 2021-09-09 17:44:22 +04:00
lmarcouiller
dea7e83360 update of mo_production.php 2021-09-09 15:33:06 +02:00
Laurent Destailleur
de005f5cd2
Merge pull request #18661 from Hystepik/develop_v14#4
Fix #18660 : fix rights of supplier order with API
2021-09-09 15:18:17 +02:00
Laurent Destailleur
5d5b7c3af4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/main.inc.php
2021-09-09 15:15:26 +02:00
Laurent Destailleur
30894b989c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-09-09 15:12:16 +02:00
Laurent Destailleur
70f22f2648 # WARNING: head commit changed in the meantime
Merge
2021-09-09 15:12:02 +02:00
Laurent Destailleur
654bf4d672 Fix name of index #18623 2021-09-09 15:07:55 +02:00
Laurent Destailleur
e332ca88e4 Fix missing sql 2021-09-09 15:06:30 +02:00
Laurent Destailleur
4d5621ea6f Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 14:59:12 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields
14.0 fix salary extrafields are no more available
2021-09-09 14:58:54 +02:00
Laurent Destailleur
1a8364adcc
Merge pull request #18637 from hregis/fix_multicompany
FIX multicompany transverse mode compatibility
2021-09-09 14:50:22 +02:00
Laurent Destailleur
085b893074
Update mo_production.php 2021-09-09 14:44:52 +02:00
lmarcouiller
4928d03c4f update to have modify ! to empty() 2021-09-09 14:44:17 +02:00
fr69400
ad0c4c518f Update row.php
right write doesn't exist for supplier_proposal

->line order dont works
2021-09-09 14:42:43 +02:00
Laurent Destailleur
402757bdfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-09 14:41:51 +02:00
Laurent Destailleur
3581c37b83
Merge pull request #18626 from fr69400/develop
FIX : line reorder dont work on supplier_proposal
2021-09-09 14:41:30 +02:00
lmarcouiller
8af6b8679e update with fournisseur && supplier_order 2021-09-09 14:40:39 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects
NEW : mass action delete, no more break if at least one object has child
2021-09-09 14:38:49 +02:00