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
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
Marcos Garcí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
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +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
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
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
7c2ac4b3ee
NEW The probability of lead/opportunity can be defined per lead.
2016-01-28 20:04:02 +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
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
bcadc33e31
Debug visibility on task/projects
2015-12-04 15:37:28 +01:00
Laurent Destailleur
350ef610e9
Fix beluga pdf for projects. Add missing expense reports.
2015-11-07 12:36:34 +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
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
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
ff5f823bef
FIX not responsive part for project page
2015-09-27 16:01:57 +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
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
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
a21b015cbb
Fix XSS
2015-09-05 20:03:02 +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
ad5612158a
Fix report of all error messages
2015-07-19 15:29:18 +02:00
Marcos Garcí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
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
b766f99acc
Uniformize look.
...
Make code to manage link "Now" on calendar more generic.
2015-06-30 21:50:24 +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
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
