Laurent Destailleur
|
bd15bf2952
|
CSS
|
2019-04-27 13:43: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
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Laurent Destailleur
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
ATM john
|
684879d73c
|
apply appli btn to more elements
|
2019-04-16 21:49:26 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +02:00 |
|
John BOTELLA
|
7372e8c610
|
Appli function to links
|
2019-04-15 15:47:36 +02:00 |
|
Laurent Destailleur
|
621709ed42
|
FIX check thirdparty defined when PROJECT_THIRDPARTY_REQUIRED is set
|
2019-04-10 16:54:20 +02:00 |
|
Laurent Destailleur
|
2765cee005
|
CSS
|
2019-04-09 19:36:56 +02:00 |
|
Laurent Destailleur
|
d7f980fda0
|
NEW Add picto of deletion on mass action combo lists
|
2019-04-09 01:22:59 +02:00 |
|
Laurent Destailleur
|
321ffb859b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/perweek.php
|
2019-04-08 14:09:18 +02:00 |
|
Laurent Destailleur
|
f4efc86dd3
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-04-08 14:05:14 +02:00 |
|
Laurent Destailleur
|
ffca289bff
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-08 14:04:42 +02:00 |
|
Laurent Destailleur
|
c1f0826005
|
Update perweek.php
|
2019-04-08 13:49:16 +02:00 |
|
Laurent Destailleur
|
153e563c9f
|
Update perday.php
|
2019-04-08 13:49:05 +02:00 |
|
Laurent Destailleur
|
b23f74eab1
|
FIX Status of opportunity should never be -1
|
2019-04-08 12:17:57 +02:00 |
|
atm-ph
|
ea87b2ddb6
|
Fix no init hook on timesheet
|
2019-04-05 11:26:11 +02:00 |
|
Laurent Destailleur
|
5891d0a056
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/list.php
htdocs/projet/list.php
|
2019-04-04 17:45:02 +02:00 |
|
Laurent Destailleur
|
fa95f5575c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/product/list.php
|
2019-04-04 17:41:22 +02:00 |
|
Laurent Destailleur
|
eaf9a2402a
|
Fix length of label
|
2019-04-04 17:39:51 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Laurent Destailleur
|
0091b65a83
|
Fix phpcs
|
2019-04-01 18:10:14 +02:00 |
|
Laurent Destailleur
|
c07159fee9
|
Fix regression in timesheet. Keep extrafield of task for the moment.
|
2019-03-31 22:06:41 +02:00 |
|
Laurent Destailleur
|
d572a9258c
|
Merge branch 'develop' into new_evol_time_spent_views
|
2019-03-31 19:12:27 +02:00 |
|
Laurent Destailleur
|
0d564cdd6c
|
Merge pull request #10919 from grandoc/new_branch_26_03_2019
New branch 26 03 2019
|
2019-03-31 18:23:05 +02:00 |
|
Laurent Destailleur
|
4e09867b01
|
Generation of invoice for timespent works on all timesheet tabs
|
2019-03-29 15:54:46 +01:00 |
|
Laurent Destailleur
|
ecc7afa4e3
|
Removed duplicate code
|
2019-03-29 15:27:00 +01:00 |
|
Laurent Destailleur
|
697a2e5576
|
Show time to bill and billed in list of tasks
|
2019-03-29 14:34:55 +01:00 |
|
Laurent Destailleur
|
9a34e58474
|
Fix regression in mass action
|
2019-03-29 13:39:59 +01:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
f1db09fc4f
|
Shwo field time billed and not billed on list of tasks
|
2019-03-29 13:18:12 +01:00 |
|
Laurent Destailleur
|
9eaef2ce7a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
|
2019-03-26 12:40:36 +01:00 |
|
Laurent Destailleur
|
29fe65ed75
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-26 12:37:21 +01:00 |
|
Laurent Destailleur
|
e5f54bd14c
|
FIX Remane of project
|
2019-03-26 12:35:44 +01:00 |
|
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 |
|