Laurent Destailleur
eeb219cb55
Revert "NEW sorting elements on project overview"
2020-03-06 14:52:29 +01:00
Tobias Sekan
eceaf5b321
Fix Travis CI error
2020-03-06 12:09:50 +01:00
Tobias Sekan
8c115a07b0
Fix lint errors
2020-03-06 11:49:49 +01:00
stickler-ci
03b8c86c06
Fixing style errors.
2020-03-06 10:45:35 +00:00
Tobias Sekan
acd7366d64
fix not working unlink
2020-03-06 11:33:42 +01:00
Tobias Sekan
3e58cc4c02
Fix build errors
2020-03-06 11:25:02 +01:00
Tobias Sekan
05e76ba122
Fix wrong merge (new MRP things was missing)
2020-03-06 10:21:34 +00:00
Tobias Sekan
a155409bc2
Add sorting for project overview columns
2020-03-05 14:16:56 +01:00
Frédéric FRANCE
4801117c37
avoid warning if not an array
2020-02-21 09:24:24 +01:00
Laurent Destailleur
1d760f0e42
Add MO in project overwiew
2020-02-17 21:24:59 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
5d04775164
Fix missing categorie class
2020-02-09 15:14:01 +01:00
Laurent Destailleur
fc47fa5ec3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/element.php
2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 02:52:46 +01:00
Scrutinizer Auto-Fixer
9781c20f84
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-02 18:34:09 +00:00
stickler-ci
01b1667eed
Fixing style errors.
2020-02-02 08:13:09 +00:00
ATM john
fe009c3842
Fix project profit for loan part
2020-02-02 09:06:02 +01:00
ATM john
e59d118b8c
Fix project loan data
2020-02-02 06:36:06 +01:00
stickler-ci
1de640242f
Fixing style errors.
2020-01-28 18:33:01 +00:00
kadogo
9313aabd5c
NEW Add duration information for fichinter
2020-01-28 19:28:09 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
0d413c47b1
Fix duplicate info
2020-01-15 13:33:11 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto
...
FIX remove backward compatibility projectid and uses object id instead
2019-12-31 17:40:01 +01:00
VESSILLER
792096ad08
FIX url new for task time spent in project element tab
2019-12-23 16:00:35 +01:00
VESSILLER
99e63ad507
FIX uses GETPOSTISSET instead of GETPOST for projectfield
2019-12-23 15:18:45 +01:00
VESSILLER
e7a5d26355
FIX remove backward compatibility projectid and uses object id instead
2019-12-23 14:25:54 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
VESSILLER
d28242a3c5
FIX remove backward compatibility projectid and uses object id instead
2019-10-29 16:40:47 +01:00
Frédéric FRANCE
7581275316
wip
2019-10-20 11:59:21 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
f3bc319a78
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
412e0f193b
Update element.php
2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php
2019-09-27 12:36:15 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Laurent De Coninck
b4f31d61fa
allow to remove one custom referent in the project.
...
Allow to remove one custom referent from the project.
When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.
This fix support now the property 'project_field'. And thus set this
column to null.
[see: #11881 ]
2019-09-23 17:46:54 +02:00
Laurent Destailleur
04057cd83e
Prepare reengeneering of project usage
2019-09-01 02:02:38 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
559a902405
FIX summary of time spent in preview tab of projects
2019-07-23 03:39:35 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
1b4507f07d
Fix on a hidden option
2019-07-02 11:40:05 +02:00
Laurent Destailleur
def94b55c0
CSS
2019-06-25 13:02:11 +02:00
Laurent Destailleur
b275160f20
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-27 13:26:12 +02:00
Laurent Destailleur
143cbec281
Fix test
2019-04-26 13:23:33 +02:00
Laurent Destailleur
f27f65e8bf
Responsive
2019-03-25 10:09:02 +01:00