Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

18964 Commits

Author SHA1 Message Date
Laurent Destailleur
a352fd5a6e Revert "FIX#12482" 2019-11-30 21:00:56 +01:00
Nicolas
f2ff443641 FIX #12482 2019-11-30 20:04:27 +01:00
Maxime Kohlhaas
558669dd88 Fix #6497 : deposit lines were not translated 2019-11-30 16:14:16 +01:00
Maxime Kohlhaas
2c165d0a61 Fix deposit date display in PDF 2019-11-30 15:53:50 +01:00
stickler-ci
a13b2267aa Fixing style errors. 2019-11-30 14:22:25 +00:00
Maxime Kohlhaas
916954b301 Fix #12371 : access rights on contacts 2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
9095482113 Fix margins access + menu display 2019-11-30 14:47:48 +01:00
Nicolas
fd7a18c26f FIX #12473 2019-11-30 12:49:31 +01:00
ATM John BOTELLA
b7d39b610b Fix divided by zero 2019-11-30 10:08:55 +01:00
Laurent Destailleur
35b4318cee Merge pull request #12552 from frederic34/patch-15 
$head was never initialized
 2019-11-30 01:16:40 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
Laurent Destailleur
0a3614adbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-29 11:42:16 +01:00
Laurent Destailleur
3b9d2abcb2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/product.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/list.php
 2019-11-29 11:42:08 +01:00
Laurent Destailleur
3acd0bc2ff FIX Reduce number of request for list of products 2019-11-29 11:32:09 +01:00
Laurent Destailleur
eed8f242b8 Update demo 2019-11-29 10:23:18 +01:00
Frédéric FRANCE
00a80e498e $head was never initialized 2019-11-28 23:06:04 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM 
Enhance demo data for TakePOS
 2019-11-28 15:18:14 +01:00
Laurent Destailleur
614b82fe88 Fix var not initialized 2019-11-28 14:16:54 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Laurent Destailleur
552f2088f9 Merge pull request #12532 from frederic34/patch-15 
The property rowid does not seem to exist on Adherent.
 2019-11-28 12:21:35 +01:00
Laurent Destailleur
540f47b998 Merge pull request #12523 from oscim/patch-11 
Put $object in complete_head_from_modules
 2019-11-28 12:20:16 +01:00
Laurent Destailleur
1e84b0ea97 Merge pull request #12522 from Dolibarr/scrutinizer-patch-15 
Scrutinizer Auto-Fixes
 2019-11-28 12:19:43 +01:00
Laurent Destailleur
874f5b7005 Merge pull request #12528 from frederic34/patch-8 
image2wbmp() is deprecated as of PHP 7.3.0
 2019-11-28 12:19:32 +01:00
Laurent Destailleur
20b52db5b8 Merge pull request #12527 from frederic34/patch-7 
dol_print_error returns void
 2019-11-27 20:11:40 +01:00
Laurent Destailleur
c0d349e9f7 Merge pull request #12530 from frederic34/patch-13 
fix doxygen
 2019-11-27 20:11:24 +01:00
Laurent Destailleur
c22fea52e5 Fix do not ping name of server 2019-11-27 11:38:30 +01:00
Laurent Destailleur
9a9a43fc4d Return OS with ping 2019-11-27 11:34:10 +01:00
altairis
355d7545f6 filter language is an array 2019-11-27 10:23:01 +01:00
Frédéric FRANCE
32aca5f186 Update pdf_standard.class.php 2019-11-26 19:52:10 +01:00
Frédéric FRANCE
757d05e907 fix doxygen 2019-11-26 18:59:26 +01:00
Frédéric FRANCE
a04fa05b6c image2wbmp() is deprecated as of PHP 7.3.0 
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
 2019-11-26 18:41:38 +01:00
Frédéric FRANCE
c7e8194df9 dol_print_error returns void 2019-11-26 18:28:44 +01:00
Laurent Destailleur
3a687b1dae Fix box of task hidden if tasks are not used 2019-11-26 17:44:21 +01:00
oscim
1e6b93500a Put $object in complete_head_from_modules 
Add object for correctly usage in function complete_head_from_modules
 2019-11-26 16:34:16 +01:00
Scrutinizer Auto-Fixer
057ab6a059 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-26 11:52:04 +00:00
Laurent Destailleur
4ef6c9cc13 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/ticket.lang
 2019-11-26 11:54:42 +01:00
Laurent Destailleur
d1419f81da Merge pull request #12390 from bb2a/patch-4 
Use english name of subsitution variables for thirdparties
 2019-11-26 10:26:45 +01:00
Laurent Destailleur
b370d70426 Merge pull request #12511 from erpware/develop 
just fixed two small css issues
 2019-11-26 09:20:40 +01:00
Laurent Destailleur
0032b27a8e Merge pull request #12517 from frederic34/patch-16 
$out does not seem to be defined for all execution paths
 2019-11-26 09:14:55 +01:00
Laurent Destailleur
cee40561df Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-11-26 09:13:52 +01:00
Laurent Destailleur
b0b579bdbf Fix phpcs 2019-11-26 09:13:35 +01:00
Laurent Destailleur
034267edbf Merge pull request #12516 from frederic34/patch-15 
doxygen
 2019-11-26 09:11:10 +01:00
Laurent Destailleur
b44817f2bf Merge pull request #12518 from frederic34/patch-17 
doxygen
 2019-11-26 09:10:47 +01:00
Alexandre SPANGARO
6cc61fef9c Fix Ticket - Deprecated <center> 2019-11-26 04:32:38 +01:00
Frédéric FRANCE
1ccf0808d0 doxygen 2019-11-26 00:28:26 +01:00
Frédéric FRANCE
a142c0050e $out does not seem to be defined for all execution paths 2019-11-26 00:24:00 +01:00
Frédéric FRANCE
77a300c9ae doxygen 2019-11-26 00:20:40 +01:00
andreubisquerra
6baa1c8d4a Fix travis 2019-11-25 23:32:40 +01:00
Daniel Seichter
7a4beb824f Merge remote-tracking branch 'upstream/develop' into develop 2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550 fix small css issues 2019-11-25 23:13:31 +01:00