lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99,738 Commits 43 Branches 150 Tags 886 MiB
2586fcd1a3
Commit Graph

99738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +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
2069eeceda Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 10:30:02 +02:00
Laurent Destailleur
8c9bec3e3b Code comment 2021-06-04 10:29:30 +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
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note 
ADD note to supplier order refusal
 2021-06-04 10:10:17 +02:00
Laurent Destailleur
402d90554a Clean code 2021-06-04 10:04:56 +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
5f74e378a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 09:39:36 +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
6c8341a43f
Merge pull request #17787 from Hystepik/develop#5 
Fix #17726 : holliday with advanced perms works
 2021-06-04 09:37:32 +02:00
Laurent Destailleur
c7e21daee7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 09:36:20 +02:00
Laurent Destailleur
621aa9e6f3 Fix typo 2021-06-04 09:27:33 +02:00
Laurent Destailleur
d8aa7a7f33
Merge pull request #17792 from Hystepik/develop#6 
Fix #17791 : Error when loading chart of accounts
 2021-06-04 09:25:24 +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
81cc8cef75
Merge pull request #17797 from Hystepik/develop#7 
Fix propal/index.php error on thirdparty display
 2021-06-04 09:07:53 +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
ce64ebc167
Merge pull request #17805 from frederic34/patch-22 
fix warning
 2021-06-04 08:58:53 +02:00
Laurent Destailleur
c39c7d6a81
Merge pull request #17806 from frederic34/patch-23 
fix warning
 2021-06-04 08:58:43 +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
Laurent Destailleur
3ae3137eaf Missing picto 2021-06-04 08:57:48 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24 
fix warning
 2021-06-04 08:57:10 +02:00
Laurent Destailleur
a8aacb3150
Merge pull request #17818 from frederic34/setmodetransport 
debug intracomm report transport mode
 2021-06-04 08:41:42 +02:00
Laurent Destailleur
350a421544
Update card.php 2021-06-04 08:41:26 +02:00
Laurent Destailleur
b674835d89
Merge pull request #17813 from frederic34/patch-25 
fix warning
 2021-06-04 08:39:20 +02:00
Laurent Destailleur
b6c3488c9c
Merge pull request #17815 from frederic34/patch-26 
fix warnings
 2021-06-04 08:39:04 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode 2021-06-03 21:47:10 +02:00
Frédéric FRANCE
0b28587e65
fix warnings 2021-06-03 15:28:47 +02:00
Frédéric FRANCE
e83e399cb6
fix warning 2021-06-03 15:19:54 +02:00
Frédéric FRANCE
ee55a5568f
fix warning 2021-06-03 15:14:31 +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
lmarcouiller
71856984a3 Fix #17791 : fix for at account 2021-06-03 09:35:31 +02:00
lmarcouiller
fa71402a9b Fix 17791 : fix for at account 2021-06-03 09:34:49 +02:00
lmarcouiller
8f7daf7f57 Fix 17791 : fix for at account 2021-06-03 09:32:58 +02:00
lmarcouiller
583acfbad4 Fix #17791 : fix at account 2021-06-03 09:29:12 +02:00
lmarcouiller
aa1ade5224 Fix #17791 : fix for SKR03 2021-06-03 09:13:48 +02:00
Frédéric FRANCE
c3d58ad044
fix warning 2021-06-03 08:36:50 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning 2021-06-03 08:33:44 +02:00
Laurent Destailleur
456356ded7 Fix migration 2021-06-02 18:45:48 +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
Laurent Destailleur
da7d821a3e css 2021-06-02 15:32:39 +02:00
lmarcouiller
431691cec4 Fix propal/index.php error on thirdparty display 2021-06-02 15:18:45 +02:00
Laurent Destailleur
db5bcd1b99 Fix css 2021-06-02 13:41:08 +02:00