Commit Graph

94433 Commits

Author SHA1 Message Date
Laurent Destailleur
1bf63c7862 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2021-06-10 16:47:45 +02:00
Laurent Destailleur
5d6735f364
Merge pull request #17826 from ptibogxiv/patch-428
Fix date_start of last subscription
2021-06-10 13:01:07 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade
FIX : childtablesoncascade doc
2021-06-10 12:59:19 +02:00
Laurent Destailleur
b7ba9df6b4
Update societe.class.php 2021-06-10 12:59:04 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php 2021-06-10 12:58:42 +02:00
Laurent Destailleur
0c6f3a2616
Merge pull request #17862 from atm-gauthier/fix_rounding_on_formatted_tags
FIX : auto rounding on "_FORMATED_" tags
2021-06-10 12:50:50 +02:00
Laurent Destailleur
d3c4cf50ca
Merge pull request #17846 from frederic34/patch-9
avoid fatal error
2021-06-10 12:22:36 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning
Fix php 7 warning : Only variables should be passed by reference
2021-06-10 12:20:26 +02:00
Laurent Destailleur
f5be9b6244
Merge pull request #17859 from aspangaro/12p14
FIX Missing link to language file
2021-06-10 12:19:19 +02:00
Laurent Destailleur
9ed7a3a5c5
Merge pull request #17863 from marc-dll/11.0_FIX_holiday_massaction_delete_right
FIX: holiday list: bad right for mass deletion
2021-06-10 12:13:10 +02:00
Laurent Destailleur
729c12a8e4
Merge pull request #17864 from DorianVabre/FIX_11.0_CSMSFile_count
Fix: using strlen() instead of count() to measure a message length on CSMSFile
2021-06-10 12:12:43 +02:00
Laurent Destailleur
4d5aa723d4
Merge pull request #17870 from aspangaro/12p15
FIX Customer invoice list - Pagination lost search_date_xxx information
2021-06-10 12:09:57 +02:00
Alexandre SPANGARO
08186fdff1 Fix warning - search_societe is already present 2021-06-10 06:28:09 +02:00
Alexandre SPANGARO
b216c81c60 FIX Customer invoice list - Pagination lost search_date_xxx information 2021-06-10 06:22:03 +02:00
Dorian Vabre
0a23cf029d using strlen instead of count 2021-06-09 14:13:50 +02:00
Marc de Lima Lucio
5d9aa40065 FIX: holiday list: bad right for mass deletion 2021-06-09 12:40:34 +02:00
Gauthier PC portable 024
4b6fb7dd47 FIX : auto rounding on "_FORMATED_" tags 2021-06-09 12:26:28 +02:00
Alexandre SPANGARO
a4f3792cec FIX Missing link to language file 2021-06-09 07:42:05 +02:00
John BOTELLA
5131ab5199 Fix php 7 warning : Only variables should be passed by reference 2021-06-08 12:36:08 +02:00
Frédéric FRANCE
4e530c2486
Update card.php 2021-06-08 12:05:45 +02:00
Frédéric FRANCE
0ea0966b09
Update card.php 2021-06-08 12:01:05 +02:00
Frédéric FRANCE
b1c3a7cf48
avoid fatal error 2021-06-08 10:38:34 +02:00
ATM john
1aca7efce3 Fix childtablesoncascade doc 2021-06-06 13:15:03 +02:00
Laurent Destailleur
273c4c2880 Fix typo 2021-06-05 15:28:41 +02:00
ptibogxiv
36accba5c9
Fix date_start of last subscription 2021-06-05 14:43:40 +02:00
Laurent Destailleur
27018bd4b4 Fix group by 2021-06-04 14:25:32 +02:00
Laurent Destailleur
d1d305e470
Merge pull request #17738 from frederic34/patch-11
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-06-04 12:42:26 +02:00
Francis Appels
01f5a5fb18 Fix update receipt eatby 2021-06-04 12:38:04 +02:00
Laurent Destailleur
4d460b1383
Merge pull request #17763 from FHenry/13_fix_paiementpage_badgetpost_test
13 fix paiementpage bad GETPOST test
2021-06-04 11:54:14 +02:00
Laurent Destailleur
131d666d1d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-06-04 11:05:08 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Laurent Destailleur
7608f0b383
Merge pull request #17778 from tuxgasy/fix_check_stock_with_batch
Fix: Do a strict comparison when check if stock is enough
2021-06-04 10:34:29 +02:00
Laurent Destailleur
174c6f8a45
Update mouvementstock.class.php 2021-06-04 10:33:13 +02:00
Laurent Destailleur
47eb2471f1
Merge pull request #17779 from OGPayet/fix/addMissingHooksInSocieteList
add missing hooks in societe list.php
2021-06-04 10:10:54 +02:00
Laurent Destailleur
9b0605f979 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-04 09:41:35 +02:00
Laurent Destailleur
164fe9fb4a
Merge pull request #17786 from FHenry/12_fix_ordersupplierstats
FIX: order supplier stats by category now display figures
2021-06-04 09:39:17 +02:00
Laurent Destailleur
aafb074b41
Merge pull request #17793 from ATM-Consulting/Fix_12.0_update_usergroup_label
update ->nom field if different from ->name
2021-06-04 09:21:51 +02:00
Laurent Destailleur
935ba6ae18
Merge pull request #17796 from atm-john/13.0_fix_warehouse_id
FIX  Warehouse id
2021-06-04 09:09:18 +02:00
Laurent Destailleur
d79be7615c
Merge pull request #17799 from atm-john/13.0_fix_wrong_context
FIX : wrong hook context
2021-06-04 09:07:02 +02:00
Laurent Destailleur
5e0eef68d0
Merge pull request #17809 from atm-gauthier/fix_status_holiday_list
FIX : field name is search_status and not search_statut
2021-06-04 08:59:07 +02:00
Laurent Destailleur
5c16a52a53
Merge pull request #17810 from inoveaconseil/patch-1
FIX delete object actionComm
2021-06-04 08:58:20 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm 2021-06-03 14:36:47 +02:00
Gauthier PC portable 024
093705a1b5 FIX : field name is search_status and not search_statut 2021-06-03 11:32:41 +02:00
ATM john
38423ba260 Fix wrong hook context 2021-06-02 16:31:31 +02:00
Laurent Destailleur
1468761073 Fix select 2021-06-02 16:29:38 +02:00
ATM john
3aca9bdb9e Fix warehouse id 2021-06-02 12:02:27 +02:00
atm-greg
f875bcfe09 update ->nom field if different from ->name 2021-06-02 10:30:48 +02:00
Laurent Destailleur
33a4c98dc3 Fix popup 2021-06-02 04:34:10 +02:00