Commit Graph

55867 Commits

Author SHA1 Message Date
Juanjo Menent
c37c3d1939 Merge pull request #5496 from olsesacl/3.8_#5450
Fix #5450 Bug: Expenses Form : SQL error on updating line
2016-07-17 15:46:03 +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
Sergio Sanchis Climent
e52d6db3fd Fix #5450 2016-07-17 12:18:29 +02:00
Juanjo Menent
60384f6d66 Merge pull request #5492 from simnandez/3.8
FIX #5474 Country_id of "Don" object is still empty
2016-07-17 09:45:56 +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
Sergio Sanchis Climent
3b56370060 Fix #5450 2016-07-17 02:48:04 +02:00
Laurent Destailleur
d345153c5e Update doc 2016-07-17 00:08:34 +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 2016-07-16 20:03:04 +02:00
Juanjo Menent
1232e25859 FIX #5474 Country_id of "Don" object is still empty 2016-07-16 20:00:55 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Sof
4d86291527 Fix : syntax error 2016-07-16 19:57:41 +02:00
Laurent Destailleur
afbdf40c63 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-16 19:56:05 +02:00
Laurent Destailleur
a9b1693e09 Update doc 2016-07-16 19:55:54 +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
Juanjo Menent
70d1c7d1d9 Merge pull request #5487 from mrsof/patch-3
FIX : bad name of field
2016-07-16 19:29:48 +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
e7b015853c Merge pull request #5491 from mrsof/patch-5
Fix : syntax error
2016-07-16 19:16:42 +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
Sof
4a0668f7ae Fix : syntax error 2016-07-16 18:33:29 +02:00
BENKE Charlie
05b02e7bef Update user.class.php 2016-07-16 18:05:58 +02:00
BENKE Charlie
282def1930 add feature on other dolibarr element 2016-07-16 18:00:53 +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
Laurent Destailleur
28d86bc5a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-15 19:57:46 +02:00
Laurent Destailleur
97b03e225b NEW Add option "Stock can be negative". Off by default. 2016-07-15 19:57:35 +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
1195e3bf0c FIX Direction of movement lost if an error occurs 2016-07-15 19:35:00 +02:00
Juanjo Menent
d932bb9532 Merge pull request #5488 from simnandez/develop
NEW Do not use Functions Aliases
2016-07-15 18:44:22 +02:00
Laurent Destailleur
7263b29cb4 Merge pull request #5301 from atm-ph/fix_develop_issue_2858
NEW issue 2858 - Option to allow negative transfer
2016-07-15 18:15:20 +02:00
Juanjo Menent
62c1302a27 NEW Do not use Functions Aliases 2016-07-15 17:58:14 +02:00