Rui Strecht
|
41c663f03f
|
Fixed issue with elementarray null if num_rows = 0
|
2018-02-22 12:22:31 +00:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
6b74c79798
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
|
2018-02-15 15:34:17 +01:00 |
|
Laurent Destailleur
|
a4384b1921
|
Fix date start/end of project are day not hours
|
2018-02-15 02:02:32 +01:00 |
|
Laurent Destailleur
|
74116f495e
|
CSS enhancement
|
2018-02-10 00:05:04 +01:00 |
|
Laurent Destailleur
|
01f09e6c09
|
CSS enhancement
|
2018-02-10 00:04:05 +01:00 |
|
Laurent Destailleur
|
2315997aad
|
CSS enhancement
|
2018-02-10 00:00:12 +01:00 |
|
Laurent Destailleur
|
e984d7df9f
|
NEW Add total of time spent in timespent page at top of page too.
|
2018-02-09 23:52:43 +01:00 |
|
Laurent Destailleur
|
633dc507fe
|
NEW Use a css style for weekend in time spent
|
2018-02-09 20:11:32 +01:00 |
|
Laurent Destailleur
|
729cf20df7
|
Fix css
|
2018-02-07 20:53:13 +01:00 |
|
Laurent Destailleur
|
490a1bd08d
|
Fix label
|
2018-02-06 18:36:47 +01:00 |
|
Laurent Destailleur
|
69196dc52c
|
Fix menu not visible with auguria module
|
2018-02-06 18:22:04 +01:00 |
|
Laurent Destailleur
|
ea92f6beae
|
Fix for multicompany
|
2018-02-06 10:57:53 +01:00 |
|
Laurent Destailleur
|
5455ab3280
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/projet/card.php
|
2018-02-04 23:17:09 +01:00 |
|
Laurent Destailleur
|
dbe45d03d3
|
Fix: amount into form must be numeric without format
|
2018-02-04 23:12:19 +01:00 |
|
Laurent Destailleur
|
742079cfe3
|
Clean code
|
2018-02-01 19:15:50 +01:00 |
|
Laurent Destailleur
|
0412d3d11d
|
Fix extrafield mandatory check.Fix empty extrafields with type link.
|
2018-02-01 19:05:24 +01:00 |
|
Laurent Destailleur
|
f6c17247af
|
Fix can set draft status of project
|
2018-02-01 17:50:19 +01:00 |
|
Laurent Destailleur
|
d4e15545b4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-01-26 12:10:13 +01:00 |
|
Laurent Destailleur
|
1834be79a0
|
Fix supplier suggested when creating order from project overview
|
2018-01-26 11:31:34 +01:00 |
|
Laurent Destailleur
|
6e906ac0e3
|
Clean code
|
2018-01-24 13:08:09 +01:00 |
|
Laurent Destailleur
|
dcd579242f
|
Fix <br /> (xml) into <br> (html)
|
2018-01-17 13:26:57 +01:00 |
|
Laurent Destailleur
|
1f2d275ef2
|
Fix conditions of some fields
|
2018-01-13 17:21:56 +01:00 |
|
Laurent Destailleur
|
6d9a9dd3fe
|
Fix Time spent for "other task" was not visible when filtering project
|
2018-01-11 13:08:13 +01:00 |
|
Laurent Destailleur
|
940e9cb1a5
|
Fix travis error
|
2018-01-05 01:46:07 +01:00 |
|
Laurent Destailleur
|
90e9b3db68
|
Fix look and feel v7
|
2018-01-04 20:42:57 +01:00 |
|
Laurent Destailleur
|
e10a9912dc
|
Fix missing worload
|
2018-01-04 19:54:30 +01:00 |
|
Laurent Destailleur
|
300d4e1603
|
Fix disable direct debit request for replaced invoices
|
2018-01-04 14:35:02 +01:00 |
|
Laurent Destailleur
|
c4eba665d0
|
Fix order of task in gantt diagram
|
2018-01-04 13:52:37 +01:00 |
|
Laurent Destailleur
|
f6007045f5
|
Fix search filters
|
2018-01-04 00:23:08 +01:00 |
|
Laurent Destailleur
|
635917d0e6
|
CSS
|
2017-12-20 21:33:45 +01:00 |
|
Laurent Destailleur
|
2204790602
|
Fix filter on project id when id is list with comma
|
2017-12-18 19:04:57 +01:00 |
|
Laurent Destailleur
|
1351a43a30
|
FIX Maxi debug of permission for users external or restricted to sales
representatives
|
2017-12-18 16:13:05 +01:00 |
|
Laurent Destailleur
|
6524fce9b7
|
Merge pull request #7959 from AurelienC/patch-1
Fix Resolve bug for REST API PUT task
|
2017-12-16 01:05:54 +01:00 |
|
Laurent Destailleur
|
929893bd49
|
Fix regression introduced with task comments
|
2017-12-15 20:07:35 +01:00 |
|
Laurent Destailleur
|
ebdbddb7fd
|
Fix error message and migration
|
2017-12-15 19:50:39 +01:00 |
|
Aurélien
|
88b456a542
|
Resolve bug for REST API PUT task
An error occured when I was trying to PUT task despite all rigths.
Ressource 'task' --> 'tasks'
|
2017-12-14 11:53:48 +01:00 |
|
Laurent Destailleur
|
9314dcb046
|
Fix regression
|
2017-12-12 10:13:48 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
Maxime Kohlhaas
|
8a39e2a413
|
Fix : no need for action button on cards, link is now available
|
2017-12-07 00:36:23 +01:00 |
|
ATM-Nicolas
|
bdf1e30ef3
|
Merge branch 'develop' into 6.0_fix_project_conf
|
2017-12-05 12:20:48 +01:00 |
|
ATM-Nicolas
|
36bcd26e27
|
FIX : link project from other company conf
|
2017-12-05 09:21:24 +01:00 |
|
Laurent Destailleur
|
78c4b7f912
|
Fix look and feel v7
|
2017-12-04 20:17:07 +01:00 |
|
Laurent Destailleur
|
ce32da6217
|
Fix debugs APIs
|
2017-12-01 15:39:18 +01:00 |
|
Laurent Destailleur
|
a0231b5c60
|
Fix responsive
|
2017-12-01 12:55:28 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
Laurent Destailleur
|
4f4f929efb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
|
2017-11-24 17:02:14 +01:00 |
|
Laurent Destailleur
|
9c22b5f335
|
Replace deprecated dol_print_graph with DolGraph
|
2017-11-23 20:24:05 +01:00 |
|
Laurent Destailleur
|
b0cecab22b
|
Removed useless code
|
2017-11-22 21:26:24 +01:00 |
|
Laurent Destailleur
|
5fa8db1650
|
Work on timesheets
|
2017-11-22 21:19:40 +01:00 |
|
Laurent Destailleur
|
e1344eb97c
|
Fix edit of time spent
|
2017-11-22 17:25:31 +01:00 |
|
Laurent Destailleur
|
9bdd31e05a
|
Module builder
|
2017-11-21 12:28:34 +01:00 |
|
Laurent Destailleur
|
ba372bfc5c
|
Fix typo
|
2017-11-16 23:11:49 +01:00 |
|
Laurent Destailleur
|
e06087888b
|
NEW Show line "other filtered task" when using filter on timesheet.
|
2017-11-16 22:55:04 +01:00 |
|
Laurent Destailleur
|
4b90510b82
|
Fix time assigned to wrong user
|
2017-11-16 22:35:55 +01:00 |
|
Laurent Destailleur
|
f153d9c9ff
|
Fix time spent counted twice
|
2017-11-16 19:41:31 +01:00 |
|
Laurent Destailleur
|
0d192df1fd
|
Standardize interface
|
2017-11-16 18:33:56 +01:00 |
|
Laurent Destailleur
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +01:00 |
|
Laurent Destailleur
|
a12186a0b8
|
Use HTTP response code 304 instead of 500 when nothing is done
|
2017-11-14 01:26:02 +01:00 |
|
Laurent Destailleur
|
836f6bf3c9
|
Fix search filter when using extrafields 'links'
|
2017-11-12 12:39:23 +01:00 |
|
Laurent Destailleur
|
d1860b87f8
|
NEW Add a confirmation for all mass action 'delete'
|
2017-11-11 16:34:11 +01:00 |
|
Laurent Destailleur
|
1b28c45e2c
|
PERF Links in getNomUrl use only one tag a instead of 2.
|
2017-11-02 15:19:14 +01:00 |
|
Laurent Destailleur
|
d569218162
|
Fix 'separate' extrafields must be visible by default.
Sandardize name of list pages (must end with _list.php)
|
2017-10-29 11:23:20 +01:00 |
|
Laurent Destailleur
|
a00cf6b28b
|
Merge pull request #7708 from Elimig/patch-3
Fix don't show title in tooltip
|
2017-10-27 01:55:14 +02:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Elimig
|
9ad2073b7e
|
Update list.php
Fixed bug of non-uploading title in tooltip
|
2017-10-25 12:03:22 +02:00 |
|
Laurent Destailleur
|
9f0f5eb5e8
|
Fix translation of extrafields type
|
2017-10-24 18:05:43 +02:00 |
|
Elimig
|
dbad8636ef
|
update index.php
I propose to the maintainer a variation to code at line number 97 to show only the statuses enabled in the pie chart.
|
2017-10-23 13:48:45 +02:00 |
|
Laurent Destailleur
|
f4f47c6732
|
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
|
2017-10-22 21:15:08 +02:00 |
|
Laurent Destailleur
|
5b70468cac
|
Better translation
|
2017-10-20 04:25:49 +02:00 |
|
Laurent Destailleur
|
a16f0e4356
|
NEW The gantt diagram is now sensitive to hours
NEW Add a group task line for tasks on same level on gantt diagram
|
2017-10-20 04:15:44 +02:00 |
|
Laurent Destailleur
|
abd5251330
|
Better responsive
|
2017-10-19 19:53:29 +02:00 |
|
Laurent Destailleur
|
a818422302
|
Update jsgantt to 1.7.5.4
|
2017-10-18 21:24:17 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
41c1dd2822
|
Code comment
|
2017-10-18 19:41:28 +02:00 |
|
Laurent Destailleur
|
3e43e164ae
|
FIX Bad ressource list in popup in gantt view
|
2017-10-18 19:13:44 +02:00 |
|
Laurent Destailleur
|
cfeab01996
|
Prefill hour/min to 23:59 when creating a task
|
2017-10-18 18:50:30 +02:00 |
|
Laurent Destailleur
|
428c3e973d
|
FIX for combo on rtl languages
|
2017-10-18 18:36:10 +02:00 |
|
Laurent Destailleur
|
45ac8367bd
|
NEW Add API for contracts
|
2017-10-16 17:56:59 +02:00 |
|
Laurent Destailleur
|
4b0b83f203
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-10-13 13:29:07 +02:00 |
|
Scrutinizer Auto-Fixer
|
165741517e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-13 11:28:26 +00:00 |
|
Laurent Destailleur
|
02ce9c5e62
|
Fix doxygen
|
2017-10-13 13:25:55 +02:00 |
|
Laurent Destailleur
|
8c5cf9ea45
|
Fix date output
|
2017-10-12 18:04:47 +02:00 |
|
Laurent Destailleur
|
1fba58b9ce
|
Fix bookmark list
|
2017-10-12 17:09:17 +02:00 |
|
Laurent Destailleur
|
2fd0ffbfec
|
Fix tz for date creation/update
|
2017-10-12 14:50:25 +02:00 |
|
Laurent Destailleur
|
3f36cf23f5
|
NEW Break lines per project on the new timesheet page
|
2017-10-12 13:17:22 +02:00 |
|
Laurent Destailleur
|
f93ecc1584
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/projet/activity/perweek.php
htdocs/projet/element.php
|
2017-10-10 11:24:17 +02:00 |
|
Laurent Destailleur
|
dce71d6e7d
|
Fix loose filter
|
2017-10-09 18:51:33 +02:00 |
|
Laurent Destailleur
|
9427655dd0
|
Option PROJECT_LINES_PERxxx_SHOW_THIRDPARTY is the default
|
2017-10-09 18:18:34 +02:00 |
|
Laurent Destailleur
|
6402d5a2e4
|
Fix translation
|
2017-10-09 13:30:08 +02:00 |
|
Nicolas Leichtle
|
b110eb517d
|
Merge branch 'develop' into RestAPI
|
2017-10-08 23:15:14 +02:00 |
|
Scrutinizer Auto-Fixer
|
328d39bc71
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-07 11:09:31 +00:00 |
|
Laurent Destailleur
|
df38f60617
|
Export website into zip
|
2017-10-06 18:29:18 +02:00 |
|
Laurent Destailleur
|
d808add499
|
FIX #7567
|
2017-10-06 15:48:48 +02:00 |
|
Laurent Destailleur
|
43d85af5ae
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-10-06 15:23:10 +02:00 |
|
Laurent Destailleur
|
d07ec07896
|
FIX #7554
|
2017-10-06 15:22:40 +02:00 |
|
Laurent Destailleur
|
1becbb8805
|
Fix bad date on time spent view
|
2017-10-06 14:38:33 +02:00 |
|
Laurent Destailleur
|
afc1938676
|
FIX #7550
|
2017-10-06 14:28:01 +02:00 |
|
Laurent Destailleur
|
ef3d86333c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/activity/perday.php
|
2017-10-06 12:38:50 +02:00 |
|
Laurent Destailleur
|
06b18a740e
|
NEW Add date of birth on user card.
NEW Show expected worked hours on the timesheet form.
|
2017-10-06 12:08:01 +02:00 |
|
Laurent Destailleur
|
711bbe0afb
|
FIX #7546
|
2017-10-05 11:09:09 +02:00 |
|
Laurent Destailleur
|
85606126a9
|
Standardize code for events
|
2017-10-04 12:58:13 +02:00 |
|
Laurent Destailleur
|
2dee81125a
|
Hide comment feature for the moment
|
2017-10-04 11:18:31 +02:00 |
|
Laurent Destailleur
|
75a7e086b3
|
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
New comment generic element
|
2017-10-04 11:13:39 +02:00 |
|
Laurent Destailleur
|
3f3a5e0921
|
Merge pull request #7499 from atm-gauthier/NEW_custom_meteo
New custom meteo
|
2017-10-02 00:48:52 +02:00 |
|
Nicolas Leichtle
|
629c6d93f6
|
FIX: REST function addTimeSpent
|
2017-10-01 14:33:59 +02:00 |
|
Laurent Destailleur
|
f007f9e7e5
|
NEW Add new property visible dy default on lists on extrafields
|
2017-09-29 13:26:44 +02:00 |
|
arnaud
|
f29ea35dc8
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
|
2017-09-27 14:56:52 +02:00 |
|
gauthier
|
7f938bc517
|
NEW : unexistant function load_state_board() on several objects
|
2017-09-26 12:32:58 +02:00 |
|
Laurent Destailleur
|
91d303465d
|
NEW Can add html content on right of tabs
|
2017-09-24 01:39:06 +02:00 |
|
Laurent Destailleur
|
23604a2b54
|
NEW Add hidden option PROJECT_DISABLE_UNLINK_FROM_OVERVIEW
|
2017-09-21 11:54:37 +02:00 |
|
Laurent Destailleur
|
8a06a1f433
|
Code comment
|
2017-09-21 11:50:36 +02:00 |
|
Laurent Destailleur
|
ee01ebba0f
|
Merge pull request #7441 from tysauron/patch-13
For use ajax select company
|
2017-09-21 11:19:39 +02:00 |
|
tysauron
|
e61032a313
|
Bug get socid with old object sosciete
|
2017-09-20 17:35:11 +02:00 |
|
tysauron
|
3220225af3
|
Bug get socid with old object sosciete
|
2017-09-20 00:53:48 +02:00 |
|
tysauron
|
8bb3130aab
|
For use ajax select company
|
2017-09-20 00:35:52 +02:00 |
|
Laurent Destailleur
|
5f7631a95d
|
NEW Days where user is on vacation use different colors in timesheet.
|
2017-09-19 17:07:39 +02:00 |
|
Laurent Destailleur
|
f4ddce7274
|
FIX View of timespent for another user
|
2017-09-19 17:05:50 +02:00 |
|
Laurent Destailleur
|
2a04d497da
|
Use a different css into timespent entry page when user is on holiday
|
2017-09-19 16:40:55 +02:00 |
|
arnaud
|
e7bb7a3588
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
|
2017-09-18 17:28:03 +02:00 |
|
arnaud
|
9795f48046
|
NEW comment system working with all objects
|
2017-09-18 17:27:29 +02:00 |
|
Laurent Destailleur
|
da6b1e92b2
|
NEW Add the total in the perday view of the time spent form.
|
2017-09-18 14:18:34 +02:00 |
|
Laurent Destailleur
|
291a0d46e6
|
Fix edit of categories
|
2017-09-18 01:39:39 +02:00 |
|
Laurent Destailleur
|
bb73da4c5e
|
Cherry pick
|
2017-09-17 20:20:27 +02:00 |
|
Laurent Destailleur
|
41e19e723b
|
Fix look and feel v6
|
2017-09-17 20:05:36 +02:00 |
|
Laurent Destailleur
|
8773a6860f
|
Fix HTML5 use of <br> is preferred to <br />
|
2017-09-15 23:49:04 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +02:00 |
|
Laurent Destailleur
|
2f80618545
|
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
Fix task comment design
|
2017-09-14 12:21:58 +02:00 |
|
Laurent Destailleur
|
4b43c97808
|
Update time.php
|
2017-09-14 12:21:41 +02:00 |
|
Laurent Destailleur
|
24436b550d
|
Update time.php
|
2017-09-14 12:03:36 +02:00 |
|
arnaud
|
ed8e08b78a
|
FIX time.php crashed without project id in param
|
2017-09-14 12:03:27 +02:00 |
|
Laurent Destailleur
|
fd7602382c
|
Merge pull request #7373 from atm-arnaud/FIX_time_without_projectid
FIX time.php crashed without project id in param if project isn't linked to a company
|
2017-09-14 12:02:16 +02:00 |
|
Laurent Destailleur
|
14d000f011
|
Update time.php
|
2017-09-14 12:01:32 +02:00 |
|
Laurent Destailleur
|
322af9e2df
|
Fix travis
|
2017-09-14 08:25:04 +02:00 |
|
Laurent Destailleur
|
c44a5ede43
|
FIX Several problem with the last event box on project/tasks
Conflicts:
htdocs/core/lib/functions2.lib.php
|
2017-09-13 15:16:06 +02:00 |
|
Laurent Destailleur
|
7767ac2aa7
|
FIX Several problem with the last event box on project/tasks
|
2017-09-13 15:12:54 +02:00 |
|
Laurent Destailleur
|
149ab80b3a
|
The event array of an object is visible even if no event yet recorded.
|
2017-09-13 14:18:36 +02:00 |
|
arnaud
|
ad017495f4
|
FIX task comment design
|
2017-09-13 12:09:01 +02:00 |
|
arnaud
|
4b6553d360
|
FIX comment color and create colorIsLight function
|
2017-09-13 10:43:44 +02:00 |
|
Laurent Destailleur
|
6370e2f514
|
Force type of object
|
2017-09-12 19:03:30 +02:00 |
|
Laurent Destailleur
|
47d2350ad4
|
Fix bugs reported by scrutinizer
|
2017-09-12 19:03:12 +02:00 |
|
arnaud
|
adc78296aa
|
FIX time.php crashed without project id in param
|
2017-09-11 16:56:50 +02:00 |
|
Laurent Destailleur
|
1f56800a50
|
Merge pull request #7341 from atm-arnaud/NEW_task_discussion
New task discussion
|
2017-09-11 15:20:13 +02:00 |
|
Laurent Destailleur
|
dcc9cb4a16
|
Some fixes in various payment
|
2017-09-11 14:29:27 +02:00 |
|
Laurent Destailleur
|
259cca0230
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
|
2017-09-08 13:30:54 +02:00 |
|
arnaud
|
7f5950c958
|
FIX multiple comments not reset on fetch
|
2017-09-08 09:14:34 +02:00 |
|
arnaud
|
680fab313c
|
NEW preload comments in task
|
2017-09-07 16:47:52 +02:00 |
|
arnaud
|
82440fd399
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion
|
2017-09-07 16:24:34 +02:00 |
|
arnaud
|
8906c95eea
|
NEW comments system on task
|
2017-09-07 16:23:51 +02:00 |
|
Laurent Destailleur
|
bde293af22
|
Fix filter on extrafield with type sellist
|
2017-09-07 15:34:25 +02:00 |
|
Laurent Destailleur
|
859d0dfe97
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-09-06 19:24:42 +02:00 |
|
Laurent Destailleur
|
032f54dd1a
|
Fix search criteria lost during navigation
|
2017-09-06 15:36:16 +02:00 |
|
Laurent Destailleur
|
3e9679f273
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-04 10:20:17 +02:00 |
|
Regis Houssin
|
0fc8a0f840
|
Fix: avoid warning "non-numeric value encountered"
|
2017-09-01 16:54:06 +02:00 |
|
Alexandre SPANGARO
|
84fcbb724e
|
Add project on various_payment
|
2017-09-01 07:21:27 +02:00 |
|
Laurent Destailleur
|
c573df4f0e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/card.php
|
2017-08-26 22:33:56 +02:00 |
|
Laurent Destailleur
|
d8ead2693f
|
Fix field position
|
2017-08-24 17:59:20 +02:00 |
|
Laurent Destailleur
|
90afbcb034
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
|
2017-08-23 17:02:53 +02:00 |
|
Laurent Destailleur
|
f3ef6448d7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
|
2017-08-23 16:11:51 +02:00 |
|
Regis Houssin
|
6dda2f3670
|
Fix: "scandir" in url is blocked in some providers
|
2017-08-23 10:07:00 +02:00 |
|
Laurent Destailleur
|
aae24c26a3
|
Some fixes with smartphones
|
2017-08-22 20:20:34 +02:00 |
|
bomuux
|
52523be3ce
|
FIX: printFieldListValue Hook, $obj never set.
Replaced $obj by $task_time, that should be the useful object.
|
2017-08-06 18:35:25 +02:00 |
|
Laurent Destailleur
|
fa752348c8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
|
2017-08-02 17:56:09 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
b6a7ce6822
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-01 10:22:37 +02:00 |
|
Laurent Destailleur
|
ecb4eebfac
|
Fix filter of project in timespent view
|
2017-07-31 06:58:55 +02:00 |
|
Laurent Destailleur
|
13cbd597ad
|
Fix filter lost
|
2017-07-31 06:20:32 +02:00 |
|
Laurent Destailleur
|
2f68d446ef
|
Fix on filter on project list
|
2017-07-31 04:52:27 +02:00 |
|
Laurent Destailleur
|
80f096a9d8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-31 02:09:15 +02:00 |
|
Laurent Destailleur
|
cae21d3937
|
Fix in agenda output per user/type (reduce memory usage)
|
2017-07-29 01:59:26 +02:00 |
|
Laurent Destailleur
|
8b82fc3c70
|
Fix project edition on loan menu
Fix translation on profit view of projects.
|
2017-07-29 00:28:41 +02:00 |
|
Laurent Destailleur
|
5e17c2efb9
|
Fix into filters of time consumed
|
2017-07-28 23:32:55 +02:00 |
|
Laurent Destailleur
|
d511fed504
|
Enhance modulebuilder
|
2017-07-25 12:44:55 +02:00 |
|
Laurent Destailleur
|
874e96fc38
|
Merge branch 'develop' into patch-21
|
2017-07-21 15:18:18 +02:00 |
|
Laurent Destailleur
|
cfe7216577
|
Removed constant PROJECT_DEFAULT_PUBLIC (become useless)
|
2017-07-18 10:23:25 +02:00 |
|
Laurent Destailleur
|
74e29a3fdb
|
FIX empty object
|
2017-07-13 14:32:49 +02:00 |
|
Laurent Destailleur
|
2870798d07
|
Fix remove warnings
|
2017-07-13 00:35:10 +02:00 |
|
Laurent Destailleur
|
10cb7b2524
|
Fix remove warnings
|
2017-07-09 20:31:27 +02:00 |
|
Laurent Destailleur
|
02aa4f7e0c
|
Fix permission to show details of project
|
2017-07-07 20:28:43 +02:00 |
|
BENKE Charlene
|
3a89591fb4
|
Adding Hook for tooltip on project
|
2017-07-06 15:48:22 +02:00 |
|
Laurent Destailleur
|
6f82837b0f
|
Fix GETPOST of lang_id
|
2017-06-27 17:27:01 +02:00 |
|
Laurent Destailleur
|
693b2fe3b4
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
|
2017-06-23 11:20:29 +02:00 |
|
Laurent Destailleur
|
d572bd4f34
|
FIX #7003
|
2017-06-20 10:45:20 +02:00 |
|
Laurent Destailleur
|
bb2d27280b
|
Fix sort link must be disabled for computed field
|
2017-06-19 14:31:08 +02:00 |
|
Laurent Destailleur
|
1b56e4a01c
|
Fix look and feel v6
|
2017-06-14 11:28:42 +02:00 |
|
Laurent Destailleur
|
961594afad
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-06-11 10:38:09 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Laurent Destailleur
|
074c43920a
|
Create projects.php
|
2017-06-11 00:35:03 +02:00 |
|
atm-ph
|
6b4e22ec3c
|
Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is used we got BadFirstParameterForGETPOST
|
2017-06-10 16:07:56 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
b441c62e1d
|
Fix syntax error
|
2017-06-08 14:55:12 +02:00 |
|
Laurent Destailleur
|
b1f93ccb0c
|
Fix security
|
2017-06-08 14:33:46 +02:00 |
|
Laurent Destailleur
|
543630e487
|
Fix missing count of nb of columns into lists
|
2017-06-08 14:14:06 +02:00 |
|
Regis Houssin
|
2b36135641
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-07 20:14:03 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Laurent Destailleur
|
3427413255
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-06-07 11:13:25 +02:00 |
|
Laurent Destailleur
|
0805c693ae
|
Fix restore of last_search_value ko
|
2017-06-07 10:55:39 +02:00 |
|
Regis Houssin
|
bfd6116e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
|
2017-06-06 15:03:36 +02:00 |
|