2
0
forked from Wavyzz/dolibarr
Commit Graph

54599 Commits

Author SHA1 Message Date
Laurent Destailleur
2c77a901b3 Fix to avoid removal of trnaslation key to keep 2016-07-18 12:55:44 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
Laurent Destailleur
10cd5ba730 Fix sort of sent notification by date desc 2016-07-18 11:54:35 +02:00
Laurent Destailleur
9a0367db0d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-18 11:51:51 +02:00
Laurent Destailleur
5e654e8cb3 Fix help 2016-07-18 11:49:34 +02:00
Juanjo Menent
e5235be7d0 Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency
FIX : class FactureLine fetch() and update() crash
2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291 sd 2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce fix problem with call update method after fetch on invocie lines 2016-07-18 07:37:18 +02:00
Laurent Destailleur
bf67cf9dc2 Update documentation 2016-07-17 13:40:14 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Laurent Destailleur
4382724b86 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-17 12:48:27 +02:00
Laurent Destailleur
9b47d7e05d Keep only us file 2016-07-17 12:46:09 +02:00
Juanjo Menent
970d088510 Merge pull request #5494 from EuskalMoneta/bug-5493
FIX #5493 The login field is ignored when doing a "search in all" for members
2016-07-17 09:45:16 +02:00
Juanjo Menent
9973f03f3b Merge pull request #5499 from aspangaro/4.0-p34
Fix: Accountancy - Problem with empty accountancy acccount in create / update mode
2016-07-17 09:37:01 +02:00
Juanjo Menent
5eeb630a14 Merge pull request #5498 from aspangaro/4.0-p35
Fix: Missing key language on home for boxes
2016-07-17 09:35:35 +02:00
aspangaro
90a84335ab Fix: Missing key language on home for boxes 2016-07-17 07:34:19 +02:00
aspangaro
e6da7c5574 Fix: Accountancy - Problem with empty accountancy acccount in create / modify mode 2016-07-17 07:09:17 +02:00
Laurent Destailleur
25d9969590 Fix watch to use orig.tar.gz on package_ubuntu directory 2016-07-16 23:47:37 +02:00
Laurent Destailleur
653bfd5d43 Fix missing orig file in upload. 2016-07-16 22:19:26 +02:00
Xebax
8a303fd4d8 FIX #5493 The login field is ignored when doing a "search in all" for
members.
2016-07-16 20:16:46 +02:00
Laurent Destailleur
587484fabb Prepare 3.9.3 3.9.3 2016-07-16 20:03:04 +02:00
Sof
4d86291527 Fix : syntax error 2016-07-16 19:57:41 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
2016-07-16 19:54:57 +02:00
Laurent Destailleur
c3bf1b2619 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-16 19:52:53 +02:00
Laurent Destailleur
58caf89aab Fix for debian package 2016-07-16 19:52:42 +02:00
Laurent Destailleur
87c31d0761 Prepare 3.9.3 2016-07-16 19:38:58 +02:00
Laurent Destailleur
931531232c FIX duplicate jquery.js files 2016-07-16 19:38:18 +02:00
Laurent Destailleur
e299bad2b5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-16 19:20:15 +02:00
Laurent Destailleur
6f489c1fbd FIX Missing original .js file (license violation if sources are not
provided)
2016-07-16 19:19:52 +02:00
Juanjo Menent
5aa63ffe73 Merge pull request #5490 from simnandez/4.0
FIX #5479 using uninitialized variable $socid and other stuffs
2016-07-16 19:15:39 +02:00
Laurent Destailleur
970c4bea75 Fix minor css 2016-07-16 15:34:09 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
68227d91d9 FIX after enabling module expense report, the document template is not
active by default.
2016-07-16 14:14:28 +02:00
Juanjo Menent
a037e2f2d6 FIX #5479 using uninitialized variable $socid and other stuffs 2016-07-15 23:14:15 +02:00
Juanjo Menent
feef5b2eff Merge pull request #5489 from simnandez/3.9
FIX Option strict mode compatibility
2016-07-15 20:04:00 +02:00
Juanjo Menent
cd0849209c FIX Failed to open file 2016-07-15 19:44:45 +02:00
Juanjo Menent
2ed446d014 FIX Option strict mode compatibility 2016-07-15 19:35:01 +02:00
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
0f4f4ea61c FIX #5482 #5485 2016-07-15 14:22:49 +02:00
Laurent Destailleur
fdfe4d9ac5 Fix missing getFormMail as "addreplace" hook 2016-07-15 14:21:07 +02:00
Laurent Destailleur
258662e616 Fix: missing month of update in leave "view log" page. 2016-07-14 15:31:56 +02:00
Laurent Destailleur
241fd8db98 Fix css 2016-07-14 15:22:04 +02:00
Laurent Destailleur
9bd937a3bc Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-14 00:35:59 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for
substitution hooks
2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Juanjo Menent
015b941966 Merge pull request #5478 from simnandez/4.0
Merge #5464 Fix: Prevent SQLiFix into 4.0
2016-07-13 12:45:17 +02:00
Laurent Destailleur
c787e7f2a1 FIX Clear of filter should also reset categories and extrafields filter
FIX Filter on categories should depends on context
2016-07-13 12:03:30 +02:00
Juanjo Menent
fc5b308605 Merge remote-tracking branch 'upstream/develop' into 4.0 2016-07-13 12:00:50 +02:00
Juanjo Menent
df74fa37de Merge pull request #5464 from AppChecker/develop
Fix: Prevent SQLi
2016-07-13 08:45:00 +02:00