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

3159 Commits

Author SHA1 Message Date
Laurent Destailleur
dd953b6e5a Fix filter 2021-11-27 01:09:16 +01:00
Laurent Destailleur
78f94b1c76 Fix css and label for recurring invoices 2021-11-25 14:17:20 +01:00
Laurent Destailleur
4cfec658bc css 2021-11-25 14:11:18 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00
Marc de Lima Lucio
ffa88b803f FIX: project timesheet by week: cleanup unused code 2021-11-19 16:03:41 +01:00
Marc de Lima Lucio
c5f0faad43 FIX: project timesheet: public holidays offset by 1 day 2021-11-19 15:36:00 +01:00
Marc de Lima Lucio
7cb657c991 FIX: project timesheets: assume Saturday and Sunday are default weekend days when working days conf is empty or badly formed 2021-11-19 14:49:11 +01:00
lmarcouiller
00369a5269 fix errors 2021-11-19 14:32:40 +01:00
Hystepik
63773bf36d
Merge branch 'develop' into develop#4 2021-11-19 14:22:39 +01:00
Laurent Destailleur
2afe6ccb4b Debug feature shown/hide canceled orders 2021-11-18 21:26:35 +01:00
Laurent Destailleur
c6463c9a83
Merge pull request #19166 from polkiko/canceled_orders 
NEW Canceled purchase orders do not qualify for total and are hidden
 2021-11-18 20:56:42 +01:00
Laurent Destailleur
fd74e33ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:19:01 +01:00
Laurent Destailleur
ddad00c8e4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/takepos/index.php
 2021-11-11 16:14:48 +01:00
Laurent Destailleur
6e01f1702e Fix css 2021-11-08 18:45:00 +01:00
Marc de Lima Lucio
c1a2e7b12e FIX: project task list: extrafields could not be displayed 2021-11-08 17:51:19 +01:00
Laurent Destailleur
ca53176b14
Merge pull request #19179 from frederic34/tasklist 
fix warnings in task list
 2021-10-31 17:52:31 +01:00
Laurent Destailleur
8f54143bfb
Merge pull request #19178 from frederic34/patch-1 
fix not defined
 2021-10-31 17:47:34 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Alexandre SPANGARO
9142599ea5 copyright 2021-10-30 21:18:52 +02:00
Alexandre SPANGARO
b1c799ee08 FIX #19241 Project - Fix display salary in overview 2021-10-30 21:17:15 +02:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Frédéric FRANCE
42cd2ce868
Update list.php 2021-10-26 18:46:51 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Frédéric FRANCE
db44f4082b
fix warnings in task list 2021-10-24 14:26:43 +02:00
Frédéric FRANCE
8cd4b0bc83
fix warnings in task list 2021-10-24 14:25:05 +02:00
Frédéric FRANCE
5f198c78a9
fix warnings in task list 2021-10-24 14:08:44 +02:00
Frédéric FRANCE
5ef5075f8f
fix warnings in task list 2021-10-24 14:00:05 +02:00
Frédéric FRANCE
3765a89283
fix warnings in task list 2021-10-24 13:57:04 +02:00
Frédéric FRANCE
ede0c60e2e
fix not defined 2021-10-24 13:50:22 +02:00
Laurent Destailleur
dcb433756d
Merge pull request #19174 from frederic34/fixticketlist 
fix warnings in ticket list
 2021-10-24 12:31:57 +02:00
Frédéric FRANCE
cc374e9eb1
fix warnings in ticket list 2021-10-24 10:02:12 +02:00
Frédéric FRANCE
d240a9f774
fix warnings in ticket list 2021-10-24 09:59:30 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Jesús Jerez
fc307fb685
Merge branch 'develop' into canceled_orders 2021-10-23 23:24:47 +02:00
Polkiko
a58f713f6d NEW Canceled purchase orders do not qualify for total in project overview (and are hidden) 
If purchase order has been canceled then it does not qualify for total amount and is not shown in table. It can be seen by clicking on the "show/hide" button.
 2021-10-23 23:12:23 +02:00
Lucas Marcouiller
58b28d3d7d Fix: fix php 8.0 warnings project 2021-10-23 22:32:03 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
06bc357409 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-23 14:49:50 +02:00
Laurent Destailleur
3f60cbbedc Remove the div class="ficheaddleft" 2021-10-23 14:49:35 +02:00
Hystepik
67711bdea9
Merge branch 'develop' into develop#3 2021-10-23 10:59:36 +02:00
Lucas Marcouiller
953a56b08c Fix: PHP 8.0 Warnings 2021-10-23 10:57:03 +02:00
Laurent Destailleur
728a00560f
Merge pull request #19122 from frederic34/patch-7 
fix warnings
 2021-10-22 22:48:53 +02:00
Frédéric FRANCE
6ec183cc3a
fix warnings 2021-10-22 22:32:01 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Frédéric FRANCE
7c449892bb
fix display 2021-10-22 00:19:10 +02:00
Laurent Destailleur
6c870bb3d1
Merge pull request #19059 from FHenry/fix_introduced_scrutinizer 
fix: scrutinizer
 2021-10-21 22:52:20 +02:00
Florian HENRY
7970f4ba5c fix scrutinzer 2021-10-21 22:24:35 +02:00
Florian HENRY
3bdec20364 fix scrutinzer 2021-10-21 19:09:13 +02:00
Florian HENRY
ac27532d62 fix scrutinzer 2021-10-21 19:06:40 +02:00
Florian HENRY
24cc74cd3a fix scrutinizer 2021-10-21 19:00:48 +02:00
Laurent Destailleur
f1d646bded Look and feel v15 2021-10-18 15:41:55 +02:00
Laurent Destailleur
c896c05464
Merge pull request #18989 from FHenry/dev_18986 
NEW: Add budget field into task #18986
 2021-10-16 21:16:01 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Florian HENRY
aeffad4c0f fix order 2021-10-15 11:02:05 +02:00
Florian HENRY
ab9ba4e0a2 NEW: feature #18986 2021-10-15 10:53:17 +02:00
Florian HENRY
5f4410468d add filed budget in task 2021-10-15 10:24:56 +02:00
Laurent Destailleur
e6c451cdae Fix responsive 2021-10-12 23:50:23 +02:00
Lucas Marcouiller
bbf5cb5db1 FIX: creation of project backtopage 2021-10-11 15:02:53 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Laurent Destailleur
92ae3c9d52 Fix label in graph 2021-10-06 14:26:48 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
d6e1a6be93 Look and feel v14 2021-10-03 18:20:01 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Norbert Penel
4e86f872ca it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-30 13:35:23 +02:00
Norbert Penel
d43cf4938a
it was impossible to update a task 
after some investigation i saw those errors but they are maybe some more around here
 2021-09-28 13:46:03 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
70d255740b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/class/task.class.php
 2021-09-24 02:33:48 +02:00
Laurent Destailleur
3d22cbe4da Fix look and feel 2021-09-24 02:16:40 +02:00
Laurent Destailleur
4c80e0425b Fix date for tasks created during project creation 2021-09-24 02:10:42 +02:00
Laurent Destailleur
8fb5286260 FIX #18797 2021-09-24 02:02:12 +02:00
Laurent Destailleur
b08b7d2f68 NEW Can show progression of task into combo list of tasks 2021-09-23 13:20:42 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Noé Cendrier
c89468428e add warehouse in projects elements count 2021-09-21 17:22:55 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
2acb84b432 FIX unprivileged user can see task associated with a not allowed project 2021-09-19 01:30:39 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Laurent Destailleur
b546f21ef4 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2021-09-17 12:21:25 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Marc de Lima Lucio
571d130c3c FIX: task time: keep on using natural_search 2021-09-17 10:51:37 +02:00
Laurent Destailleur
c559e5cc3e Fix missing label 2021-09-16 21:23:02 +02:00
Marc de Lima Lucio
88cd8fface FIX: task time: can't filter by user with pgsql + show error message 2021-09-16 17:53:47 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
 2021-09-16 13:33:49 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Juanjo Menent
1eb4975a76 fix: Bad date creation for project clone 2021-09-10 11:44:58 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Givriz
1c99bd7c4a Compatibility phpv8 2021-09-02 18:48:46 +02:00
Laurent Destailleur
28aa57b169
Merge pull request #18497 from FHenry/dev_new_projtask_changefilterdate 
NEW: date filter on project list and task list From->To
 2021-09-01 19:19:08 +02:00
Laurent Destailleur
270eede593 Removed $_GET and $_REQUEST 2021-09-01 18:39:35 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2 
Undef vars2
 2021-09-01 18:36:26 +02:00
Laurent Destailleur
79a25248cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2021-09-01 17:55:32 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
375557e092 FIX Menu List of project was not visible. 2021-09-01 15:10:02 +02:00
Laurent Destailleur
dad4c34ec5 Debug module conference or booth 2021-08-31 23:51:45 +02:00
Florian HENRY
673852c739 better line desc 2021-08-31 09:24:41 +02:00
Florian HENRY
009fa41762 add checkbox to ask detail on line desc 2021-08-31 09:10:57 +02:00
Florian HENRY
0ae4e721c4 merge 2021-08-30 23:50:33 +02:00
Florian HENRY
ff1ba623c1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_projtask_changefilterdate 2021-08-30 23:46:34 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
86af3ff3d7
Merge pull request #18492 from aspangaro/15a5 
NEW Task - Add From/to input on search date
 2021-08-28 17:43:15 +02:00
Laurent Destailleur
28752ddca4 Fix concat 2021-08-28 15:19:54 +02:00
Laurent Destailleur
82eb118583
Merge pull request #18530 from FHenry/dev_more_inv_task_comment 
add hidden option to display date and duration in invoice generation from task time spent
 2021-08-28 15:15:21 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Florian HENRY
b492d49908 add hidden option to display date and duration in invoice generation from task time spent 2021-08-27 17:27:05 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
stickler-ci
601cc865fb Fixing style errors. 2021-08-25 10:54:09 +00:00
GurvanKervern
15445e9bba Fix undef vars 7 
To remove PHP8 warnings
 2021-08-25 18:50:05 +08:00
Florian HENRY
5e795e74d7 NEW: date filter on project list and task list From->To 2021-08-25 12:48:32 +02:00
Florian HENRY
03b04bea08 NEW: date filter on project list and task list From->To 2021-08-25 12:46:56 +02:00
Alexandre SPANGARO
01a6d8296e NEW Task - Add From/to input on search date 2021-08-25 09:30:52 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
2d870d0f81
Merge branch '14.0' into 14p10 2021-08-24 15:15:38 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
7af023665f Clean var not defined 2021-08-23 19:37:11 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Alexandre SPANGARO
af843ed82c Merge branch '14.0' into 14p10 2021-08-20 22:11:42 +02:00
Alexandre SPANGARO
53af4b0076 FIX #18375 SQL Error on tasks statistics 2021-08-20 22:11:26 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
335e1ff405 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-20 12:45:37 +02:00
Laurent Destailleur
e1dc5b5188 css 2021-08-19 16:12:13 +02:00
Laurent Destailleur
ce5acda635 Fix phpcs 2021-08-03 15:03:41 +02:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/class/html.form.class.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/accountancy/tpl/export_journal.tpl.php
	htdocs/projet/tasks/time.php
 2021-08-02 18:31:26 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Christian Foellmann
b5c30126cb extend the hook getElementList to make $ids in the hooked function 2021-07-29 14:49:41 +02:00
laurantines
f8563ace0d
Fix opp statusbrequires even if PROJECT_USE_OPPORTUNITIES off 
If I modify a project and do not have PROJECT_USE_OPPORTUNITIES enabled, I cannot change the project budget. I get the error message that ErrorOppStatusRequiredIfAmount. However, I do not have the opportunities enabled and it does not make sense for that message to appear when I have not added any opportunities.
 2021-07-28 16:14:38 +02:00
kamel
95ecbb8940 FIX: add include missing file '/core/actions_dellink.inc.php' in project card 2021-07-28 12:05:46 +02:00
Christian Foellmann
0cd8527c35 longer field for project ref on create and edit 2021-07-28 11:01:38 +02:00
Florian HENRY
a7cef1aa15 FIX: cannot add time spend when column ref is not displayed 2021-07-26 10:20:11 +02:00
Frédéric FRANCE
922354f366
Update projects.php 2021-07-20 18:19:27 +02:00
Laurent Destailleur
0d12f25341 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-13 13:21:50 +02:00
Laurent Destailleur
f9d60b15d9 Fix phpcs 2021-07-12 23:56:42 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00