Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

17481 Commits

Author SHA1 Message Date
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
ptibogxiv
a30f029bbf Update product.lib.php 2019-06-13 20:53:24 +02:00
ptibogxiv
b13b089c58 Fix measuring_units_string display function 2019-06-13 20:52:52 +02:00
Laurent Destailleur
7e1eacb7d5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-13 13:26:54 +02:00
Laurent Destailleur
357c5244f7 Fix phpcs 2019-06-13 13:26:35 +02:00
Laurent Destailleur
f00c9a10db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2019-06-13 12:15:51 +02:00
Laurent Destailleur
52159dcb69 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:14:19 +02:00
Laurent Destailleur
3e6b7208cc Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:12:37 +02:00
Laurent Destailleur
319bc7ec8a Fix syntax error 2019-06-13 12:12:20 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Laurent Destailleur
b6f477fc83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-13 12:07:24 +02:00
Laurent Destailleur
4b26702516 code comment 2019-06-13 11:07:38 +02:00
Laurent Destailleur
60e1e89981 Merge pull request #11328 from fappels/clean_10_beta 
Fix scrutinizer bugs
 2019-06-13 10:18:59 +02:00
Laurent Destailleur
ab9742f4df Try to keep proportion of logo 2019-06-13 10:09:20 +02:00
Laurent Destailleur
2bc821d900 Try to keep proportions of logo 2019-06-13 10:08:35 +02:00
Laurent Destailleur
1318e26cda Merge pull request #11298 from hregis/7.0_price 
FIX missing compatibility with multicompany transverse mode
 2019-06-13 10:01:05 +02:00
Laurent Destailleur
4cbfb67d63 Update html.formother.class.php 2019-06-13 09:59:10 +02:00
Francis Appels
3f63be6045 fix typo 2019-06-12 22:10:40 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
e81663ec34 Fix cropping of image files for BOM module was ko 2019-06-12 19:00:34 +02:00
Laurent Destailleur
c57013f293 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-12 13:59:14 +02:00
Laurent Destailleur
4f5f03b893 Merge pull request #11326 from atm-greg/FIX_massaction_presend 
Fix massaction presend
 2019-06-12 12:37:03 +02:00
Laurent Destailleur
0bf7512f28 Update actions_massactions.inc.php 2019-06-12 12:33:31 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
Laurent Destailleur
91a4e8bc0a Merge 2019-06-12 12:09:56 +02:00
atm-greg
9ba102b6b9 bad object used 2019-06-12 12:08:16 +02:00
atm-greg
25031e534d fix massaction presend 2019-06-12 12:05:02 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
 2019-06-12 12:03:46 +02:00
Laurent Destailleur
afe1ec633b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:21 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Laurent Destailleur
8447259f25 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-12 10:06:34 +02:00
Laurent Destailleur
420f3bbdab FIX #11316 2019-06-12 10:05:53 +02:00
Laurent Destailleur
2ac8723ce9 Code comment 2019-06-11 21:02:41 +02:00
Maxime Kohlhaas
0ce2c2aab5 Fix missing massaction hook params 2019-06-10 10:11:26 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:58:58 +02:00
Laurent Destailleur
0a903da5dc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
 2019-06-07 22:53:30 +02:00
Laurent Destailleur
b36f80ab2e Merge pull request #11306 from frederic34/patch-6 
Parameter must be array or object that implements Countable
 2019-06-07 18:10:03 +02:00
Laurent Destailleur
b73d287953 Update agenda.lib.php 2019-06-07 18:09:43 +02:00
Laurent Destailleur
4c44378049 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 16:56:39 +02:00
Laurent Destailleur
0edd94c4f8 Merge pull request #11303 from atm-florian/10.0 
fix various little stuff from scrutinizer (undeclared vriable, misspelling variable, mistype declaration)
 2019-06-07 15:21:30 +02:00
Laurent Destailleur
4ed7e281c5 Merge pull request #11301 from frederic34/patch-5 
avoid warning with php 7.2
 2019-06-07 15:08:49 +02:00
Laurent Destailleur
a0a0c2207b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-07 01:29:55 +02:00
Laurent Destailleur
3d8910d327 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 2019-06-06 19:19:05 +02:00
Laurent Destailleur
3ff154c1d0 Fix sql error 2019-06-06 19:05:47 +02:00
Frédéric FRANCE
f11db8396a Parameter must be array or object that implements Countable 
warning with php 7.2
 2019-06-06 09:49:32 +02:00
florian HENRY
f2171d466b fix variable name 2019-06-05 17:05:26 +02:00
florian HENRY
acad2e633b fix scrutinzer 2019-06-05 16:34:32 +02:00
florian HENRY
3927a74d6b fix scrunitizer 2019-06-05 16:30:22 +02:00