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

304 Commits

Author SHA1 Message Date
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
92423be43d Fix english 2016-10-11 15:03:56 +02:00
Laurent Destailleur
a99e18865b FIX Missing translation for ProjectCreatedInDolibarr 2016-10-04 13:02:05 +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
1642d7c23b Trans 2016-09-22 18:48:17 +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
da84fac390 Fix: data were lost if creation failed 2016-08-04 10:08:58 +02:00
Laurent Destailleur
0e4dcb301c Fix several bugs into projects 2016-07-09 13:58:46 +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
d0a15d32b2 Clean language files 2016-06-18 19:48:58 +02:00
Laurent Destailleur
4382f2a437 Clean language files 2016-06-18 11:06:11 +02:00
novalore
d924be8b95 en_US lang fixes again 2016-06-04 14:21:21 +02:00
novalore
3ee8f931b4 other fixes in en_US lang files 2016-06-04 02:16:58 +02:00
novalore
1227ee5eb6 Miscellaneous typos and errors in en_US lang files 2016-06-04 00:14:56 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
0ed998af03 Revert "Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN"" 2016-04-29 19:01:38 +02:00
Laurent Destailleur
3a74946210 Revert "FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN" 2016-04-29 18:59:54 +02:00
Marcos García de La Fuente
867649e922 FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN 
Close #4813
 2016-04-23 13:36:12 +02:00
Laurent Destailleur
8b16a76936 Avoid duplicate translation 2016-03-11 10:59:28 +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
2ee74a80d9 NEW Enhance navigation of project module 2016-02-28 00:01:50 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:17:22 +01:00
BENKE Charlie
7939169ae8 Change projets title Area 2016-02-18 11:54: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
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
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +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
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +01:00
Laurent Destailleur
25924f31ad Bad translation 2016-01-26 17:57:57 +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
7f3531a04c Enhance script to track duplicate translation string and use it to 
remove around 50 duplicates.
 2015-12-06 13:34:57 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +01:00
Laurent Destailleur
350ef610e9 Fix beluga pdf for projects. Add missing expense reports. 2015-11-07 12:36:34 +01:00
Laurent Destailleur
87c240252c FIX Can export a field into task time table with export project profile 2015-10-27 22:24:18 +01:00
aspangaro
1d4c747aa2 Fix #3227 #3226 Missing translations in supplier exports 2015-09-13 21:44:59 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
76ce98630f Fix translation 2015-08-17 19:42:19 +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
Laurent Destailleur
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +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
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +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
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
94ff635cc2 NEW Add filter on user contact or user task into task list 2015-04-23 16:20:25 +02:00
faust
4bb83de146 en_US: fix lang 2015-04-18 18:03:40 +02:00
faust
b7fb3d7d9e en_US: 'opened' is not an adjective... 2015-04-18 16:39:57 +02:00
Laurent Destailleur
503a4ff7a0 Enhance filtering for bank transaction and timesheet. 2015-04-09 20:40:49 +02:00
aspangaro
f0823a215b Add language key 2015-03-26 21:16:52 +01:00
Laurent Destailleur
5d4d8151c1 Work on new timesheet input pages. 2015-03-18 11:04:50 +01:00
Laurent Destailleur
6d7b340cee Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/class/dolgraph.class.php
	htdocs/langs/en_AU/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/other.lang
 2015-03-16 18:30:30 +01:00
Laurent Destailleur
5670e92842 Position of field into pdf baleine 2015-03-14 12:35:03 +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
c36f92396b Add navigation into the new timesheet week page. 
Fix bad merge
 2015-03-05 11:13:44 +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
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
25bb6a588f Fix list of project must be restricted on opened status 2015-02-23 00:57:48 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +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
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
Marcos GarciÌa de La Fuente
09a094104c Removed duplicated and unused translation key 2014-12-25 18:31:24 +01:00
Marcos GarciÌa de La Fuente
78307a748d Corrected confusing table header in task list 2014-12-23 15:56:29 +01:00
Florian HENRY
99f817b69a - New: Add Option to not change date on cloning project 2014-12-05 21:40:55 +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
78d289110d Trans: Same verb 2014-10-17 13:07:23 +02:00
Laurent Destailleur
494e6786b3 Fix: Translation 2014-10-03 03:52:50 +02:00
Florian HENRY
119be5da42 Better ressource management on project and task 2014-09-20 10:14:26 +02:00
Laurent Destailleur
ef2629d309 Fix: Translation 2014-07-17 02:02:35 +02:00
Laurent Destailleur
9394f3f405 Fix: Translation 2014-07-17 01:56:34 +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
Raphaël Doursenaud
e6c0321fb6 Automatic events for project tasks 2014-04-22 15:30:10 +02:00
Laurent Destailleur
086b319248 Fix: Translation 2014-03-17 15:16:33 +01:00
Laurent Destailleur
a084887442 Merge branch 'project-translations' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations

Conflicts:
	ChangeLog
 2014-03-01 13:38:50 +01:00
Marcos GarciÌa de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Marcos GarciÌa de La Fuente
968b5771db Corrected project contact types translation 2014-02-25 02:42:10 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
66e941d0c1 Fix: Some translation were lost 2013-10-25 11:22:56 +02:00
Laurent Destailleur
086eb125bf Qual: Removed no more required translation entry UTF8 2013-10-23 10:34:48 +02:00
Florian Henry
9555cb35f0 Add project clone option : copy project files, copy task files 2013-10-19 17:51:21 +02:00
simnandez
a16b3b6e73 Trad: Add missing translation 2013-08-05 16:32:35 +02:00
Laurent Destailleur
a4abfe1abc New: Can add an event automatically when a projet is create. 2013-07-10 14:46:16 +02:00
Laurent Destailleur
af4651f1a2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php
 2013-06-25 23:22:00 +02:00
Laurent Destailleur
c2654fa7e2 Fix: Bad translation. Must use a different string than products 2013-06-25 15:00:10 +02:00
Laurent Destailleur
d8cef10ea3 Make comment generic for all files 2013-05-27 10:38:50 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
Laurent Destailleur
6512fd90a9 New: Can export customer shipments. 2012-11-18 15:24:01 +01:00
Laurent Destailleur
792c0a33f3 Fix: Works with checkbox htdocs/core/class/html.form.class.php 2012-05-07 17:04:35 +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
Laurent Destailleur
f9dbb35628 Update trans 2012-01-22 13:11:15 +01:00
Regis Houssin
42e608bd63 Fix: chmod 644 2011-11-03 18:03:52 +01: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
8e867ca6d9 Add TimesSpent 2011-05-16 16:12:28 +00:00
Laurent Destailleur
ca6f631e36 New: Enhancement in actions list management. Can define an order. Add check during dictionnary add. 2011-02-02 13:29:54 +00:00
Regis Houssin
eafca74fe8 Fix: add error message 
Fix: delete obsolete action
 2010-11-07 07:41:18 +00:00
Laurent Destailleur
e853319400 Trad 2010-09-19 17:17:26 +00:00
Laurent Destailleur
3e767382e8 Fix: Removed not translated combo box. 2010-06-24 21:10:43 +00:00
Laurent Destailleur
1a53d5637a Fix: Try a better fix for numbering modules to be more stable when using another module 2010-06-01 07:31:40 +00:00
Laurent Destailleur
8044300ef7 Work on gantt view. 2010-05-23 20:37:28 +00:00
Laurent Destailleur
ad8ab9c7fd New: Add gantt diagramm om project module 2010-05-23 10:20:35 +00:00
Laurent Destailleur
8bdbf014e4 New: Add experimental gant diagramm for project module 2010-05-22 16:53:36 +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
435922ae37 New: Can link trips and expenses to a project. 2010-03-21 14:01:39 +00:00
Philippe Grand
a958d47b92 some spelling changes 2010-03-20 22:35:57 +00:00
Regis Houssin
b7201c5c5d Add task progress in list 2010-03-04 09:04:36 +00:00
Regis Houssin
dd06f2af7e Fix: management of time spent in task card 2010-02-24 10:30:26 +00:00
Laurent Destailleur
22c1f604e7 Trad 2010-02-21 22:48:23 +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
Laurent Destailleur
0635ce83b8 Trad: Missing translation 2010-02-08 15:01:34 +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
d94473e164 Works on enhancement of project tasks 
Fix: use task.class.php
 2010-01-25 22:24:40 +00:00
Regis Houssin
062e9da861 Fix: translation 2010-01-25 08:55:17 +00:00
Laurent Destailleur
6c1ff6e340 Trad: Add translation of contact types 2010-01-23 01:50:13 +00:00
Laurent Destailleur
75c3b81195 Trad 2010-01-21 21:25:11 +00:00
Laurent Destailleur
b326033334 Some fix in contact's projects 2010-01-13 13:32:09 +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
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
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
fd2782edc8 Convert iso files to utf 2009-01-22 01:00:42 +00:00
Laurent Destailleur
1e464088c8 Added nl_NL in UTF8 2009-01-18 23:42:26 +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
429dcd3b6a Minor changes in task management 2009-01-12 09:53:45 +00:00
Laurent Destailleur
1af616666d Add contracts in project referrers 2008-12-31 15:10:21 +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
67d8f58877 Patch traduction anglais 2007-10-23 17:49:18 +00:00
Regis Houssin
72377732d6 Fix: traduction 2007-05-28 11:41:15 +00:00
Regis Houssin
bfc2ec5754 Add: on peut définir le responsable du projet 2007-05-28 11:30:44 +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
01ba915aab Ajout bouton "créer proposition" dans l'onglet "proposition commerciale" d'un projet 2006-04-10 12:35:17 +00:00
Regis Houssin
b919a64ba2 Ajout traduction 2005-12-07 16:22:06 +00:00
Laurent Destailleur
51b8ef37c6 Trad: Traduction espace projets 2005-08-31 21:12:15 +00:00
Laurent Destailleur
fa81f25351 Look: Les caractéristiques complexes (projet, rib...) au sein des onglets se modifient par le bouton modifier insérer à l'emplacement même de la carac. 2005-07-15 23:28:38 +00:00
Laurent Destailleur
004290a232 Fix: Statut facturée d'une propale non géré 2005-07-10 15:09:55 +00:00
marc_ocebo
a16e2ef285 L'onglet 'Documents' des propales est fonctionnel + diverses modifications esthétiques 2005-06-27 21:47:44 +00:00
Laurent Destailleur
ac8cf8221a Trad: Traduction espace projet 2005-04-07 00:03:07 +00:00
Laurent Destailleur
731d3ec1a7 Fix: Pb traduction 2005-01-28 21:42:23 +00:00
Laurent Destailleur
0315954f79 Trad: Traduction des titres des petites listes des derniers projets, propals, factures, commandes des onglets compta et commercial. 2005-01-16 18:02:07 +00:00
Laurent Destailleur
3cd7a2e949 Trad: Et encore des trad 2005-01-14 21:00:01 +00:00
Laurent Destailleur
cb4dcbe582 Trad: Traductions sur propals et menu espace commercial 2004-11-07 15:45:38 +00:00
Laurent Destailleur
d452056877 Trad: Traductions d'une partie du module projet 2004-10-23 15:11:01 +00:00
Laurent Destailleur
d72bafc270 Trad: Traduction pages projets 2004-08-13 21:38:59 +00:00