aspangaro
|
a92f68a5ed
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-29 09:25:06 +02:00 |
|
aspangaro
|
ce6df7c022
|
Debug
|
2015-03-29 09:20:32 +02:00 |
|
frederic34
|
be1595a187
|
Add tab for notes
|
2015-03-28 17:42:33 +01:00 |
|
Laurent Destailleur
|
42c2c81e28
|
Fix detection of html was wrong with img
|
2015-03-26 12:05:52 +01:00 |
|
aspangaro
|
2b2b43afb6
|
Dir "Don"
|
2015-03-25 22:37:14 +01:00 |
|
aspangaro
|
679391d337
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-25 20:59:48 +01:00 |
|
Laurent Destailleur
|
cc2d86bd58
|
Status of project was not visible on thirdparty card
|
2015-03-25 14:31:04 +01:00 |
|
aspangaro
|
9d34b40897
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/compta/bank/account.php
|
2015-03-24 05:28:57 +01:00 |
|
Laurent Destailleur
|
efe9c21b81
|
Merge pull request #2382 from aspangaro/develop-loan
NEW: Module loans
|
2015-03-23 23:28:57 +01:00 |
|
aspangaro
|
be0ab4c9b4
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-23 06:58:25 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
5c36bb94f2
|
Work on theme material design
|
2015-03-22 22:29:52 +01:00 |
|
Laurent Destailleur
|
1a1959b52c
|
Fix: Solve conflict with imgup and imgdown class use for sort fields and
to drag and drop lines.
|
2015-03-22 21:18:25 +01:00 |
|
aspangaro
|
ad0f1aae6b
|
Move loan in htdocs
|
2015-03-22 20:19:22 +01:00 |
|
Laurent Destailleur
|
49824a0e56
|
Method colorStringToArray can accept the #
Method monthArray can return short label of month
|
2015-03-22 18:17:25 +01:00 |
|
aspangaro
|
414d4c6432
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-03-22 18:08:12 +01:00 |
|
Laurent Destailleur
|
2d90256640
|
Revert "Refactor 1"
|
2015-03-22 12:51:29 +01:00 |
|
Laurent Destailleur
|
a79a779b04
|
Merge pull request #2456 from marcosgdf/refactor-1
Refactor 1
|
2015-03-22 12:47:05 +01:00 |
|
Laurent Destailleur
|
a55af4387b
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
|
2015-03-22 12:10:39 +01:00 |
|
aspangaro
|
9264482e25
|
Update works
|
2015-03-22 08:20:19 +01:00 |
|
Laurent Destailleur
|
73266bb965
|
Fix error when using a log hangler that make output into the http
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
|
2015-03-21 01:22:05 +01:00 |
|
Laurent Destailleur
|
f44d91e153
|
NEW: The notification module accept keyword __SUPERVISOR__ to send
notification to supervisor of user.
|
2015-03-19 11:47:30 +01:00 |
|
Laurent Destailleur
|
6ceda02eaa
|
NEW: Enhancement of module 'Notification by Email'. Show nb of
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
|
2015-03-18 21:44:57 +01:00 |
|
Laurent Destailleur
|
b0b88be81f
|
Sync transifex
|
2015-03-18 15:27:27 +01:00 |
|
Laurent Destailleur
|
840b047468
|
Work on new timesheet input pages.
|
2015-03-18 11:20:08 +01:00 |
|
Laurent Destailleur
|
5d4d8151c1
|
Work on new timesheet input pages.
|
2015-03-18 11:04:50 +01:00 |
|
Laurent Destailleur
|
a73ff524e5
|
Merge pull request #2459 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
|
2015-03-17 00:38:40 +01:00 |
|
Scrutinizer Auto-Fixer
|
b693ed3f51
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-03-16 23:21:17 +00:00 |
|
Laurent Destailleur
|
141fa56d67
|
Fixed bad parameter
|
2015-03-17 00:11:04 +01:00 |
|
Laurent Destailleur
|
6d7b340cee
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
|
2015-03-16 18:30:30 +01:00 |
|
AcceTT Soluciones Computacionales
|
60d334f646
|
Update functionsnumtoword.lib.php
Now the function convert since -1000000000000 to 1000000000000.
Correct some bugs.
Change $lang-> default to $langs
|
2015-03-15 17:47:51 -06:00 |
|
Marcos García de La Fuente
|
086e439543
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
|
2015-03-15 18:16:55 +01:00 |
|
Marcos García de La Fuente
|
2e68b51a10
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2015-03-15 17:52:07 +01:00 |
|
Laurent Destailleur
|
10bbf463e7
|
Several bug fixes from scrutinizer
|
2015-03-14 14:55:41 +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
|
895b2c6e9c
|
Fix bad merge
|
2015-03-13 14:37:27 +01:00 |
|
aspangaro
|
3897e65425
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-03-11 05:28:59 +01:00 |
|
Laurent Destailleur
|
b564b754fc
|
Doxygen
|
2015-03-10 14:09:29 +01:00 |
|
Laurent Destailleur
|
12be50d4ba
|
Doxygen
|
2015-03-10 13:50:05 +01:00 |
|
Laurent Destailleur
|
35dfaf4dd1
|
Natural search on numeric works also with several space after operator
|
2015-03-10 10:14:24 +01:00 |
|
Laurent Destailleur
|
9e4e9a5411
|
NEW: Can search on customer order amount into customer order list.
|
2015-03-06 20:59:18 +01:00 |
|
Laurent Destailleur
|
dd3f569ede
|
NEW: Enhance the natural_search function so we can use it to search
numeric fields with criteria with operator <>= inside (< 100, >= 1000)
|
2015-03-06 20:34:00 +01:00 |
|
Scrutinizer Auto-Fixer
|
27e99793a3
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-03-06 02:10:01 +00:00 |
|
Laurent Destailleur
|
97f36825df
|
Work on new timesheet page
|
2015-03-05 21:47:50 +01:00 |
|
aspangaro
|
11704e0807
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-05 20:24:53 +01:00 |
|
Laurent Destailleur
|
d7ab3f112c
|
NEW: Show difference between timespent by everybody and time spent by
user making timesheet into timesheet pages.
NEW: Can enter start hours of task when creating timesheet
|
2015-03-05 13:48:57 +01:00 |
|
Laurent Destailleur
|
e431e24889
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-05 11:14:01 +01:00 |
|
Laurent Destailleur
|
c36f92396b
|
Add navigation into the new timesheet week page.
Fix bad merge
|
2015-03-05 11:13:44 +01:00 |
|
Laurent Destailleur
|
f0f0e7bfbb
|
Merge pull request #2415 from aspangaro/develop-patch16
NEW: Add bank account owner in invoice/proposal/orders footer
|
2015-03-04 23:07:46 +01:00 |
|
Laurent Destailleur
|
40adbe5a72
|
Merge pull request #2420 from aspangaro/develop-patch17
NEW: [T1848] Merge bank card & account card
|
2015-03-04 21:09:28 +01:00 |
|