lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,791 Commits 43 Branches 150 Tags 886 MiB
609eefaf08
Commit Graph

76791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
609eefaf08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:36:08 +02:00
Laurent Destailleur
70f19b3a3d Fix counter of record 2019-06-24 16:31:56 +02:00
Laurent Destailleur
202fbf5e7d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:31:09 +02:00
Laurent Destailleur
bf731e3de6 Fix trans 2019-06-24 16:30:55 +02:00
Laurent Destailleur
43123d6a87 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:13:36 +02:00
Laurent Destailleur
b98874848f Fix backport 9.0 2019-06-24 16:12:54 +02:00
Laurent Destailleur
84575df7e6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
Laurent Destailleur
04606ec6a3
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail 
FIX mass send mail
 2019-06-24 15:34:06 +02:00
Laurent Destailleur
cade08342c
Merge pull request #11390 from grandoc/develop 
translation
 2019-06-24 15:30:30 +02:00
Laurent Destailleur
7bbbe49b70
Merge pull request #11389 from atm-john/9.0_fix_ancor 
Fix send mail ancor
 2019-06-24 15:29:36 +02:00
Laurent Destailleur
60596d4237
Merge pull request #11376 from bafbes/abb90061 
Fix:modulebuilder output folder
 2019-06-24 15:29:13 +02:00
Laurent Destailleur
a340bb616d
Update myobject_document.php 2019-06-24 15:28:13 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0 
fix depending extrafeilds list
 2019-06-24 15:23:48 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
Laurent Destailleur
01b8522216 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 13:56:39 +02:00
Laurent Destailleur
7154ecb80b Fix reload of conf in cron script 2019-06-24 13:56:10 +02:00
Laurent Destailleur
76d49229cd Fix log 2019-06-24 13:42:46 +02:00
Laurent Destailleur
1c86294f83 Enhance pdf_getFormat 2019-06-24 13:39:32 +02:00
Laurent Destailleur
1699413a4c Add log 2019-06-24 12:59:16 +02:00
Laurent Destailleur
43fc0466e5 Fix position of modules 2019-06-23 20:05:15 +02:00
Laurent Destailleur
e12fde398a Fix phpcs 2019-06-23 19:50:55 +02:00
Laurent Destailleur
2e5b4ee4e7 Fix phpcs 2019-06-23 19:32:29 +02:00
Laurent Destailleur
9c54de57ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-23 18:12:56 +02:00
Laurent Destailleur
a6fc75fed2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expensereport/card.php
 2019-06-23 18:12:30 +02:00
Laurent Destailleur
0854984a08 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/holiday/card.php
 2019-06-23 18:09:49 +02:00
Laurent Destailleur
b153019000 FIX security (a user can read leave or holiday of other without perm. 2019-06-23 18:08:24 +02:00
Laurent Destailleur
1c48b8be32 Fix code comment 2019-06-23 17:23:41 +02:00
Laurent Destailleur
8866ab5565 Fix missing trans 2019-06-23 16:42:06 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
8a9c858609 Code comment 2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
71b266b5a8 Code comment 2019-06-22 19:20:01 +02:00
Laurent Destailleur
2854e0dae6 Code comment 2019-06-22 19:15:15 +02:00
Laurent Destailleur
d9f6d9f0c3 Code comment 2019-06-22 19:12:44 +02:00
Laurent Destailleur
76f394cc43 Fix phpcs 2019-06-22 18:58:14 +02:00
Laurent Destailleur
17412ce7aa Try to use new scrutinizer engine 2019-06-22 18:49:55 +02:00
Laurent Destailleur
5c3d3cec9e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 18:44:12 +02:00
Laurent Destailleur
e456cd27d1 Fix deprecated call and hide pass in debug 2019-06-22 18:42:24 +02:00
Laurent Destailleur
c1f6b76a6a Remove deprecated 2019-06-22 18:29:24 +02:00
Laurent Destailleur
662afe8a36 Fix missing global 2019-06-22 18:24:29 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Laurent Destailleur
3f2ba2780f Add @ignore so scrutinizer ignores duplicate definition of llxHeader 2019-06-22 18:06:14 +02:00
Laurent Destailleur
eb20df8e64 Fix debug save of state into setup 2019-06-22 14:47:46 +02:00
Laurent Destailleur
db241b22dd Fix clean of database 2019-06-22 14:33:31 +02:00
Laurent Destailleur
fdff737329 Fix clean of database 2019-06-22 14:33:04 +02:00
Laurent Destailleur
c089a47b4c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 14:15:30 +02:00
Laurent Destailleur
e6ea9cc448 Clean widget not correctly removed 2019-06-22 14:15:10 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00