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
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +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
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
71a573df61
FIX Pb in management of date end of projects
2016-11-09 17:46:30 +01:00
Laurent Destailleur
384abd8462
Uniformize look and feel
2016-10-25 02:56:46 +02:00
Laurent Destailleur
6338b04ac0
Remove call of a deprecated function
2016-10-24 11:27:39 +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
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
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
ec99a056ac
NEW introduce option PROJECT_DISABLE_PRIVATE_PROJECT and
...
PROJECT_DISABLE_PUBLIC_PROJECT
2016-09-05 15:13:03 +02:00
florian HENRY
a4ce756724
Manage project category
2016-08-29 10:32:00 +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
da84fac390
Fix: data were lost if creation failed
2016-08-04 10:08:58 +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
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
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
geoffrey.girard
321ccce438
Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS on project edit view
2016-06-24 15:57:08 +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
fb724566f0
FIX #5252
2016-06-03 22:15:07 +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
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
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