Philippe GRAND
|
3509a240b1
|
fix : typo
|
2019-03-26 12:32:58 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
7d54c7a480
|
Fix translation
|
2019-03-22 14:38:06 +01:00 |
|
Laurent Destailleur
|
cd6a0bacdd
|
Look and feel v10
|
2019-03-22 14:32:15 +01:00 |
|
atm-ph
|
b202169e9a
|
New evol "Input per day" display
|
2019-03-21 15:20:59 +01:00 |
|
atm-ph
|
fa41eeec7f
|
New evol "Input per week" display
|
2019-03-21 14:21:29 +01:00 |
|
Laurent Destailleur
|
23ce97fb2d
|
NEW Introduce css "nobottomiftotal"
|
2019-03-19 16:01:03 +01:00 |
|
Laurent Destailleur
|
f3cf3482fa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/paiement/class/paiement.class.php
htdocs/projet/element.php
|
2019-03-18 10:23:14 +01:00 |
|
Laurent Destailleur
|
34034787af
|
FIX problem with sign of various payment in project preview
|
2019-03-18 10:16:08 +01:00 |
|
Laurent Destailleur
|
227f5f8f92
|
Code is cleaner
|
2019-03-18 09:08:53 +01:00 |
|
Alexandre SPANGARO
|
350f77db2b
|
FIX: Error with various & salary payment on project
|
2019-03-17 23:00:13 +01:00 |
|
Philippe GRAND
|
c6dbc0621a
|
update with html5 compliant code
|
2019-03-17 10:05:24 +01:00 |
|
Philippe GRAND
|
c37fa8f6aa
|
update with html5 compliant code
|
2019-03-17 10:00:39 +01:00 |
|
Laurent Destailleur
|
6f0fbc42c1
|
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
htdocs/expensereport/card.php
htdocs/projet/card.php
htdocs/public/members/new.php
htdocs/public/opensurvey/studs.php
|
2019-03-15 15:16:29 +01:00 |
|
atm-ph
|
2da60fb885
|
Fix var name
|
2019-03-15 15:15:03 +01:00 |
|
Laurent Destailleur
|
e5c08978c3
|
FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
|
2019-03-15 15:13:28 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
f2de44ce51
|
Clean code
|
2019-03-11 01:11:39 +01:00 |
|
Laurent Destailleur
|
b710e28ffa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
|
2019-03-09 01:20:13 +01:00 |
|
Laurent Destailleur
|
73b359c124
|
Fix class visibility
|
2019-03-09 00:54:10 +01:00 |
|
Laurent Destailleur
|
d88fc8cf91
|
Fix bad link
|
2019-03-07 17:32:10 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Laurent Destailleur
|
a5711a51ab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
|
2019-03-02 18:30:17 +01:00 |
|
Frédéric FRANCE
|
40d34940f1
|
fix exclude from phpcs
|
2019-03-02 10:00:51 +01:00 |
|
Laurent Destailleur
|
b3fb0eaf5b
|
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 15:48:31 +01:00 |
|
Laurent Destailleur
|
2448d1deaa
|
fk_projet -> fk_project
|
2019-02-27 15:32:18 +01:00 |
|
Frédéric FRANCE
|
5a4ac82880
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 08:23:29 +01:00 |
|
Laurent Destailleur
|
014c199173
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/tpl/extrafields_list_print_fields.tpl.php
|
2019-02-27 01:28:12 +01:00 |
|
Frédéric FRANCE
|
81f2f99db5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-26 21:16:01 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
atm-quentin
|
35762c0d4e
|
add data elem on task list
|
2019-02-26 11:25:40 +01:00 |
|
Frédéric FRANCE
|
6ee186096c
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-24 23:48:51 +01:00 |
|
Frédéric FRANCE
|
27218b7087
|
wip
|
2019-02-24 23:32:09 +01:00 |
|
Frédéric FRANCE
|
ec956e1c72
|
replace html code by html5 in project
|
2019-02-23 22:24:26 +01:00 |
|
Sof
|
a47a9d8a65
|
Typo
|
2019-02-17 20:08:52 +01:00 |
|
Sof
|
69f1d9825c
|
Typo
|
2019-02-17 20:08:03 +01:00 |
|
florian HENRY
|
dd9896516b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
|
2019-02-13 12:52:07 +01:00 |
|
Laurent Destailleur
|
ced386fdca
|
Fix phpcs
|
2019-02-13 11:32:00 +01:00 |
|
florian HENRY
|
5c059c897d
|
fix travis (mosty for dev no conerne by my changes)
|
2019-02-13 09:21:14 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
5a6e46a9c3
|
Doc
|
2019-02-03 21:40:23 +01:00 |
|
Laurent Destailleur
|
695a681c14
|
NEW Can generate invoices from timespent of a project
|
2019-02-03 21:35:30 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
80b48680f6
|
clean missing spaces in the last merge
|
2019-02-02 09:49:07 +01:00 |
|
Frédéric FRANCE
|
2f40443b46
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-02 09:46:14 +01:00 |
|
Laurent Destailleur
|
28c1b1ce58
|
Work on billing time spent
|
2019-02-01 22:39:36 +01:00 |
|
Frédéric FRANCE
|
f83ee43a19
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 22:15:22 +01:00 |
|
Laurent Destailleur
|
b197ad72d3
|
Work on billing projects
|
2019-01-30 20:02:41 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
cc574852d2
|
Fix phpcs
|
2019-01-26 15:20:36 +01:00 |
|
Laurent Destailleur
|
e42fe4022a
|
Uniformize lenght of small list
|
2019-01-25 15:22:36 +01:00 |
|
Laurent Destailleur
|
a5daa25707
|
Move common code to get sell price into a method
|
2019-01-24 19:45:17 +01:00 |
|
Laurent Destailleur
|
2c8557e2e0
|
Work on invoicing of time spent
|
2019-01-24 18:16:14 +01:00 |
|
Philippe GRAND
|
af36883d72
|
update with html5 compliant code
|
2019-01-21 10:04:43 +01:00 |
|
Laurent Destailleur
|
5c825310a3
|
Fix bad link and css
|
2019-01-19 14:49:44 +01:00 |
|
Laurent Destailleur
|
b1e51835f5
|
Fix bad link and css
|
2019-01-19 14:49:26 +01:00 |
|
Laurent Destailleur
|
2db0f84f29
|
NEW Pagination into list of time spent
|
2019-01-18 20:06:33 +01:00 |
|
Laurent Destailleur
|
e3d53867f4
|
WIP Billing task time
|
2019-01-18 18:11:10 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Laurent Destailleur
|
adc6c1d2d1
|
Work on invoicing time spent
|
2019-01-15 20:59:56 +01:00 |
|
Laurent Destailleur
|
0f2406c202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-15 10:55:28 +01:00 |
|
Laurent Destailleur
|
e0d11edb6b
|
FIX Sql error on filter of project preview with date
|
2019-01-13 14:09:40 +01:00 |
|
ldestailleur
|
5094b6bcfc
|
WIP Work on split of timespent
|
2019-01-04 16:24:56 +01:00 |
|
ldestailleur
|
2c474de61e
|
FIX Update of timespent when date is empty
|
2019-01-04 15:44:39 +01:00 |
|
ldestailleur
|
b928a49b1b
|
FIX Update of timespent when date is empty
|
2019-01-04 15:44:09 +01:00 |
|
Laurent Destailleur
|
f09efbf1cd
|
Fix var_dump
|
2018-12-21 12:07:13 +01:00 |
|
Laurent Destailleur
|
ae6596cac7
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-21 09:57:29 +01:00 |
|
Laurent Destailleur
|
d9b8a8c8ae
|
Debug cash fence feature
|
2018-12-19 16:12:55 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
83efdee7d3
|
Merge branch 'develop' into new_mass_generate
|
2018-12-14 15:44:46 +01:00 |
|
Laurent Destailleur
|
9e83699193
|
Merge branch 'develop' into new_branch_31_10_2018
|
2018-12-14 14:27:35 +01:00 |
|
Laurent Destailleur
|
434cf2e046
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-11 09:58:14 +01:00 |
|
Laurent Destailleur
|
f3a67d6c3f
|
FIX Show warning when trying to create task on closed project
|
2018-12-10 15:06:54 +01:00 |
|
Laurent Destailleur
|
188cda7902
|
Fix look and feel v9
|
2018-12-10 12:32:26 +01:00 |
|
Laurent Destailleur
|
cd3716ff9f
|
Dolibarize module ticket
|
2018-12-08 16:37:41 +01:00 |
|
Laurent Destailleur
|
d3a6b16021
|
FIX Show declared progress
|
2018-12-07 14:54:09 +01:00 |
|
Laurent Destailleur
|
572366c6c2
|
FIX status of user
|
2018-12-07 14:54:02 +01:00 |
|
Laurent Destailleur
|
a9a191819f
|
Work on billing time spent
|
2018-12-06 21:25:28 +01:00 |
|
Laurent Destailleur
|
6d8a6bf0ad
|
FIX Show declared progress
|
2018-12-06 21:25:04 +01:00 |
|
Laurent Destailleur
|
1647980ac6
|
FIX status of user
|
2018-12-06 21:16:02 +01:00 |
|
Philippe GRAND
|
8722ccef82
|
fix typo error
|
2018-11-26 14:35:29 +01:00 |
|
Thibault Descamps
|
c2e5a29246
|
NEW redirect if only one result on global search on card
|
2018-11-22 11:36:30 +01:00 |
|
Frédéric FRANCE
|
ce6b7adaa0
|
Merge remote-tracking branch 'upstream/develop' into actionrefused
|
2018-11-15 22:15:45 +01:00 |
|
Laurent Destailleur
|
7d5c9959bc
|
Close #9978
Better way to address the feature. Work in most cases, need less code
and less sql access.
|
2018-11-15 18:20:38 +01:00 |
|
Laurent Destailleur
|
103dfe2aa7
|
FIX go back to create form if error
|
2018-11-15 17:55:27 +01:00 |
|
Laurent Destailleur
|
ff0a5d9fe1
|
Merge pull request #10016 from WSoptics/wsoptics-8.0
FIX: sql errors
|
2018-11-15 16:47:52 +01:00 |
|
Laurent Destailleur
|
6ffd63c965
|
Update projectstats.class.php
|
2018-11-15 16:47:40 +01:00 |
|
Laurent Destailleur
|
85cdc44105
|
Several fixes in project creation, cache of dolGetIfFromCode, ...
|
2018-11-15 13:39:12 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
Tobias Elbert
|
ceae6ac376
|
fixed sql query error
|
2018-11-12 16:21:20 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
3e844db74f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fichinter/stats/index.php
|
2018-11-08 20:19:28 +01:00 |
|
Laurent Destailleur
|
8a89da25c6
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/margin/tabs/thirdpartyMargins.php
|
2018-11-08 20:18:13 +01:00 |
|
Laurent Destailleur
|
9a31a61c9d
|
FIX #9971
|
2018-11-08 20:05:01 +01:00 |
|
John BOTELLA
|
7c4dad2728
|
FIX Warning: count()
|
2018-11-08 12:12:45 +01:00 |
|
gauthier
|
70826c3191
|
FIX : same on lines
|
2018-11-07 16:32:23 +01:00 |
|
gauthier
|
05a679a10c
|
FIX : OppStatusShort doesn't exists
|
2018-11-07 16:26:25 +01:00 |
|
Laurent Destailleur
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +01:00 |
|
Laurent Destailleur
|
e0070bd348
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
|
2018-11-06 18:30:57 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Laurent Destailleur
|
4c591daab1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.formprojet.class.php
|
2018-11-05 10:39:22 +01:00 |
|
Laurent Destailleur
|
56a70ab4e5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-11-05 10:23:15 +01:00 |
|
Philippe GRAND
|
fe6b185bf1
|
Typo
|
2018-10-31 10:32:40 +01:00 |
|
Regis Houssin
|
9589f69574
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
|
2018-10-30 18:29:28 +01:00 |
|
Marc de Lima Lucio
|
2fbc305683
|
FIX: task time screen: last fix was overkill
|
2018-10-30 16:00:56 +01:00 |
|
Marc de Lima Lucio
|
8911d72be8
|
FIX: task time screen: prevent users with access to all project from assigning to tasks they're not allowed to do
|
2018-10-30 12:28:04 +01:00 |
|
Laurent Destailleur
|
4ef0d2ce82
|
Merge branch 'develop' into 8.0_dict
|
2018-10-30 12:26:37 +01:00 |
|
Regis Houssin
|
6e2d62bea6
|
FIX wrong entity id
|
2018-10-29 12:30:36 +01:00 |
|
Regis Houssin
|
9e3800d7fd
|
FIX missing entity filter for stock
|
2018-10-29 11:14:05 +01:00 |
|
Regis Houssin
|
31497e867f
|
FIX missing entity filter
|
2018-10-29 11:01:02 +01:00 |
|
Laurent Destailleur
|
b4600fdc06
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/js/timesheet.js
|
2018-10-29 02:31:05 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
461bd76f70
|
Fix customer and supplier code name
Fix bill time flag must be visible only if option on
|
2018-10-26 23:27:29 +02:00 |
|
Laurent Destailleur
|
d3893b8b95
|
Debug v9
|
2018-10-26 19:00:24 +02:00 |
|
Laurent Destailleur
|
d800fe9256
|
FIX extrafields of taks not visible in creation
|
2018-10-26 16:21:01 +02:00 |
|
Laurent Destailleur
|
852b069785
|
Fix reponsive in stats pages
|
2018-10-26 15:46:17 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
0ad991766c
|
Fix deletion of project when there is events
|
2018-10-23 17:53:01 +02:00 |
|
Laurent Destailleur
|
6a6a8ae14b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-19 14:29:22 +02:00 |
|
Laurent Destailleur
|
5a1a5548df
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/discount.class.php
htdocs/core/lib/payments.lib.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/societe/class/societe.class.php
|
2018-10-19 14:27:15 +02:00 |
|
Frédéric FRANCE
|
47048baa36
|
do not trim int
|
2018-10-17 20:14:01 +02:00 |
|
Philippe GRAND
|
729ff0b9bb
|
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
|
2018-10-16 14:20:11 +02:00 |
|
Maxime Kohlhaas
|
dfe239bf8d
|
Fix refused proposals were counted in totals in project overview
|
2018-10-15 16:58:53 +02:00 |
|
Laurent Destailleur
|
47d98ab69d
|
FIX content lost when editing a label with "
|
2018-10-15 11:05:04 +02:00 |
|
Laurent Destailleur
|
30072a98e9
|
FIX content lost when editing a label with "
|
2018-10-15 11:04:29 +02:00 |
|
Maxime Kohlhaas
|
d4d921b1cc
|
Add massaction generate on main lists
|
2018-10-14 16:27:59 +02:00 |
|
Philippe GRAND
|
7e6cdfb5ec
|
Standardize and update code
|
2018-10-12 09:34:54 +02:00 |
|
Maxime Kohlhaas
|
320ca3db67
|
Fix request on project overview
Fixes #9220
|
2018-10-06 22:53:28 +02:00 |
|
Philippe GRAND
|
956c7b21e2
|
Standardize code
|
2018-10-06 12:18:03 +02:00 |
|
Laurent Destailleur
|
20f45db6b8
|
Merge pull request #9677 from grandoc/new_branch_04_10_2018
Standardize and update code
|
2018-10-04 18:33:24 +02:00 |
|
Laurent Destailleur
|
3a0d777df7
|
Merge pull request #9649 from lex111/replaces-load
Replace multiple load calls with loadLangs method
|
2018-10-04 17:05:48 +02:00 |
|
Philippe GRAND
|
c32b96c207
|
Standardize and update code
|
2018-10-04 09:15:15 +02:00 |
|
Laurent Destailleur
|
771922f427
|
Use 2 distinct left menu entries for leads and projects
|
2018-10-01 18:56:47 +02:00 |
|
Alexey Pyltsyn
|
49de7a5881
|
Replace multiple load calls with loadLangs method
|
2018-10-01 09:22:23 +03:00 |
|
Laurent Destailleur
|
5bd538fb2c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
|
2018-09-20 23:43:34 +02:00 |
|
Laurent Destailleur
|
824b572bd0
|
FIX Amount when using mutlicurrency on PDF
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
|
2018-09-19 15:03:24 +02:00 |
|
Laurent Destailleur
|
9b190d2cbc
|
Merge pull request #9201 from atm-quentin/FIX_select_element
FIX exclude element of the select
|
2018-09-19 14:55:31 +02:00 |
|
Laurent Destailleur
|
eeb919dcda
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-16 14:24:13 +02:00 |
|
Laurent Destailleur
|
055a0b2859
|
Merge branch '8.0' of github.com:Dolibarr/dolibarr into 8.0
|
2018-09-16 13:29:13 +02:00 |
|
Laurent Destailleur
|
79b15b81f2
|
Fix list of tasks on time consumed
|
2018-09-16 13:28:37 +02:00 |
|
Laurent Destailleur
|
d6ee00f2e7
|
Fix constructors does not need return value
|
2018-09-16 10:22:23 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Frédéric FRANCE
|
3e71f4e6b0
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 18:36:49 +02:00 |
|
Frédéric FRANCE
|
998b67fa98
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-12 18:32:15 +02:00 |
|
Laurent Destailleur
|
fcabe67e4b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-12 13:30:28 +02:00 |
|
Frédéric FRANCE
|
a558c3bdac
|
replace select_date
|
2018-09-09 11:25:59 +02:00 |
|
Frédéric FRANCE
|
8249756726
|
replace select_date
|
2018-09-09 10:40:00 +02:00 |
|
Frédéric FRANCE
|
c2ad09cc0e
|
replace select_date
|
2018-09-09 10:11:27 +02:00 |
|
Frédéric FRANCE
|
4a7ea33008
|
replace select_date
|
2018-09-09 08:02:26 +02:00 |
|
Frédéric FRANCE
|
80880d8fb9
|
replace select_date by selectDate
|
2018-09-08 13:00:39 +02:00 |
|
Laurent Destailleur
|
7c5ceff569
|
Fix search on project
|
2018-09-07 15:01:34 +02:00 |
|
Frédéric FRANCE
|
4e619dd0ed
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 18:51:21 +02:00 |
|
Frédéric FRANCE
|
f7c3ca9d20
|
move phpcs:ignore
|
2018-09-05 18:49:06 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Laurent Destailleur
|
203c925c5b
|
Fix look and feel v8
|
2018-09-04 12:03:21 +02:00 |
|
Laurent Destailleur
|
8c2eac4c93
|
FIX #9317
|
2018-09-04 11:34:23 +02:00 |
|
Frédéric FRANCE
|
5f4a922c1d
|
move phpcs:ignore
|
2018-09-03 19:00:37 +02:00 |
|
Philippe GRAND
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe GRAND
|
45cbc36a15
|
Standardize and update code
|
2018-09-01 15:27:55 +02:00 |
|
Frédéric FRANCE
|
10200374ef
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 14:06:23 +02:00 |
|
Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +02:00 |
|
Philippe GRAND
|
d8e6492e93
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2018-09-01 13:07:30 +02:00 |
|
Laurent Destailleur
|
5604f3b0c3
|
Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
|
2018-09-01 12:59:32 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Frédéric FRANCE
|
02b74afe5f
|
function Comment Missing
|
2018-08-31 22:41:51 +02:00 |
|
Frédéric FRANCE
|
a676f4f64f
|
function Comment Missing
|
2018-08-31 21:54:40 +02:00 |
|
Philippe GRAND
|
3a8bde227b
|
Standardize and update code
|
2018-08-31 19:26:08 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
cbdc669ba9
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-29 18:45:36 +02:00 |
|
Frédéric FRANCE
|
0e512cbc36
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 15:47:55 +02:00 |
|
Laurent Destailleur
|
ee204e2e64
|
Fix regression in php style
|
2018-08-29 15:37:35 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Frédéric FRANCE
|
1182f29864
|
trimtrailing
|
2018-08-28 08:33:02 +02:00 |
|
Laurent Destailleur
|
1842a4bb41
|
Merge pull request #9278 from grandoc/new_branch_21_08_2018
Update and standardize code
|
2018-08-28 02:13:28 +02:00 |
|
atm-quentin
|
ec9eeb5201
|
FIX check !empty exclude select element
|
2018-08-27 10:17:18 +02:00 |
|
Frédéric FRANCE
|
d8bf4a0ecf
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-25 09:07:04 +02:00 |
|
Laurent Destailleur
|
7a35b560a6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-23 19:51:52 +02:00 |
|
Laurent Destailleur
|
499d93b8c4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
|
2018-08-23 19:50:58 +02:00 |
|
Laurent Destailleur
|
62b2981e42
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-08-23 19:47:31 +02:00 |
|
Philippe GRAND
|
30992f2730
|
Standardize and update code
|
2018-08-23 18:52:47 +02:00 |
|
Philippe GRAND
|
0c75c41e7b
|
Update and standardize code
|
2018-08-22 19:56:24 +02:00 |
|
Philippe GRAND
|
95349365ba
|
Update and standardize code
|
2018-08-22 11:39:37 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Laurent Destailleur
|
3cfc47a732
|
Fix urls in project module
|
2018-08-21 14:41:59 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
4fdd521d61
|
Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks
FIX : Fetch task will now fetch comments
|
2018-08-21 13:36:20 +02:00 |
|
Laurent Destailleur
|
91bfa4be6c
|
Update project.class.php
|
2018-08-21 13:10:20 +02:00 |
|
Laurent Destailleur
|
3523c2b3d2
|
Update project.class.php
|
2018-08-21 13:09:06 +02:00 |
|
Philippe GRAND
|
a31ad5af3d
|
standardize code
|
2018-08-17 17:55:00 +02:00 |
|
Frédéric FRANCE
|
39462742e2
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-16 08:17:55 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Laurent Destailleur
|
3b245f1b30
|
Merge pull request #9247 from frederic34/missingReturn
return comment
|
2018-08-16 00:35:39 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Philippe GRAND
|
57f51fda3e
|
Standardize
|
2018-08-15 12:48:13 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
atm-greg
|
ba6f7d4b0a
|
fix infinite loop
|
2018-08-14 09:32:43 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
atm-greg
|
3d84adbd76
|
fix recurcivity
|
2018-08-09 12:21:48 +02:00 |
|
atm-greg
|
4e16f64af0
|
Fix project::delete to delete children tasks before parent tasks
|
2018-08-09 12:13:06 +02:00 |
|
atm-quentin
|
09dfcc6016
|
FIX exclude element of the select
|
2018-08-03 14:54:21 +02:00 |
|
Laurent Destailleur
|
b01f07efda
|
Merge branch 'develop' into FIX_project_overview
|
2018-08-02 18:43:55 +02:00 |
|
Juanjo Menent
|
788060aa28
|
Merge pull request #9178 from aspangaro/9.0_a3
NEW : Add project on salaries
|
2018-08-02 11:19:34 +02:00 |
|
Alexandre SPANGARO
|
ee61a88540
|
Small fix
|
2018-08-01 07:46:17 +02:00 |
|
atm-quentin
|
37a4a0c488
|
fix for travis
|
2018-07-31 10:02:36 +02:00 |
|
Alexandre SPANGARO
|
0509a176ca
|
Merge branch 'develop' into 9.0_a3
|
2018-07-31 07:47:43 +02:00 |
|
Alexandre SPANGARO
|
b0e2e69ed0
|
New : Add project on salaries
|
2018-07-31 07:45:03 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
atm-quentin
|
1297470c99
|
FIX project overview (can use any fields as fk_projet)
|
2018-07-26 15:05:32 +02:00 |
|
Laurent Destailleur
|
9d1b7e25f7
|
Merge pull request #9127 from IAS-SYSTEMS-CSC/develop
Fix if time spent minutes was zero
|
2018-07-24 17:35:33 +02:00 |
|
ias-ceo
|
84bfe2965b
|
if time spent minutes zero
|
2018-07-20 16:16:27 +03:00 |
|
Philippe GRAND
|
010c5af245
|
Clean and update code
|
2018-07-19 16:48:20 +02:00 |
|
Laurent Destailleur
|
7ef6b16d31
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/install/step1.php
|
2018-07-03 10:04:25 +02:00 |
|
Laurent Destailleur
|
0138b0e0b7
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-07-03 10:01:30 +02:00 |
|
Laurent Destailleur
|
5138a09db3
|
Fix sql of time spent per day
|
2018-07-02 15:54:21 +02:00 |
|
gauthier
|
d8ca9f2947
|
FIX : we must see number of all shared projects
|
2018-06-27 17:26:04 +02:00 |
|
gauthier
|
86a58def3b
|
FIX : getEntity project and not projet
|
2018-06-27 17:13:50 +02:00 |
|
Laurent Destailleur
|
27a27e02a1
|
Fix css
|
2018-06-22 22:53:53 +02:00 |
|
Laurent Destailleur
|
88d3bf0148
|
FIX creation of tasks must hide closed project
|
2018-06-21 18:47:02 +02:00 |
|
Laurent Destailleur
|
07c514b85c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
htdocs/projet/class/projectstats.class.php
|
2018-06-20 21:56:10 +02:00 |
|
Laurent Destailleur
|
828a9296b4
|
Fix stats on project
|
2018-06-20 21:52:06 +02:00 |
|
Laurent Destailleur
|
714057d435
|
Fix stats on project. Must use assignement on project as filter.
|
2018-06-20 21:31:37 +02:00 |
|
Laurent Destailleur
|
90b2314d98
|
Code comment
|
2018-06-20 21:24:57 +02:00 |
|
Laurent Destailleur
|
4a5fd35e11
|
Look and feel v8
|
2018-06-13 22:57:41 +02:00 |
|
Philippe GRAND
|
5021c7a556
|
clean and update code
|
2018-06-10 18:29:04 +02:00 |
|
Laurent Destailleur
|
95d5a1088b
|
Fix error on sql error (field does not exists)
|
2018-06-08 16:49:14 +02:00 |
|
Laurent Destailleur
|
29ee5dffc4
|
Clean code
|
2018-06-04 12:55:55 +02:00 |
|
Frédéric FRANCE
|
622c394283
|
loadlangs
|
2018-05-26 21:11:25 +02:00 |
|
Laurent Destailleur
|
3d97fa36d1
|
CSS
|
2018-05-25 11:08:05 +02:00 |
|
Laurent Destailleur
|
8303dc1e6f
|
Merge pull request #8815 from atm-florian/develop_fixproject
NEW: add filter on project task list
|
2018-05-25 10:56:10 +02:00 |
|
Laurent Destailleur
|
034752dc0b
|
Update tasks.php
|
2018-05-25 10:54:17 +02:00 |
|
Laurent Destailleur
|
e7cfad0e60
|
Update tasks.php
|
2018-05-25 10:52:24 +02:00 |
|
Laurent Destailleur
|
e51aa68284
|
Fix link to warehouses for events
|
2018-05-24 12:16:04 +02:00 |
|
ATM-Nicolas
|
a455f60c42
|
FIX : Add calls to fetchComments function
|
2018-05-22 16:07:32 +02:00 |
|
ATM-Nicolas
|
d875553648
|
FIX : Remove fetchComments from project and task fetch function
|
2018-05-22 16:03:03 +02:00 |
|
ATM-Nicolas
|
f46d514586
|
Merge branch '7.0' of github.com:Dolibarr/dolibarr into fix_comments_on_tasks
|
2018-05-22 15:12:24 +02:00 |
|
Laurent Destailleur
|
de84f0e687
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
|
2018-05-21 23:35:09 +02:00 |
|
florian HENRY
|
dd946dd197
|
add ressource
|
2018-05-21 11:03:48 +02:00 |
|
Laurent Destailleur
|
fa7f81c828
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-05-18 11:38:26 +02:00 |
|
Laurent Destailleur
|
a450f99e8a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/filefunc.inc.php
|
2018-05-18 11:38:11 +02:00 |
|
Laurent Destailleur
|
162d271884
|
Merge pull request #8803 from atm-alexis/7.0_fix_task_contact_card_withoutproject
FIX 7.0 task contact card without withproject parameters
|
2018-05-18 11:29:11 +02:00 |
|
Laurent Destailleur
|
71f8971a8e
|
Merge pull request #8794 from ATM-Nicolas/fix_select_user
FIX : Select user on add time spent form
|
2018-05-18 11:27:05 +02:00 |
|
florian HENRY
|
a27c263747
|
NEW: add filter on project task list
|
2018-05-18 10:33:32 +02:00 |
|
florian HENRY
|
1b4dcefcb0
|
fix hookname as uniq by card
|
2018-05-18 08:52:13 +02:00 |
|
alexis Algoud
|
5c727c077b
|
fix task contact card without withproject parameters
|
2018-05-16 16:34:19 +02:00 |
|
florian HENRY
|
630e38072b
|
fix SQL and add hook
|
2018-05-15 17:02:54 +02:00 |
|
Laurent Destailleur
|
9552a914d8
|
FIX link for projets not linked to a thirdparties
|
2018-05-14 15:16:19 +02:00 |
|
ATM-Nicolas
|
ca09fddfb3
|
FIX : Select user on add time spent form
|
2018-05-14 15:16:07 +02:00 |
|
Laurent Destailleur
|
546da0ceda
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
|
2018-05-05 14:40:39 +02:00 |
|
Laurent Destailleur
|
9c68b81f59
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
|
2018-05-05 14:34:54 +02:00 |
|
Laurent Destailleur
|
8b4b786969
|
Merge pull request #8730 from atm-arnaud/FIX_project_list_label
FIX label in getnomurl projectlist
|
2018-05-05 13:26:11 +02:00 |
|
Laurent Destailleur
|
2f79a12c6b
|
Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter
fix project and task visibility same as list
|
2018-05-05 13:13:25 +02:00 |
|
Laurent Destailleur
|
8e2844b295
|
css
|
2018-05-04 17:55:29 +02:00 |
|
Laurent Destailleur
|
5cff4c152b
|
Add tab "time spent" in project view. Can swith gantt/list.
|
2018-05-04 11:25:21 +02:00 |
|
atm-arnaud
|
6245f25deb
|
FIX label in getnomurl projectlist
|
2018-05-03 11:47:31 +02:00 |
|
florian HENRY
|
46e94af594
|
fix taskid
|
2018-05-02 19:46:04 +02:00 |
|
florian HENRY
|
3657857d21
|
fix project and task visibility same as list
|
2018-05-02 19:29:18 +02:00 |
|
Laurent Destailleur
|
3374c50e2d
|
CSS
|
2018-05-01 10:42:09 +02:00 |
|
Laurent Destailleur
|
69db960a92
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/activity/perweek.php
|
2018-04-26 18:33:02 +02:00 |
|
Laurent Destailleur
|
761d2b3667
|
FIX Not approved holidays must not be visible into timesheet
|
2018-04-26 17:44:36 +02:00 |
|
Laurent Destailleur
|
45c8bbbf74
|
NEW Can filter on progression in timesheet
|
2018-04-26 12:42:02 +02:00 |
|
Laurent Destailleur
|
bf829a4f9f
|
NEW Add name of day in the timesheet input page per day.
|
2018-04-26 11:12:41 +02:00 |
|
Laurent Destailleur
|
d988585f86
|
Save spaces in timesheet report page
|
2018-04-26 11:07:20 +02:00 |
|
Laurent Destailleur
|
36616cdd50
|
FIX When time is entered without hour, edit keeps this
|
2018-04-26 10:07:27 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
ATM-Nicolas
|
3d179fb7d3
|
FIX : Fetch function will fetch comments
|
2018-04-24 09:17:03 +02:00 |
|
Laurent Destailleur
|
fb8ad77378
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2018-04-23 23:09:53 +02:00 |
|
Laurent Destailleur
|
f95e5078c1
|
FIX Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
|
2018-04-23 21:33:49 +02:00 |
|
Laurent Destailleur
|
ac89951acd
|
Merge pull request #8647 from fmarcet/develop
New: Add same parameters on 'printFieldListTitle' hooks
|
2018-04-22 19:35:09 +02:00 |
|
Laurent Destailleur
|
cef9782179
|
Clean defined constant at begin of pages
|
2018-04-21 12:00:55 +02:00 |
|
Ferran Marcet
|
6ced1a3264
|
New: Add same parameters on 'printFieldListTitle' hooks
|
2018-04-20 10:38:16 +02:00 |
|
Laurent Destailleur
|
bbfc4a3e17
|
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
|
2018-04-18 03:26:15 +02:00 |
|
Laurent Destailleur
|
0d0da234b1
|
Lowercase NULL, TRUE, FALSE according to PSR2
|
2018-04-16 13:51:16 +02:00 |
|
Laurent Destailleur
|
8fbde88872
|
Look and feel v8
|
2018-04-15 17:37:49 +02:00 |
|
Laurent Destailleur
|
d4cd5a0d95
|
Fix syntax error
|
2018-04-13 13:37:43 +02:00 |
|
Laurent Destailleur
|
be965bdbab
|
Clean code
|
2018-04-13 13:28:48 +02:00 |
|
Laurent Destailleur
|
1521b0595b
|
Clean code
|
2018-04-13 11:03:03 +02:00 |
|
All-3kcis
|
880fa55dd5
|
display user-friendly filesize
|
2018-04-12 15:29:22 +02:00 |
|
Laurent Destailleur
|
1feee6378f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-04-11 14:45:52 +02:00 |
|
Laurent Destailleur
|
21c65f812a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-04-11 13:21:20 +02:00 |
|
Laurent Destailleur
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
atm-greg
|
b1469ba761
|
add doActions hook on projettaskcard
|
2018-04-09 07:06:20 +02:00 |
|
Laurent Destailleur
|
f659b62316
|
CSS
|
2018-04-07 17:14:23 +02:00 |
|
Laurent Destailleur
|
d46a8eb8f0
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/company.php
|
2018-04-07 12:30:30 +02:00 |
|
Laurent Destailleur
|
920891ba70
|
Fix edit of default opportunit percent
|
2018-04-06 00:01:24 +02:00 |
|
Laurent Destailleur
|
9d9f3ddf85
|
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
NEW: generalize use of button to create new element from list
|
2018-04-05 16:40:15 +02:00 |
|
Laurent Destailleur
|
b59d8a6473
|
Merge pull request #8501 from ATM-Consulting/develop_atm
NEW: send mails from project card
|
2018-04-05 16:39:06 +02:00 |
|
Laurent Destailleur
|
43f8834b28
|
Uniformize code with the new module builder framework
|
2018-03-31 18:48:27 +02:00 |
|
Marc de Lima Lucio
|
0366e645d5
|
NEW: generalize button to create object from list, for most of the lists
|
2018-03-30 16:54:38 +02:00 |
|
Marc de Lima Lucio
|
913135cb20
|
FIX: project mail: templates + hide actions when in presend
|
2018-03-28 17:10:12 +02:00 |
|
Marc de Lima Lucio
|
f5324bb15e
|
FIX: only send mail from open project
|
2018-03-28 16:07:02 +02:00 |
|
Marc de Lima Lucio
|
f9bc5bf931
|
NEW: can send mail from project card
|
2018-03-28 15:22:47 +02:00 |
|
Laurent Destailleur
|
0c45760dd4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
|
2018-03-19 17:58:19 +01:00 |
|
Laurent Destailleur
|
5db718448f
|
Delete at end
|
2018-03-19 11:29:06 +01:00 |
|
Laurent Destailleur
|
b4881645d8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2018-03-18 20:21:59 +01:00 |
|
philippe-opendsi
|
452c9e22bb
|
Add mass action on project's list to close projects
|
2018-03-16 15:24:49 +01:00 |
|
Laurent Destailleur
|
c962b89495
|
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
|
2018-03-15 20:46:55 +01:00 |
|
Laurent Destailleur
|
852bf8dab7
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
|
2018-03-15 01:57:35 +01:00 |
|
ATM-Nicolas
|
e801b5a431
|
FIX : Delete tasks on project delete will now trigger TASK_DELETE
|
2018-03-14 11:38:42 +01:00 |
|
Laurent Destailleur
|
e7a315958d
|
Merge pull request #8381 from fmarcet/7.0
FIX Can't activate tasks on projects configuration
|
2018-03-14 10:42:45 +01:00 |
|
Ferran Marcet
|
304595ee4f
|
Fix: Can't activate tasks on projects configuration
|
2018-03-14 09:48:39 +01:00 |
|
Laurent Destailleur
|
0258d3aeeb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-13 18:04:59 +01:00 |
|
Laurent Destailleur
|
17b7c6268e
|
FIX avoid "Array" on screen
|
2018-03-13 15:29:52 +01:00 |
|
Laurent Destailleur
|
5b8006a6bb
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
|
2018-03-08 16:37:17 +01:00 |
|
Laurent Destailleur
|
d8dcebfa9a
|
FIX Do not lose filter when editing comment of a time spent in task view
|
2018-03-07 20:12:40 +01:00 |
|
Laurent Destailleur
|
c1497b065c
|
CSS
|
2018-03-07 14:13:55 +01:00 |
|
Laurent Destailleur
|
7e6ba51780
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/tasks/comment.php
|
2018-03-07 13:06:29 +01:00 |
|
Laurent Destailleur
|
f7f9f0e605
|
Update comment.php
|
2018-03-07 12:40:09 +01:00 |
|
Laurent Destailleur
|
1ca5c7083a
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
|
2018-03-07 11:54:48 +01:00 |
|
florian HENRY
|
bb73a715a8
|
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task
|
2018-03-07 08:49:08 +01:00 |
|
florian HENRY
|
03873038d5
|
fix comment task
|
2018-03-07 08:47:34 +01:00 |
|
Laurent Destailleur
|
23a4a60970
|
Fix status of task
|
2018-03-06 21:51:43 +01:00 |
|
Laurent Destailleur
|
01b0336e9b
|
Fix tooltip on delete button
|
2018-03-03 12:10:27 +01:00 |
|
Laurent Destailleur
|
85dfc2cdf6
|
Merge pull request #8252 from ruistrecht-alt/Fix_missing_row_on_project_insert
Fix missing insert bill_time in project.class on create
|
2018-03-02 17:59:56 +01:00 |
|
Laurent Destailleur
|
04934cc4aa
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
|
2018-02-27 19:18:43 +01:00 |
|
Rui Strecht
|
e58cf4db42
|
Fix missing insert bill_time in project.class on create
|
2018-02-27 11:44:03 +00:00 |
|
Laurent Destailleur
|
0cc84ab92f
|
FIX Missing restore_lastsearch_values
|
2018-02-26 21:21:28 +01:00 |
|
Laurent Destailleur
|
3c552cec15
|
FIX Missing restore_lastsearch_values
|
2018-02-26 21:16:40 +01:00 |
|
Laurent Destailleur
|
82475e2e5f
|
WIP Option PROJECT_BILL_TIME_SPENT
|
2018-02-26 14:28:51 +01:00 |
|
Laurent Destailleur
|
de89893d57
|
NEW Show total of time consumed in week in time spent entry page
|
2018-02-26 14:09:56 +01:00 |
|
Laurent Destailleur
|
cb45c86711
|
WIP Option PROJECT_BILL_TIME_SPENT
|
2018-02-26 13:21:16 +01:00 |
|
Laurent Destailleur
|
229ee5c12f
|
Fix search criteria lost
|
2018-02-26 12:32:56 +01:00 |
|
Laurent Destailleur
|
ce928d9150
|
Fix search criteria lost
|
2018-02-26 12:32:26 +01:00 |
|
Laurent Destailleur
|
46c2f098e0
|
NEW Can enter time spent from the list of time spent of project
|
2018-02-26 12:21:01 +01:00 |
|
Laurent Destailleur
|
d1e846385a
|
FIX Useless clean of tree
|
2018-02-26 12:01:36 +01:00 |
|
Laurent Destailleur
|
46f70ebf8e
|
FIX Useless clean of tree
|
2018-02-26 12:01:13 +01:00 |
|
Laurent Destailleur
|
0d12552445
|
NEW Can enter time spent from the list of time spent of project
|
2018-02-26 11:57:29 +01:00 |
|
Laurent Destailleur
|
667c9045a2
|
FIX duplicate confirm message. Missing reposition class
|
2018-02-26 10:33:39 +01:00 |
|
Laurent Destailleur
|
41638e6dff
|
Fix back link of look and feel v7
|
2018-02-26 09:20:05 +01:00 |
|
Rui Strecht
|
7b448a2d18
|
Fixed issue with elementarray null if num_rows = 0
|
2018-02-25 12:29:15 +01:00 |
|
Rui Strecht
|
41c663f03f
|
Fixed issue with elementarray null if num_rows = 0
|
2018-02-22 12:22:31 +00:00 |
|
Laurent Destailleur
|
b4446764f8
|
Clean code of deprecated usage
|
2018-02-21 14:48:25 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
6b74c79798
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
|
2018-02-15 15:34:17 +01:00 |
|
Laurent Destailleur
|
a4384b1921
|
Fix date start/end of project are day not hours
|
2018-02-15 02:02:32 +01:00 |
|
Laurent Destailleur
|
74116f495e
|
CSS enhancement
|
2018-02-10 00:05:04 +01:00 |
|
Laurent Destailleur
|
01f09e6c09
|
CSS enhancement
|
2018-02-10 00:04:05 +01:00 |
|
Laurent Destailleur
|
2315997aad
|
CSS enhancement
|
2018-02-10 00:00:12 +01:00 |
|
Laurent Destailleur
|
e984d7df9f
|
NEW Add total of time spent in timespent page at top of page too.
|
2018-02-09 23:52:43 +01:00 |
|
Laurent Destailleur
|
633dc507fe
|
NEW Use a css style for weekend in time spent
|
2018-02-09 20:11:32 +01:00 |
|
Laurent Destailleur
|
729cf20df7
|
Fix css
|
2018-02-07 20:53:13 +01:00 |
|
Laurent Destailleur
|
490a1bd08d
|
Fix label
|
2018-02-06 18:36:47 +01:00 |
|
Laurent Destailleur
|
69196dc52c
|
Fix menu not visible with auguria module
|
2018-02-06 18:22:04 +01:00 |
|
Laurent Destailleur
|
ea92f6beae
|
Fix for multicompany
|
2018-02-06 10:57:53 +01:00 |
|
Laurent Destailleur
|
5455ab3280
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/projet/card.php
|
2018-02-04 23:17:09 +01:00 |
|
Laurent Destailleur
|
dbe45d03d3
|
Fix: amount into form must be numeric without format
|
2018-02-04 23:12:19 +01:00 |
|
Laurent Destailleur
|
742079cfe3
|
Clean code
|
2018-02-01 19:15:50 +01:00 |
|
Laurent Destailleur
|
0412d3d11d
|
Fix extrafield mandatory check.Fix empty extrafields with type link.
|
2018-02-01 19:05:24 +01:00 |
|
Laurent Destailleur
|
f6c17247af
|
Fix can set draft status of project
|
2018-02-01 17:50:19 +01:00 |
|
Laurent Destailleur
|
d4e15545b4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-01-26 12:10:13 +01:00 |
|
Laurent Destailleur
|
1834be79a0
|
Fix supplier suggested when creating order from project overview
|
2018-01-26 11:31:34 +01:00 |
|
Laurent Destailleur
|
6e906ac0e3
|
Clean code
|
2018-01-24 13:08:09 +01:00 |
|
Laurent Destailleur
|
dcd579242f
|
Fix <br /> (xml) into <br> (html)
|
2018-01-17 13:26:57 +01:00 |
|
Laurent Destailleur
|
1f2d275ef2
|
Fix conditions of some fields
|
2018-01-13 17:21:56 +01:00 |
|
Laurent Destailleur
|
6d9a9dd3fe
|
Fix Time spent for "other task" was not visible when filtering project
|
2018-01-11 13:08:13 +01:00 |
|
Laurent Destailleur
|
940e9cb1a5
|
Fix travis error
|
2018-01-05 01:46:07 +01:00 |
|
Laurent Destailleur
|
90e9b3db68
|
Fix look and feel v7
|
2018-01-04 20:42:57 +01:00 |
|
Laurent Destailleur
|
e10a9912dc
|
Fix missing worload
|
2018-01-04 19:54:30 +01:00 |
|
Laurent Destailleur
|
300d4e1603
|
Fix disable direct debit request for replaced invoices
|
2018-01-04 14:35:02 +01:00 |
|
Laurent Destailleur
|
c4eba665d0
|
Fix order of task in gantt diagram
|
2018-01-04 13:52:37 +01:00 |
|
Laurent Destailleur
|
f6007045f5
|
Fix search filters
|
2018-01-04 00:23:08 +01:00 |
|
Laurent Destailleur
|
635917d0e6
|
CSS
|
2017-12-20 21:33:45 +01:00 |
|
Laurent Destailleur
|
2204790602
|
Fix filter on project id when id is list with comma
|
2017-12-18 19:04:57 +01:00 |
|
Laurent Destailleur
|
1351a43a30
|
FIX Maxi debug of permission for users external or restricted to sales
representatives
|
2017-12-18 16:13:05 +01:00 |
|
Laurent Destailleur
|
6524fce9b7
|
Merge pull request #7959 from AurelienC/patch-1
Fix Resolve bug for REST API PUT task
|
2017-12-16 01:05:54 +01:00 |
|
Laurent Destailleur
|
929893bd49
|
Fix regression introduced with task comments
|
2017-12-15 20:07:35 +01:00 |
|
Laurent Destailleur
|
ebdbddb7fd
|
Fix error message and migration
|
2017-12-15 19:50:39 +01:00 |
|
Aurélien
|
88b456a542
|
Resolve bug for REST API PUT task
An error occured when I was trying to PUT task despite all rigths.
Ressource 'task' --> 'tasks'
|
2017-12-14 11:53:48 +01:00 |
|
Laurent Destailleur
|
9314dcb046
|
Fix regression
|
2017-12-12 10:13:48 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
Maxime Kohlhaas
|
8a39e2a413
|
Fix : no need for action button on cards, link is now available
|
2017-12-07 00:36:23 +01:00 |
|
ATM-Nicolas
|
bdf1e30ef3
|
Merge branch 'develop' into 6.0_fix_project_conf
|
2017-12-05 12:20:48 +01:00 |
|
ATM-Nicolas
|
36bcd26e27
|
FIX : link project from other company conf
|
2017-12-05 09:21:24 +01:00 |
|
Laurent Destailleur
|
78c4b7f912
|
Fix look and feel v7
|
2017-12-04 20:17:07 +01:00 |
|
Laurent Destailleur
|
ce32da6217
|
Fix debugs APIs
|
2017-12-01 15:39:18 +01:00 |
|
Laurent Destailleur
|
a0231b5c60
|
Fix responsive
|
2017-12-01 12:55:28 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
Laurent Destailleur
|
4f4f929efb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
|
2017-11-24 17:02:14 +01:00 |
|
Laurent Destailleur
|
9c22b5f335
|
Replace deprecated dol_print_graph with DolGraph
|
2017-11-23 20:24:05 +01:00 |
|
Laurent Destailleur
|
b0cecab22b
|
Removed useless code
|
2017-11-22 21:26:24 +01:00 |
|
Laurent Destailleur
|
5fa8db1650
|
Work on timesheets
|
2017-11-22 21:19:40 +01:00 |
|
Laurent Destailleur
|
e1344eb97c
|
Fix edit of time spent
|
2017-11-22 17:25:31 +01:00 |
|
Laurent Destailleur
|
9bdd31e05a
|
Module builder
|
2017-11-21 12:28:34 +01:00 |
|
Laurent Destailleur
|
ba372bfc5c
|
Fix typo
|
2017-11-16 23:11:49 +01:00 |
|
Laurent Destailleur
|
e06087888b
|
NEW Show line "other filtered task" when using filter on timesheet.
|
2017-11-16 22:55:04 +01:00 |
|
Laurent Destailleur
|
4b90510b82
|
Fix time assigned to wrong user
|
2017-11-16 22:35:55 +01:00 |
|
Laurent Destailleur
|
f153d9c9ff
|
Fix time spent counted twice
|
2017-11-16 19:41:31 +01:00 |
|
Laurent Destailleur
|
0d192df1fd
|
Standardize interface
|
2017-11-16 18:33:56 +01:00 |
|
Laurent Destailleur
|
f68b2bdeca
|
Use the confirmation when deleting from mass action everywhere.
|
2017-11-15 11:39:11 +01:00 |
|
Laurent Destailleur
|
a12186a0b8
|
Use HTTP response code 304 instead of 500 when nothing is done
|
2017-11-14 01:26:02 +01:00 |
|
Laurent Destailleur
|
836f6bf3c9
|
Fix search filter when using extrafields 'links'
|
2017-11-12 12:39:23 +01:00 |
|
Laurent Destailleur
|
d1860b87f8
|
NEW Add a confirmation for all mass action 'delete'
|
2017-11-11 16:34:11 +01:00 |
|
Laurent Destailleur
|
1b28c45e2c
|
PERF Links in getNomUrl use only one tag a instead of 2.
|
2017-11-02 15:19:14 +01:00 |
|
Laurent Destailleur
|
d569218162
|
Fix 'separate' extrafields must be visible by default.
Sandardize name of list pages (must end with _list.php)
|
2017-10-29 11:23:20 +01:00 |
|
Laurent Destailleur
|
a00cf6b28b
|
Merge pull request #7708 from Elimig/patch-3
Fix don't show title in tooltip
|
2017-10-27 01:55:14 +02:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Elimig
|
9ad2073b7e
|
Update list.php
Fixed bug of non-uploading title in tooltip
|
2017-10-25 12:03:22 +02:00 |
|
Laurent Destailleur
|
9f0f5eb5e8
|
Fix translation of extrafields type
|
2017-10-24 18:05:43 +02:00 |
|
Elimig
|
dbad8636ef
|
update index.php
I propose to the maintainer a variation to code at line number 97 to show only the statuses enabled in the pie chart.
|
2017-10-23 13:48:45 +02:00 |
|
Laurent Destailleur
|
f4f47c6732
|
NEW Remove tooltip tipTip library replaced with standatd jquery tooltip
|
2017-10-22 21:15:08 +02:00 |
|
Laurent Destailleur
|
5b70468cac
|
Better translation
|
2017-10-20 04:25:49 +02:00 |
|
Laurent Destailleur
|
a16f0e4356
|
NEW The gantt diagram is now sensitive to hours
NEW Add a group task line for tasks on same level on gantt diagram
|
2017-10-20 04:15:44 +02:00 |
|
Laurent Destailleur
|
abd5251330
|
Better responsive
|
2017-10-19 19:53:29 +02:00 |
|
Laurent Destailleur
|
a818422302
|
Update jsgantt to 1.7.5.4
|
2017-10-18 21:24:17 +02:00 |
|
Laurent Destailleur
|
7f85d73001
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
|
2017-10-18 19:51:29 +02:00 |
|
Laurent Destailleur
|
41c1dd2822
|
Code comment
|
2017-10-18 19:41:28 +02:00 |
|
Laurent Destailleur
|
3e43e164ae
|
FIX Bad ressource list in popup in gantt view
|
2017-10-18 19:13:44 +02:00 |
|
Laurent Destailleur
|
cfeab01996
|
Prefill hour/min to 23:59 when creating a task
|
2017-10-18 18:50:30 +02:00 |
|
Laurent Destailleur
|
428c3e973d
|
FIX for combo on rtl languages
|
2017-10-18 18:36:10 +02:00 |
|
Laurent Destailleur
|
45ac8367bd
|
NEW Add API for contracts
|
2017-10-16 17:56:59 +02:00 |
|
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 |
|