lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,555 Commits 43 Branches 150 Tags 886 MiB
c03958a867
Commit Graph

100555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
6ffbc2744e Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_sale_top_menu_supplieronly 2021-05-17 09:22:51 +02:00
Laurent Destailleur
c013a22008 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 09:20:40 +02:00
Laurent Destailleur
88d1ce7e49 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 09:19:39 +02:00
Laurent Destailleur
af2f40cc18 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Laurent Destailleur
592cfb5e93
Merge pull request #17602 from fmarcet/11.0 
FIX: Impossible to add multiple localtax2
 2021-05-17 09:13:58 +02:00
Laurent Destailleur
608e4e8891
Merge pull request #17601 from ptibogxiv/patch-426 
NEW report contact/adresses on credit note from invoice
 2021-05-17 09:12:12 +02:00
Laurent Destailleur
847e4ae4d7
Merge pull request #17616 from piernov/11.0-fix-LDAPposixAccount 
Fix LDAP synchronisation for User class when using posixAccount objectclass
 2021-05-17 09:08:50 +02:00
Laurent Destailleur
6a9fa11539
Merge branch 'develop' into 11.0-fix-LDAPposixAccount 2021-05-17 09:07:30 +02:00
Laurent Destailleur
8dc6241aee Clean dead code 2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7 Clean comment 2021-05-17 08:48:02 +02:00
Laurent Destailleur
242db33311
Merge pull request #17620 from atm-maxime/fix/hrm 
Fix quick create dropdown + translations
 2021-05-17 08:31:54 +02:00
stickler-ci
67fc5bce5f Fixing style errors. 2021-05-17 06:30:30 +00:00
Laurent Destailleur
6308c17c5f
Update main.inc.php 2021-05-17 08:30:12 +02:00
Laurent Destailleur
77bcd7ecff
Merge pull request #17628 from atm-maxime/fix/ticket3 
Fix missing substitutionarray on ticket presend
 2021-05-17 08:01:21 +02:00
Laurent Destailleur
d4162f3076
Update card.php 2021-05-17 08:00:33 +02:00
Laurent Destailleur
4768729c09 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/core/class/rssparser.class.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
	htdocs/expedition/list.php
 2021-05-17 07:57:32 +02:00
stickler-ci
bdf876ead4 Fixing style errors. 2021-05-17 05:38:46 +00:00
Laurent Destailleur
dd88f9cd76
Update card.php 2021-05-17 07:37:01 +02:00
Laurent Destailleur
c36f231f41
Update card.php 2021-05-17 07:34:56 +02:00
Laurent Destailleur
ea78462167 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-17 07:33:37 +02:00
Laurent Destailleur
2f2ba933f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/user/class/usergroup.class.php
 2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
6236721067
Merge pull request #17607 from fappels/14_selectwarehouses 
fix implode on string for formproduct loadwarehouse
 2021-05-17 07:20:15 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2 
Update box_dolibarr_state_board.php
 2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId 
Fix: properly set gid for Group LDAP synchro
 2021-05-17 07:14:25 +02:00
Laurent Destailleur
eec54a5c9d
Merge pull request #17609 from fmarcet/13.0 
FIX: Filter of the dates in the lists is lost
 2021-05-17 07:13:14 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3 
avoid sql error with sql_mode=only_full_group_by
 2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php 2021-05-17 07:11:41 +02:00
Laurent Destailleur
fc22565532
Merge pull request #17613 from atm-maxime/fix/date_propal 
Fix use of DatePropal instead of Date
 2021-05-17 07:09:35 +02:00
Laurent Destailleur
3428c1f165
Merge pull request #17619 from atm-maxime/fix/usergroup_entity 
Fix entity was set to 0 on group creation (HOT FIX)
 2021-05-17 07:09:11 +02:00
Laurent Destailleur
7d0fa95d81
Update card.php 2021-05-17 07:08:45 +02:00
Laurent Destailleur
829f6520bd
Merge pull request #17621 from atm-maxime/patch-1 
Update admin_extrafields_view.tpl.php
 2021-05-17 07:01:41 +02:00
Laurent Destailleur
0cc519a26d
Merge pull request #17622 from atm-maxime/fix/expense_id 
Fix id of expense report must be before object fetch (HOT FIX)
 2021-05-17 07:01:25 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket 
Fix ticket when module societe not enabled
 2021-05-17 06:59:32 +02:00
Laurent Destailleur
c7fff29c54
Merge pull request #17623 from atm-maxime/fix/hrm_homepage 
Fix HRM homepage
 2021-05-17 06:58:57 +02:00
Laurent Destailleur
ea5d374f23
Update index.php 2021-05-17 06:57:21 +02:00
Laurent Destailleur
90d6f70bce Comment 2021-05-17 06:54:39 +02:00
Laurent Destailleur
78b38f75a1 Minor fixes 2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590 Add comment 2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
1fbd53993f Fix missing substitutionarray on ticket presend 2021-05-16 19:07:36 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422
Update box_dolibarr_state_board.php 
Global stats box is always enabled
 2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
78633ccb2b Fix expensereport and recruitment homepages 2021-05-16 16:20:46 +02:00
Maxime Kohlhaas
240137b768 Fix HRM homepage 2021-05-16 16:04:19 +02:00
Aisuko
3aa40e97cb Merge branch 'Dolibarr:develop' into develop 2021-05-16 13:56:01 +02:00