Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-03-03 09:05:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 39 Branches 192 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

3297 Commits

Author SHA1 Message Date
stickler-ci
1de640242f Fixing style errors. 2020-01-28 18:33:01 +00:00
kadogo
9313aabd5c NEW Add duration information for fichinter 2020-01-28 19:28:09 +01:00
Laurent Destailleur
3ece94fb2e Fix class not found 2020-01-27 00:06:10 +01:00
Laurent Destailleur
2177116f83 Merge pull request #12499 from altatof/updtask 
NEW : allow time consumed to be linked to another task
 2020-01-26 23:58:28 +01:00
Norbert Penel
24cb739b7c FIX : multicompany, impossible to add second task 
due to ref already exists, it was impossible to add a second task on company > 1

this need to be fixed in all Dolibarr versions 

All datas with more than 1 company are corrupted !
 2020-01-20 18:54:35 +01:00
Laurent Destailleur
3f79c00542 Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
a803feb842 Merge pull request #12474 from openthink-laurent/add-wysiwyg-editor-description-field-projects 
Add WYSIWYG editor to description field of projects
 2020-01-15 14:18:42 +01:00
stickler-ci
eddc38e37f Fixing style errors. 2020-01-15 13:18:25 +00:00
Laurent Destailleur
e15b96c37d Merge branch 'develop' into updtask 2020-01-15 14:16:43 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
6196f5412b Fix date format 2020-01-15 13:37:04 +01:00
Laurent Destailleur
be9decf06d Fix date format 2020-01-15 13:36:22 +01:00
Laurent Destailleur
0d413c47b1 Fix duplicate info 2020-01-15 13:33:11 +01:00
Laurent Destailleur
43bf0a79e6 Merge pull request #12770 from guillaumematheron/develop 
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
 2020-01-15 13:23:25 +01:00
Scrutinizer Auto-Fixer
8691194627 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:03:10 +00:00
Laurent Destailleur
14e92bd0be css 2020-01-08 02:39:25 +01:00
Guillaume Matheron
ffa88ad11f Merge remote-tracking branch 'upstream/develop' into develop 2020-01-05 14:51:03 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
stickler-ci
2c68b08e4f Fixing style errors. 2020-01-02 14:27:35 +00:00
Guillaume Matheron
9efdec6c6e Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop 2020-01-02 15:26:28 +01:00
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