lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,684 Commits 43 Branches 150 Tags 886 MiB
dcd84e0310
Commit Graph

54684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dcd84e0310 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-20 18:06:15 +02:00
Laurent Destailleur
366769e97c Merge pull request #5508 from defrance/patch-14 
fix : warning error if no graphfiles
 2016-07-20 18:06:04 +02:00
Laurent Destailleur
699f857a5e NEW Add option PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty 
on page to submit time.
 2016-07-20 18:02:33 +02:00
BENKE Charlie
f54bc367a4 fix : warning error if no graphfiles 
append when we have no element present (start from new)
 2016-07-20 01:53:06 +02:00
Laurent Destailleur
3fb80d9678 Merge pull request #5334 from defrance/patch-9 
Replace feature level activation by hidden function
 2016-07-19 18:29:09 +02:00
Juanjo Menent
d2209be6e3 Merge pull request #5501 from defrance/patch-13 
Fix: Add $result on db->free
 2016-07-18 17:15:47 +02:00
Laurent Destailleur
135bebd9a0 Sort of sent notification by date desc 2016-07-18 11:53:13 +02:00
BENKE Charlie
260e296f20 add $result on db->free 2016-07-18 02:05:30 +02:00
Laurent Destailleur
d345153c5e Update doc 2016-07-17 00:08:34 +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
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
Laurent Destailleur
6fcd9e8dbf Merge pull request #4612 from bafbes/abb-1 
FIX Target object does not need to have all extrafields of source object.
 2016-07-15 17:41:29 +02:00
Juanjo Menent
e5372e5636 NEW Do not use Functions Aliases 2016-07-15 17:31:44 +02:00
Laurent Destailleur
6a30be1e67 NEW Notification module can also manage notification per user. 2016-07-15 17:25:09 +02:00
Laurent Destailleur
8c53921b5f CRLF 2016-07-15 17:22:27 +02:00
Laurent Destailleur
e0e96cef60 Merge remote-tracking branch 'origin/4.0' into develop 2016-07-15 17:13:44 +02:00
Juanjo Menent
88d12618ce NEW Do not use Functions Aliases 2016-07-15 17:10:13 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Juanjo Menent
8a022fb19d NEW Do not use Function Aliases 2016-07-15 16:58:26 +02:00
Sof
35fb83e68f FIX : bad name of field 2016-07-15 16:53:53 +02:00
Juanjo Menent
00496cd49e Merge remote-tracking branch 'upstream/develop' into develop 2016-07-15 16:10:20 +02:00
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
f0c80bf78b Merge pull request #5388 from atm-florian/dev_new_ship_tag_mail 
NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping
 2016-07-15 14:31:17 +02:00