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

47265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d056abc4e1 No need to have this protected. Property can be read with method show() 
and this method can be override.
 2015-03-13 21:45:52 +01:00
Laurent Destailleur
50b09fa8a9 Doxygen 2015-03-13 21:39:39 +01:00
Laurent Destailleur
ba2c0a2651 Clean code of hooks. 
Extrafield index on fk_object must be unique.
 2015-03-13 20:27:54 +01:00
Laurent Destailleur
bc3f9bf800 Fix: the visible version was not enough to know version of dolibarr. We 
also need the MAIN_FEATURES_LEVEL.
 2015-03-13 18:11:31 +01:00
Laurent Destailleur
51c877e32c Hide a feature that is really not stable. So i move it as a "develop" 
feature.
 2015-03-13 18:03:21 +01:00
Laurent Destailleur
f090893807 Hide a feature that is really not stable. So i move it as a "develop" 
feature.
 2015-03-13 18:02:54 +01:00
Laurent Destailleur
687e3d250b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/fixdosfiles.sh
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-03-13 17:46:31 +01:00
Laurent Destailleur
f75749cc2b Sync transifex 2015-03-13 17:43:04 +01:00
Laurent Destailleur
927925f4fd Can also sync alternatives languages from transifex now. 2015-03-13 17:42:50 +01:00
Laurent Destailleur
5cc48c7c78 Prepare cleaning tools for release. 2015-03-13 16:20:42 +01:00
Laurent Destailleur
b47e16fbe9 Update changelog 2015-03-13 16:02:40 +01:00
Laurent Destailleur
a452823e1e Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility 
with 3.6
 2015-03-13 15:20:08 +01:00
Laurent Destailleur
895b2c6e9c Fix bad merge 2015-03-13 14:37:27 +01:00
Laurent Destailleur
279e16a811 grey disabled 2015-03-13 14:24:32 +01:00
Laurent Destailleur
dfe1ee7e7d Fix: count of notification emails was wrong 2015-03-13 14:11:59 +01:00
Laurent Destailleur
622d8ad9b0 Remove duplicate entry 2015-03-13 13:51:35 +01:00
Laurent Destailleur
9b4f65587f Fix option MAIN_HTML_TITLE 2015-03-13 13:27:24 +01:00
Laurent Destailleur
59cbde042c Generalize option MAIN_HTML_TITLE for all tabs of thirdparty. 2015-03-12 17:29:52 +01:00
Maxime Kohlhaas
60022ab80d NEW : autofocus on product selection dropdown list or search field 2015-03-12 17:25:57 +01:00
Maxime Kohlhaas
ba0f19d116 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-03-12 17:12:34 +01:00
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
Laurent Destailleur
958667ada0 Fix phpcs 2015-03-11 12:33:34 +01:00
BENKE Charles
e7ed8ce95b Update purchasesjournal.php 2015-03-11 10:23:33 +01:00
BENKE Charles
9fc83ca011 Update sellsjournal.php 2015-03-11 10:23:13 +01:00
BENKE Charles
f88646d954 Update export.class.php 2015-03-11 10:22:37 +01:00
Maxime Kohlhaas
3578ca8baa Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-03-11 08:52:09 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +01:00
Laurent Destailleur
e2e95b5f8c phpcs 2015-03-11 03:58:57 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Laurent Destailleur
ec322e2e29 Revert was not complete 2015-03-11 03:03:17 +01:00
Laurent Destailleur
4b8fa00edb Merge pull request #2422 from guedel/sqlite3-dev 
Sqlite3 dev
 2015-03-11 02:54:15 +01:00
Laurent Destailleur
41b09d8c70 Merge pull request #2448 from atm-maxime/3.6 
Fix : display proposal date on proposal list
 2015-03-11 02:50:26 +01:00
Laurent Destailleur
52e9ae5fe4 Merge pull request #2442 from delcroip/patch-2 
FIX: jdate returning -62169955200 on x64 machine
 2015-03-11 02:35:36 +01:00
Laurent Destailleur
242a71e967 Merge pull request #2436 from marcosgdf/patch-1 
Update ChangeLog
 2015-03-11 02:31:24 +01:00
Laurent Destailleur
6f39270450 Merge pull request #2310 from FHenry/3.7 
re-add index.html file
 2015-03-11 02:29:29 +01:00
Laurent Destailleur
0b661675e2 Merge branch 'marcosgdf-bug-1825-37' into 3.7 2015-03-11 02:26:20 +01:00
Laurent Destailleur
0ff2a0ad9f Merge branch 'bug-1825-37' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1825-37

Conflicts:
	htdocs/comm/action/index.php
 2015-03-11 02:26:01 +01:00
Laurent Destailleur
e8732df747 Merge pull request #2441 from aspangaro/develop-ReviewER 
FIXED: Review Expense Report
 2015-03-11 02:14:13 +01:00
Laurent Destailleur
734a7dd5c7 Merge pull request #2443 from biznext/patch-4 
Fix Anchor link for quick access when editing.
 2015-03-11 02:13:29 +01:00
Laurent Destailleur
5748ea8f35 Merge pull request #2447 from TomasVotruba/patch-1 
travis: PHP 7.0 nightly added
 2015-03-11 02:12:58 +01:00
Laurent Destailleur
f484abe5ec Merge pull request #2446 from GPCsolutions/3.6-#1901 
FIXED #1901: Inverted supplier order/invoice buttons in project referring objects
 2015-03-11 02:12:01 +01:00
Laurent Destailleur
c271257452 Prepare extrafield for option by default into lists 2015-03-10 22:27:16 +01:00
BENKE Charles
f91127c92a Update purchasesjournal.php 2015-03-10 21:48:47 +01:00
BENKE Charles
bf86693dcb Update sellsjournal.php 2015-03-10 21:47:39 +01:00
Laurent Destailleur
548e720ca2 Uniformize code 2015-03-10 19:31:04 +01:00
Laurent Destailleur
b4a8f19696 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/extrafields.class.php
 2015-03-10 18:37:13 +01:00
Laurent Destailleur
364b185442 Fix sql syntax 2015-03-10 18:33:14 +01:00
BENKE Charles
ea0964d1eb Update export.class.php 
add specific choice of prefix for export (usefull with many dolibarr exporting data)
 2015-03-10 17:17:02 +01:00
Laurent Destailleur
154865f545 Fix return error when it is not 2015-03-10 16:37:39 +01:00