lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,659 Commits 43 Branches 150 Tags 886 MiB
12.0
Commit Graph

2527 Commits

Author SHA1 Message Date
Guillaume Matheron
19e69dc869 Creating invoice from time spent now takes in to account the product duration to compute the quantity to bill 2020-01-02 15:18:18 +01:00
stickler-ci
92f50f6357 Fixing style errors. 2020-01-02 14:00:39 +00:00
Guillaume Matheron
e9e0aae1ce Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill) 2020-01-02 14:59:53 +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
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
stickler-ci
458c1e2174 Fixing style errors. 2019-12-29 19:58:38 +00:00
Guillaume Matheron
84d8ca4b33 Made spaces/tab usage more consistent 2019-12-29 20:47:18 +01:00
Guillaume Matheron
5b1ae96ce9 Added two new options when billing time spent on a project : 
- Create one invoice line per timespent entry

 - Create one invoice line per task
 2019-12-29 20:46:53 +01:00
VESSILLER
811adad8c8 FIX notice var nbfield of array not initialized 2019-12-26 10:34:10 +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
Laurent Destailleur
e2451bcd26 Update images 
Fix value of delay for warning on project not closed
 2019-12-21 17:11:21 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
3207add2a6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/fourn/class/fournisseur.product.class.php
 2019-12-17 12:52:12 +01:00
Laurent Destailleur
27b1e71cd2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-17 12:45:00 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Frédéric FRANCE
7eee26cc0f
Update project.php 2019-12-14 16:18:41 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
VESSILLER
7246b63542 NEW add total weighted amount in project list 2019-12-12 17:34:37 +01:00
VESSILLER
4ea042213e NEW show project label in project index 2019-12-11 10:59:19 +01:00
VESSILLER
0396b348f7 NEW add weighted amount on project/opportunity 2019-12-10 09:32:37 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
f549c4fc9c
Merge pull request #12544 from frederic34/select_produits 
Form select_produits returns void
 2019-12-01 00:47:02 +01:00
Laurent Destailleur
dc77b47d7f
Merge pull request #12564 from atm-john/develop_fix_task_extrafield_fatal_error 
Fix Fatal error : task extrafield error
 2019-12-01 00:45:23 +01:00
ATM John BOTELLA
ff55c9da4a Fix task extrafield error 2019-11-30 00:56:45 +01:00
Frédéric FRANCE
7bbd500e81
The property table_element_date does not exist on Project 
see line 612
 2019-11-28 23:02:14 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void 2019-11-28 21:23:53 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
stickler-ci
7f24d1fe40 Fixing style errors. 2019-11-22 14:18:09 +00:00
altairis
bdb2b730af allow time consumed to be linked to another task 2019-11-22 15:14:55 +01:00
Laurent Destailleur
796c13403d
Merge pull request #12486 from TobiasSekan/FixBoardTaskNumberAlwaysZero 
Fix open tasks number on dashboard was always zero
 2019-11-22 14:37:48 +01:00
Scrutinizer Auto-Fixer
b388c6b7a8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:14:59 +00:00
Laurent Destailleur
0fffdd891e Sanitize data 2019-11-21 15:37:59 +01:00
Laurent Destailleur
9a8c5d5c29 Sanitize param 2019-11-21 15:36:30 +01:00
Tobias Sekan
f6c5605fd5
Fix number of tasks on dashboard always zero 2019-11-21 08:29:47 +01:00
Laurent Léonard
dbbcda9e99 Add WYSIWYG editor to description field of projects 2019-11-20 06:38:28 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Frédéric FRANCE
67d05cae1b
doxygen 2019-11-14 19:06:14 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:46 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2019-11-14 08:49:53 +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
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:34:37 +00:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2 2019-11-13 19:14:50 +01:00
Laurent Destailleur
d10be4f169 FIX #12409 FIX #12408 2019-11-13 18:40:24 +01:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent 
100% centpercent
 2019-11-07 10:39:09 +01:00
Laurent Destailleur
b3feb6b095 Fix lang not defined 2019-11-06 00:42:29 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
98102e49d2 Fix phpcs 2019-11-05 15:48:41 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
cc51066161
Merge pull request #12273 from frederic34/patch-6 
css
 2019-11-02 13:30:56 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c Fix color of task progression 2019-11-01 23:16:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
c3a9f7ce58
css 2019-10-30 18:49:48 +01:00
Philippe GRAND
e02da55c2d add some comment 2019-10-30 10:08:36 +01:00
Laurent Destailleur
5cbed0a6ed
Merge pull request #12220 from frederic34/patch-8 
css
 2019-10-30 03:13:39 +01:00
VESSILLER
d28242a3c5 FIX remove backward compatibility projectid and uses object id instead 2019-10-29 16:40:47 +01:00
Laurent Destailleur
7fee355fba FIX statistics on MRP page 2019-10-25 10:35:09 +02:00
Frédéric FRANCE
ee21415c6c
Update index.php 2019-10-24 23:12:16 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02: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
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
15d4a18599
Update document.php 2019-10-14 21:21:04 +02:00
iouston
f6aafea33c
Update document.php 
add 2 hidden options for set a default field and a defaut order on document page
 2019-10-14 15:09:59 +02:00
Frédéric FRANCE
fbb44192e0
fix travis 2019-10-08 18:40:39 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
f6cd3814ac FIX Look and feel v10 2019-10-06 15:08:05 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
stickler-ci
cb34c7e299 Fixing style errors. 2019-10-03 20:08:42 +00:00
ATM john
13e456d992 Fix Project LibStatus langs 2019-10-03 22:05:48 +02:00
ATM john
edc4dc3727 Fix project libStatus to use new dolGetStatus 2019-10-03 21:20:07 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
cd242523a5 Fix billed time is empty 2019-10-01 13:47:12 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +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
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +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
Laurent Destailleur
2eaa910336
Update project.class.php 2019-09-27 12:32:27 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +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
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/ligne.php
 2019-09-17 12:23:58 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
9f775ca480 Fix look and feel v10 2019-08-29 01:37:19 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
cb05380f74 Fix look and feel v10 2019-08-21 04:02:30 +02:00
Laurent Destailleur
cb0bb55b3a Label centered 2019-08-19 10:29:59 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
ATM john
22c4a1b49e Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-11 09:57:13 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +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
1d7885bc0c FIX We should remove property comments only for project and task api. 2019-07-25 16:58:24 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
559a902405 FIX summary of time spent in preview tab of projects 2019-07-23 03:39:35 +02:00
Laurent Destailleur
d6d5a93225 Fix css 2019-07-23 03:15:06 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
ddc01b4c27 Removed the method liste_array() of project class. It was not used by 
core code.
 2019-07-18 14:22:05 +02:00
Laurent Destailleur
3b393e818a Fix missing entity property into fetch 2019-07-18 14:17:29 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
1b4507f07d Fix on a hidden option 2019-07-02 11:40:05 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
 2019-06-25 13:03:54 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared 
NEW Add global task declared progression
 2019-06-24 18:12:55 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Maxime Kohlhaas
476df203a7 Add global task declared progression 2019-06-20 13:59:08 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
Alexandre SPANGARO
bcd5949bac Responsive on project index 2019-06-18 21:39:30 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
f6f66f2a77 Fix syntax error 2019-06-17 18:11:38 +02:00
Laurent Destailleur
dac99c878c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-17 15:57:06 +02:00
Laurent Destailleur
157526205d Fix css 2019-06-16 23:00:40 +02:00
Laurent Destailleur
c0a30d1ff5 FIX #11325 FIX #5249 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-16 22:21:38 +02:00
Laurent Destailleur
dd5e42e325 FIX #11325 FIX #5249 2019-06-16 22:17:04 +02:00
Juanjo Menent
a73ae49c4d FIX: #11296 2019-06-14 18:56:30 +02:00
Laurent Destailleur
ed2d9435db
Update project.class.php 2019-06-07 15:21:15 +02:00
florian HENRY
c5afc3131f fix variable name 2019-06-05 15:59:35 +02:00
florian HENRY
1d4962cf81 fix scrutinizer 2019-06-05 15:57:16 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
 2019-05-20 15:47:06 +02:00
Laurent Destailleur
ebf252f8a3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-20 15:40:50 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
florian HENRY
f1aad766ca fix: bad sql request 2019-05-18 15:11:12 +02:00
florian HENRY
f3315bb8f5 fix: bad sql request 2019-05-18 15:09:03 +02:00
florian HENRY
c2b1c8d439 remove bad fix 2019-05-18 12:26:36 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
 2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
John BOTELLA
b0e780fab0 Fix travis 2019-05-13 09:39:45 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
92534cc101
Merge pull request #11127 from Supermanu/del_proj_cat 
FIX: Remove link between categories and project when deleting
 2019-05-04 12:52:35 +02:00
Supermanu
9aed9359ad FIX: Remove link between categories and project when deleting 2019-05-04 12:22:45 +02:00
Sof
8927b37ae2
FIX : Fatal Errors 
"Countable array" and Class "Facture" not found
 2019-05-04 11:18:14 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
627ef14454 FIX The autocopy feature was ko for suppliers 2019-04-29 18:51:15 +02:00
Laurent Destailleur
899f41d68c Fix bad constant MAIN_MAIL_AUTOCOPY into email form of project page. 2019-04-29 18:26:27 +02:00
Laurent Destailleur
3393aba85f Fix autocopy on projects 2019-04-29 18:19:56 +02:00
Laurent Destailleur
c7fcecc336 Fix email not loaded 2019-04-29 17:17:25 +02:00
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