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

3199 Commits

Author SHA1 Message Date
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
Laurent Destailleur
6a82d9e656 Merge pull request #6950 from defrance/patch-13 
Additionnal filter on getProjectsAuthorizedForUser
 2017-06-06 11:10:05 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
BENKE Charlene
6e83e899e2 Additionnal filter on getProjectsAuthorizedForUser 
with great list of projects, have more filter is a good thing
 2017-06-06 08:29:41 +02:00
Regis Houssin
a25facef7c Fix: use 0 instead false 2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
af584bc9c0 FIX #6880 #6925 2017-06-03 00:58:51 +02:00
Laurent Destailleur
bfa50b8d1d Fix some security issues 2017-06-02 19:36:03 +02:00
Laurent Destailleur
1761df2bc2 NEW Add page statistics for project tasks 2017-06-02 19:28:22 +02:00
Laurent Destailleur
447db1b324 Fix orphelins for categories tables 2017-06-02 13:46:30 +02:00
Laurent Destailleur
c59d216cf5 NEW Can read time spent of others (hierarchy only or all if granted) 2017-06-02 13:24:45 +02:00
Laurent Destailleur
dd2d9f533a Clean duplicated vars 2017-06-01 18:18:57 +02:00
Laurent Destailleur
77df19009d Removed duplicated code 2017-06-01 12:11:45 +02:00
Regis Houssin
aa780ea33b Fix: missing dot 2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
e5fe629a0e NEW Extrafields support formulas to be computed using PHP expressions 2017-05-24 22:48:44 +02:00
Laurent Destailleur
3782bc4458 Look and feel v6 2017-05-24 19:47:02 +02:00
Laurent Destailleur
f5e29d6c86 Fix phpcs warning 2017-05-22 10:45:02 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
ff2a268831 NEW Architecture to manage search criteria persistance (using 
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
 2017-05-19 00:52:13 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
Laurent Destailleur
a36a9fab2f Look and feel v6 2017-05-18 12:12:36 +02:00
Laurent Destailleur
0b52c43e05 Fix bad selection of progress when not known 2017-05-18 11:35:12 +02:00
Laurent Destailleur
1a1b27d68c Fix input of duration 2017-05-18 11:13:18 +02:00
Laurent Destailleur
b29f325fcf Work on search criteria persistence 2017-05-16 23:38:23 +02:00
Laurent Destailleur
d110292a1b Uniformize code 2017-05-16 17:49:38 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef Debug default value feature. 2017-05-16 12:22:55 +02:00
Alexandre SPANGARO
4dc7d5cd8d Fix : tooltip on bank in customer invoice card 2017-05-14 21:20:35 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
d855f4b202 Merge pull request #6820 from atm-alexis/NEW_get_amout_base_on_thm_ficheinter 
NEW get amount base on user thm ficheinter
 2017-05-10 23:13:32 +02:00
Laurent Destailleur
5e54567558 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
 2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2 Fix label "total for this page" on last page. 2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
 2017-05-10 00:48:27 +02:00
alexis portable
ae57395562 NEW get amount base on thm for ficheinter 2017-05-09 22:37:17 +02:00
Laurent Destailleur
b8b91db007 Use function top_httphead to include headers in pages. 2017-05-09 21:46:57 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
d53654e64f Look and feel v6 2017-05-05 20:45:06 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
3749a7a1d1 New look 2017-04-11 02:51:44 +02:00
Laurent Destailleur
759315aef5 NEW Mass action delete available on project and tasks 2017-04-11 02:48:16 +02:00
Laurent Destailleur
d15792bdf4 Minor fix 2017-04-11 00:59:47 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
a61543dedc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-06 21:59:41 +02:00
Laurent Destailleur
e2ea5945dd Work on look and feel v6 2017-04-06 21:48:28 +02:00
delcroix Patrick
422bdd1ef6 FIX: Supplier is not the project customer 2017-04-04 09:06:29 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
93687997c9 Work on 6.0 look and feel 2017-03-31 18:40:53 +02:00
Laurent Destailleur
54b03a3552 Work on 6.0 new look and feel 2017-03-29 11:03:13 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02:00
Laurent Destailleur
f843f8a93d Start to move search bar before table titles 2017-03-27 00:48:50 +02:00
Laurent Destailleur
4bc2864a6f Better board for open items 2017-03-23 19:26:28 +01:00
Laurent Destailleur
53a04703d6 Uniformize code 2017-03-23 16:10:38 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/projet/class/project.class.php
 2017-03-21 19:20:14 +01:00
Laurent Destailleur
61031f1633 FIX Missing total on project overview. 2017-03-21 19:10:43 +01:00
Laurent Destailleur
e7e51d9e4f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/projet/class/project.class.php
 2017-03-21 17:19:30 +01:00
Laurent Destailleur
43e70830ed Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-03-21 17:18:41 +01:00
Laurent Destailleur
e2e76b40da FIX list of projects 
Conflicts:
	htdocs/core/boxes/box_project.php
 2017-03-21 13:43:48 +01:00
Laurent Destailleur
68257283e4 Enhance select list 2017-03-21 13:39:42 +01:00
Laurent Destailleur
aa71710a74 FIX list of projects 2017-03-21 13:38:00 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Laurent Destailleur
dba6d99686 Minor look enhancement 2017-03-16 17:02:30 +01:00
Laurent Destailleur
0d6a99b35a Fix space 2017-03-16 11:01:35 +01:00
Laurent Destailleur
68e50d0c79 FIX Filter on date lost after submit on time spent page 2017-03-16 10:36:17 +01:00
Laurent Destailleur
6c392fad9f Fix CSS 2017-03-14 14:06:55 +01:00
Laurent Destailleur
ec7d48931e Merge duplicate menus/page on projects 2017-03-14 13:49:04 +01:00
Laurent Destailleur
60a9268ff5 Merge pull request #6518 from marcosgdf/bug-6505 
FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
 2017-03-14 10:45:09 +01:00
Marcos GarciÌa de La Fuente
cd349ab6cc FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled 
Close #6505
 2017-03-13 20:17:31 +01:00
Marcos GarciÌa de La Fuente
e9d5b44009 Fixed Project counter showing total amount of projects instead of just the projects current user can see 2017-03-12 15:31:39 +01:00
Alexandre SPANGARO
c6c07bf9f4 New : Add project to social contributions 2017-03-12 14:32:49 +01:00
Laurent Destailleur
67300f2a4e FIX choice of category was lost if an error occurs during creation 2017-03-11 00:52:30 +01:00
Laurent Destailleur
21189048e7 FIX choice of category was lost if an error occurs during creation 2017-03-11 00:50:31 +01:00
Laurent Destailleur
106d74184c CSS change. 
More information on project list of thirdparty.
 2017-03-11 00:43:06 +01:00
Laurent Destailleur
5033c6ea99 Add hidden constant as this is not common 2017-03-11 00:35:39 +01:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Laurent Destailleur
28ad50e059 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/suppliers.lang
 2017-03-03 14:31:35 +01:00
fmarcet
e1f459d67a Fix: Error when references are numeric 2017-03-03 12:57:52 +01:00
Laurent Destailleur
e6846f5c01 Fix error management when renaming a project with existing ref. 2017-03-02 20:06:10 +01:00
Laurent Destailleur
57b532cdd0 Fix status of opportunity is required if an amount is defined 2017-03-02 12:56:22 +01:00
Laurent Destailleur
1562df8f93 Fix responsive design 2017-03-02 01:26:15 +01:00
Laurent Destailleur
19e60f03b9 Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms 2017-02-21 14:17:44 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
d883c3cd8d Fix rendering 2017-02-20 04:25:20 +01:00
Laurent Destailleur
3803330701 NEW Add option PROJECT_THIRDPARTY_REQUIRED 2017-02-15 18:09:45 +01:00
Laurent Destailleur
fcbc12ce31 Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project 
New link movement stock to project
 2017-02-06 20:45:04 +01:00
Laurent Destailleur
bda915c63a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:34:59 +01:00
Laurent Destailleur
b5ca8ebef9 FIX #6316 2017-02-02 03:07:40 +01:00
Laurent Destailleur
c3fb559d3b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modProduct.class.php
 2017-02-01 20:58:17 +01:00
Laurent Destailleur
fbbf8cd8a4 Fix bad side effect of uniformizing a constant name. 2017-02-01 15:47:08 +01:00
Laurent Destailleur
9a9b31c9c0 Fix cancel button + logic to close project when setting opp to WON/LOST. 2017-02-01 13:25:16 +01:00
Laurent Destailleur
f16e65c6b1 Fix css 2017-01-30 12:22:58 +01:00
atm-ph
ccad6d6dde New show on project "overview" tab the informations about movements stock 2017-01-29 13:36:33 +01:00
Laurent Destailleur
39151d7a74 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
ac32161711 Fix error in total of tasks 2017-01-20 14:36:56 +01:00
Laurent Destailleur
e66aabea85 Fix error in total of tasks 2017-01-20 14:35:18 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
4047de82bd Fix navigation on projects 2017-01-20 10:27:37 +01:00
Laurent Destailleur
8ec1784e41 Better translation 2017-01-20 09:46:36 +01:00
Laurent Destailleur
acb2c57f47 Merge pull request #6290 from marcosgdf/little-change-generatedoc 
Uniformize code: Little improvement to generateDocument function
 2017-01-18 16:38:39 +01:00
bgenere
c6bd1a7d7d FIX issue on Task delete 
Added a control on time spent so it is not possible to delete a task
where some time spent has already been tracked.
 2017-01-18 10:57:18 +01:00
Marcos GarciÌa de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Laurent Destailleur
3a2f44adac Fix security permissions to edit/delete time spent 2017-01-13 14:24:39 +01:00
Laurent Destailleur
32a453e8e6 Fix label combo 2017-01-12 15:44:20 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
4c4aeba855 Fix project on loans 2017-01-07 17:54:47 +01:00
Laurent Destailleur
e9853f3cd7 Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into 
Franck-MOREAU-develop

Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
	htdocs/projet/element.php
 2017-01-07 17:45:05 +01:00
tarrsalah
eb62c1eb0d fix undefined method getProjectsAuthorizedForUser. 
When a user don't have the permission
`$user->rights->projet->all->lire`, viewing some tasks related entities
(like `tasks/contact.php?id=1&withproject=1`) cause `Call to undefined
method Task::getProjectsAuthorizedForUser()` fatal error.

The problem is caused by calling getProjectsAuthorizedForUser on $object
insted of $projectstatic.
 2017-01-04 16:35:04 +01:00
Laurent Destailleur
e4a5302f51 Fix bad sort order 2017-01-02 12:41:33 +01:00
Laurent Destailleur
9694a00179 Fix sort is lost on agenda/event of projects 2017-01-02 12:39:12 +01:00
Laurent Destailleur
477b9c8338 Fix duplicate view of agenda/events for projects 2017-01-02 12:34:23 +01:00
Laurent Destailleur
40fa816b99 Fix missing total of timespent 2017-01-02 12:27:34 +01:00
Laurent Destailleur
1b352768c2 Fix remove debug info 2017-01-02 12:18:17 +01:00
Laurent Destailleur
064f38b89e Fix condition to show time spent on project overview 2017-01-02 12:17:27 +01:00
Laurent Destailleur
82052450a6 Complete work on dol_banner 2016-12-26 18:21:18 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
293560f9c1 Fix missing ref is object is supplier object 2016-12-22 17:41:58 +01:00
Laurent Destailleur
081d3f0814 Quick hack by adding hidden constant to solve a locking feature (how to 
add project if likned to another third on project view)
 2016-12-22 16:52:03 +01:00
Laurent Destailleur
5c6ecf9aeb Complete work on new list v5 2016-12-16 01:12:24 +01:00
Laurent Destailleur
209990fd15 Fix look and feel v5 2016-12-15 23:28:18 +01:00
Laurent Destailleur
2802be2ed5 Fix bad limit 2016-12-11 02:20:13 +01:00
Laurent Destailleur
09520d814a Fix columns hidden 2016-12-10 23:08:11 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
db9af0118c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2016-12-06 14:08:43 +01:00
Laurent Destailleur
cfff6a8cb8 FIX Export of opportunity status must be code, not id. 2016-12-06 14:05:43 +01:00
Laurent Destailleur
bd0b017571 Missing filters 2016-12-06 12:13:03 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
 2016-12-03 16:01:18 +01:00
Laurent Destailleur
69b5baebc5 FIX rendering of output of estimated amount on project overview page. 2016-12-03 15:54:06 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
f4fb07b570 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-22 19:45:38 +01:00
Laurent Destailleur
839f30bea9 Fix scrutinizer warnings 2016-11-22 19:45:28 +01:00
Scrutinizer Auto-Fixer
2a62564768 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-11-22 18:16:17 +00:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Laurent Destailleur
2d7d240c86 FIX the time spent on project was not visible in its overwiew 2016-11-17 17:03:50 +01:00
florian HENRY
a251f0df51 Various fix on Loan and project link 2016-11-16 09:38:13 +01:00
moreauf
081be37787 NEW: Add project and Hook to Loan 
BUG: Correct discard_closed parametters management in project
 2016-11-14 19:25:50 +01:00
Laurent Destailleur
b20c4bdfe4 Responsive design 2016-11-11 12:55:03 +01:00
Laurent Destailleur
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
cc64994f30 Better responsive design 2016-11-10 11:33:25 +01:00
Laurent Destailleur
9fd5ddf807 NEW Add REST API for projects 2016-11-09 22:54:51 +01:00
Laurent Destailleur
71a573df61 FIX Pb in management of date end of projects 2016-11-09 17:46:30 +01:00
Laurent Destailleur
ff4eddb8dc Fix warning on project late 2016-11-09 17:37:58 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
b4c20f1b1a Fix regression in creation of invoice 
Uniformize code
 2016-11-08 11:23:40 +01:00
Laurent Destailleur
7fa9692458 Uniformize code. Generalize option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE. 2016-11-02 12:48:50 +01:00
Laurent Destailleur
f1ec2c04ed Uniformize code 2016-10-28 18:40:26 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Laurent Destailleur
384abd8462 Uniformize look and feel 2016-10-25 02:56:46 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
36c2b5afcd Responsive 2016-10-24 18:43:17 +02:00
Laurent Destailleur
6bd219b117 Fix column task ref/label 2016-10-24 17:47:31 +02:00
Laurent Destailleur
bc2342e9a4 Fix bad link 2016-10-24 17:37:39 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
Sergio Sanchis Climent
4800918323 FIX: Documents no change directory if change reference of the task. 2016-10-18 23:17:45 +02:00
philippe-opendsi
9ee61d20e3 Add create events on project card when MAIN_ADD_EVENT_ON_ELEMENT_CARD is 
enabled like for propal, order and invoice
The new event is linked to the project
 2016-10-18 22:23:03 +02:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Laurent Destailleur
0f88bdd971 NEW Can filter on project ref on the "new time consumed" page. 2016-10-18 12:15:59 +02:00
Laurent Destailleur
c1bf7c52f4 Add a line of filter in list of events related to thirdparty or projects 2016-10-18 00:02:18 +02:00
Laurent Destailleur
63628f6a01 Uniformize look and feel 2016-10-17 21:27:40 +02:00
Laurent Destailleur
be917c34af Uniformize code and look and feel 2016-10-17 18:18:06 +02:00
Laurent Destailleur
434b3ef643 Uniformize code and look and feel 2016-10-17 17:52:58 +02:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
Laurent Destailleur
fe471c43d1 Minor css enhancement 2016-10-16 18:28:09 +02:00
Laurent Destailleur
8edb51a017 FIX Extra fields of task not copied on project cloning 2016-10-16 18:27:39 +02:00
Laurent Destailleur
ee1ee1eee7 Management of the "Copy of" when cloning projects. 2016-10-16 12:12:45 +02:00
Laurent Destailleur
2695f35284 Fix to avoid scroll on confirm popup 2016-10-16 11:40:10 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Josep Lluís
89f4dbe64f Fix bug: replaced invoices in projects 
In balance whole project, don't count the total amount in replaced invoices.
In invoice details the replaced invoices are OK.
 2016-10-11 16:37:44 +02:00
Laurent Destailleur
8755fa07af Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/main.inc.php
 2016-10-11 12:35:14 +02:00
Laurent Destailleur
3eb8a667bc Fix clean of search criteria 2016-10-11 12:34:21 +02:00
Laurent Destailleur
b91b8c64b5 Fix sql error if we use separator extra field 2016-10-11 12:27:20 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
4dfdf29a55 FIX #5742 error on project list if an extra field separator is added. 2016-10-01 18:00:17 +02:00
Laurent Destailleur
538274998b FIX #5770 Dolibarr doesn't modify correctly the hour of a task 2016-10-01 14:09:41 +02:00
Laurent Destailleur
2a6d8e77db FIX Lost filter on opportunities 2016-09-30 11:45:36 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
dc45776d31 FIX Date visible on project overview 2016-09-23 10:32:19 +02:00
Laurent Destailleur
039bf4aae9 Fix date 2016-09-22 19:16:29 +02:00
Laurent Destailleur
8791a9f5f1 Fix date on Purchase Orders 2016-09-22 18:47:31 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
891297d165 Fix alignement 2016-09-19 17:12:53 +02:00
Laurent Destailleur
10e9f4372b NEW Show total line (planned workload and time spent) on on list of 
tasks.
 2016-09-19 16:42:45 +02:00
Laurent Destailleur
537c6b0cc7 Uniformize code 2016-09-18 15:57:53 +02:00
Laurent Destailleur
13c3db08e7 Uniformize code and look and feel 2016-09-18 15:48:29 +02:00
Laurent Destailleur
7e24f449d2 Can filter on project category on project list 2016-09-18 15:36:38 +02:00
Laurent Destailleur
ec99a056ac NEW introduce option PROJECT_DISABLE_PRIVATE_PROJECT and 
PROJECT_DISABLE_PUBLIC_PROJECT
 2016-09-05 15:13:03 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
Laurent Destailleur
8352f64474 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2016-08-31 01:04:33 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
Laurent Destailleur
c2b503d90f Fix missing filter 2016-08-31 00:15:09 +02:00
Laurent Destailleur
1be3c86b4b NEW Use new archi to select field into list of time spent 2016-08-30 20:17:34 +02:00
Laurent Destailleur
42293089a0 Fix several fix into tab management of tasks 2016-08-30 20:16:58 +02:00
florian HENRY
90466f37a7 travis comment 2016-08-29 11:10:30 +02:00
florian HENRY
a4ce756724 Manage project category 2016-08-29 10:32:00 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
florian HENRY
cd8585da63 fix for finche inter same problem 2016-08-10 11:54:49 +02:00
florian HENRY
d38ff5c246 FIX : create proposal from project 2016-08-10 11:34:10 +02:00
Laurent Destailleur
a2f1291f94 Fix missing supplier proposals in project overview 2016-08-09 17:28:02 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
af150c35fc Fix no picto on setup pages 2016-08-04 10:19:30 +02:00
Laurent Destailleur
da84fac390 Fix: data were lost if creation failed 2016-08-04 10:08:58 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
a240cf30d6 Fix PROJECT_LINES_PERWEEK_SHOW_THIRDPARTY to show thirdparty. 2016-08-03 00:50:17 +02:00
Laurent Destailleur
216ec6ac4b Label week too long with some language 2016-08-02 23:33:31 +02:00
Laurent Destailleur
ae0b90d61e Fix doxygen 2016-07-26 21:25:12 +02:00
Laurent Destailleur
f47f39f69a Fix width and remove hours on date into table 2016-07-26 14:45:22 +02:00
Laurent Destailleur
14cb6d73bc Fix date into new gantt chart 2016-07-26 14:41:15 +02:00
Laurent Destailleur
03cb5c66b8 Fix javascript error on french language 2016-07-26 14:17:45 +02:00
Laurent Destailleur
2866d60240 Revert "change jsgantt to jsGanttImproved" 
This reverts commit caf963351b.
 2016-07-26 13:59:08 +02:00
Sergio Sanchis Climent
71d153c4e2 change jsgantt to jsGanttImproved 2016-07-26 13:56:34 +02:00
Sergio Sanchis Climent
caf963351b change jsgantt to jsGanttImproved 2016-07-26 01:59:27 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Laurent Destailleur
2a6ab47689 NEW Can change thirdparty when cloning a project. 2016-07-21 12:47:56 +02:00
Laurent Destailleur
ff9b2803e7 Fix if previous percent not defined, we do not try to show previous 
percent.
 2016-07-21 12:15:53 +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
Juanjo Menent
c5ebb8f983 Fix bad param name to test if showing selector for suppliers 2016-07-18 18:44:05 +02:00
Laurent Destailleur
52d9bbb92b Merge pull request #5345 from atm-alexis/NEW_add_element_in_referent_list 
NEW hook in element overview for a project
 2016-07-14 23:18:01 +02:00
Laurent Destailleur
2e372ced1e Fix missing fields 2016-07-11 10:28:57 +02:00
Laurent Destailleur
c6ab11a9e5 Fix translation 2016-07-09 15:44:03 +02:00
Laurent Destailleur
bfb48ecce9 Where is the info tab of project ? 2016-07-09 15:30:42 +02:00
Laurent Destailleur
a258663175 Fix edition of status were loosing old percent. We show it to allow user 
to keep it if required.
 2016-07-09 14:58:51 +02:00
Laurent Destailleur
03dbf6e747 Fix edit of progess only 2016-07-09 14:28:33 +02:00
Laurent Destailleur
0e4dcb301c Fix several bugs into projects 2016-07-09 13:58:46 +02:00
Laurent Destailleur
298c55b3ed Fix bad property set. Must set fk_task_parent not fk_parent. 2016-07-08 16:22:16 +02:00
Laurent Destailleur
d940cc392a FIX Several fix to exclude WON/LOST of reporting of opportunities amount 
(sometimes we need, sometimes not).
 2016-07-08 10:59:13 +02:00
Laurent Destailleur
de157d9099 Fix quick search on tasks 2016-07-03 20:15:26 +02:00
Laurent Destailleur
59f86a12d2 Fix delete of documents generated on project. 
Fix missin translation
 2016-07-01 17:49:13 +02:00
Laurent Destailleur
05384b2f88 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/list.php
	htdocs/projet/card.php
	htdocs/societe/consumption.php
 2016-07-01 02:39:29 +02:00
Maxime Kohlhaas
c73c1a577a Time spent can be saved with project read right 2016-06-30 14:24:03 +02:00
Laurent Destailleur
d1850be261 Fix conflict in leftmenu value for projet menu 2016-06-29 17:00:05 +02:00
Laurent Destailleur
b6700c70d6 Merge pull request #5399 from atm-geoffrey/fix_PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS 
FIX Hide a non relevant message when PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is on on project edit view
 2016-06-24 21:54:36 +02:00
geoffrey.girard
321ccce438 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS on project edit view 2016-06-24 15:57:08 +02:00
geoffrey.girard
0a5ded20a3 FIX extrafield cloned on project clone 2016-06-24 15:27:47 +02:00
Laurent Destailleur
00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/imports/import.php
	htdocs/includes/odtphp/odf.php
	htdocs/product/stock/product.php
	htdocs/projet/list.php
 2016-06-22 20:22:22 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Laurent Destailleur
94b7e176a6 Clean language files 2016-06-18 16:46:21 +02:00
Laurent Destailleur
9781baa743 FIX Filter on opportunity amount and budget 2016-06-16 12:42:21 +02:00
Laurent Destailleur
5b5b7a2bf9 FIX Bad value used for task warning delay 
FIX Compatibility datee and date_end for warning of tasks
 2016-06-15 14:05:48 +02:00
Alexis Algoud
dc224f3c88 NEW hook in element overview 2016-06-13 16:25:27 +02:00
Laurent Destailleur
6034ba658c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-10 18:59:05 +02:00
Laurent Destailleur
2c48391365 No currency into lists 2016-06-09 07:51:56 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +02:00
Laurent Destailleur
c7065cc3b8 Minor esthetic fixes 2016-06-07 13:15:38 +02:00
Laurent Destailleur
fb13225173 Fix links on list from warnings dashboard 2016-06-06 16:31:50 +02:00
Laurent Destailleur
473ab18306 Fix link on workboard 
Fix warning picto is missing on task list
 2016-06-06 15:48:41 +02:00
Laurent Destailleur
b57476153f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php
 2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fourn/ajax/getSupplierPrices.php
 2016-06-04 00:58:16 +02:00
Maxime Kohlhaas
c9c7045a6f Fix access to project task time spent creation #5249 2016-06-03 23:34:37 +02:00
Laurent Destailleur
fb724566f0 FIX #5252 2016-06-03 22:15:07 +02:00
Laurent Destailleur
9511187f6e FIX Change to status "Shipment in progress" for orders is done whane 
validating and not creating a shipment.
 2016-05-27 16:49:55 +02:00
Laurent Destailleur
075b92b4c3 FIX Field for opportunities must not be visible if option off 2016-05-21 12:06:33 +02:00
Laurent Destailleur
89d37ccc62 Fix translation 2016-05-17 21:55:39 +02:00
Laurent Destailleur
d2df537d43 Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project 
NEW allow a document to be linked to project from another customer
 2016-05-05 22:24:32 +02:00
Laurent Destailleur
f901453a6b FIX addMoreActionsButtons hook must be inside the div class=tabaction. 2016-05-05 21:38:29 +02:00
Laurent Destailleur
92f9919f97 Merge pull request #5116 from defrance/patch-3 
Add addMoreActionsButtons Hook (standardisation)
 2016-05-05 21:31:02 +02:00
Laurent Destailleur
878ba07fcd NEW The note on time spent can be entered when using the view per day. 2016-05-04 12:24:15 +02:00
BENKE Charlie
379a621b1f soory it's a mistake 2016-04-30 01:01:32 +02:00
Alexis Algoud
e5b6d39e51 NEW allow a document to be linked to project from another customer on config 2016-04-29 18:04:59 +02:00
BENKE Charlie
8a63298102 Missing addMoreActionsButtons hook 2016-04-27 22:19:38 +02:00
BENKE Charlie
520facd55e Missing addMoreActionsButtons hook 2016-04-27 22:17:45 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
Laurent Destailleur
7515b2ba7b NEW Add a parameter on graph function to show a generic graph when no 
data are available.
 2016-04-22 12:11:57 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Marcos GarciÌa de La Fuente
7cc1288bb2 FIX #4743 UI glitch in project summary page 
Close #4743
 2016-04-09 22:54:34 +02:00
Laurent Destailleur
43165bab02 FIX Filter/search on extrafields on lists 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-04 16:22:26 +02:00
Laurent Destailleur
592a041bc5 FIX Filter/search on extrafields on lists 2016-04-04 16:02:29 +02:00
Laurent Destailleur
5101c96223 Restore button to create object from the project view. 2016-04-04 15:25:08 +02:00
Laurent Destailleur
f36f33f71b Merge pull request #4915 from defrance/patch-117 
Add contact hook on specific task contact page
 2016-04-04 00:21:57 +02:00
Juanjo Menent
75eb718c01 Merge pull request #4922 from atm-alexis/NEW_multientity_for_project 
FIX multicompany project access
 2016-04-03 16:13:24 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
e40b678d7b Uniformize code 2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
root
b018500fd4 FIX multicompany project access 2016-03-31 14:44:18 +02:00
BENKE Charlie
98ef179307 Add contact hook 
I use the same hook name as contactpl
 2016-03-30 21:09:27 +02:00
Laurent Destailleur
2e5cc98e59 Fix into badges visibility 2016-03-29 20:06:01 +02:00
Laurent Destailleur
08e506874a FIX If thirdparty module not enabled, we must hide thirdparty info. 2016-03-25 19:42:14 +01:00
Laurent Destailleur
423120db17 Merge pull request #4876 from atm-alexis/NEW_multientity_for_project 
# New # multientity for project
 2016-03-25 18:01:45 +01:00
Laurent Destailleur
85cd0038f5 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-25 16:10:10 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Alexis Algoud
c3bdc6372d NEW allow project to be shared across entities 2016-03-22 16:48:51 +01:00
Laurent Destailleur
8189a5eadd Merge remote-tracking branch 'origin/3.8' into 3.9 2016-03-22 12:58:34 +01:00
Marcos GarciÌa de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Laurent Destailleur
99ceb006e4 FIX Bad include and param for project numbering module call 2016-03-21 11:47:32 +01:00
Marcos GarciÌa de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos GarciÌa de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos GarciÌa de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
ba4f5c8648 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-19 19:26:57 +01:00
Laurent Destailleur
6f8200893b FIX #4784 2016-03-18 15:02:37 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
a102dc29d4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-03-17 23:19:28 +01:00
Laurent Destailleur
fb16feb666 FIX Same term to create than other objects 2016-03-17 23:19:19 +01:00
Alexis Algoud
19d7577267 FIX Bad function name call on delete 2016-03-15 11:14:51 +01:00
Laurent Destailleur
619ebf9a3e Enhance css of search fields 2016-03-13 20:38:16 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
Laurent Destailleur
1df8e50a1b NEW Add statistics on number of projets on home page 2016-02-28 00:19:12 +01:00
Laurent Destailleur
2ee74a80d9 NEW Enhance navigation of project module 2016-02-28 00:01:50 +01:00
Laurent Destailleur
39d6d16c02 Fix bad picto "shared project" 2016-02-27 19:20:11 +01:00
Laurent Destailleur
6b7551c5d2 Fix: Introduce hidden option to disable feature than hangs when too much 
data
 2016-02-27 19:12:45 +01:00
Laurent Destailleur
193699a1b3 Fix duration format 2016-02-27 18:47:02 +01:00
Laurent Destailleur
d644a3bc43 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-02-27 18:43:50 +01:00
Laurent Destailleur
1038e92354 FIX sql request and total for time spen for current month 2016-02-27 18:42:57 +01:00
Laurent Destailleur
5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/prospect/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
 2016-02-27 18:33:39 +01:00
Laurent Destailleur
15503f12b9 FIX Removed a bugged list. Fixed another one to not count data of 
previous year.
 2016-02-27 18:29:01 +01:00
Laurent Destailleur
526ea743e0 Fix: the view my task must show only task you are assigned to 2016-02-27 17:56:59 +01:00
BENKE Charlie
d889a1d91f Change title page 'projects' to "project Area" 2016-02-18 11:56:32 +01:00
Laurent Destailleur
e67be201ed NEW Can select number of lines on page list for projects and tasks 2016-02-11 16:49:13 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
806d3642d8 FIX Bad filter on opportunities 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2016-02-06 15:09:57 +01:00
Laurent Destailleur
3828fe7026 FIX Bad filter on opportunities 2016-02-06 15:06:37 +01:00
Laurent Destailleur
64514b38da Merge remote-tracking branch 'origin/3.9' into develop 2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b Fix bad management of option MAIN_HTML_TITLE 2016-02-01 01:19:37 +01:00
Laurent Destailleur
08b3b0cf19 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-28 23:50:23 +01:00
Laurent Destailleur
7c2ac4b3ee NEW The probability of lead/opportunity can be defined per lead. 2016-01-28 20:04:02 +01:00
Laurent Destailleur
c8d232e056 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/contrat/card.php
 2016-01-28 12:18:25 +01:00
Laurent Destailleur
25924f31ad Bad translation 2016-01-26 17:57:57 +01:00
Laurent Destailleur
33355c613a FIX When we make a direct assignement on a task to a user, we must check 
he is also assigned to project (and if not assign it)
 2016-01-26 17:50:57 +01:00
Laurent Destailleur
93903b7330 Task lit to assign when entering timesheet is on top. This is more 
convenient and save spaces.
 2016-01-25 16:01:50 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
b5c047d9a5 Fix link on project ref on task list must jump to tab task 2016-01-21 15:15:26 +01:00
Laurent Destailleur
39aede4071 Fix bad list of project/tasks 2016-01-21 15:09:46 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00
Laurent Destailleur
ddd8f8586f Fix rewrite of project and task list to solve bad listing 
Fix correct sort and pagination of lists
 2016-01-21 14:59:09 +01:00
Laurent Destailleur
19bcdb6910 Fix size of cells make page too large even for large screen 2016-01-21 14:56:26 +01:00
Laurent Destailleur
1ec3454925 Add option to show a box on dashboard (that may be very very long) 2016-01-21 14:13:38 +01:00
Laurent Destailleur
55dc6c31fc Minor performance enhancement 2016-01-21 14:12:17 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
Laurent Destailleur
6eb6b0315f Fix bad field used for search on start date 2016-01-18 16:47:14 +01:00
Laurent Destailleur
6ef70ad476 Fix bad field used for search on start date 2016-01-18 16:46:54 +01:00
Laurent Destailleur
17ceca3758 Fix: no create button on list 2016-01-18 16:44:04 +01:00
Laurent Destailleur
0f456c46ab Clean project pages to work like other modules 2016-01-18 16:43:15 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Laurent Destailleur
0f97bca363 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-01-15 01:52:32 +01:00
Laurent Destailleur
4d5845fce5 Prepare split of module supplier 2016-01-15 01:16:14 +01:00
Laurent Destailleur
03eccb3336 Prepare database to be able to manage a different opportunity 
probability for each opportunity.
 2016-01-10 19:48:59 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
befe58ab98 Fix selection of first entry into select 2016-01-07 13:44:19 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
philippe grand
8e8c6b1534 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2015-12-21 14:22:45 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page 
Fix Missing translations
 2015-12-21 00:47:44 +01:00
philippe grand
7a33e2983d [Qual] Uniformize code 2015-12-20 10:36:20 +01:00
philippe grand
b91031b693 fix some issue within my last commit 2015-12-17 17:20:28 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Laurent Destailleur
745875d21e NEW Can choose fields to show on project list 2015-12-06 01:19:27 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
Laurent Destailleur
8c03e46a83 Removed a TODO 2015-12-04 18:33:57 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +01:00
Laurent Destailleur
4dd1cb3e77 Theme MD looks ready for 3.9 now. 2015-12-04 12:12:12 +01:00
Laurent Destailleur
9aaab2c1dc Work on select fields on project list 2015-12-02 23:20:19 +01:00
Laurent Destailleur
3e403720e6 FIX User is selected when choosing menu "My projects" 
Graph of opportunities is moved into an include file.
 2015-11-28 17:35:52 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Laurent Destailleur
a454e92656 Increase size of combo list 2015-11-26 00:31:12 +01:00
braito4
677cba01ce Part solution bug #4095 
It allow us to deactivate the link to a project queries to lower the page workload.
 2015-11-25 18:58:47 +01:00
Laurent Destailleur
c7447b0899 Add thirdparty of project into project summary of project home page. 
Total use a different color
 2015-11-21 20:25:28 +01:00
Laurent Destailleur
5c6f7425f1 FIX: List of user to assign a task is not visible 2015-11-18 13:23:01 +01:00
Laurent Destailleur
350ef610e9 Fix beluga pdf for projects. Add missing expense reports. 2015-11-07 12:36:34 +01:00
Laurent Destailleur
c119859696 NEW The quick search box on left menu can also search into expense 
reports.
 2015-11-02 13:14:46 +01:00
Frédéric FRANCE
ee94aea1ef Update list.php 2015-10-31 11:28:49 +01:00
Laurent Destailleur
3015a0388a NEW List of projects of a thirdparty are visible on a project tab 2015-10-24 16:09:26 +02:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
537a13e2f4 NEW Show which fields are used for search when doing a generic search 
from the quick search form.
 2015-10-17 00:14:36 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
57ea4fc23d FIX sql syntax error when sort order not defined. 2015-10-13 14:40:02 +02:00
Laurent Destailleur
a1d37f92cb Several fix in CSS 2015-10-09 20:00:43 +02:00
Laurent Destailleur
61d739635e Uniformize code and css for tables. Filters must be implemented 
following example in test_arrays.php.
 2015-10-09 12:30:16 +02:00
Laurent Destailleur
e776f685ba FIX when editing time spent, date of line suggested was a rubbish value 2015-10-06 16:09:24 +02:00
Laurent Destailleur
f54a1ca367 CSS enhancement 2015-10-06 01:03:31 +02:00
Laurent Destailleur
d92604f646 FIX Link of project must be cickable if user has permission to read all 
projects
FIX Missing information into the alt of project picto
 2015-10-06 00:46:26 +02:00
Laurent Destailleur
f1cf629b80 FIX List of project for user that are restrited as sale repreentative to 
some thirdparties.
 2015-10-05 23:52:54 +02:00
Laurent Destailleur
68d4a9fc63 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/societe/list.php
 2015-10-04 20:57:00 +02:00
Laurent Destailleur
75e337e8d9 FIX select of project using ajax autocomplete option 2015-10-04 16:02:50 +02:00
frederic34
1e8ff69267 Optioncss 2015-10-04 13:34:55 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
60c0338d64 FIX #3628 2015-10-01 16:50:18 +02:00
Laurent Destailleur
0c64fa04bc Merge pull request #3614 from marcosgdf/bug-3572 
FIX #3572 Impossible to attach project in order. The option to use autocompletion for project failed.
 2015-10-01 10:32:32 +02:00
Marcos GarciÌa de La Fuente
188489c8ef FIX #3572 Impossible to attach project in order 
Added missing file of commit 65d3f79

Close #3572
 2015-09-27 21:52:44 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
fa9103fc97 FIX Bad title line in project view when using jmobile 2015-09-27 16:50:47 +02:00
Laurent Destailleur
ff5f823bef FIX not responsive part for project page 2015-09-27 16:01:57 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Laurent Destailleur
5f765419ea Fix because project module introduced opportunity, user may create 
project (opportunity) even when thirdparty does not exists yet, so we
must provide a solution for this.
 2015-09-26 11:04:17 +02:00
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users 
[Qual] Replaced deprecated select_users()
 2015-09-26 08:44:34 +02:00
Juanjo Menent
ef161e356e Merge pull request #3590 from GPCsolutions/json 
[Qual] Replaced deprecated dol_json_*()
 2015-09-26 08:42:13 +02:00
Juanjo Menent
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
85c34af019 [Qual] Replaced deprecated dol_json_*() 2015-09-24 18:57:05 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
a5c6582bc1 Fix duplicate translation/encoding on setEventMessage 
Conflicts:
	htdocs/ftp/index.php
 2015-09-12 12:55:20 +02:00
Laurent Destailleur
c785f8cfb1 Fix duplicate translation/encoding on setEventMessage 2015-09-12 12:52:07 +02:00
Laurent Destailleur
91ddca6ab0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
 2015-09-06 16:34:40 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
Laurent Destailleur
a21b015cbb Fix XSS 2015-09-05 20:03:02 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
cf3eb1e452 Fix limit of nb of project. 2015-08-31 17:01:32 +02:00
Laurent Destailleur
3a32b08512 Fix filter on opportunity status 2015-08-31 15:52:54 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
Laurent Destailleur
2c85cf246c Merge branch 'patch-1' of https://github.com/gschratzer/dolibarr into 
gschratzer-patch-1

Conflicts:
	htdocs/projet/element.php
 2015-08-31 00:45:18 +02:00
Laurent Destailleur
4377a2d013 Fix style and sql error for field fde.ref not found 2015-08-28 18:20:51 +02:00
Raphaël Doursenaud
ba1ad9f317 Fix #3219 More conventional presentation 2015-08-26 19:51:06 +02:00
Guido Schratzer
154f6cff9f Fix: htdocs/projet/element.php Logoposition 
Fixed Logo from center to right
set table width to 100 %
 2015-08-26 18:35:15 +02:00
Laurent Destailleur
7ff149e876 Fix missing param mode 2015-08-17 15:13:40 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
fmarcet
62ad7d4d34 FIX: Not showing task extrafields when creating from left menu 2015-08-04 13:32:44 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
 2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/resultat/clientfourn.php
 2015-07-30 15:07:22 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
phf
824da6d2b0 FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE 2015-07-27 17:38:27 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
ad5612158a Fix report of all error messages 2015-07-19 15:29:18 +02:00
Marcos GarciÌa de La Fuente
f2313748c8 Merge branch '3.7' into bug-1634 2015-07-19 14:57:39 +02:00
Marcos GarciÌa de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects 
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
 2015-07-19 14:56:52 +02:00
Laurent Destailleur
2f2b0df6f8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contact/exportimport.php
	htdocs/contact/info.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/core/tpl/document_actions_pre_headers.tpl.php
	htdocs/langs/fr_FR/categories.lang
	htdocs/main.inc.php
	htdocs/product/reassort.php
	htdocs/projet/list.php
	htdocs/societe/info.php
 2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
 2015-07-19 12:04:30 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
85d9d3587e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 16:25:43 +02:00
Laurent Destailleur
a9289de616 Several fixes. Fix #2927 2015-07-13 11:22:18 +02:00
Laurent Destailleur
0c9e984bb1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-13 10:29:45 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
8d77667764 Bad stat report 2015-07-10 10:42:42 +02:00
Laurent Destailleur
8eb4a208ce Debug statistics of project module 2015-07-05 22:04:30 +02:00
Laurent Destailleur
324d855b9c Still working on project module to uniformize way of working with other 
modules
 2015-07-04 18:20:17 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
Maxime Kohlhaas
ee643ed2a7 Fix : Project list was not keeping parameters on sorts 2015-07-02 14:08:16 +02:00
Laurent Destailleur
6ef0b8e330 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-07-01 21:17:05 +02:00
Laurent Destailleur
b766f99acc Uniformize look. 
Make code to manage link "Now" on calendar more generic.
 2015-06-30 21:50:24 +02:00
Laurent Destailleur
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +02:00
Laurent Destailleur
4a1dfa60a5 Uniformize code 2015-06-30 13:14:19 +02:00
Laurent Destailleur
a8f1066faa Fix support of option to manage opportunities 2015-06-30 01:53:01 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
Laurent Destailleur
5a8e763099 Uniformize code for hooks 
Uniformize page name societe.php into list.php
 2015-06-22 15:48:48 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
Laurent Destailleur
7507a71121 Lenght of fields 2015-06-18 14:47:33 +02:00
Laurent Destailleur
8df56511be NEW Enhance prototype, project list and proposal list with new hook to 
have an external module able to add more fields.
 2015-06-16 19:36:44 +02:00
Marcos GarciÌa de La Fuente
65d3f7968a NEW [ task 1191 ] AJAX selector for projects 2015-06-15 10:04:36 +02:00
Laurent Destailleur
bcd254c137 Fix bad objet use. Add label of project into list. 2015-06-15 00:12:52 +02:00
Laurent Destailleur
ed0e6753e3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-06-12 13:09:32 +02:00
Laurent Destailleur
3678a12767 NEW Can assign a task to yourself to have it appear on timesheet 2015-06-11 18:27:59 +02:00
Laurent Destailleur
488257d180 Fix bad coding 2015-06-08 22:16:00 +02:00
Laurent Destailleur
67a9fa529f Merge pull request #2241 from defrance69/patch-44 
Update task.php
 2015-06-05 15:45:50 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
b98999c9d9 Can't delete a project 2015-06-05 15:41:27 +02:00
Laurent Destailleur
a33241f487 Maxi debug of 3.8. Nearly ready for freeze. 2015-06-05 14:46:30 +02:00
Laurent Destailleur
dd8a0b849a NEW If module salaries is on, you can set a hourly value for tome 
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
 2015-06-03 21:01:50 +02:00
Laurent Destailleur
d109c78c6b Fix label of project was not visible 2015-06-03 16:59:48 +02:00
Laurent Destailleur
f7eaf35d30 NEW When creating order, proposal or invoice from thirdparty card, the 
project is asked during creation. A link to create project if it does
not exists is also available.
NEW Uniformize form creation of proposal to add public and private notes
during creation like done for order and invoice.
 2015-06-03 11:55:39 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
aspangaro
47045e0746 Accountancy: Review presentation 2015-05-28 21:34:35 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
e2280ce93e NEW Can close a project that has draft status with no need to switch it 
to validate status before.
 2015-05-18 23:49:08 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
6d95de48c2 Css fixes 2015-05-14 20:49:22 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
Raphaël Doursenaud
aee61aa2c4 [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
Juanjo Menent
e07cebd50b Merge pull request #2793 from GPCsolutions/htmlfixes 
HTML fixes
 2015-05-09 13:58:43 +02:00
Juanjo Menent
c5101ae5ea Code fixes 2015-05-07 20:07:47 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
94ff635cc2 NEW Add filter on user contact or user task into task list 2015-04-23 16:20:25 +02:00
Laurent Destailleur
4f3fe82e93 NEW Add filter on task ref and task label into list of tasks 2015-04-23 15:22:50 +02:00
Laurent Destailleur
c97c5e0cfd Fix selection of user was lost 2015-04-23 13:54:49 +02:00
Laurent Destailleur
f9285d6d23 NEW Can add all user of a project as user of a task, in one step. 2015-04-23 13:44:45 +02:00
Laurent Destailleur
47ecb91a3e Avoid DOS attack when high number of tasks 2015-04-22 21:17:49 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/expedition/fiche.php
 2015-04-18 23:55:17 +02:00
jfefe
57d04c601f Add title picto for project section 2015-04-18 23:39:04 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Marcos GarciÌa de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos GarciÌa de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos GarciÌa de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
philippe grand
eaf0fda6aa fix syntax errors 2015-04-18 18:07:41 +02:00
Laurent Destailleur
78e6aacda2 Fix format not supported by js lib 2015-04-17 13:22:36 +02:00
Laurent Destailleur
75b3fd442e Add option to allow to filter list on project creation 2015-04-14 12:32:19 +02:00
Laurent Destailleur
f323e89919 Add hidden option PROJECT_LIST_SHOW_STARTDATE to show start date of 
project.
Increase visible length of fields.
 2015-04-14 12:21:23 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Marcos GarciÌa de La Fuente
bbd01c0c8d Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project 2015-04-12 20:59:58 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
503a4ff7a0 Enhance filtering for bank transaction and timesheet. 2015-04-09 20:40:49 +02:00
Laurent Destailleur
ca7a7a9038 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/product/stock/product.php
 2015-04-08 20:43:51 +02:00
Laurent Destailleur
091420f8ae Close #2568 2015-04-08 20:40:01 +02:00
Scrutinizer Auto-Fixer
918ed34364 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-07 00:45:30 +00:00
Marcos GarciÌa de La Fuente
5c8e92d52a Closes #2535 Bug: Untranslated string in "Linked objects" page of a project 2015-04-04 17:52:05 +02:00
Laurent Destailleur
e827b1b9cd Merge pull request #2529 from aspangaro/develop-don 
NEW better integration in project for donation module
 2015-04-02 11:42:15 +02:00
aspangaro
115777f05d New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin 2015-04-02 06:54:04 +02:00
aspangaro
d8f56eb406 New: better integration in project for donation module 
Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility
 2015-04-02 06:36:32 +02:00
aspangaro
4918326958 Fixed: Wrong path to don.class in element project 2015-04-01 08:13:10 +02:00
Laurent Destailleur
73b2e0bd01 Merge pull request #2471 from marcosgdf/refactor 
refactor
 2015-03-29 16:17:36 +02:00
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
aspangaro
b60f1e33d6 Debug 2015-03-26 06:29:16 +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
cbadfa5075 NEW: Title of page project contains project ref and label 2015-03-23 12:44:41 +01:00
Marcos GarciÌa de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39: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
aspangaro
c4a580723d Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-20 06:36:06 +01:00
aspangaro
c9d31dab3a Move module Dons in htdocs->donations 2015-03-19 05:41:13 +01:00
aspangaro
dbeccf7653 Update work 2015-03-18 21:56:00 +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
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
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
Marcos GarciÌ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 GarciÌa de La Fuente
2e68b51a10 Merge remote-tracking branch 'upstream/develop' into develop 2015-03-15 17:52:07 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Laurent Destailleur
605a7dee0e Fix: Deleting task do not return to correct page 2015-03-14 11:56:28 +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
Raphaël Doursenaud
f8dfa61859 FIXED #1901: Inverted supplier order/invoice buttons in project referring objects 2015-03-09 16:20:51 +01:00
Laurent Destailleur
97f36825df Work on new timesheet page 2015-03-05 21:47:50 +01:00
Laurent Destailleur
22045603b7 Fix bad update of denormalized field 2015-03-05 13:51:29 +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
8b5dd4910f Fix bad update of denormalized field 2015-03-05 13:02:37 +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
596f977f7c Merge pull request #2423 from defrance69/patch-49 
Update index.php
 2015-03-04 22:02:16 +01:00
Laurent Destailleur
09035c1fee Merge branch 'fetchobject' of https://github.com/frederic34/dolibarr 
into develop

Conflicts:
	htdocs/includes/tcpdi/fpdf_tpl.php
	htdocs/projet/card.php
 2015-03-04 20:52:54 +01:00
Laurent Destailleur
13d8f26247 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/class/project.class.php
 2015-03-04 18:58:50 +01:00
Laurent Destailleur
cf3190a4ef Bad error management 2015-03-04 18:56:57 +01:00
Laurent Destailleur
5335a6affa NEW: Add close date and user for projects. 2015-03-04 16:28:29 +01:00
Marcos GarciÌa de La Fuente
0170d409d3 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2015-03-04 10:16:25 +01:00
Laurent Destailleur
4c1d51bd39 phpcs 2015-03-04 02:28:16 +01:00
Laurent Destailleur
107a16ed75 Work on timesheet module 2015-03-04 00:53:35 +01:00
BENKE Charles
06b7f610ed Update index.php 
list of cossumed time more usefull if ordered by desc
 2015-03-03 17:18:20 +01:00
frederic34
4af26c119f fetch object in include file 2015-03-02 17:54:35 +01:00
Laurent Destailleur
1493e66d64 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-03-02 02:39:29 +01:00
Laurent Destailleur
45a90b54fe Fix: param to set id of object into url must be id everywhere (except 
company, it might be socid)
 2015-03-02 02:14:18 +01:00
Laurent Destailleur
c0d0fa317b Merge pull request #2404 from frederic34/patch-3 
Update card.php
 2015-03-02 02:05:40 +01:00
Laurent Destailleur
5a541c4206 Forgot to commit one file 2015-03-02 01:39:08 +01:00
Laurent Destailleur
7fc0c2b485 Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements 
New add doc on project linked elements
 2015-03-02 00:19:21 +01:00
Laurent Destailleur
a0f8b39250 Prepare code for a perday week timesheet input of time spent. 2015-03-01 17:45:36 +01:00
Laurent Destailleur
416e0a766e Fix: we must use status to find label of status 2015-03-01 16:24:02 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Laurent Destailleur
8a67a3af10 Fix missing one param 2015-03-01 16:12:55 +01:00
Laurent Destailleur
5f29942257 Fix link missing icon 2015-03-01 14:03:14 +01:00
Laurent Destailleur
b888a04af9 Reduce a lot of duplicate code. Move all tables of extrafields setup 
into a tpl file.
 2015-02-28 20:14:26 +01:00
Laurent Destailleur
51fff77355 Fix: time 0 must be different than time unknown. 2015-02-28 19:02:03 +01:00
Frédéric FRANCE
84b5888cd5 Update card.php 2015-02-28 10:45:48 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also 
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
 2015-02-26 13:03:17 +01:00
Marcos GarciÌa de La Fuente
e3853a648f Redundant code 2015-02-25 19:44:12 +01:00
Alexis Algoud
5bc3763945 fix supplier order element 2015-02-24 18:23:40 +01:00
Alexis Algoud
b4f3068141 NEW add PDF icon on linked element into project 2015-02-24 18:20:19 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
Laurent Destailleur
25bb6a588f Fix list of project must be restricted on opened status 2015-02-23 00:57:48 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
3ca31e34cb New: Add field "budget" (amount) on projects. 2015-02-16 10:58:05 +01:00
Laurent Destailleur
82b3f4a102 Add field budget_amount on project. 2015-02-16 10:40:09 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
c5269eb0a5 Fix: back to project page 2015-02-07 04:06:38 +01:00
Laurent Destailleur
7cc9a09f99 Fix bad order 2015-02-07 04:06:30 +01:00
Laurent Destailleur
4a3e4d6ec9 Fix: back to project page 2015-02-07 04:04:56 +01:00
Laurent Destailleur
2c364dbe8c Fix filter on status 2015-02-07 03:54:00 +01:00
Laurent Destailleur
7738478564 Fix bad order 2015-02-07 03:29:33 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
Laurent Destailleur
2f388949f6 Make a test with jsganttimproved 2015-02-07 03:11:35 +01:00
Laurent Destailleur
79ac620ab5 Fix label of status 2015-02-07 01:32:21 +01:00
Laurent Destailleur
e0f86f0270 Oubli sur option PROJECT_HIDE_TASKS 2015-02-02 21:33:09 +01:00
Laurent Destailleur
b36e40ee4c Fix feature to break by email 2015-02-02 21:12:43 +01:00
Laurent Destailleur
edcf39cd58 Merge pull request #2300 from aschio/develop 
NEW: search filter fields in list project page
 2015-01-31 20:24:48 +01:00
frederic34
b850b7b448 Merge remote branch 'upstream/develop' into tooltip 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-01-30 16:45:24 +01:00
frederic34
736bee565c Tooltip everywhere 2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
cla
0501153835 Update list project page: add sales rapresentatives and linked user. 2015-01-30 11:08:49 +01:00
cla
0d0c10be1f ADD filter fields in list project page 2015-01-29 18:17:43 +01:00
Laurent Destailleur
5306220e5e Fixed: Translation 2015-01-23 02:21:43 +01:00
Laurent Destailleur
71a8f97c89 Optimize code 2015-01-23 02:11:10 +01:00
Laurent Destailleur
eedca43cc3 New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines 
into refering project view.
 2015-01-22 21:31:00 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +01:00
Laurent Destailleur
7b8b189bac Fix: select if field is null 2015-01-22 20:09:57 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
BENKE Charles
d98d4d219f Update task.php 
use GETPOST instead of $_GET and $_POST
 2015-01-19 22:46:28 +01:00
Florian HENRY
ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php
 2015-01-19 09:38:00 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Laurent Destailleur
2f4352c759 Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1785

Conflicts:
	ChangeLog
 2015-01-18 12:45:05 +01:00
Florian HENRY
c8db8f001b fix travis 2015-01-18 12:06:05 +01:00
Florian HENRY
b407716175 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-18 11:57:32 +01:00
BENKE Charles
c923d06d84 Update task.php 2015-01-15 17:10:47 +01:00
Marcos GarciÌa de La Fuente
61809ef6b5 - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database 2015-01-15 13:22:58 +01:00
BENKE Charles
a33727f4c5 Update task.php 
Allow to change the ref of a task (like the ref of project)
 2015-01-15 13:00:11 +01:00
Marcos GarciÌa de La Fuente
6c4702f282 Fix: [ bug #1785 ] Start date is lost in Project > Linked objects 2015-01-13 09:11:04 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Ion Agorria
bdd7e9df23 Added searching using year 2014-12-28 03:39:30 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Laurent Destailleur
ade688b589 Merge pull request #2174 from marcosgdf/bug-1723 
Fix [ bug #1723 ] Draft tasks?
 2014-12-26 03:48:15 +01:00
Laurent Destailleur
b2d27a7d25 Merge pull request #2173 from marcosgdf/translation 
Fixed string not translated in linked objects of a project
 2014-12-26 03:47:56 +01:00
Marcos GarciÌa de La Fuente
5ec38d89ff Fixed [ bug #1763 ] Undefined variable $interface in Project:574 2014-12-25 22:59:57 +01:00
Marcos GarciÌa de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Marcos GarciÌa de La Fuente
78307a748d Corrected confusing table header in task list 2014-12-23 15:56:29 +01:00
Marcos GarciÌa de La Fuente
a90a03412a Fixed string not translated in linked objects of a project 2014-12-23 15:43:45 +01:00
Marcos GarciÌa de La Fuente
db30186386 Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs 2014-12-22 22:52:43 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
31f782ffe9 Fix: Several fixes into tasks and time spent management 2014-12-21 14:58:18 +01:00
Laurent Destailleur
c3ac607e4f Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-18 23:56:40 +01:00
Laurent Destailleur
c571013fc9 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-18 23:55:07 +01:00
Florian HENRY
6f43206331 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 15:42:44 +01:00
Florian HENRY
c209d16881 [ bug #1749 ] Undefined $mailchimp 2014-12-18 15:42:28 +01:00
Laurent Destailleur
4769e26d8e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-18 12:34:41 +01:00
Laurent Destailleur
ef5035b349 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/liste.php
 2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/paypal/lib/paypal.lib.php
 2014-12-18 10:13:25 +01:00
Laurent Destailleur
a8c6417604 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-15 10:33:14 +01:00
Laurent Destailleur
2245361a2e Fixed: [ bug #1732 ] Tasks ressources and time consumption are not 
deleted on project / task deletion
 2014-12-14 15:09:30 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
cd6c72b142 Fixed: Update of time consumed 2014-12-10 20:03:39 +01:00
Laurent Destailleur
6ddae270b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-07 23:52:02 +01:00
Laurent Destailleur
634a9d8402 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2014-12-07 19:19:48 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
Florian HENRY
99f817b69a - New: Add Option to not change date on cloning project 2014-12-05 21:40:55 +01:00
Florian HENRY
bd8b393d8a Fix [ bug #1740 ] Clone project make task date crazy 2014-12-05 21:25:43 +01:00
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
ec9c3cc115 Fix: Better translation 2014-12-04 11:53:44 +01:00
Laurent Destailleur
782486bb4c Fix: Project with no tasks was not visible 2014-12-04 11:14:02 +01:00
Laurent Destailleur
76bd7dd512 Fixed: A lot of fixed on project views (info on project area). Also add 
a limit to avoid problem with very large database.
 2014-12-04 11:03:48 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it 
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
 2014-11-28 02:05:40 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center 
Task 1603 - Remove <center> deprecated HTML5 tags
 2014-11-27 23:58:44 +01:00
Laurent Destailleur
60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/bookmarks/card.php
 2014-11-27 22:01:02 +01:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +01:00
Laurent Destailleur
891e39189a Fixed: missing css class 2014-11-23 23:31:35 +01:00
aspangaro
bbdd25f97c Add function purge criteria in project module 2014-11-23 21:37:45 +01:00
Laurent Destailleur
068c7fdb2d Fixed: [ bug #1635 ] le tiers n'apparait plus sur la fiche tache 2014-11-22 00:31:19 +01:00
Laurent Destailleur
8bf402593a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-20 15:39:50 +01:00
Laurent Destailleur
d462facf6d Fixed: [ bug #1653 ] Can't access task notes 2014-11-20 14:44:49 +01:00
Frédéric FRANCE
3dea1fd68f #1695 SQL error on task creation 2014-11-18 22:53:39 +01:00
Laurent Destailleur
05059da9e8 Fix: [ bug #1631 ] technical error in the display of associated objects 
/ erreur technique à l'affichage des objets associés à un projet
 2014-11-17 01:06:30 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
Alexis Algoud
d177a2fbb4 fix bug on thm 2014-11-04 16:13:51 +01:00
Laurent Destailleur
65b73ab778 Fix: td balance 2014-10-29 20:24:33 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Laurent Destailleur
3243958a70 New: getNomUrl can point to different page for tasks 2014-10-29 18:01:51 +01:00
Laurent Destailleur
4b34455f0a Fix permissions 2014-10-17 15:01:56 +02:00
Laurent Destailleur
9768550696 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2014-10-12 02:54:34 +02:00
Laurent Destailleur
44e2cd2194 Prepare code to manage task_datehour with task_date. 2014-10-12 01:20:03 +02:00
Laurent Destailleur
2b479aa0b4 Qual: Uniformize translated label of progress on all pages. 
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
 2014-10-12 01:04:34 +02:00
Laurent Destailleur
6c3c1d3a0a Merge pull request #1930 from GPCsolutions/reportprogress 
Allow reporting progress along with timespent
 2014-10-12 00:10:28 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message 
Fix: pgsql syntax error
 2014-10-08 15:35:39 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
a853aed348 Fix: Some fields not visibles. Wrong value for calculated time. 2014-10-03 03:42:11 +02:00
Raphaël Doursenaud
769d824e7b Allow reporting progress along with timespent 2014-10-01 14:12:47 +02:00
Regis Houssin
f1f4fc18e9 Fix: use "doc" instead "pdf" dir and uniformize code 2014-09-29 11:08:50 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
a3436135c9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/projet/activity/list.php
 2014-09-26 13:34:31 +02:00
Laurent Destailleur
a4d8739477 Qual: Clean a lot of deprecated code 2014-09-24 01:35:29 +02:00
Raphaël Doursenaud
634d5aa549 FIX: double header 2014-09-23 19:35:45 +02:00
Laurent Destailleur
dc96e10215 Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into 
marcosgdf-oop-pdf

Conflicts:
	htdocs/projet/class/project.class.php
 2014-09-23 00:02:19 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00
Marcos GarciÌa de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos GarciÌa de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +02:00
Florian HENRY
119be5da42 Better ressource management on project and task 2014-09-20 10:14:26 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Laurent Destailleur
9379e28a94 Perf: Avoid duplicate load of project 2014-09-18 09:59:29 +02:00
Laurent Destailleur
736320ba47 Fix: Bad property 2014-09-18 09:36:47 +02:00
Marcos GarciÌa de La Fuente
9dbf054026 Removed deprecated usage of project_pdf_create 2014-09-16 20:53:43 +02:00
Marcos GarciÌa de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
19e017a2c1 Merge pull request #1879 from Cubexed/3.6 
-Renamed POST "project" to "projectstart" in fiche.php
 2014-09-14 21:16:51 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Cubexed
8a3bc25029 -Renamed POST "project" to "projectstart" to avoid strange behavior at project start date selector, probably the generic name "project" was interfering with something 2014-09-12 17:21:48 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +02:00
Raphaël Doursenaud
367d225d3e Fixed missing class include for task duplication 2014-09-08 16:13:29 +02:00
Raphaël Doursenaud
c5ccf2998b Fixed forgotten rename 2014-09-08 16:13:03 +02:00
Laurent Destailleur
4a91476be3 Try cut and paste to solve pb on class project. 2014-08-28 12:26:43 +02:00
Laurent Destailleur
fc02f0f08f Fix: No new inside a constructor method. 2014-08-21 23:43:11 +02:00
Frédéric FRANCE
bac870dc3b Update project.class.php 2014-08-15 22:23:23 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Laurent Destailleur
aee35c86d6 Perf: Removed a useless distinct, add indexes. 2014-08-15 02:11:01 +02:00
Laurent Destailleur
5a0c66b9ad Qual: Use getNomUrl for project into list of timesheet. 2014-08-14 13:29:24 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
Laurent Destailleur
4eeb92d082 Fix: Bad help text 
Fix: Removed duplicate header
 2014-08-08 02:11:03 +02:00
Laurent Destailleur
75eb9cadc7 Merge pull request #1809 from KreizIT/fix_1549 
Fix :  [ bug #1549 ] It's not possible add ExtraFields
 2014-08-08 01:52:13 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
bceb72a9d1 Fix: Missing line total 2014-08-08 01:21:57 +02:00
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Laurent Destailleur
c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/projet/class/project.class.php
 2014-08-08 01:09:46 +02:00
Laurent Destailleur
e8ffb0dacf Fix: sql error on editing project with pgsql. 
Fix: Error management on project edit.
 2014-08-08 01:02:59 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:15:18 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +02:00
Laurent Destailleur
1e473839e7 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:06:16 +02:00
Laurent Destailleur
9bc2957257 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:05:42 +02:00
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:50:34 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
b7cb2e6b9d Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:48:19 +02:00
Laurent Destailleur
96b49cfabe Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:08:36 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Maxime Kohlhaas
108cf11c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-24 09:01:54 +02:00
Marcos GarciÌa de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos GarciÌa de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Marcos GarciÌa de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Marcos GarciÌa de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
Laurent Destailleur
7cbee97f6e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
 2014-07-08 20:26:38 +02:00
Laurent Destailleur
0e78e631c1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 20:22:51 +02:00
Laurent Destailleur
0eabf26d27 Fix: Checkstyle 2014-07-08 01:15:59 +02:00
Laurent Destailleur
ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	htdocs/fichinter/fiche.php
 2014-07-08 01:12:55 +02:00
Laurent Destailleur
36e6f9a9fc Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 01:06:17 +02:00
BENKE Charles
4d9f78dc07 getlibstatut added 
Add function getlibstatut and libstatut on task (fk_statut allready present on project_task table)
 2014-07-06 15:06:34 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
KreizIT
e0201535e2 Fix: [ bug #1505, #1504] Project trigger problem 2014-07-03 17:15:42 +02:00
Maxime Kohlhaas
b301c54b7e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-03 08:28:00 +02:00
Marcos GarciÌa de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
BENKE Charles
96876992d4 navigate (next/prev) error on task of project 
use the same showrefnav function setting present in task.php file (who
work fine)
 2014-07-02 04:27:18 +02:00
BENKE Charles
7dca46df57 navigate (next/prev) error on task of a project 2014-07-02 04:24:26 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +02:00
Laurent Destailleur
1db9514fed Fix: When an invoice is replaced with another, amount must not appears 
on total for project
 2014-06-24 22:02:56 +02:00
Maxime Kohlhaas
3269b463bb Fix / New : return on project page after task deletion instead of task list 2014-06-24 15:02:09 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
f0ce92292a Fix: date start/end of project was lost on some tabs. 
Fix: Bad file name for gantt include.
 2014-06-14 14:20:58 +02:00
Laurent Destailleur
e8bca38daf Fix: syntax error 2014-06-14 13:41:15 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Marcos GarciÌa de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos GarciÌa de La Fuente
0ed2481a20 Removed unuseful errors 2014-06-13 01:46:27 +02:00
Marcos GarciÌa de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
1a9e53e21f Fxi: Correct property name 2014-06-12 22:00:16 +02:00
Marcos GarciÌa de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
bb8516274e Fix: socid was not caught. 
Fix: numbering modules was not correctly scanned.
 2014-06-11 18:01:15 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
d41f87acab Fix: Option to limit was not used everywhere. 2014-05-26 01:27:22 +02:00
Laurent Destailleur
3481884731 Fix: A project is linked to a thirdparty (may be a customer, a supplier 
or a prospect).
 2014-05-22 13:20:03 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
3fd7e18c08 Fix: Bad translation into title of action buttons 2014-05-10 17:00:55 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Laurent Destailleur
62537cf5a4 Fix: translation 2014-05-09 13:39:10 +02:00
Laurent Destailleur
8bf1fde598 New: Can set page to use for getNomUrl of project. 2014-05-09 13:21:10 +02:00
Laurent Destailleur
c0af0c3b52 Fix: translation 2014-05-08 20:29:16 +02:00
Laurent Destailleur
5923a754d1 New: Add hooks for project card 2014-05-08 20:02:34 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Florian HENRY
45e134bfef Better error return for project delete method 2014-05-07 15:11:46 +02:00
Florian HENRY
3f22bc7009 Better error management in delete project method 2014-05-07 15:08:44 +02:00
Florian HENRY
e6708a5072 Fix error return project deletion 2014-05-07 15:05:40 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
Raphaël Doursenaud
d95b5e4a39 Fixed typo 2014-04-22 16:43:19 +02:00
BENKE Charles
c55e51d825 Update project.class.php 2014-04-19 14:59:42 +02:00
BENKE Charles
ebab7a0b62 Update element.php 2014-04-19 13:06:11 +02:00
BENKE Charles
cebbf1607c Update element.php 2014-04-19 13:00:42 +02:00
BENKE Charles
09d231ad0a Update project.class.php 2014-04-19 12:36:15 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
6f40825270 Merge pull request #1527 from grandoc/3.5 
translation and cleaning
 2014-04-09 00:31:57 +02:00
Laurent Destailleur
60b37dffe1 Fix: [ bug #1323 ] generation of odt files for tasks. 2014-04-09 00:07:32 +02:00
Laurent Destailleur
4e619c42fa Fix: [ bug #1340 ] Erreur de langage dans les projets 2014-04-08 23:56:10 +02:00
Grand Philippe
fe49f55a48 fix from forum 2014-04-07 11:01:11 +02:00
Laurent Destailleur
da0aebb2e9 Fix: Can't add user 2014-04-05 12:40:24 +02:00
Laurent Destailleur
c7c640f925 Fix: Can't add user 2014-04-05 12:38:59 +02:00
Laurent Destailleur
f3bbf54447 Fix: [ bug #1307 ] Quotes get removed from several inputs 2014-04-02 11:52:09 +02:00
Laurent Destailleur
c2b7e40aa1 Merge pull request #1507 from GPCsolutions/3.5-taskswithtime 
Project: make tasks accept a time
 2014-03-27 15:56:26 +01:00
Florian Henry
f93df7f3da remove debug string 2014-03-26 10:09:29 +01:00
Florian Henry
3d12979b3f remove debug string 2014-03-26 09:53:48 +01:00
Raphaël Doursenaud
7d0853d9e5 Removed debug code 2014-03-25 11:36:22 +01:00
Raphaël Doursenaud
d9cb1da4d5 Project: make tasks accept a time 2014-03-24 15:26:36 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
8cf3d258f4 Fix: Bug into calculation of total of time for tasks 2014-03-17 15:13:24 +01:00
Laurent Destailleur
58add21719 Merge pull request #1488 from atm-maxime/mko1300 
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
 2014-03-16 20:26:57 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Maxime Kohlhaas
fe767606da New PHPUnit test on project + clean initAsSpecimen 2014-03-16 13:55:32 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and 
download fails).
 2014-03-14 02:07:54 +01:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor 
Minor style and translation corrections
 2014-03-13 11:53:52 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
e76f2170b3 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:49:11 +01:00
Laurent Destailleur
4a983811d0 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:43:31 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management 
Conflicts:
	htdocs/core/lib/project.lib.php
 2014-03-11 20:53:47 +01:00
Laurent Destailleur
afca98323b Fix: Miscellaneous bugs on tasks management 2014-03-11 20:38:29 +01:00
Marcos GarciÌa de La Fuente
b80c93d277 Added missing info tooltip for project document models 2014-03-11 13:15:14 +01:00
Marcos GarciÌa de La Fuente
64e76852c5 Corrected projects admin page translation 2014-03-11 11:37:42 +01:00
Laurent Destailleur
6860ae84b9 Avoid browser to hang by adding PROJECT_MAX_NB_TASKS. 2014-03-11 09:48:45 +01:00
Laurent Destailleur
932b421d1d Merge remote-tracking branch 'origin/3.5' into develop 2014-03-11 09:46:51 +01:00
Laurent Destailleur
c9edced656 - New: Add filter on project status into task list. By default, only 
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
 2014-03-11 09:43:26 +01:00
Laurent Destailleur
97677f08a9 Fix: Add protection to avoid memory hung 2014-03-10 01:49:44 +01:00
Laurent Destailleur
2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
 2014-03-08 14:25:59 +01:00
Léo
aeaf4bf5f8 Update index.php from Project folder 
A trailing "quote" sign was causing a problem with the link generation of href in the recap table on dashboard.
 2014-03-04 02:29:18 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Alexis Algoud
9de372d4b1 debug planned_workload loosing value on error 2014-03-02 17:33:51 +01:00
Laurent Destailleur
6662f8b5a3 Fix: Bad picto for project setup page 2014-02-28 21:54:50 +01:00
BENKE Charles
42ffb4b3e7 Update project.class.php 
escape ref of project if as ' is typed inside as ref (crazy user)
 2014-02-21 22:39:45 +01:00
Laurent Destailleur
b4977cd542 Fix: Bad permission var 2014-02-12 12:52:31 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335 Fix: Missing vars and bar id. 2014-02-04 20:41:23 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
Grand Philippe
b61ccb8234 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:15:07 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
7fd34e5ff6 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
 2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
 2014-01-06 12:42:50 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 18:14:19 +01:00
Laurent Destailleur
f207aabe7a Fix: When editing thirdparty, result is not refreshed 2013-12-01 18:13:57 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
039bd5b4c8 checkstyle 2013-11-06 10:20:11 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Laurent Destailleur
922929fffb Fix: Missing column 
Fix: Line was not added correctly
Fix: Missing message
 2013-11-05 11:17:54 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
d5d252dada Fix: [ bug #1077 ] Project card does not update vinculated third when 
modified upon refresh
 2013-10-23 18:35:18 +02:00
Laurent Destailleur
fe4df6770a Fix: [ bug #1077 ] Project card does not update vinculated third when 
modified upon refresh
 2013-10-23 18:26:18 +02:00
Laurent Destailleur
3a46348988 Fix: checkstyle 2013-10-20 14:31:08 +02:00
Florian Henry
9555cb35f0 Add project clone option : copy project files, copy task files 2013-10-19 17:51:21 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
7681c60f6b Silly assignment was a bug 2013-09-05 17:22:51 +02:00
Raphaël Doursenaud
9046d620e1 Avoid using the same var as outer loop 2013-09-05 17:15:06 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management 
for project.
 2013-07-30 19:08:58 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
BENKE Charles
6ffaefc002 Update element.php 
Display of project element limited by user rights
 2013-07-23 05:49:30 +02:00
Laurent Destailleur
e80583bfb7 Fix: W3C 2013-07-23 01:56:14 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Florian Henry
8a6a3fc9f4 Continue normalizing project html.formprojet.class.php 2013-06-17 14:25:33 +02:00
Florian Henry
f2e2815cc1 Merge branch 'develop' into dev_projecthtmlform 2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Florian Henry
2704ba5f36 Fix bug on attach element in element.php (simply not work before...) 2013-06-13 18:11:23 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Christophe Battarel
b8c51e3760 sort tasks by start date 2013-05-25 11:49:05 +02:00
Christophe Battarel
b89b7405f8 update function comments header 2013-05-23 22:54:06 +02:00
Christophe Battarel
b96bff4770 [ bug #806 ] Tasks are ordered alphabetically instead of chronological order 2013-05-23 22:51:27 +02:00
fhenry
be525ad0e8 Better code quality for [ task #531 ] Add a duration on tasks 2013-05-15 14:19:16 +02:00
fhenry
b280bff809 Update comments0 2013-05-14 20:33:56 +02:00
fhenry
7de861eee4 Beteer display 2013-05-14 20:30:18 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Marcos GarciÌa
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00
fhenry
8c37063541 Fix bug [ bug #881 ] some errors 2013-05-07 18:59:28 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
7e47b37ade Fix [ bug #788 ] Date of linked interventions are not shown 2013-05-02 13:56:14 +02:00
fhenry
0b8d78c4f6 [ bug #865 ] Dolibarr navigation array in project/task do not work 
Conflicts:
	htdocs/projet/fiche.php

Change-Id: I7607f97d21cc695c9b295d94f5abcb64fe25f3af
 2013-04-30 18:23:44 +02:00
fhenry
59f218ab42 [ bug #865 ] Dolibarr navigation array in project/task do not work 2013-04-30 16:00:30 +02:00
Laurent Destailleur
1e9157603d Merge pull request #900 from defrance69/patch-3 
Update project.class.php
 2013-04-29 10:27:55 -07:00
BENKE Charles
d9363f441a Update project.class.php 
Add feature to add element in elements page of a project
 2013-04-29 13:02:58 +03:00
BENKE Charles
830aff99e4 Update element.php 
add feature: join element from element page
 2013-04-29 12:54:29 +03:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Juanjo Menent
2d9da0c4cf Merge pull request #848 from GPCsolutions/note 
Note update fixes batch
 2013-04-20 00:43:05 -07:00
Raphaël Doursenaud
13c48d4970 Fixed more private note updates 2013-04-20 06:43:14 +02:00
Raphaël Doursenaud
a564edbb87 Fixed private note update 2013-04-20 06:43:14 +02:00
Raphaël Doursenaud
e3610dfa49 Forgotten update_note parameter 
Fixes project cloning
 2013-04-20 05:53:18 +02:00
Laurent Destailleur
ac8868e2d2 Fix: Use correct format for js 2013-04-18 19:56:14 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
 2013-04-14 09:40:01 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
b5751ab658 Add copyright 2013-03-25 19:31:17 +01:00
fhenry
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
BENKE Charles
5ad98a8652 Update index.php 
rename search_product by search_project (the real search thing)
 2013-03-01 00:56:29 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
4f9f32eb3e english language standardization 2013-02-23 16:37:17 +01:00
simnandez
ad91eab0ac [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Uniformize propal code (not use addpropal.php)
 2013-02-02 18:31:45 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
a1282f5236 Fix: Navigation into projects 2013-01-10 16:04:23 +01:00
Laurent Destailleur
53df0766cb Fix: Translation 2013-01-08 18:47:40 +01:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Laurent Destailleur
8b7342f0ea New: Project notes use the note.tpl templates 2012-09-19 16:03:17 +02:00
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Laurent Destailleur
1275a41244 New: Start to work on position of tasks into a project 2012-09-07 00:14:50 +02:00
Laurent Destailleur
83ab8c05e2 New: More surface control into project edition 2012-08-31 14:31:36 +02:00
Laurent Destailleur
6709d3d377 Fix: moving date of task when moving date of project was not working 2012-08-31 14:31:08 +02:00
Laurent Destailleur
27846d1698 Fix: Start and end date not saved at project creation 
Conflicts:
	htdocs/projet/class/project.class.php
 2012-08-31 12:55:10 +02:00
Marcos GarciÌa
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00
Marcos GarciÌa
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos GarciÌa
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos GarciÌa
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Regis Houssin
74c1fa2263 Fix: bad rights 2012-08-18 10:52:10 +02:00
Regis Houssin
add63c7320 Merge pull request #321 from marcosgdf/minor 
Project::setClose wasn't setting the new status
 2012-08-17 22:28:39 -07:00
Marcos GarciÌa
4842da5679 Project::setClose wasn't setting the new status 2012-08-18 05:57:25 +02:00
Marcos GarciÌa
f7a7ca4ff2 Fixed a bug where files were not being uploaded to a project's task 
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto
 2012-08-18 04:09:28 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Laurent Destailleur
040c675de6 Fix: Do not overwrite global $user information 2012-08-07 14:54:56 +02:00
Laurent Destailleur
1307c77900 Fix: Project validation 2012-08-03 19:05:20 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of 
message
 2012-07-29 08:26:33 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links 
Created BackToList links
 2012-07-28 13:15:42 -07:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos GarciÌa
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
Marcos GarciÌa
241241bf0a Fixed some problems with translations 2012-07-28 17:34:21 +02:00
Regis Houssin
b83fbf981d Fix: problem with double quote 2012-07-26 14:33:25 +02:00
Regis Houssin
d5ff308992 Fix: declare $mesg and $mesgs in main.inc.php 
Fix: strict mode be back
 2012-07-23 20:52:55 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Regis Houssin
6f1651309e Fix: global converting lines delimiter 2012-07-02 19:30:37 +02:00
Laurent Destailleur
50719271c0 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-06-09 19:33:52 +02:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Regis Houssin
b51cd362b0 Fix: problem with external modules and uniformize code 2012-06-09 18:40:36 +02:00
Laurent Destailleur
f11508a09e Fix: an url must be with url escape format. 2012-06-01 10:12:28 +02:00
Regis Houssin
274734b828 Fix: stock message in session and reload the page for avoid url problem 
with jQuery fileupload
 2012-05-31 21:11:26 +02:00
Laurent Destailleur
c2db3265ec Fix: Regression with quot management. Try a better fix. 2012-05-30 12:43:23 +02:00
Regis Houssin
a5b0de15ac Fix: can't delete a files with quote 2012-05-30 08:30:25 +02:00
Laurent Destailleur
3fc3292142 Fix: delete of documents is done by page of element, not by the view 
wrapper.
 2012-05-29 23:50:13 +02:00
Regis Houssin
516be43404 Fix: jquery fileupload broken feature 2012-05-25 20:56:05 +02:00
Laurent Destailleur
c87af887ea Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-05-23 23:24:32 +02:00
Laurent Destailleur
5c995a421c Merge pull request #210 from FHenry/develop 
Correct start date and end date to be midnight rather than midday
 2012-05-23 05:37:08 -07:00
Laurent Destailleur
1fec3b56d9 Fix: Permissions to see project 
Conflicts:
	htdocs/projet/fiche.php
 2012-05-23 14:34:44 +02:00
Laurent Destailleur
c6c9861bff Fix: bug on projects visibility for external users 2012-05-23 13:09:36 +02:00
FHenry
dfebf31c02 Correct strat date and end date to be midnight rather than midday 2012-05-22 12:54:13 +02:00
Laurent Destailleur
16b1655ad5 Fix: Width of gantt chart 2012-05-07 18:00:53 +02:00
Laurent Destailleur
8c6570718d Fix: Better fix for gant view 2012-05-07 17:11:40 +02:00
Laurent Destailleur
792c0a33f3 Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 17:04:35 +02:00
Regis Houssin
af7dc508cd Fix: [Bug #384] Gantt doesn't display beyond 20 tasks 2012-05-07 09:58:44 +02:00
Laurent Destailleur
6599f2d755 Checkstyle 2012-05-06 00:15:03 +02:00
Regis Houssin
00b65d42e4 Fix: [bug #385] Can't delete a task 2012-05-05 09:28:06 +02:00
Regis Houssin
1b350fafd1 Fix: missing entity field in contract 
Fix: multicompany compatibility
 2012-05-03 18:42:46 +02:00
Regis Houssin
73487a6aec Fix: replace mktime() by dol_now() 2012-04-30 15:01:25 +02:00
FHenry
7aada2c442 correct debug code and alfa 2012-04-30 13:13:10 +02:00
FHenry
4fd00c50be Feature Clone project (357) 
Fix variable date property name, to be compliant with varaible naming
convention (create)
Add feature to shift task date when change project start date (option)
Add project start/end date on Project->Task View
 2012-04-30 13:13:09 +02:00
FHenry
1aece03b6b Set same space than develop branch 2012-04-27 11:09:53 +02:00
FHenry
073e06ab8f Feature Clone project (357) and other tricks 
Fix variable date property name, to be compliant with variable naming
convention (create)
Add feature to shift task date when change project start date (option)
Add project start/end date on Project->Task View
 2012-04-27 11:03:01 +02:00
Regis Houssin
bd0464b4db Merge pull request #174 from FHenry/develop 
Remove Eclipse Warning (Undeclare variable)
 2012-04-25 09:26:40 -07:00
FHenry
07bff417e8 remove useless line 2012-04-24 16:15:46 +02:00
Laurent Destailleur
afb79d5d2c Fix: [ bug #367 ] "Multi-tiers" fonctionality inverted in project 
contacts.
 2012-04-21 19:45:25 +02:00
Laurent Destailleur
010f19d531 Fix: upload dir 2012-04-20 09:45:16 +02:00
Laurent Destailleur
4ac9947772 Fix: project info are not lost when submiting actions on tasks 2012-04-18 12:15:14 +02:00
FHenry
300b0e02da Fix: Bug #362 and clean code 2012-04-18 11:16:15 +02:00
Laurent Destailleur
66531ea539 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/fourn/commande/index.php
 2012-04-16 12:03:33 +02:00
Laurent Destailleur
9114fec4ed Doxygen 2012-04-16 12:01:32 +02:00
Regis Houssin
a03b216c63 Fix: remove unnecessary function 2012-04-16 11:39:51 +02:00
Laurent Destailleur
b23bbc2432 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git 
into develop

Conflicts:
	htdocs/projet/class/task.class.php
 2012-04-15 18:49:09 +02:00
Regis Houssin
48543a0d2f Fix: sorry it's ok 2012-04-15 18:33:14 +02:00
Laurent Destailleur
ef79c1ba21 Fix: commit at wrong place 2012-04-15 18:18:46 +02:00
Regis Houssin
057103902b Fix: you can not delete project document folder in delete task method 2012-04-15 18:17:55 +02:00
FHenry
bf8389144a correct bug 364 2012-04-15 17:51:05 +02:00
FHenry
d66eb5bb23 Corect bug #364 2012-04-15 17:50:50 +02:00
FHenry
cac4d0da6b Correct bug 363 2012-04-15 17:50:40 +02:00
FHenry
d7ae9db463 Correct bug #363 2012-04-15 17:50:26 +02:00
Regis Houssin
e49df57667 Fix: compatibility with php 5.4 and E_STRICT mode 2012-04-14 15:04:46 +02:00
Laurent Destailleur
f52a07eee5 Minor look fix, fix into ecm module when dir does not exists 2012-03-26 18:23:08 +02:00
Laurent Destailleur
ab6c1a5160 Qual: Add new PHPUnit test and fix bugs the test show me 2012-03-21 12:33:51 +01:00
Laurent Destailleur
99d740fd2f New: [ task #285 ] Add search filter on project in tasks list. 2012-03-19 14:44:27 +01:00
Laurent Destailleur
59bef9caa1 Qual: Uniformize code to use new note system. 2012-03-18 02:01:23 +01:00
Laurent Destailleur
a7a55645d8 Fix: Some fix when using fckeditor with notes. 
Qual: Uniformize code to use new system for notes.
Qual: Removed duplicate updatenote method into commandefournisseur
class.
 2012-03-18 00:59:24 +01:00
simnandez
2e9ef6f49a Fix: Missing translation 2012-03-09 17:21:53 +01:00
Laurent Destailleur
2819e72084 Doxygen 2012-03-09 09:38:31 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Regis Houssin
8f9b9987ff Fix: Multiple directory traversal vulnerabilities with document.php 2012-02-27 17:02:56 +01:00
Laurent Destailleur
58d1a042a5 Fix: print select_societe was wrong as it contains already print 
instructions. Use select_company instead.
 2012-02-20 12:41:12 +01:00
Laurent Destailleur
c4b845d60a Qual: Removed deprecated function name. 2012-02-19 18:34:22 +01:00
Laurent Destailleur
8f56d2d798 Fix: Show project when task is view as a standalone card. 2012-02-15 23:27:03 +01:00
Laurent Destailleur
c614c7d84a Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-02-15 23:11:22 +01:00
Laurent Destailleur
9eb92b17ec New: Increase usability of module project. 2012-02-15 23:08:20 +01:00
Regis Houssin
3df693738b Fix: missing entity 2012-02-16 02:47:26 +08:00
Laurent Destailleur
56f7196aa2 Qual: Normalize function name 2012-02-15 13:55:00 +01:00
Laurent Destailleur
55f6cdd495 Qual: Removed warnings 2012-02-07 10:25:58 +01:00
Laurent Destailleur
62054f2f98 Fix: A lot of fix into project permissions. Uniformize code. 2012-02-04 18:34:52 +01:00
Laurent Destailleur
f3a966a313 Fix: Missing name 2012-01-29 23:24:47 +01:00
Regis Houssin
c155ab10b4 Fix: uniformize code 2012-01-25 11:05:15 +01:00
Laurent Destailleur
9df57875ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2011-12-07 10:50:04 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
ffaf4e5465 Fix: fix not initialized variables 2011-12-05 19:03:36 +01:00
Laurent Destailleur
c1658da5d8 Fix: Removed deprecated attributes 2011-12-05 01:03:17 +01:00
Laurent Destailleur
a780f79e15 Fix: W3C 2011-12-04 15:26:32 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
c16c09a451 Qual: Mutualize code to delete previews 2011-11-04 00:27:30 +01:00
Laurent Destailleur
7f0cca8fb9 Look: Enhancements into themes. 2011-11-03 01:59:13 +01:00
Laurent Destailleur
253a21eb33 Perf: Little optimization 2011-11-02 22:41:34 +01:00
Laurent Destailleur
d7f90877bc Fix: Close db connexion 2011-10-31 01:00:35 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
eldy
02ebcdfed2 New: Add label of project with ref on element pages 2011-10-09 20:12:05 +02:00
Laurent Destailleur
be6286c4b8 Qual: More POO. 
Qual: Doxygen
 2011-09-20 17:19:46 +00:00
Laurent Destailleur
b2c2adf307 Qual: Removed errors 2011-09-20 16:20:22 +00:00
Laurent Destailleur
0661264947 Qual: Removed codesniffer errors 2011-09-20 15:59:46 +00:00
Regis Houssin
6c4acefd93 Fix: Space before opening parenthesis of function call prohibited 2011-09-20 12:56:06 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Laurent Destailleur
3e394189e7 Qual: Uniformize code 2011-09-14 12:47:51 +00:00
Laurent Destailleur
b8a377fa8f Doxygen 2011-09-12 17:43:31 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
e9b113ade8 Qual: Mutualize some code 
Fix: Missing begin
Fix: Removed functions returning database cursor
 2011-08-14 03:13:50 +00:00
Laurent Destailleur
3f2e6bbf82 Qual: Removed dead code 2011-08-14 02:11:15 +00:00
Laurent Destailleur
048eab3eb8 Fix: Bad doxygen description 2011-08-08 16:00:16 +00:00
Laurent Destailleur
27ede66991 Fix: Use correct style for left tables 2011-08-08 15:28:00 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Juanjo Menent
aafc56e7f4 Proyects: Add Total time to tasks tables 2011-07-14 15:37:37 +00:00
Laurent Destailleur
e2b18d565a Fix: Bad order on documents pages 2011-07-06 20:56:48 +00:00
Laurent Destailleur
0693391519 Fix: pgql compatibility 2011-07-04 10:56:12 +00:00
Laurent Destailleur
4a92f4bc02 New: Project creation page has a cancel button 2011-07-04 08:00:52 +00:00
Laurent Destailleur
37651e9ce8 Fix: Description of task was missing into objects 2011-06-25 10:55:11 +00:00
Laurent Destailleur
87cc1cc578 Fix: Regression of return code 2011-06-19 21:00:40 +00:00
Laurent Destailleur
78a939d032 New: Add help 2011-06-13 14:29:05 +00:00
Laurent Destailleur
ea26c7a4c4 Can remove a project if project has task. 2011-05-18 12:33:38 +00:00
Laurent Destailleur
af0a8fccc8 Can remove a project if project has task. 2011-05-18 12:20:34 +00:00
Laurent Destailleur
9d903a709e Fix: Don't loose dates if creation fails 2011-05-18 11:55:41 +00:00
Laurent Destailleur
fc742e482c Fix: Don't loose dates if creation fails 2011-05-18 11:54:05 +00:00
Regis Houssin
827eed5d39 Fix: delete deprecated code 
Fix: change select_contact for view exclude contcat in grey mode
 2011-04-26 13:49:41 +00:00
Laurent Destailleur
97f15ddec4 Fix: Bad filter 2011-04-19 23:34:29 +00:00
Laurent Destailleur
ccbc95eb2a Fix: Bad filter 2011-04-19 23:21:10 +00:00
Laurent Destailleur
3a3429c4bb Qual: Removed deprecated param 2011-04-19 23:03:28 +00:00
Laurent Destailleur
c896bf2386 Fix: Use time 2011-04-19 22:46:28 +00:00
Laurent Destailleur
416e37571a Fix: total amount 2011-04-14 23:24:34 +00:00
Laurent Destailleur
e9f4879245 Qual: Prepare move of function dol_delete_file into file.lib.php 2011-03-09 15:34:57 +00:00
Regis Houssin
aba9bb9acd Fix: compatibility with pgsql, replace all addslashes by $db->escape in other files 2011-02-24 18:22:24 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
638cb105df Fix: HTML tags must be escaped 2011-02-18 10:45:38 +00:00
Laurent Destailleur
7e1e28f0d8 Fix: Wrong order of name/firstname 2011-02-09 18:27:56 +00:00
Laurent Destailleur
60aa363a91 Ergo: Add option "MAIN_DISABLEDRAFTSTATUS" to reduce nb of clicks 2011-02-09 14:45:42 +00:00
Laurent Destailleur
71f00ce669 New: Add net and without tax price of project referrer page. 2010-12-18 11:29:42 +00:00
Laurent Destailleur
6846333ec8 New: Function dol_now('tzuser') is now supported. 2010-12-08 13:13:17 +00:00
Laurent Destailleur
cc93d642e0 Fix: Date was not always visible 2010-12-01 23:42:39 +00:00
Laurent Destailleur
adfb9ea341 Sec: Removed security holes 2010-11-20 13:08:44 +00:00
Laurent Destailleur
0d14009f4b Fix: Project navigation forgot some project when permission see all was on 2010-11-11 12:16:55 +00:00
Laurent Destailleur
b766ab6832 Qual: Removed completey scriptaculous and prototype 2010-11-07 13:07:21 +00:00
Regis Houssin
eafca74fe8 Fix: add error message 
Fix: delete obsolete action
 2010-11-07 07:41:18 +00:00
Regis Houssin
a93e38d111 Fix: add error message 
Fix: delete obsolete action
 2010-11-07 07:41:18 +00:00
Regis Houssin
dffd371ca4 Fix: only one records in database 2010-11-07 07:28:23 +00:00
Regis Houssin
fcb24424d3 Fix: only one records in database 2010-11-07 07:18:16 +00:00
Regis Houssin
4e12effab1 Fix: add patch of Franois LEGASTELOIS 2010-11-06 20:55:52 +00:00
Regis Houssin
a58ae14d8f Fix: search company with jQuery - ok 2010-10-10 18:04:28 +00:00
Laurent Destailleur
46ad8917ad Perf: A little speed enhancement on document tabs. 2010-10-03 15:50:34 +00:00
Laurent Destailleur
472ba33b68 Fix: Project id is a link 2010-10-02 12:05:15 +00:00
Laurent Destailleur
47288c77da Fix: Maxi debug of project permissions 2010-09-18 13:38:43 +00:00
Regis Houssin
683fcb75c4 Qual: big uniformize code 2010-09-09 14:25:58 +00:00
Regis Houssin
7e70aaa2f0 Works on migration management positioning lines 
rang is not implemented in project task for the moment
 2010-09-06 16:51:05 +00:00
Laurent Destailleur
e7506405c8 Qual: Code is now simpler using jQuery. Removed rubbish javascript. 2010-09-06 10:18:31 +00:00
Laurent Destailleur
7a6dcd287f Trad 2010-08-30 21:46:21 +00:00
Philippe Grand
b6d0f859af task #6689, strlen problem 
replace  strlen with dol_strlen
 2010-08-24 19:51:56 +00:00
Laurent Destailleur
e804a9949e Fix: Cancel button go on nowhere 2010-08-23 19:15:51 +00:00
Laurent Destailleur
84234633b7 Fix: Project is preselected when creating a task 2010-08-23 19:03:53 +00:00
Laurent Destailleur
f027e0dc1b Fix: Missing trad 2010-08-20 16:05:07 +00:00
Laurent Destailleur
665aefe75e Fix: Error management if javascript disabled. 2010-08-19 20:36:01 +00:00
Laurent Destailleur
8fa175f3e9 Fix: Restore feature broken with renaming 2010-08-19 20:29:55 +00:00
Regis Houssin
2c4a56771f Fix: $optiontype not used 
Fix: select_array is deprecated
 2010-08-19 15:20:25 +00:00
Laurent Destailleur
da445d8502 Removed add of jquery as it is now always included. 2010-08-18 19:29:41 +00:00
Laurent Destailleur
5f1310a325 Fix: Error in download attached file on project 2010-08-14 02:22:34 +00:00
Laurent Destailleur
1785f5fe0e Fix: Postgresql compatibility 2010-08-14 02:08:49 +00:00
Laurent Destailleur
ef043984b9 Fix: Usage of numbering project ref 2010-08-12 18:52:34 +00:00
Laurent Destailleur
5affcd3b3f Qual: Renamed french field "envente" into "tosell". 2010-08-11 18:35:31 +00:00
Regis Houssin
aa62559812 Fix: fetch_client is deprecated 2010-08-06 13:56:25 +00:00
Laurent Destailleur
5da647ccad Fix: Doxygen 2010-07-27 22:38:28 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Laurent Destailleur
7ba8be7b02 Fix: List of users affected to a task 2010-07-11 13:21:28 +00:00
Laurent Destailleur
eb4ee0d42d Fix: Some fix in project referrers page. Add also third party in a column. 2010-06-28 21:26:36 +00:00
Laurent Destailleur
94c46d2a5e Fix: Gantt view 2010-06-26 00:23:18 +00:00
Laurent Destailleur
7d93be786b Fix: Permission on projects 2010-06-24 21:27:19 +00:00
Laurent Destailleur
3e767382e8 Fix: Removed not translated combo box. 2010-06-24 21:10:43 +00:00
Laurent Destailleur
f50c69f600 Fix: Switch mytask-alltasks 2010-06-07 17:39:19 +00:00
Laurent Destailleur
6dc8d0e390 Reorganize class files. 2010-06-05 15:20:09 +00:00
Laurent Destailleur
7813ef32ea Fix: A lot of bugs in project permission 2010-05-30 21:07:47 +00:00
Laurent Destailleur
4cd49aecea Fix: A lot of bugs in project permission 2010-05-30 20:44:47 +00:00
Laurent Destailleur
3c4aa3b085 Fix: A lot of bugs in project permission 2010-05-30 20:25:08 +00:00
Laurent Destailleur
a7c809d0dd More fix on project permission. 
There is still errors on task (too many task shown) but project lists are ok.
 2010-05-30 12:21:32 +00:00
Laurent Destailleur
d4e693af3b Fix: Fix a lot of permissions on project module 2010-05-28 23:26:08 +00:00
Laurent Destailleur
e7438320e3 Add resources in gantt 2010-05-23 22:07:24 +00:00
Laurent Destailleur
920706e9b4 Fix: If user has no permission to see all projects, see only its projects 2010-05-23 21:03:09 +00:00
Laurent Destailleur
8044300ef7 Work on gantt view. 2010-05-23 20:37:28 +00:00
Laurent Destailleur
ba908ed743 Fix: If user has no permission to see all projects, see only its projects 2010-05-23 20:01:10 +00:00
Laurent Destailleur
52e9105234 Fix: If user has no permission to see all projects, see only its projects 2010-05-23 18:51:03 +00:00
Laurent Destailleur
ad8ab9c7fd New: Add gantt diagramm om project module 2010-05-23 10:20:35 +00:00
Regis Houssin
277c273767 Fix: bad link 2010-05-22 18:35:43 +00:00
Laurent Destailleur
8bdbf014e4 New: Add experimental gant diagramm for project module 2010-05-22 16:53:36 +00:00
Laurent Destailleur
e18abef970 Add start and end date into return array that list tasks 2010-05-22 14:18:51 +00:00
Laurent Destailleur
da9c1a13f4 Fix: Remove useless /div 2010-05-22 14:17:38 +00:00
Laurent Destailleur
7365a16d60 Merge tab "tasks" and "mytasks". Now it is just a link to switch on page. 2010-05-22 10:20:28 +00:00
Laurent Destailleur
0f7fba3f29 Fix: List to get project 2010-05-17 00:16:40 +00:00
Laurent Destailleur
426317a355 Qual: Removed deprecated method 2010-05-09 15:15:10 +00:00
Laurent Destailleur
d2c92b91de Fix: Bad parameters 2010-05-09 15:04:16 +00:00
Laurent Destailleur
8374bf42bb Rename static object 2010-05-09 14:55:49 +00:00
Philippe Grand
a981577553 according to new tree directory 2010-05-03 08:43:32 +00:00
Philippe Grand
32025de202 according to new tree directory 2010-05-03 08:22:35 +00:00
Laurent Destailleur
968addfad3 Fix: Better error management in upload files 2010-05-01 14:28:48 +00:00
Regis Houssin
39701fc5e6 Fix: rights error 
Todo: uniformiser les noms de modules, leur repertoire et leurs droits
 2010-04-30 07:16:18 +00:00
Regis Houssin
a9eb2a9da9 Add a common function to delete the linked contact 2010-04-30 05:51:23 +00:00
Regis Houssin
ff0bbd1c43 Fix: move class to class directory 2010-04-30 05:48:16 +00:00
Philippe Grand
b749e6bdcf according to new tree directory 2010-04-29 14:34:21 +00:00
Regis Houssin
e4ea54f315 Fix: move class to class directory 
Fix: mutualize code
 2010-04-28 17:30:59 +00:00
Philippe Grand
3f4bee1f18 according to new tree directory 2010-04-28 12:53:28 +00:00
Philippe Grand
911c57b951 according to new tree directory 2010-04-28 12:24:06 +00:00
Philippe Grand
b6bc9223df according to new tree directory 2010-04-28 10:33:16 +00:00
Philippe Grand
b68a359265 according to new tree directory 2010-04-28 10:02:54 +00:00
Philippe Grand
faf19c91ae according to new tree directory 2010-04-28 08:35:57 +00:00
Philippe Grand
388470d146 according to new tree directory 2010-04-28 07:55:43 +00:00
Philippe Grand
009b251d52 according to new tree directory 2010-04-27 08:13:42 +00:00
Philippe Grand
c418128a07 according to new tree directory 2010-04-25 14:17:39 +00:00
Philippe Grand
4cdf6d0bae according to new tree directory 2010-04-25 14:17:39 +00:00
Philippe Grand
99a19b2cbf according to new tree directory 2010-04-25 12:55:26 +00:00
Laurent Destailleur
08145dd2dd Fix: Contacts in task list must be limited to contact linked to project 2010-04-24 17:23:35 +00:00
Laurent Destailleur
4bdfaf4c7c Fix: Missing global 2010-04-24 13:43:37 +00:00
Laurent Destailleur
e86d33e008 Fix: Contacts in task list must be limited to contact linked to project 2010-04-24 13:39:16 +00:00
Regis Houssin
335c038dd8 Fix: regression 2010-04-21 22:14:11 +00:00
Regis Houssin
621bd68e3b Fix: workflow module is enabled by default 
Fix: integration of triggers in the workflow module
!!! we now call "call_workflow" instead of "run_triggers" !!!
 2010-04-21 16:29:37 +00:00
Laurent Destailleur
6f337fcd41 Fix: Missing include 2010-04-17 14:49:27 +00:00
Regis Houssin
73f216fd89 Fix: rename $class to $classname to prevents problems 
http://www.manuelphp.com/php/reserved.keywords.php
 2010-04-09 07:55:37 +00:00
Philippe Grand
011ea91f81 move interfaces class to core directory 2010-04-08 13:09:00 +00:00
Philippe Grand
57ae19fc71 Move file actioncomm.class.php to comm/action directory 2010-04-01 07:51:59 +00:00
Philippe Grand
78b9faca85 move class file commonobject to core directory 2010-03-29 16:40:57 +00:00
Laurent Destailleur
4ba071958d Fix: Default project ref was wrong 2010-03-26 22:11:46 +00:00
Philippe Grand
3ce3c74ba7 Move facture class file to compta/facture directory 2010-03-26 15:45:01 +00:00
Philippe Grand
a56832d521 move contact class file to contact directory 2010-03-25 13:51:24 +00:00
Philippe Grand
497c2a9204 move file class propal to comm/propal directory 2010-03-23 20:53:15 +00:00
Laurent Destailleur
435922ae37 New: Can link trips and expenses to a project. 2010-03-21 14:01:39 +00:00
Laurent Destailleur
4249291d4b Fix: Minor change in look of project 2010-03-18 19:51:50 +00:00
Laurent Destailleur
358c43c46f Fix: Show tasks in project PDF 2010-03-18 19:33:57 +00:00
Laurent Destailleur
465cc90759 Fix W3C errors in page forging 2010-03-15 23:54:37 +00:00
Laurent Destailleur
8980d9acc2 Move permission "see hidden categories" into "see hidden products/services". 2010-03-12 23:40:39 +00:00
Regis Houssin
6822a1b18b Fix: uniformise and clean code 2010-03-11 14:31:16 +00:00
Regis Houssin
2dc31fa613 Fix: uniformise and clean code 2010-03-11 10:40:58 +00:00
Regis Houssin
92cfaa42d3 Fix: uniformise code 
Fix: prepare to compatibility with other module
 2010-03-11 10:25:55 +00:00
Regis Houssin
36ab2be4da Works on enhancement of project module 
Fix: add triggers
 2010-03-05 11:30:22 +00:00
Regis Houssin
b7201c5c5d Add task progress in list 2010-03-04 09:04:36 +00:00
Regis Houssin
f4cbec0c8f Add confirm window when delete a file 2010-03-03 14:51:37 +00:00
Regis Houssin
39a1fc5be2 Fix: code more clean 2010-03-02 19:32:13 +00:00
Regis Houssin
ff47f37996 Add document tabs in project and task cards 2010-03-02 19:18:25 +00:00
Regis Houssin
a5ea5f2617 Add document tabs in project and task cards (not finished) 
Fix: some bugs
 2010-03-02 17:13:39 +00:00
Laurent Destailleur
edf8434655 Rename function with a more english name. 
Remove duplicated "default" preselected parameter.
 2010-03-02 08:45:49 +00:00
Regis Houssin
2642d924d3 Fix: management of time spent in task card 
Fix: Update time spent in seconds
 2010-03-02 07:52:31 +00:00
Regis Houssin
e51a002c10 Fix: management of time spent in task card 
Fix: Update time spent in seconds
 2010-03-02 07:28:59 +00:00
Regis Houssin
dd588bda19 Fix: management of time spent in task card 
Fix: Update time spent in seconds
 2010-03-01 19:36:58 +00:00
Regis Houssin
4adf45647a Fix: management of time spent in task card 
Fix: Update time spent in seconds
 2010-03-01 16:42:02 +00:00
Regis Houssin
818fec7e6b Qual: First change to remove pre.inc.php 2010-03-01 08:42:10 +00:00
Laurent Destailleur
677b831b24 We store duration of time spent in seconds as this is a more "universal" format. 
Fix some bugs.
 2010-02-28 01:33:12 +00:00
Laurent Destailleur
0686579e30 Fix: Missing condition on project 2010-02-28 00:42:44 +00:00
Laurent Destailleur
8dab53a7bb Fix: Error on adding user as project contact 2010-02-27 23:46:12 +00:00
Laurent Destailleur
f8d798c031 Fix: Error on project creation 2010-02-27 23:42:45 +00:00
Laurent Destailleur
7e25edfe0a Fix: Error on project creation 2010-02-27 23:40:31 +00:00
Regis Houssin
dfd0895925 Fix: management of time spent in task card 2010-02-26 10:37:16 +00:00
Regis Houssin
1f52da3e99 Fix: management of time spent in task card 
Fix: user rights
 2010-02-26 08:45:22 +00:00
Regis Houssin
5b5b95d9d1 Fix: management of time spent in task card 2010-02-25 11:21:06 +00:00
Regis Houssin
52e2fc71dd Fix: management of time spent in task card 2010-02-25 09:44:58 +00:00
Regis Houssin
d3e8f6f3f9 Fix: bad user rights 2010-02-24 15:38:05 +00:00
Regis Houssin
e4188bf026 Fix: bad user rights 2010-02-24 15:26:54 +00:00
Regis Houssin
4d3abb2f1d Fix: management of time spent in task card 2010-02-24 15:04:10 +00:00
Regis Houssin
da2e8dd348 Fix: management of time spent in task card 2010-02-24 14:54:55 +00:00
Regis Houssin
04cd6e919a Fix: management of time spent in task card 2010-02-24 10:57:37 +00:00
Regis Houssin
ca30725757 Fix: management of time spent in task card 2010-02-24 10:30:26 +00:00
Regis Houssin
f2423b654a Fix: management of time spent in task card 2010-02-24 10:30:26 +00:00
Regis Houssin
dd06f2af7e Fix: management of time spent in task card 2010-02-24 10:30:26 +00:00
Regis Houssin
d2dbbca945 Fix: management of time spent in task card 2010-02-24 09:53:16 +00:00
Regis Houssin
21c5d870ae Fix: bad username and view datetext 2010-02-24 09:18:29 +00:00
Laurent Destailleur
bda51b47a6 Fix: A lot of fix in project permissions 2010-02-21 17:01:45 +00:00
Laurent Destailleur
8e675a9c01 A lot of fix in project module 2010-02-21 00:16:47 +00:00
Laurent Destailleur
2fd6e376da Add more clear information for project view 2010-02-20 20:24:09 +00:00
Regis Houssin
6cad2ac1d7 Works on enhancement of project tasks 
Fix: security check
 2010-02-15 10:54:55 +00:00
Laurent Destailleur
b305ab4bdb Fix: Creation of a task 2010-02-15 01:21:47 +00:00
Laurent Destailleur
48f100c068 Fix: Wrong module numbering for project 2010-02-15 00:57:27 +00:00
Laurent Destailleur
3f2ee959f0 Comment code 2010-02-14 23:35:42 +00:00
Regis Houssin
af2a715f62 Works on enhancement of project tasks 
Fix: security check
 2010-02-14 17:34:43 +00:00
Regis Houssin
2ddb3925d4 Works on enhancement of project tasks 
Fix: security check
 2010-02-14 16:54:00 +00:00
Regis Houssin
d8febc7a94 Works on enhancement of project tasks 
Fix: security check
 2010-02-14 15:43:37 +00:00
Regis Houssin
1f71ab2e39 Works on enhancement of project tasks 
Fix: security check
 2010-02-14 15:35:52 +00:00
Regis Houssin
80d808be36 Works on enhancement of project tasks 
Fix: security check
 2010-02-14 07:24:02 +00:00
Regis Houssin
2c58a7f66f Fix: we check whether the task has no sub-task 2010-02-10 16:22:08 +00:00
Regis Houssin
860611c103 Works on enhancement of project tasks 
Fix: security check
 2010-02-10 15:55:29 +00:00
Regis Houssin
5b661dbab9 Works on enhancement of project tasks 
Fix: security check
 2010-02-10 15:48:45 +00:00
Regis Houssin
07e5dc25d4 Works on enhancement of project tasks 
Fix: security check
 2010-02-07 09:49:10 +00:00
Laurent Destailleur
382f11a514 Fix and restore a lot of broken features in the project module. Must try to restore a stable module to start a release. 2010-02-07 02:39:01 +00:00
Laurent Destailleur
ad308ad087 Fix and restore a lot of broken features in the project module. Must try to restore a stable module to start a release. 2010-02-07 02:39:01 +00:00
Laurent Destailleur
8a37c13365 Look: Use style fieldrequired on mandatory fields 2010-02-04 19:54:58 +00:00
Regis Houssin
d418143bde Fix: more simple 2010-02-04 18:18:37 +00:00
Regis Houssin
9854b5ab53 Fix: add function to sort project authorized for a user 2010-02-04 17:54:00 +00:00
Regis Houssin
e6b06fd6b4 Fix: add function to sort project authorized for a user 2010-02-04 17:45:39 +00:00
Regis Houssin
0ded40ad3e Fix: add function to sort project authorized for a user 2010-02-04 17:17:38 +00:00
Regis Houssin
a3c0f4399f Fix: add function to sort project authorized for a user 2010-02-04 16:47:30 +00:00
Regis Houssin
0812ba2536 Works on enhancement of project tasks 
Fix: security check
 2010-02-04 15:30:42 +00:00
Regis Houssin
3f7127839f Works on enhancement of project tasks 
Fix: security check
 2010-02-04 11:23:29 +00:00
Regis Houssin
e0cc389c5d Works on enhancement of project tasks 
Fix: security check
 2010-02-04 11:18:36 +00:00
Regis Houssin
4dba56d640 Works on enhancement of project tasks 
Fix: project public and private
 2010-02-04 11:04:26 +00:00
Regis Houssin
cee5d7873b Works on enhancement of project tasks 
Fix: security check
 2010-02-04 10:40:18 +00:00
Laurent Destailleur
c534a8ffae New: Add property visibility private or public on projects 2010-02-03 22:38:10 +00:00
Laurent Destailleur
93cf727a1c Some fix on project 2010-02-03 22:34:12 +00:00
Regis Houssin
496f305a81 Fix: bad rights for user author 2010-02-03 22:21:46 +00:00
Laurent Destailleur
3ab469f544 Some fix on project 2010-02-03 21:48:16 +00:00
Regis Houssin
ea13df746a Works on enhancement of project tasks 
Add tab "note"
 2010-02-03 16:57:23 +00:00
Regis Houssin
1afda34ad7 Works on enhancement of project tasks 
Add rights for task
 2010-02-02 13:27:59 +00:00
Regis Houssin
9ba7d422ff Works on enhancement of project tasks 
Fix: limit modification to project leader
 2010-02-02 11:34:32 +00:00
Regis Houssin
4ac61b7459 Works on enhancement of project tasks 2010-02-02 11:09:13 +00:00
Laurent Destailleur
1d0a197f85 Add a more simple project numbering module to have always for each module: 
1 simple module with no need to understand masks.
1 generic module with a masks to define.
 2010-02-02 08:44:28 +00:00
Regis Houssin
b326c508af Works on enhancement of project tasks 2010-02-01 09:21:52 +00:00
Regis Houssin
9536a59dff Add on/off button 2010-01-30 10:43:25 +00:00
Regis Houssin
a54e98ed23 Works on enhancement of project tasks 2010-01-29 09:55:00 +00:00
Regis Houssin
0391dbf1c1 Works on enhancement of project tasks 2010-01-29 09:23:28 +00:00
Regis Houssin
29302396c2 Works on enhancement of project tasks 2010-01-28 15:55:43 +00:00
Regis Houssin
cf13e466c5 Works on enhancement of project tasks 2010-01-28 14:52:45 +00:00
Regis Houssin
a71e75c7c7 Works on enhancement of project tasks 2010-01-28 11:08:11 +00:00
Regis Houssin
354fa8a605 Works on enhancement of project tasks 2010-01-28 08:52:41 +00:00
Regis Houssin
ff2ab603ee Works on enhancement of project tasks 2010-01-27 08:06:44 +00:00
Regis Houssin
b2a265a1a8 Works on enhancement of project tasks 2010-01-27 07:58:31 +00:00
Regis Houssin
bb8f7045d8 Works on enhancement of project tasks 
Fix: data migration field fk_user_resp of llx_projet to llx_element_contact
 2010-01-26 16:54:40 +00:00
Regis Houssin
4345d2563b Works on enhancement of project tasks 
Fix: data migration of llx_projet_task_actors in llx_element_contact
 2010-01-26 13:28:25 +00:00
Regis Houssin
d94473e164 Works on enhancement of project tasks 
Fix: use task.class.php
 2010-01-25 22:24:40 +00:00
Regis Houssin
4223eacb7a Works on enhancement of project tasks 
Fix: use task.class.php
 2010-01-25 11:40:48 +00:00
Regis Houssin
b8954be4e5 Works on enhancement of project tasks 
Fix: use task.class.php
 2010-01-25 10:59:20 +00:00
Regis Houssin
062e9da861 Fix: translation 2010-01-25 08:55:17 +00:00
Laurent Destailleur
3b6048a016 Use numbering module to suggest new ref 2010-01-23 00:44:26 +00:00
Regis Houssin
a0eb862c85 Works on enhancement of project tasks 
Fix: use task.class.php
 2010-01-22 20:42:35 +00:00
Regis Houssin
3c74bd21ca Works on enhancement of project tasks 
Fix: move class in directory of module
 2010-01-22 20:20:41 +00:00
Regis Houssin
f4230d9787 Works on enhancement of project tasks 2010-01-22 17:49:13 +00:00
Laurent Destailleur
62f4345e92 Fix: Remove usage of pdate() 2010-01-13 18:51:19 +00:00
Regis Houssin
2aac1761e3 Add numbering and pdf module in project 2010-01-13 18:20:21 +00:00
Regis Houssin
535e12ca63 Add numbering and pdf module in project 2010-01-13 17:58:34 +00:00
Laurent Destailleur
b326033334 Some fix in contact's projects 2010-01-13 13:32:09 +00:00
Regis Houssin
e5f4356afc Add numbering and pdf module in project 2010-01-12 18:02:23 +00:00
Laurent Destailleur
e5658c3ae6 New: task #9802 : Can link an action to a project 2010-01-04 23:33:23 +00:00
Laurent Destailleur
b99d2764d4 New: Project module support status of project and end date 2010-01-04 22:10:22 +00:00
Laurent Destailleur
ed56542bff New: Project module support status of project and end date 2010-01-04 22:04:04 +00:00
Laurent Destailleur
2988b561c9 New: Project module support status of project and end date 2010-01-04 21:45:59 +00:00
Laurent Destailleur
5da8b40812 Fix: Project not linked to companies must be visible. 2009-11-29 19:05:22 +00:00
Regis Houssin
ac587f4d53 Fix: call class 2009-11-13 08:41:20 +00:00
Laurent Destailleur
771a8f7dc8 Fix: Control of input values 2009-11-02 19:17:58 +00:00
Laurent Destailleur
0f4b911f54 Qual: Better compatibility with other databases 2009-10-29 01:26:38 +00:00
Regis Houssin
3e4414becd Fix: functions "ereg", "ereg_replace", "eregi", "eregi_replace" is deprecated since php 5.3.0 2009-10-21 18:14:00 +00:00
Regis Houssin
01291c4a7c Fix: function "split" is deprecated since php 5.3.0 2009-10-20 13:14:44 +00:00
Laurent Destailleur
522861ac56 Uniformize code 2009-10-16 22:46:16 +00:00
Laurent Destailleur
90cd2d2acd Add link to wiki help 2009-08-30 22:08:21 +00:00
Laurent Destailleur
5f173e01ee Qual: Ajax code is simpler and now works with IE6 2009-08-28 01:14:35 +00:00
Laurent Destailleur
c11cef6d47 Add help link to online wiki 2009-08-12 12:59:14 +00:00
Laurent Destailleur
766cb6cf64 Fix: Wrong order 2009-08-10 17:28:07 +00:00
Regis Houssin
11e10a1c8c Fix: limit view for external user 2009-08-06 12:01:08 +00:00
Laurent Destailleur
bd749f6748 New: Add if project is shared or not in project list 
New: Add status of third party in some third parties list.
 2009-08-05 16:58:18 +00:00
Laurent Destailleur
093b88ad8d New: Enhancement in project module 2009-07-28 18:12:47 +00:00
Regis Houssin
e48d440630 Fix: espace en dŽbut de fichier 2009-07-28 14:23:09 +00:00
Laurent Destailleur
72f1df8eab New: Enhancement in project module 2009-07-28 13:37:28 +00:00
Laurent Destailleur
872a91d4a5 First changes to fix pb in task list 2009-07-28 00:52:34 +00:00
Laurent Destailleur
0679897b88 Look: Uniformize look 2009-07-27 00:17:35 +00:00
Laurent Destailleur
5b040dd4e9 Use new confirmation box 2009-07-27 00:11:33 +00:00
Laurent Destailleur
e1beff87ce Look: Minor fix in themes 2009-07-15 15:04:58 +00:00
Laurent Destailleur
4b35e70e8b Fix: Pb with multicompany. If a project is not linked to a company, it was invisible. 2009-06-11 01:19:42 +00:00
Laurent Destailleur
ee36b2ea43 Fix: Pb with multicompany. If a project is not linked to a company, it was invisible. 2009-06-11 01:05:43 +00:00
Laurent Destailleur
86625da643 Predefined invoices are now always enabled 2009-05-27 01:59:33 +00:00
Regis Houssin
e5d222b6cc Fix: régression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car 
comportement aléatoire avec certaines fonctions
 2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2 Fix: ajout d'un niveau supplémentaire du cache du jeton 2009-05-16 15:45:26 +00:00
Regis Houssin
e63c142ce7 Fix: ajout d'un jeton aléatoire dans les requetes POST 2009-05-15 15:33:33 +00:00
Laurent Destailleur
7c6016b355 Qual: Use a so much simpler way to have ajax confirmation boxes 2009-05-06 13:39:43 +00:00
Regis Houssin
b86684805c New: early development of multi-company module 2009-04-27 20:37:50 +00:00
Laurent Destailleur
77d3821645 New: Some pages can link to wiki help pages 2009-03-09 11:28:12 +00:00
Laurent Destailleur
61e2282cb1 Qual: Removed deprecated code 2009-03-02 18:25:51 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
68ccad2f7f Minor enhancements in project module 2009-02-12 09:09:36 +00:00
Laurent Destailleur
0d386d7e6c Fix: A lot of debug in project module 2009-02-04 20:38:07 +00:00
Laurent Destailleur
dc4448c423 Can use empty prefix for oscommerce module 2009-01-31 01:17:53 +00:00
Laurent Destailleur
e40fe712cd Major enhancement of project module 2009-01-14 23:36:51 +00:00
Laurent Destailleur
54449e3465 Debug of project module 2009-01-14 16:40:45 +00:00
Laurent Destailleur
4aa465eac4 Project leader is a link to its card on project card. 2009-01-12 20:29:35 +00:00
Laurent Destailleur
5cf2356bcb Do not allow to remove task with children 2009-01-12 20:26:06 +00:00
Laurent Destailleur
429dcd3b6a Minor changes in task management 2009-01-12 09:53:45 +00:00
Laurent Destailleur
effa56d5c9 Debug on projects 2009-01-10 03:40:06 +00:00
Laurent Destailleur
1af616666d Add contracts in project referrers 2008-12-31 15:10:21 +00:00
Laurent Destailleur
cc7ebc8251 Add status if referrer list of a project 2008-12-27 23:40:25 +00:00
Laurent Destailleur
e7e7b35742 Solve sql error on some mysql versions 2008-12-20 12:43:27 +00:00
Laurent Destailleur
90a73faaad New: Some enhancements in project module 2008-09-10 20:49:21 +00:00
Laurent Destailleur
522b0eb1b8 New: Some enhancements in project module 2008-09-10 11:36:13 +00:00
Laurent Destailleur
b7c5268a18 New: Some enhancements in project module 2008-09-10 11:14:45 +00:00
Laurent Destailleur
94e29ce7c1 New: Third party for projects is not always required. 2008-09-10 09:43:48 +00:00
Laurent Destailleur
14dd4191ec Add patch sladame 2008-08-25 22:14:58 +00:00
Regis Houssin
3e4982f4eb Fix: problème de tableau avec Firefox 3 (il en reste encore) 2008-06-18 20:01:01 +00:00
Regis Houssin
6ac4014849 Fix: traduction 2008-04-29 06:23:29 +00:00
Laurent Destailleur
5f6aeb2757 Look: Uniformisation style 2008-04-28 22:34:41 +00:00
Laurent Destailleur
1c3e137547 Fix: Support option mysql strict for orders creation 
New: Add a tab referers in project card.
Qual: Mutualize all code for project referers view
 2008-04-19 17:34:24 +00:00
Laurent Destailleur
5e4f47a8d7 Fix: Support option mysql strict for orders creation 
New: Add a tab referers in project card.
Qual: Mutualize all code for project referers view
 2008-04-19 17:26:41 +00:00
Laurent Destailleur
d73caf56af Fix: Project area broken 2008-03-31 06:29:10 +00:00
Laurent Destailleur
7f0e794251 Fix: String must be saved as they are in database. Html detect and convert must be done on screen only. 2008-03-21 00:27:37 +00:00
Laurent Destailleur
2840d88415 Fix: Creation of project 2008-03-17 04:10:35 +00:00
Laurent Destailleur
d3c0495f26 On peut créer un projet sans le lier à un tiers. 2008-03-02 22:20:44 +00:00
Laurent Destailleur
6bd6e4a309 New: Add pages for agenda module 2008-03-01 01:26:41 +00:00
Laurent Destailleur
646a6307f0 New: Super clean of permissions checks 2008-02-25 20:03:21 +00:00
Laurent Destailleur
99297fea62 Fix: Security check 2008-02-24 13:18:40 +00:00
Laurent Destailleur
fed065dd7f Qual: Nettoyage de code redondant. L'appel a getright est inutile car deja dans le main. 2008-01-29 19:03:26 +00:00
Regis Houssin
c25c4dddf9 Remplacement du terme "éditer" par "modifier" 2008-01-10 23:59:58 +00:00
Laurent Destailleur
23cba544b1 Fix: bug #21802 : Pas de message d'erreur à l'ajout d'un projet 2007-12-19 17:41:59 +00:00
Regis Houssin
8e43e47126 Fix: problème de droit d'accès, mise en place de la fonction restrictedArea 2007-11-29 21:19:21 +00:00
Regis Houssin
164dc8a577 Fix: problème de droit d'accès, mise en place de la fonction restrictedArea 2007-11-29 21:05:32 +00:00
Laurent Destailleur
802c37c75c Suppression des TODO/FIXME 2007-11-28 22:53:21 +00:00
Laurent Destailleur
431a48992c Oubli du param sortorder dans les appels de print_liste_field_titre 2007-11-11 16:01:01 +00:00
Laurent Destailleur
a70ced9753 Oubli du param sortorder dans les appels de print_liste_field_titre 2007-11-11 15:55:45 +00:00
Regis Houssin
e9c01bcfd7 modification de mon adresse mail 2007-11-01 20:39:36 +00:00
Regis Houssin
f179fcf75a Fix: champ price obsolete 2007-11-01 13:13:42 +00:00
Regis Houssin
9352004e62 Fix: champ price obsolete 2007-11-01 13:11:06 +00:00
Regis Houssin
7db064d98b Fix: variable mal orthographiée 2007-10-14 18:53:05 +00:00
Laurent Destailleur
193775bed9 Fix: On ne doit pas utilise de fonction week, month, year dans les sql. Peu portables et surtout empeche utilisation d'index. 
Il vaut mieux calculer les bornes en PHP (temps fixe et negligeable) puis executer la requete avec filtre sur ces bornes. L'index du champ date
fonctionne alors evitant le full scan.
 2007-09-24 18:36:44 +00:00
Laurent Destailleur
0c66db7143 Fix: On ne doit pas utilise de fonction week, month, year dans les sql. Peu portables et surtout empeche utilisation d'index. 
Il vaut mieux calculer les bornes en PHP (temps fixe et negligeable) puis executer la requete avec filtre sur ces bornes. L'index du champ date
fonctionne alors evitant le full scan.
 2007-09-24 17:50:49 +00:00
Regis Houssin
1d4b3c4798 Changement du fonctionnement des bons d'interventions 2007-08-28 07:44:17 +00:00
Laurent Destailleur
119070e3ab Qual: Utilisation de dolibarr_print_date chaque fois que c'est possible au lieu de strftime 2007-08-08 15:14:52 +00:00
Regis Houssin
59a3a32f78 Fix: changement de idp en rowid pour llx_societe et llx_socpeople afin d'unifier le code. 2007-06-11 22:51:47 +00:00
Regis Houssin
54c955a7f8 Fix: mauvaise affichage de la date et de la traduction 2007-05-28 11:51:00 +00:00
Regis Houssin
bfc2ec5754 Add: on peut définir le responsable du projet 2007-05-28 11:30:44 +00:00
Laurent Destailleur
e4f3b922ca Doc: doxygen 2007-05-04 23:28:09 +00:00
Regis Houssin
18e51b52e3 Suppression du champ "code" de la table llx_user 2007-03-10 22:14:14 +00:00
liedekef
6854dc40fd Fix for bug #18801: les variables _GET et _POST ne doivent plus passer 
par strislashes, c'est deja fait en main.inc.php
 2007-01-16 22:33:30 +00:00
Laurent Destailleur
fe9f754e6a Qual: Les fichiers du module webcal sont sortie de projet et placé dans webcal. 
New: Ajout module mantis pour intégrer l'interface du bug tracking Mantis dans le menu Dolibarr.
 2006-12-01 04:22:40 +00:00
Laurent Destailleur
2118c965c7 Mutualisation code 
Ajout champ id tache sur liste des taches d'un projet
 2006-09-23 00:36:00 +00:00
Laurent Destailleur
1b36283769 Mutualisation code 
Ajout champ id tache sur liste des taches d'un projet
 2006-09-23 00:27:47 +00:00
Laurent Destailleur
f10ae4b4dd Modif longueru champ saisie 2006-09-22 23:12:50 +00:00
Laurent Destailleur
f9d90c3908 Fix: Uniformisation du nom du champ id societe. On prend partout "socid". 2006-09-13 18:56:30 +00:00
Laurent Destailleur
9294334913 Qual: Déplacement des drivers de base de données de /lib dans /lib/databases pour plus de clarté. 
New: Ajout du driver mysqli pour accéder à mysql via les fonction mysqli de la 4.1
 2006-08-05 23:55:10 +00:00
Laurent Destailleur
b565f51c7d Mega grosse mise en facteur de code commun. 
Pour cela la classe CcommonObject a été crée pour héberger les methodes communes a toutes les entites métiers dolibarr (facture, contrat, propal, commande).
Ces classes métiers n'ont qu'à hériter de cette classe pour profiter du code commun.
 2006-06-18 14:18:41 +00:00
Laurent Destailleur
490e293947 Look: Uniformisation affichage ecrans projets 2006-06-03 16:50:58 +00:00
Laurent Destailleur
c617bac12f Qual: Suppression des propriétés nom_url au profit de la methode getNomUrl. Ce qui permet de passer en parametre si on veut en plus le picto ou non dans le lien 2006-06-03 14:47:05 +00:00
Laurent Destailleur
75b5f8665e Fix: Pb acces trop restrictif 2006-06-02 23:34:28 +00:00
activdev
f333422018 BugFix: Probleme d'acces a un projet pour les utilisateurs qui n'ont pas de restriction sur l'acces aux clients. 2006-05-29 14:12:36 +00:00
Laurent Destailleur
0d8499ac0b Fix: bug #16564 overview: Accès refusé sur le module projet 2006-05-13 00:52:13 +00:00
Regis Houssin
50e7433ce5 bugfix 2006-04-14 10:11:19 +00:00
Regis Houssin
e291b68931 Fix: problème de droit sur la modification du projet 2006-04-14 10:07:57 +00:00
Regis Houssin
82c11dc30a Fix: droits non définis 2006-04-14 09:58:28 +00:00
Regis Houssin
f42bbfb422 Ajout bouton "créer" dans les onglets d'un projet 2006-04-10 13:18:40 +00:00
Regis Houssin
c1f7367bd6 Ajout bouton "créer" dans les onglets d'un projet 2006-04-10 13:09:19 +00:00
Regis Houssin
c928c3ca64 Ajout bouton "créer" dans les onglets d'un projet 2006-04-10 12:55:21 +00:00
Regis Houssin
96a0530391 Ajout bouton "créer" dans les onglets d'un projet 2006-04-10 12:55:20 +00:00
Regis Houssin
4985ec37d7 *** empty log message *** 2006-04-10 12:37:36 +00:00
Regis Houssin
01ba915aab Ajout bouton "créer proposition" dans l'onglet "proposition commerciale" d'un projet 2006-04-10 12:35:17 +00:00
Regis Houssin
dd4aa17e09 Ajout bouton "créer proposition" dans l'onglet "proposition commerciale" d'un projet 2006-04-10 12:28:36 +00:00
Regis Houssin
ec151e707c Fix: bug #16263 2006-04-06 10:19:50 +00:00
Regis Houssin
8bb656a475 bugfix pfff 2006-03-10 17:21:27 +00:00
Regis Houssin
a66844976e amélioration de la sécurité 2006-03-10 17:19:14 +00:00
Regis Houssin
3c97a3c15d bugfix 2006-03-10 17:15:20 +00:00
Regis Houssin
9352e6d5c7 amélioration de la sécurité 2006-03-10 17:13:31 +00:00
Regis Houssin
82e4d84b5e bugfix 2006-03-10 16:56:56 +00:00
Regis Houssin
27f8e2f4f0 amélioration de la sécurité 2006-03-10 16:55:25 +00:00
Regis Houssin
dec9f95d7d Ajout de la permission "consulter tous les clients" dans le module commercial, afin 
qu'un commercial puisse voir que les clients qui lui sont affectés.
 2006-03-10 16:08:22 +00:00
Regis Houssin
bf3496fc30 pourquoi c'était en commentaire et remplacé par une autre requete ? 2006-03-10 15:49:08 +00:00
Regis Houssin
08c77144fa il faut vérifier ce code !! 2006-03-09 13:34:59 +00:00
Regis Houssin
4a87aed43c Ajout de la permission "consulter tous les clients" dans le module commercial, afin 
qu'un commercial puisse voir que les clients qui lui sont affectés.
 2006-03-09 13:31:02 +00:00
Regis Houssin
bc520b51a7 Ajout de la permission "consulter tous les clients" dans le module commercial, afin 
qu'un commercial puisse voir que les clients qui lui sont affectés.
 2006-03-09 11:43:13 +00:00
Regis Houssin
96402a9dcc Ajout de la permission "consulter tous les clients" dans le module commercial, afin 
qu'un commercial puisse voir que les clients qui lui sont affectés.
 2006-03-09 11:35:25 +00:00
Regis Houssin
4186e0db40 Ajout de la permission "consulter tous les clients" dans le module commercial, afin 
qu'un commercial puisse voir que les clients qui lui sont affectés.
 2006-03-09 11:14:41 +00:00
Andre Cianfarani
eb912a3774 modifs pour date en popup 2006-03-01 16:59:18 +00:00
Laurent Destailleur
2bb7e4818c Fix: bug #15799 2006-02-25 12:25:26 +00:00
Regis Houssin
b919a64ba2 Ajout traduction 2005-12-07 16:22:06 +00:00
Regis Houssin
4135239c46 Ajout traduction 2005-12-02 17:00:31 +00:00
Regis Houssin
a4a23da9ff Ajout traduction 2005-12-02 16:55:26 +00:00
Regis Houssin
79d1b10b47 Ajout traduction 2005-12-02 12:53:42 +00:00
Laurent Destailleur
57bb94bbfb Look: Correction du bug IE qui positionne mal les onglets dans certains cas. 2005-10-02 19:48:55 +00:00
Laurent Destailleur
b54e5cd560 Fix: requete incorrecte si socid != 0 2005-09-25 22:28:25 +00:00
Laurent Destailleur
90e7514b1f Qual: meilleur respect xhtml 2005-09-17 00:53:49 +00:00
Laurent Destailleur
5768ed171e Trad: Traduction 2005-09-04 15:46:56 +00:00
Laurent Destailleur
51b8ef37c6 Trad: Traduction espace projets 2005-08-31 21:12:15 +00:00
Laurent Destailleur
8735a5c2b9 Fix: Liens include invalides 2005-08-25 20:27:17 +00:00
Rodolphe Quiedeville
3d054f421a Amélioration interface 2005-08-25 13:45:59 +00:00
Rodolphe Quiedeville
079ddb1af7 Amélioration 2005-08-25 13:29:43 +00:00
Rodolphe Quiedeville
2efdf0a520 Ajout des liens Activite 2005-08-25 13:24:19 +00:00
Rodolphe Quiedeville
4ab2a33c17 Modif esthetique 2005-08-22 17:25:53 +00:00
Rodolphe Quiedeville
9d1178f1bc Nouveau fichier 2005-08-22 17:22:47 +00:00
Rodolphe Quiedeville
4edd205321 Nouveau fichier 2005-08-22 17:10:46 +00:00
Rodolphe Quiedeville
d6660662d1 Ajout entrée de menu vers l'activité 2005-08-22 15:53:49 +00:00
Rodolphe Quiedeville
29af900653 Modif order requete SQL 2005-08-22 09:39:29 +00:00
Rodolphe Quiedeville
7cd26bdbee Bugfix 2005-08-22 09:38:36 +00:00
Rodolphe Quiedeville
5722c9eceb Suppression du formulaire ajout lien sur les projets 2005-08-22 09:35:31 +00:00
Rodolphe Quiedeville
b664725f79 Filtre sur mes taches 2005-08-22 09:16:43 +00:00
Rodolphe Quiedeville
519027b3aa Gestion primaire des permissions 2005-08-22 09:12:46 +00:00
Laurent Destailleur
1b93d0b808 Look: Modif esthétiques mineures 2005-08-21 19:40:40 +00:00
Rodolphe Quiedeville
811810619c Ajout entrée de menu pour Mytasks 2005-08-21 13:02:07 +00:00
Rodolphe Quiedeville
b8f87a1688 Nouveau fichier 2005-08-21 13:01:50 +00:00
Rodolphe Quiedeville
6088e2faec Ajout inclusion de la class task. 2005-08-21 12:41:25 +00:00
Rodolphe Quiedeville
1a0ca38598 Nouveau fichier 2005-08-21 12:39:11 +00:00
Rodolphe Quiedeville
bfbb583bea Correction bug ajout d'une durée 2005-08-21 12:38:23 +00:00
Rodolphe Quiedeville
52f328db8d Ajout onglet 2005-08-21 12:27:54 +00:00
Rodolphe Quiedeville
311ad98507 Nouveau fichier 2005-08-21 12:24:33 +00:00
Rodolphe Quiedeville
16e599a617 Ajout permission et mise aux normes 2005-08-21 12:11:44 +00:00
Rodolphe Quiedeville
6f783419a9 Ajout gestion des permission 2005-08-21 12:10:05 +00:00
Rodolphe Quiedeville
68363773a8 Ajout gestion de permission 2005-08-21 12:09:51 +00:00
Rodolphe Quiedeville
015220bfd8 Ajout lien taches 2005-08-20 21:45:15 +00:00
Rodolphe Quiedeville
f2fd790711 Nouveau fichier 2005-08-20 21:44:34 +00:00
Laurent Destailleur
a691947a84 Fix: Meilleur gestion erreur sur création projet 2005-08-14 01:38:12 +00:00
Laurent Destailleur
5beb8aee03 Fix: Pb de classe commande chargée 2 fois. Tous les chemins des require doivent etre de la forme DOL_DOCUMENT_ROOT."/commande/commande.class.php" 2005-08-13 21:23:02 +00:00
Laurent Destailleur
d55cf878d0 Fix: Fatal error: Call to undefined function: delete() in /dolibarr/htdocs/projet/fiche.php on line 79 2005-08-12 01:34:46 +00:00
Rodolphe Quiedeville
cda84e1e25 Gestion de la suppression 2005-07-30 20:24:13 +00:00
Rodolphe Quiedeville
51aeef1b7b Ajout lien Clients 2005-07-30 19:53:36 +00:00
Laurent Destailleur
1ef07971da Fix: Respect W3C. 2005-07-16 11:21:08 +00:00
Laurent Destailleur
3bf528351e Doc: Documentation doxygen 2005-07-10 20:08:27 +00:00
Laurent Destailleur
48acd8d39c Trad: Traduction de la monnaie par la monnaie principale. 2005-07-10 17:46:02 +00:00
marc_ocebo
a16e2ef285 L'onglet 'Documents' des propales est fonctionnel + diverses modifications esthétiques 2005-06-27 21:47:44 +00:00
marc_ocebo
5625f09ec6 ajout barre de recherche 2005-04-29 01:06:29 +00:00
Laurent Destailleur
ac8cf8221a Trad: Traduction espace projet 2005-04-07 00:03:07 +00:00
Rodolphe Quiedeville
e6343ba01f No longer use 2005-04-05 11:54:37 +00:00
Rodolphe Quiedeville
95e30d081b Modif de la classe chargée 2005-04-05 11:53:14 +00:00
Rodolphe Quiedeville
5c9d74f8f2 Modir appel de la méthode create de l'objet project 2005-04-05 11:52:52 +00:00
Rodolphe Quiedeville
695d6f27ab Mise en conformité 2005-04-05 11:47:33 +00:00
Rodolphe Quiedeville
6383e11610 Mise en conformaité 2005-04-05 11:46:55 +00:00
Rodolphe Quiedeville
56299d2855 Mise en conformité 2005-04-05 11:22:28 +00:00
Rodolphe Quiedeville
e5c3f2905a Nouveau fichier 2005-04-05 11:22:12 +00:00
Laurent Destailleur
082a80e05d Doc: Documentation doxygen 2005-04-02 10:18:01 +00:00
Laurent Destailleur
01c84cbb2e Fix: Pour rendre la fonction last_insert_id compatible enre mysql et pgsql, on rend le paramètre obligatoire. 2005-03-18 23:56:41 +00:00
Laurent Destailleur
8eb28a675c Fix: Correction mauvaise utilisation de la methode fectch_object avec en paramètre un indice au lieu d'un resultset. 2005-03-18 22:50:53 +00:00
Laurent Destailleur
add221b92e Fix: Problème sur le menu webcalendar. C'est un autre menu qui apparaissait sélectionné. 2005-01-23 18:22:06 +00:00
Laurent Destailleur
df342b3b4b Qual: Améliorations diverses mineures du module projet pour uniformiser l'interface 2005-01-14 20:30:49 +00:00
Laurent Destailleur
63faa3d6fe Qual: Utilisation de $conf->monnaie au lieu de la constante MAIN_MONNAIE. 2004-12-04 20:22:20 +00:00
Laurent Destailleur
9b79d4e26e Qual: Utilisation de $conf->monnaie au lieu de la constante MAIN_MONNAIE. 2004-12-04 20:19:53 +00:00
Laurent Destailleur
679cb682a0 Fix: Tri sur les champ du tableau. 2004-11-23 19:15:22 +00:00