Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

704 Commits

Author SHA1 Message Date
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +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
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
Philippe GRAND
c6dbc0621a update with html5 compliant code 2019-03-17 10:05:24 +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
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +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
Laurent Destailleur
695a681c14 NEW Can generate invoices from timespent of a project 2019-02-03 21:35:30 +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
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +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
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
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
adc6c1d2d1 Work on invoicing time spent 2019-01-15 20:59:56 +01:00
ldestailleur
5094b6bcfc WIP Work on split of timespent 2019-01-04 16:24:56 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
188cda7902 Fix look and feel v9 2018-12-10 12:32:26 +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
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
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +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
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +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
852b069785 Fix reponsive in stats pages 2018-10-26 15:46:17 +02:00