Laurent Destailleur
|
cfdf12950b
|
Merge pull request #2452 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2015-03-14 14:34:06 +01:00 |
|
Scrutinizer Auto-Fixer
|
cbacfa3137
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-03-14 13:30:19 +00:00 |
|
Laurent Destailleur
|
c06ff8acd9
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-14 14:30:09 +01:00 |
|
Laurent Destailleur
|
44d6bdb1c5
|
Doc
|
2015-03-14 14:27:45 +01:00 |
|
Laurent Destailleur
|
ecbee5d4dc
|
Merge pull request #2450 from defrance69/patch-52
New type of extrafields : link to connect dolibarr elements
|
2015-03-14 14:18:19 +01:00 |
|
Laurent Destailleur
|
c45ec24958
|
Merge pull request #2379 from atm-maxime/develop
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
|
2015-03-14 14:08:38 +01:00 |
|
Laurent Destailleur
|
306eff62ad
|
NEW: Show last official stable version into system - update page.
|
2015-03-14 13:23:36 +01:00 |
|
Laurent Destailleur
|
e935745727
|
Merge pull request #2285 from ndrosis/patch-14
New: Check live last version from sourceforge.net
|
2015-03-14 13:09:05 +01:00 |
|
Laurent Destailleur
|
2a09e34bdf
|
Uniformize etrafields visibility for thirdparties card
|
2015-03-14 13:05:28 +01:00 |
|
BENKE Charles
|
9e62013bca
|
Update admin_extrafields_edit.tpl.php
add new type of extrafields : link
|
2015-03-14 12:44:26 +01:00 |
|
BENKE Charles
|
4783db82ac
|
Update admin_extrafields_add.tpl.php
new type of extrafield : link
|
2015-03-14 12:42:52 +01:00 |
|
BENKE Charles
|
0aa2360691
|
Update extrafields.class.php
add new extrafields type 'link'
|
2015-03-14 12:31:22 +01:00 |
|
BENKE Charles
|
df9f822a70
|
Update commonobject.class.php
new extafields type
|
2015-03-14 12:25:17 +01:00 |
|
BENKE Charles
|
41a05bc4ba
|
Update actions_extrafields.inc.php
add new type of extrafields "link" : linked to dolibarr element
|
2015-03-14 12:04:00 +01:00 |
|
Juanjo Menent
|
a2adeb2807
|
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
159
|
2015-03-14 10:17:41 +01:00 |
|
Juanjo Menent
|
a63b1cf4c3
|
Fix: Showing system error if not enough stock of product into orders
creation with lines
Conflicts:
htdocs/commande/class/commande.class.php
|
2015-03-14 09:57:28 +01:00 |
|
Juanjo Menent
|
971f9b0c30
|
Fix: Migration script
|
2015-03-13 22:08:24 +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
|
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
|
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 |
|
Maxime Kohlhaas
|
3578ca8baa
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2015-03-11 08:52:09 +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 |
|