Laurent Destailleur
a298a845f1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
2021-11-30 16:24:18 +01:00
Laurent Destailleur
3de3adad74
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/ajax/objectonoff.php
2021-11-30 16:11:12 +01:00
Laurent Destailleur
055cb5c0c9
Merge pull request #18526 from cfoellmann/PR/deprecated-html
...
deprecated html attributes
2021-11-30 14:27:12 +01:00
Laurent Destailleur
1122cd1e5e
Merge pull request #19163 from Hystepik/develop#4
...
Fix: php 8.0 warnings project
2021-11-30 14:18:23 +01:00
Laurent Destailleur
2b1fab2181
Clean code
2021-11-30 11:50:27 +01:00
Christian Foellmann
6608f5f0d8
update all script tags to be uniform. language="javascript" removed
...
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
2021-11-29 15:09:18 +01:00
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
Florian HENRY
1cc04c54ca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project
2021-08-21 15:29:32 +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
Florian HENRY
63a47112ae
new: #18162
2021-07-16 11:14:30 +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
stickler-ci
b227a85d31
Fixing style errors.
2021-07-11 07:53:28 +00:00
fr69400
209fe70da0
Update note.php
2021-07-11 09:53:13 +02:00
stickler-ci
2a1eb97b7d
Fixing style errors.
2021-07-11 07:50:57 +00:00
fr69400
2e4b45488f
Update note.php
2021-07-11 09:50:42 +02:00
stickler-ci
4272f93aa4
Fixing style errors.
2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d
NEW add hookmanager on note pages
2021-07-09 18:36:21 +02:00
Laurent Destailleur
f286017cab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 19:03:55 +02:00
Francis Appels
1333ca3660
Fix php 8 warning on not set field keys
2021-07-05 14:51:34 +02:00
Francis Appels
5d824899e5
Fix php 8 warning on home page
2021-07-05 13:44:05 +02:00
Laurent Destailleur
9b7c0a9246
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-07-03 18:32:31 +02:00
Laurent Destailleur
1de165a6cd
css
2021-06-30 18:34:04 +02:00
Laurent Destailleur
aec4d6016c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:20 +02:00
Laurent Destailleur
a914ffa42c
CSS
2021-06-30 15:00:04 +02:00
Christophe Battarel
3b4ea5c5af
use formintervention
2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab
Merge branch 'develop' into timespent2inter
2021-06-30 10:34:22 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet
...
NEW: project time spent: conf to prevent recording time after X months
2021-06-29 19:53:20 +02:00
Christophe Battarel
c8f55907eb
stickler
2021-06-29 15:52:50 +02:00
Christophe Battarel
d423e47d3b
stickler
2021-06-29 15:50:41 +02:00
Christophe Battarel
6d77f5e12f
fix translation string
2021-06-29 15:38:24 +02:00
Christophe Battarel
ef8aaa7fd7
generate intervention from time spent
2021-06-29 15:26:04 +02:00
Laurent Destailleur
e62ed28701
Debug v14
2021-06-26 15:39:52 +02:00
Laurent Destailleur
7e7800c110
Fix phpcs
2021-06-14 20:37:21 +02:00
Laurent Destailleur
347c6ae8a8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
htdocs/projet/class/project.class.php
htdocs/projet/list.php
2021-06-14 20:13:27 +02:00
Laurent Destailleur
d154ec2344
FIX Collector to create lead was broken
2021-06-14 20:06:52 +02:00
Laurent Destailleur
a79afeaf02
Add info to allow debug of email collector
2021-06-14 19:58:12 +02:00
Laurent Destailleur
f8f951977c
Debug v14
2021-06-14 01:33:01 +02:00
Laurent Destailleur
34cebe6aa3
Look and feel v14
2021-06-14 01:11:39 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
4fd9d36eb9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-06-11 18:46:51 +02:00
Laurent Destailleur
65f8405ca4
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-11 18:44:45 +02:00
Laurent Destailleur
6bf9a72dab
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-11 18:44:37 +02:00
Laurent Destailleur
a8f11fec31
Update perweek.php
2021-06-11 18:12:39 +02:00
Laurent Destailleur
057d91698f
Update perday.php
2021-06-11 18:11:55 +02:00
Laurent Destailleur
0315f45198
Update permonth.php
2021-06-11 18:10:57 +02:00
Marc de Lima Lucio
3f72f9b544
FIX: project time spent by month: quote mismatch in SQL query to assign to check task assigment
2021-06-10 23:29:37 +02:00
Marc de Lima Lucio
96656ff148
FIX: project time spent by day/week: quote mismatch is SQL query to assign to check task assigment
2021-06-10 23:26:33 +02:00
Laurent Destailleur
85a8a66545
Merge pull request #17856 from FHenry/dev_fix_imagnethumbnail_project_files
...
fix : #17827
2021-06-10 12:18:21 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
stickler-ci
c62c668c68
Fixing style errors.
2021-06-09 09:29:22 +00:00
Marc de Lima Lucio
d383941596
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop_NEW_project_block_timesheet
2021-06-09 11:24:17 +02:00
Marc de Lima Lucio
7317aad41f
FIX: projet time spent: also restrict to X months back for update and delete
2021-06-09 11:08:38 +02:00
Marc de Lima Lucio
4c6dfd8d5c
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop
2021-06-09 11:03:04 +02:00
Florian HENRY
71dbb8733d
fix : #17827
2021-06-08 20:18:31 +02:00
Marc de Lima Lucio
6733d278d8
NEW: project time spent: conf to prevent recording time after X months
2021-06-08 18:13:18 +02:00
Laurent Destailleur
fa4786a3f6
Fix permission
2021-06-08 16:19:21 +02:00
Laurent Destailleur
1e657b8621
Fix value of showoncombobox
2021-06-05 15:14:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1
2021-05-25 19:55:31 +02:00
Laurent Destailleur
3dfb22b05e
Update task.class.php
2021-05-25 19:54:09 +02:00
Laurent Destailleur
a0418fc17d
FIX CWE-269 huntr - download of files of project
2021-05-21 18:53:09 +02:00
Givriz
0c5a934e10
Compatibility phpv8
2021-05-20 17:40:44 +02:00
Laurent Destailleur
a829d8cedc
css
2021-05-18 16:31:59 +02:00
Laurent Destailleur
f3803bab91
Responsive
2021-05-18 16:28:30 +02:00
Laurent Destailleur
7569275d28
Fix generation of invoice
2021-05-18 13:36:07 +02:00
Laurent Destailleur
2ef713bd5f
Merge branch 'develop' into look_feel_user_author_list
2021-05-18 12:27:30 +02:00
Laurent Destailleur
7b9161ec63
Merge pull request #17644 from bb2a/thirdparty_infos_list
...
Add popup thirdparty info in list
2021-05-18 12:15:51 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Anthony Berton
58db723502
thirdparty info popup list
2021-05-17 23:27:33 +02:00
Anthony Berton
0b7f474dd3
look_feel user author in list
2021-05-17 18:04:21 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
e6729355b8
Look and feel v14
2021-04-30 17:56:42 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
Laurent Destailleur
18e911a636
FIX dol_print_date for %a and %b with some Timezone
2021-04-28 20:44:22 +02:00
Laurent Destailleur
9579533f4f
Merge pull request #17346 from dolibit-ut/patch-296
...
Update element.php
2021-04-27 01:23:59 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
Laurent Destailleur
389b71bc7e
Clean API
2021-04-25 19:21:48 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
UT from dolibit
53a89180d9
Update element.php
...
merging by
- if (!empty($conf->facture->enabled))
- if (!empty($conf->loan->enabled))
2021-04-20 11:22:12 +02:00
Laurent Destailleur
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
1a6df3f3cc
Merge pull request #17335 from dolibit-ut/patch-291
...
Update comment.php
2021-04-19 20:21:08 +02:00
Laurent Destailleur
26d49c6e23
Merge pull request #17336 from dolibit-ut/patch-292
...
Update contact.php
2021-04-19 20:18:51 +02:00
Laurent Destailleur
7b0ed67181
Merge pull request #17337 from dolibit-ut/patch-293
...
Update document.php
2021-04-19 20:18:42 +02:00
Laurent Destailleur
0b634b2a77
Merge pull request #17338 from dolibit-ut/patch-294
...
Update element.php
2021-04-19 20:18:06 +02:00
UT from dolibit
b8fbfd5078
Update index.php
...
new: $help_url
add DE:Modul_Projekte
" " => ' '
llxHeader('', $title, $help_url);
2021-04-19 18:24:19 +02:00
stickler-ci
8437761bb6
Fixing style errors.
2021-04-19 16:15:07 +00:00
UT from dolibit
0f8ef61d34
Update element.php
...
$title / $help_url / llxHeader " " => ' '
add DE:Modul_Projekte
llxHeader('', $title, $help_url);
2021-04-19 18:13:06 +02:00
stickler-ci
8db9b5bb22
Fixing style errors.
2021-04-19 16:10:55 +00:00
UT from dolibit
b78f85b959
Update document.php
...
$title / $help_url " " => ' '
add DE:Modul_Projekte
2021-04-19 18:08:36 +02:00
stickler-ci
6fff8baac5
Fixing style errors.
2021-04-19 16:07:19 +00:00
UT from dolibit
a886725b1c
Update contact.php
...
$title / $help_url " " => ' '
add DE:Modul_Projekte
2021-04-19 18:05:18 +02:00
UT from dolibit
00eda15ac6
Update comment.php
...
$title = $langs->trans('CommentPage');
llxHeader('', $title, '');
2021-04-19 17:58:14 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions
...
Next picto mass actions
2021-04-16 20:40:19 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project
...
Warehouses in project
2021-04-16 20:29:21 +02:00
altairis-noe
2e340c61cc
preselect project when warehouse created from there
2021-04-15 10:31:18 +02:00
altairis-noe
3fe0eb54c7
association of warehouses to projects
2021-04-15 09:59:08 +02:00
Anthony Berton
a612831e28
next_change
2021-04-14 14:45:55 +02:00
Laurent Destailleur
9154e07689
Fix picto for tags
2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248
Use css on img_picto
2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca
picto_mass_actions
2021-04-14 10:20:34 +02:00
Laurent Destailleur
97292d6843
Fix phpcs
2021-04-13 20:28:25 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Laurent Destailleur
fe57ba2116
Fix phpcs
2021-04-13 20:00:36 +02:00
Laurent Destailleur
ce18d416e6
Merge pull request #17222 from aspangaro/13p31
...
FIX Write right on document
2021-04-13 16:18:48 +02:00
Laurent Destailleur
ee07796131
Update card.php
2021-04-13 15:39:34 +02:00
Laurent Destailleur
de73c0adb2
Update card.php
2021-04-13 15:38:51 +02:00
stickler-ci
6ab0de145b
Fixing style errors.
2021-04-13 08:33:57 +00:00
Robin
d6caa057f2
FIX: project visibility field with two option
...
If two option of disabled visibility are add on constant, combo is not display
2021-04-13 10:23:05 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f
move include_once to include when it's a tpl
2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2
Clean code of ol deprecated option
2021-04-12 15:37:26 +02:00
Alexandre SPANGARO
8d72448f43
Add right supplier_order
2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
1ef89b8e7a
Add right supplier_invoice
2021-04-12 08:59:25 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00
Laurent Destailleur
0bc93d437e
css
2021-04-10 14:21:03 +02:00
Laurent Destailleur
5be6ed3996
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/activity/perweek.php
2021-04-10 14:02:12 +02:00
Laurent Destailleur
cb57546d99
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:53:23 +02:00
Laurent Destailleur
95a5296d45
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:29:24 +02:00
Laurent Destailleur
667481acd5
Fix #yogosha5832 - Missin test on permission for /index routes on APIs
2021-04-08 19:05:28 +02:00
UT from dolibit
baf8c47ceb
Create index.html
2021-04-07 20:48:49 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
stickler-ci
f5aa199c94
Fixing style errors.
2021-04-06 15:03:07 +00:00
Gauthier PC portable 024
04cb8453f0
FIX : we can't update task if closed project because of wrong test with PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE conf
2021-04-06 16:59:00 +02:00
Laurent Destailleur
92da23945b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-04-02 22:51:14 +02:00
Laurent Destailleur
25e32c4fcd
Merge branch 'develop' into dev_EventOrganisation
2021-04-02 22:43:10 +02:00
Laurent Destailleur
e0cb175208
Doxygen
2021-04-02 21:49:21 +02:00
Florian HENRY
88b481e5a8
keep tab project
2021-04-02 11:25:14 +02:00
Florian HENRY
73d7eefdcf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-31 20:09:44 +02:00
Florian HENRY
c3f4e5e2d5
better attendded woth project tabs
2021-03-31 20:09:13 +02:00
Laurent Destailleur
625ade1a53
Clean log
2021-03-31 12:41:44 +02:00
Laurent Destailleur
be6bb3a756
FIX #yogosha5746 - next step (work in progress)
2021-03-30 19:12:07 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead
FIX #yogosha5782
2021-03-30 11:26:49 +02:00
Laurent Destailleur
d61f61ab45
Clean $_GET
2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Laurent Destailleur
41ec8893e4
Fix get mode
2021-03-29 22:05:04 +02:00
Laurent Destailleur
843e0a2c39
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
Laurent Destailleur
c4a8dca4ab
FIX #yogosha5756
2021-03-29 21:35:19 +02:00
Florian HENRY
14a90a3a9d
on goung
2021-03-29 17:26:43 +02:00
Florian HENRY
f25360cc4c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 15:49:43 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Florian HENRY
2def98809c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 11:55:26 +02:00
Laurent Destailleur
5b64a517ea
Fix label
2021-03-27 14:30:10 +01:00
Florian HENRY
f87711bf2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-26 18:30:08 +01:00
Laurent Destailleur
01c1101b29
Look and feel v14
2021-03-26 18:16:12 +01:00
Laurent Destailleur
99496e365f
css
2021-03-25 04:13:28 +01:00
Laurent Destailleur
a82ce2e5af
css
2021-03-25 04:11:13 +01:00
Laurent Destailleur
443fd544be
Update time.php
2021-03-25 01:07:29 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
047471c220
Remove $_POST war
2021-03-24 19:06:44 +01:00
Florian HENRY
cc78e7c685
add field on conf or booth tabs
2021-03-23 21:04:38 +01:00
stickler-ci
ba66eaeb18
Fixing style errors.
2021-03-22 14:42:31 +00:00
Florian HENRY
b121587582
change to GETPOST
2021-03-22 15:39:54 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4
Fix #ygosha5698
2021-03-22 12:47:23 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
Laurent Destailleur
d8aa5f5eab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
2021-03-20 12:18:40 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments
2021-03-20 10:00:24 +01:00
Robin
26dc897042
Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0
...
htdocs/projet/card.php
2021-03-19 11:12:49 +01:00
Robin
d852816101
FIX: fix checkbox displayed according to module project setup parameters
2021-03-19 09:54:11 +01:00
Frédéric FRANCE
e7ad9f1290
fix project replace projet
2021-03-18 20:55:47 +01:00
Frédéric FRANCE
c43d3dff92
fix project replace projet
2021-03-18 20:51:40 +01:00
Robin
b3757a6f69
FIX: fix checkbox displayed according to module project setup parameters - work in progress
2021-03-18 11:07:48 +01:00
Frédéric FRANCE
a420d0acbd
fix php8 warnings
2021-03-17 18:40:11 +01:00
Frédéric FRANCE
efaa2be3b8
fix php8 warnings
2021-03-17 18:38:24 +01:00
Laurent Destailleur
e366d2c379
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
2021-03-16 14:50:06 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-16 10:34:55 +01:00
Laurent Destailleur
c84395281e
Merge pull request #16716 from frederic34/patch-13
...
fix php8 warning
2021-03-16 10:30:54 +01:00
Alexandre SPANGARO
f8703a0691
Translation "Generated documents"
2021-03-16 04:04:33 +01:00
Alexandre SPANGARO
4fd24c6855
Translation "Generated documents"
2021-03-16 04:04:18 +01:00
Frédéric FRANCE
89219fe7fa
fix php8 warning
2021-03-15 21:13:15 +01:00
Florian HENRY
177a6bfe4f
conference or booth card and list ok
2021-03-15 20:20:53 +01:00
Florian HENRY
17c49e6ce9
ongoinf card and list
2021-03-15 18:06:23 +01:00
Laurent Destailleur
8d3ed71f5f
Merge pull request #16682 from frederic34/patch-3
...
fix php8 warning
2021-03-15 13:28:50 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-15 11:37:57 +01:00
Frédéric FRANCE
cc25fb727b
fix php8 warning
2021-03-15 11:25:23 +01:00
Laurent Destailleur
cbaaff799b
Merge pull request #16643 from dolibit-ut/patch-72
...
Update card.php
2021-03-15 11:14:26 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
UT from dolibit
83c6e5f8e7
Update card.php
...
at $help_url add DE:Modul_Projekte
2021-03-13 15:19:09 +01:00
Frédéric FRANCE
815a7683a2
force getnextref if project create fail
2021-03-12 16:48:43 +01:00
Florian HENRY
862926316a
working on list
2021-03-11 19:09:42 +01:00
Florian HENRY
3af4f3fbca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
2021-03-11 16:59:08 +01:00
Laurent Destailleur
8babacfe55
Look and feel v14
2021-03-09 19:10:41 +01:00
Laurent Destailleur
d56890de17
Fix phpcs
2021-03-04 17:24:58 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Laurent Destailleur
87da30d2d9
Update tasks.php
2021-03-04 16:50:39 +01:00
lmarcouiller
e94f703f5d
Fix #16523 : return to backward compatibility
2021-03-04 10:33:18 +01:00
lmarcouiller
500f192a05
Fix #16523 : New column Contact assigned
2021-03-04 10:15:41 +01:00
Florian HENRY
de4a76a266
ongoung
2021-03-03 22:00:23 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Frédéric FRANCE
a82df7e6ea
code syntax project
2021-02-26 18:49:22 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +01:00
Frédéric FRANCE
cb1e36de9c
really fix typo
2021-02-26 12:58:41 +01:00
Laurent Destailleur
5ac6fa1ed6
Merge pull request #16400 from frederic34/patch-2
...
fix typo
2021-02-26 12:56:30 +01:00
Gauthier PC portable 024
c996871f98
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 11:50:18 +01:00
Laurent Destailleur
ebb4f03788
Prepare public page for autocreate contact-lead
2021-02-24 12:19:28 +01:00
Gauthier PC portable 024
c0160a5f3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:20:15 +01:00
Frédéric FRANCE
00f10d1850
fix typo
2021-02-23 13:33:27 +01:00
Florian HENRY
f800e86e61
Merge branch 'dev_EventOrganisation_draft' of github.com:FHenry/dolibarr into dev_EventOrganisation_draft
2021-02-22 21:01:22 +01:00
Florian HENRY
c9a51d971d
rename column
2021-02-22 21:00:54 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
stickler-ci
565fb392b4
Fixing style errors.
2021-02-21 11:36:58 +00:00
Florian HENRY
be34fb4541
tab event ok
2021-02-21 12:32:16 +01:00
Laurent Destailleur
2be6992916
Fix include_once into include for inc.php file. See comment in #16338
2021-02-19 16:10:19 +01:00
Laurent Destailleur
f814c70a63
Merge pull request #16328 from ATM-Consulting/new/14.0_auto_close_project_when_all_tasks_done
...
FIX - possible warning in recently added feature (autoclose project when tasks done)
2021-02-19 13:52:06 +01:00
Laurent Destailleur
70e2d1dbbd
Merge branch 'develop' into dev_EventOrganisation_ProjectCardAndList
2021-02-19 12:54:38 +01:00
Gauthier PC portable 024
134d7e00ec
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-17 16:56:50 +01:00
Florian Mortgat
7f0dc9e894
FIX possible warning
2021-02-17 11:58:22 +01:00
Florian Mortgat
0f68b69383
NEW option to automatically close an open project when all its tasks are done (=progress 100%)
2021-02-16 14:11:21 +01:00
Laurent Destailleur
53754a5097
Fix unused code
2021-02-15 16:52:05 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Florian HENRY
f186e7bf4b
project list and card ok
2021-02-15 12:18:08 +01:00
Frédéric FRANCE
811c02b970
fix inverted test
2021-02-12 15:45:49 +01:00
Laurent Destailleur
c2df267858
Merge pull request #16242 from frederic34/patch-4
...
remove deprecated
2021-02-10 01:29:47 +01:00
Frédéric FRANCE
f8dd1a7fc7
Update list.php
2021-02-09 22:00:54 +01:00
Laurent Destailleur
beb9f4f1e9
Fix 2 lines on one line when there is 2 or more sale representatives
2021-02-09 21:35:50 +01:00
Laurent Destailleur
92a19c0caa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2021-02-09 18:34:50 +01:00
Laurent Destailleur
e2d1813451
Fix column title wrapped
2021-02-09 18:30:34 +01:00
Laurent Destailleur
4f07de5b9c
Fix when no contact set
2021-02-09 18:04:46 +01:00
Laurent Destailleur
21558dd0a6
Debug and enhance the feature to assign tasks on project assignation
2021-02-09 17:52:33 +01:00
Laurent Destailleur
1b129831a9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-09 14:09:46 +01:00
Laurent Destailleur
48a4ed656b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/projet/element.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-02-09 14:08:49 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact
...
NEW: When add contact/user to Project, ask to also affect on Tasks
2021-02-09 13:43:08 +01:00
Laurent Destailleur
8acc5e1486
Fix calculation of profit
2021-02-08 23:37:32 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Frédéric FRANCE
e0b2e26da6
fix html
2021-02-07 19:05:10 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
eee49b9132
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
f92dcf71ac
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-04 13:04:57 +01:00
Laurent Destailleur
b58b3a4932
FIX link to create event when task is in a project with a thirdparty
2021-02-04 13:03:05 +01:00
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
9ac2dc1a6e
Fix phpcs
2021-02-03 20:42:30 +01:00
Laurent Destailleur
bd9eb4c949
FIX Assignement of actors on tasks
2021-02-02 15:36:54 +01:00
Laurent Destailleur
fed99aa3bb
FIX Assignement of actors on tasks
2021-02-02 15:35:40 +01:00
Laurent Destailleur
641885d814
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-31 19:05:27 +01:00
Laurent Destailleur
f461bccc02
Fix var not defined
2021-01-31 17:06:42 +01:00
Laurent Destailleur
9ec5ba46fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-28 14:47:06 +01:00
Laurent Destailleur
b488bca020
FIX 16084
2021-01-28 08:53:13 +01:00
Laurent Destailleur
1637b6af7d
Look and feel v14
2021-01-26 15:16:06 +01:00
Laurent Destailleur
f331ce8028
Look and feel v14
2021-01-26 14:24:32 +01:00
Laurent Destailleur
452aea1d8b
Fix bad test
2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b
Fix error test
2021-01-23 17:49:08 +01:00
Laurent Destailleur
599d69b07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
b25f65c995
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/projet/info.php
2021-01-22 01:09:35 +01:00
Laurent Destailleur
5aba1f9ccd
FIX missing socid into link to create event from project agenda tab
2021-01-22 01:07:45 +01:00
Frédéric FRANCE
118c9ac990
add more infos in link
2021-01-20 21:02:01 +01:00
Frédéric FRANCE
96dffb619a
add more infos in link
2021-01-20 18:48:56 +01:00
Frédéric FRANCE
9e5f0a8cb9
add more infos in link
2021-01-20 18:45:44 +01:00
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Laurent Destailleur
803ae91136
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-19 16:20:19 +01:00
Laurent Destailleur
560d401cff
Code comment
2021-01-19 15:54:24 +01:00
Laurent Destailleur
a109dd8948
Fix removed unexpected values in stats graph
...
Conflicts:
htdocs/projet/graph_opportunities.inc.php
2021-01-18 13:55:11 +01:00
Laurent Destailleur
b46d1fa6a1
Fix removed unexpected values in stats graph
2021-01-18 13:51:35 +01:00
Laurent Destailleur
512745920a
css
2021-01-18 13:47:29 +01:00
Laurent Destailleur
5a4ab3d00e
Fix look and feel v13
2021-01-18 12:07:40 +01:00
Laurent Destailleur
4c50f25c12
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 11:41:45 +01:00
Laurent Destailleur
6db640d0d0
Fix phpcs
2021-01-15 11:41:09 +01:00
Laurent Destailleur
16d98d2691
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/projet/graph_opportunities.inc.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/projet/graph_opportunities.inc.php
htdocs/user/class/usergroup.class.php
2021-01-14 13:43:48 +01:00
Laurent Destailleur
1cf86931b3
Fix graph of opportunity when a status has been removed.
2021-01-14 12:58:50 +01:00
Florian HENRY
d856b0149d
Merge branch '13_backport' into develop
2021-01-12 10:08:12 +01:00
Laurent Destailleur
6e860efa44
CSS
2021-01-11 20:53:18 +01:00
Laurent Destailleur
81ab33ff12
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/product/list.php
2020-12-27 19:40:03 +01:00
Florian HENRY
d3bdb72cc8
finish
2020-12-24 15:03:12 +01:00
Florian HENRY
268618d045
project done
2020-12-24 00:53:10 +01:00
Florian HENRY
60d8fb4719
fic porject mass action right
2020-12-24 00:48:48 +01:00
Florian HENRY
1978e23c5e
ongoing
2020-12-24 00:48:22 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Laurent Destailleur
b740d79f8e
Fix v13
2020-12-17 22:52:42 +01:00
Laurent Destailleur
9cd211a79b
Fix syntax error
2020-12-17 14:06:54 +01:00
Laurent Destailleur
9c37b8b806
Merge branch 'develop' into fix/12.0_missing_project_overview_hook
2020-12-17 14:05:04 +01:00
Laurent Destailleur
842d6f695f
Update element.php
2020-12-17 14:01:42 +01:00
Laurent Destailleur
f6b280c9df
Update project.class.php
2020-12-17 13:57:12 +01:00
stickler-ci
e61b71bc93
Fixing style errors.
2020-12-16 15:40:38 +00:00
ATM john
1f29d4f5e8
Add missing hooks
2020-12-16 16:25:30 +01:00
ATM john
50b27239a7
Fix missing hook for project overview control
2020-12-15 11:34:04 +01:00
Laurent Destailleur
506659a9d2
Update jsGant lib to 2.7.3
2020-12-15 03:56:08 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Juanjo Menent
4fc57d096e
Fix #15556
2020-12-12 20:37:00 +01:00
stickler-ci
5d86a5bd2a
Fixing style errors.
2020-12-11 16:44:38 +00:00
Florian HENRY
0ed084d585
NEW: When add contact/user to Project, ask to also affect on project task
2020-12-11 17:38:38 +01:00
Laurent Destailleur
206caec290
Debug v13
2020-12-11 01:20:40 +01:00
Laurent Destailleur
cfa194436f
Debug v13
2020-12-11 00:55:21 +01:00
Laurent Destailleur
5b031473ff
Fix hide table if empty
2020-12-08 20:08:14 +01:00
Stephane Lesage
5d8dfadd09
Third-party details in Lists in project index
2020-12-08 15:47:22 +01:00
Laurent Destailleur
8491be2572
Fix look and feel v13
2020-12-08 11:58:47 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
...
doxygen
2020-12-07 22:31:08 +01:00
lmarcouiller
aa2f0f766d
Fix #15689 patch of Bug project filters in projet/list.php
2020-12-07 11:25:06 +01:00
Frédéric FRANCE
4e18f46f28
doxygen
2020-12-05 23:53:55 +01:00
lmarcouiller
d7f56b42cf
Fix #15646 : patch of this bug
2020-12-04 15:29:57 +01:00
Laurent Destailleur
dd54d28dc6
Debug v13
2020-12-03 10:13:13 +01:00
Laurent Destailleur
d88173d7ba
Fix bad column
2020-12-02 19:13:32 +01:00
Scrutinizer Auto-Fixer
6df4954b20
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-12-01 01:41:19 +00:00
Laurent Destailleur
958893228a
Fix combo to add contact and status of contact on popup
2020-11-30 15:18:58 +01:00
Laurent Destailleur
00ad6df395
Fight against $_POST
2020-11-30 14:47:07 +01:00
Laurent Destailleur
379bca0b61
Clean code
2020-11-30 13:18:23 +01:00
Laurent Destailleur
bd5dc6399b
Fix deprecated code
2020-11-30 12:35:05 +01:00
Laurent Destailleur
7e6af6a54f
FIX translation not loaded for error message of numbering modules
2020-11-28 02:09:27 +01:00
Laurent Destailleur
7c4599a5c5
Look and feel v13
2020-11-28 01:15:23 +01:00
Laurent Destailleur
1685b5396c
Fix warning
2020-11-28 00:59:07 +01:00
Laurent Destailleur
574919de52
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/accountancy/bookkeeping/balance.php
htdocs/adherents/class/subscription.class.php
htdocs/compta/bank/categ.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/class/interfaces.class.php
htdocs/core/lib/project.lib.php
htdocs/core/modules/modCategorie.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/install/repair.php
htdocs/main.inc.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735
Clean code
2020-11-27 14:24:15 +01:00
Laurent Destailleur
d8bf7b2714
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
2020-11-25 18:04:06 +01:00
Laurent Destailleur
16e3baeff2
FIX filter on project list
2020-11-25 17:28:53 +01:00
Laurent Destailleur
bac24485c2
Fix label of project. Must use ProjectLabel instead of Label
2020-11-24 21:12:44 +01:00
Givriz
dca4cf5987
Feature : ajout de la class "button-cancel"
...
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Laurent Destailleur
69750e4cc4
Fix page lost
2020-11-22 02:15:54 +01:00
Laurent Destailleur
a30e842521
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-11-21 23:48:34 +01:00
Laurent Destailleur
73a3a03398
Fix for smartphone
2020-11-21 23:36:20 +01:00
Givriz
c48129e279
Ajout de la class "button-save"
...
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
2020-11-19 20:23:38 +01:00
Christian Foellmann
1502b254eb
fix not able to delete time entry from task
2020-11-12 13:58:59 +01:00
Laurent Destailleur
29f0a9b784
Fix in select of user when firstname and lastname is empty
2020-11-10 15:03:35 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-11-09 14:18:56 +00:00
Laurent Destailleur
da6c6c9e0a
Clean code
2020-11-08 14:39:20 +01:00
Laurent Destailleur
a9fbe9dd6c
Fix remove warning
2020-11-08 00:18:41 +01:00
Laurent Destailleur
4535d81964
Fix CSS for holiday. Fix #15266
2020-11-05 19:09:58 +01:00
Laurent Destailleur
b2273eec6b
Fix GETPOST
2020-11-05 19:01:33 +01:00
Laurent Destailleur
57bb6506a3
Fix POST moved into GETPOST
2020-11-05 14:33:41 +01:00
Laurent Destailleur
72e94edae4
Fix permission on project for external user that are external contact
2020-11-05 09:40:37 +01:00
Laurent Destailleur
83a7b19333
Look and feel v13
2020-11-02 11:41:07 +01:00
Laurent Destailleur
e0ed89c514
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/compta/facture/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/product/class/product.class.php
htdocs/product/price.php
htdocs/projet/tasks/time.php
2020-11-01 17:58:41 +01:00
Laurent Destailleur
45f834cb15
FIX #15199
2020-11-01 15:20:33 +01:00
Scrutinizer Auto-Fixer
ab25e047c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Frédéric FRANCE
a64e676dad
fix undefined variable
2020-10-31 09:40:15 +01:00
Frédéric FRANCE
8190711342
doxygen
2020-10-30 18:01:01 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end
2020-10-27 18:19:31 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉
2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated
2020-10-22 22:50:03 +02:00
Laurent Destailleur
547b3602cc
FIX refresh of tasks combo must use an ajax page not a full html page
2020-10-17 21:14:19 +02:00
Laurent Destailleur
53eef48596
Doc
2020-10-17 20:06:30 +02:00
Laurent Destailleur
7504f92a41
Standardize code and look and feel
2020-10-16 13:30:20 +02:00
Laurent Destailleur
5b37ff0bfd
Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
...
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
bc6b5d919a
Better responsive
2020-10-13 10:51:51 +02:00
Damien BENOIT
276783a709
Essai de revalidation
...
Une ligne n'était pas synchronisée avec le projet upstream.
2020-10-12 18:36:13 +02:00
Givriz
d158716ccc
Fix : correction de commentaires
...
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais). Il reste beaucoup à faire, mais je fais un premier PR pour vérifier que cela marche.
2020-10-12 17:41:03 +02:00
Laurent Destailleur
a514c20183
Add warning if we try to add a task on a draft project
2020-10-12 12:53:57 +02:00
Laurent Destailleur
1538823b4c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-10-12 12:34:18 +02:00
Laurent Destailleur
d831edb481
Fix bad popup
2020-10-12 12:33:58 +02:00
Laurent Destailleur
bf458215c1
Merge branch 'develop' into 12.0
2020-10-12 12:14:39 +02:00
Laurent Destailleur
e854cce158
Update element.php
2020-10-08 19:23:35 +02:00
ATM john
3bf12ca193
Fix total loan calculation
2020-10-08 19:10:41 +02:00
Laurent Destailleur
eb41a72e27
Properties ->titre have been renamed into ->title
2020-10-07 17:41:36 +02:00
Scrutinizer Auto-Fixer
1512521d91
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
47c80f0d14
Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount
...
Show count on project overview tab
2020-10-06 23:34:43 +02:00
Laurent Destailleur
663f149982
Better error management
2020-10-06 16:48:48 +02:00
Sekan, Tobias
3ceb5c217f
Show count on project overview tab
2020-10-06 12:56:28 +02:00
Laurent Destailleur
e3542c6d4f
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
...
NEW Show category filter on lists only when user have rights to read categories
2020-10-06 12:29:10 +02:00
Laurent Destailleur
04bad37564
Merge pull request #14858 from TobiasSekan/UseObjectFieldsOnProjectList
...
NEW Use object field of project in project list (internal)
2020-10-01 19:26:42 +02:00
Laurent Destailleur
7b3a7c9921
Add token on all url with action=delete
2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9
Add token on most GET url for admin action
2020-09-30 15:13:28 +02:00
stickler-ci
fd8e7fdfe3
Fixing style errors.
2020-09-30 12:57:36 +00:00
Sekan, Tobias
27c90abc0b
address feedback
2020-09-30 14:54:24 +02:00
Sekan, Tobias
c0a3aa2b5b
add mising elements from last commit
2020-09-29 12:00:54 +02:00
Sekan, Tobias
2d4e2ee378
Use object field for list fields (project)
2020-09-29 10:00:14 +02:00
Sekan, Tobias
2bf15b3a92
Show category filter only on rights to read it
2020-09-28 10:42:49 +02:00
Laurent Destailleur
3c6dda9dd5
Clean code
2020-09-25 10:27:30 +02:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-23 09:09:42 +02:00
Laurent Destailleur
72a9cf8820
FIX #14751
2020-09-22 16:03:36 +02:00
Laurent Destailleur
e52559783f
Look and feel v13
2020-09-21 13:54:26 +02:00
Laurent Destailleur
e5cca13ea0
Fix escaping
2020-09-20 03:32:43 +02:00
Laurent Destailleur
216b3c885d
Fix escaping
2020-09-20 01:30:36 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList
2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b
fix more different button visibility
2020-09-18 11:48:53 +02:00
Sekan, Tobias
ae8c302c19
merge variable declaration
2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7
Make button visiblity identical on most lists
2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad
Add function to all list that support $socid
2020-09-18 10:36:40 +02:00
Laurent Destailleur
11b1e0b420
Escape output
2020-09-18 01:39:32 +02:00
Laurent Destailleur
7704375ccd
Fix GETPOST
2020-09-18 01:36:06 +02:00
Laurent Destailleur
c4b5f5a249
Maxi clean of code
2020-09-18 01:29:17 +02:00
Laurent Destailleur
7056c19cd2
css
2020-09-17 22:35:05 +02:00
Laurent Destailleur
caaf0d370a
Fix #yogosha4474
2020-09-17 19:01:01 +02:00
Laurent Destailleur
0bf0312d50
FIX #yogosha4448
2020-09-17 12:30:14 +02:00
Laurent Destailleur
bfbb217607
Fix GETPOST on 'action'
2020-09-16 19:39:50 +02:00
Laurent Destailleur
cc37f4b29c
Clean code. <input name="token" value="$_SESSION['newtoken']" is now
...
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Laurent Destailleur
1f8278c8ca
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/core/class/html.formmail.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/other.lang
htdocs/product/class/product.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/translate.class.php
2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
2020-09-12 04:25:54 +02:00
Laurent Destailleur
c4383747a1
Look and feel v13
2020-09-11 13:57:16 +02:00
ATM-Nicolas
7944c21fe5
FIX : Wrong redirection
2020-09-10 12:32:12 +02:00
Laurent Destailleur
b8fe2188a6
Standardize code around model_pdf
2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-08 19:27:28 +00:00
Scrutinizer Auto-Fixer
b78ff67d7e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-09-07 08:18:17 +00:00
Laurent Destailleur
83d70c9856
Fix use new navigation
2020-08-30 19:54:34 +02:00
Laurent Destailleur
02f108835d
Fix tooltip
2020-08-30 19:45:46 +02:00
Laurent Destailleur
d35e374584
css
2020-08-30 19:32:52 +02:00
Laurent Destailleur
e030b2089a
Look and feel v13
2020-08-30 13:14:28 +02:00
Laurent Destailleur
0309510ab8
Fix avoid duplicate event recorded from email collector
2020-08-27 18:50:08 +02:00
Laurent Destailleur
bd7261a449
Debug recruitment module
2020-08-23 18:04:52 +02:00
Laurent Destailleur
ad0625b6ec
Debug posting message from ticket page
2020-08-21 01:11:22 +02:00
Laurent Destailleur
8057ccb223
Update task.class.php
2020-08-19 14:13:30 +02:00
abichotte
1c6a062486
FIX|fix #14502 fix to create a task for a project with api
2020-08-19 11:24:32 +02:00
Laurent Destailleur
964c4ef0d2
Standardize code. Use model_pdf.
2020-08-18 14:48:38 +02:00
Laurent Destailleur
0381cf5665
Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/modules/modPaymentByBankTransfer.class.php
htdocs/filefunc.inc.php
2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200
Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0
...
Conflicts:
htdocs/product/composition/card.php
2020-08-14 11:06:39 +02:00
Laurent Destailleur
68a3716fd2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/projet/info.php
2020-08-07 12:09:58 +02:00
quentin
215242a4a1
fix right project info.php
2020-08-06 14:11:26 +02:00
Laurent Destailleur
07f420d58e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
2020-08-04 15:03:51 +02:00
Laurent Destailleur
e16fd45972
FIX Label of opportunities in graph with special chars badly encoded
2020-08-04 14:44:52 +02:00
Laurent Destailleur
4c1aa25b32
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent_emails.php
htdocs/core/tpl/extrafields_list_search_title.tpl.php
htdocs/product/traduction.php
2020-08-04 13:51:11 +02:00
Laurent Destailleur
2076d18825
FIX Param of fetch_name_optionals_label must be object->table_element
2020-08-04 12:47:09 +02:00
Laurent Destailleur
fb811a1656
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/database-tables.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/commonobject.class.php
htdocs/langs/fr_FR/withdrawals.lang
htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
576363f353
Fix error message
2020-08-03 12:26:26 +02:00
Laurent Destailleur
b93f60c446
Look and feel v13
2020-07-27 14:19:50 +02:00
Laurent Destailleur
42234ba506
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +02:00
Laurent Destailleur
c30491284f
Fix phpcs
2020-07-18 23:16:05 +02:00
Laurent Destailleur
eef66ae6ed
Fix var not defined
2020-07-18 19:22:03 +02:00
Laurent Destailleur
bb4543167f
FIX #14222
2020-07-18 19:19:12 +02:00
Laurent Destailleur
2dc1008663
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-07-10 05:21:40 +02:00
Laurent Destailleur
a36c6a8dda
FIX #14209
2020-07-10 02:46:59 +02:00
Laurent Destailleur
5ea47f3ade
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/product/admin/product.php
htdocs/projet/tasks/list.php
2020-07-08 18:11:58 +02:00
Laurent Destailleur
471f3e66e6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2020-07-06 12:27:43 +02:00
Laurent Destailleur
6a41d5bba8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/resultat/index.php
htdocs/projet/tasks/list.php
2020-07-06 12:27:25 +02:00
Laurent Destailleur
056aa81ed3
Fix responsive
2020-07-06 10:59:23 +02:00
gauthier
466b7e84ef
FIX : soc filter doesn't work on task list
2020-07-06 09:58:44 +02:00
Laurent Destailleur
b76828df9f
Fix use of newtoken()
2020-07-06 09:39:26 +02:00
oscim
ca66eac76c
Update project.class.php
...
Fix order of delete extra prev table of project
2020-07-03 00:40:15 +02:00
oscim
eb22947c07
Update project.class.php
...
Fix order of delete extra prev table of project
2020-06-29 14:01:48 +02:00
Laurent Destailleur
aa91bada07
Merge pull request #14114 from atm-maxime/new_project_task_progress_filter
...
NEW filter on progress column in task list
2020-06-28 21:22:33 +02:00
Laurent Destailleur
ee5156034d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-06-24 20:03:40 +02:00
Laurent Destailleur
de62037ba5
Fix signed only in margin calculation of project
2020-06-24 12:58:10 +02:00
Maxime Kohlhaas
69b320f347
New : filter on progress column in task list
2020-06-24 10:17:46 +02:00
Laurent Destailleur
b6c1cdad7c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/element.php
2020-06-24 09:59:08 +02:00
Laurent Destailleur
a854d955b8
Fix rounding
2020-06-23 16:08:31 +02:00
Laurent Destailleur
0363717476
Fix PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 16:05:00 +02:00
Laurent Destailleur
7c992eac5e
Fix option PROJECT_ELEMENTS_FOR_MINUS_MARGIN
2020-06-23 15:52:17 +02:00
Laurent Destailleur
a607ff4c1a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/core/lib/project.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/ticket.lang
htdocs/mrp/mo_card.php
2020-06-18 15:50:31 +02:00
Laurent Destailleur
c986ab95cf
FIX Edit of a time spent line
2020-06-18 14:09:43 +02:00
Laurent Destailleur
1ed649ff28
Fix tooltip on project not visible sometimes
2020-06-18 02:50:46 +02:00
Laurent Destailleur
5bc9e656bf
Fix phpcs
2020-06-11 13:03:21 +02:00
Laurent Destailleur
ff9312c96a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/prelevement/card.php
htdocs/compta/prelevement/class/ligneprelevement.class.php
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/line.php
2020-06-08 20:36:54 +02:00
Laurent Destailleur
cf976a2b98
Fix translation
2020-06-08 17:00:58 +02:00
Laurent Destailleur
6e55abe831
Rename var to include "array" into name
2020-05-31 20:57:16 +02:00
Laurent Destailleur
82455681d6
Merge pull request #13582 from TobiasSekan/UseCatApiForProjectList
...
NEW Use new category API for project list view
2020-05-30 17:22:43 +02:00
kamel
6e10abe427
[NEW] Save filter of the project homepage
...
Save the filter into the user parameters
2020-05-27 15:51:25 +02:00
Frédéric FRANCE
b41ac00b98
add new rule
2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule
2020-05-21 02:02:54 +02:00
Laurent Destailleur
86de0d5e14
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/projet/class/project.class.php
2020-05-20 23:58:32 +02:00
Laurent Destailleur
9e3e8df60f
Fix phpcs
2020-05-20 23:56:06 +02:00
Laurent Destailleur
7d6cf4c01a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/projet/class/project.class.php
2020-05-20 23:27:45 +02:00
Laurent Destailleur
650bddde0d
Fix phpcs
2020-05-20 23:25:10 +02:00
Laurent Destailleur
cce72ad8d6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/bills.lang
htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
18ec65b4af
Fix: action on an ID must not include test on entity.
2020-05-19 22:06:17 +02:00
Laurent Destailleur
2ba9d7f288
Fix translation
2020-05-19 21:38:42 +02:00
Laurent Destailleur
791c4b48b6
Fix
2020-05-15 20:08:35 +02:00
Laurent Destailleur
9fb1766266
CSS
2020-05-15 17:14:28 +02:00
Laurent Destailleur
bfbe0037b6
Fix responsive
2020-05-15 16:29:18 +02:00
Laurent Destailleur
5fe9c45fb2
Fix look and feel v12
2020-05-15 16:07:39 +02:00
Laurent Destailleur
86ff60f161
Fix break line and set of opportunity fields
2020-05-15 15:50:50 +02:00
Laurent Destailleur
99db3a2991
Fix field for opportunities must be visible only if we use opportinities
2020-05-15 15:15:07 +02:00
Laurent Destailleur
895833effc
FIX #13864
2020-05-15 15:00:58 +02:00
Laurent Destailleur
a6708009d7
Add option PROJECT_OPEN_ALWAYS_ON_TAB
2020-05-12 14:53:03 +02:00
Laurent Destailleur
4584fa1aa6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/asset/list.php
htdocs/compta/bank/list.php
htdocs/contrat/services_list.php
htdocs/core/lib/date.lib.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/holiday/list.php
htdocs/projet/tasks/list.php
htdocs/supplier_proposal/list.php
htdocs/user/list.php
2020-05-11 19:43:06 +02:00
Maxime Kohlhaas
1a9afe6b20
Fix missing hook params for printFieldListValue
2020-05-08 01:40:25 +02:00
Laurent Destailleur
ebe169b9ef
Fix objects used for profit calculation.
2020-05-05 20:51:29 +02:00
Laurent Destailleur
6990bef6a2
Merge pull request #13764 from Tim-Otte/fixProjectTaskListStatusSearch
...
Fixed project task list search
2020-04-28 18:01:10 +02:00
Laurent Destailleur
aa9ee060d5
Look and feel v12
2020-04-28 17:34:11 +02:00
Tim Otte
947609fc12
Minor fix
2020-04-28 12:59:15 +02:00
Tim Otte
afbd73b946
Merge pull request #3 from Dolibarr/develop
...
Merging changes from Dolibarr
2020-04-28 12:42:05 +02:00
Tim Otte
4a8173f498
Fixed search_projectstatus to allow default values
2020-04-28 12:40:10 +02:00
Laurent Destailleur
72c8397e36
css
2020-04-28 11:24:13 +02:00
Laurent Destailleur
3090eb578b
Look and feel v12
2020-04-25 17:43:12 +02:00
Scrutinizer Auto-Fixer
1bf5745286
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-25 11:52:07 +00:00
Laurent Destailleur
3ed11f374a
Look and feel v12
2020-04-24 23:56:57 +02:00
Laurent Destailleur
72c6ac1c72
Complete #13708 , normalization of code
2020-04-23 13:21:39 +02:00
Laurent Destailleur
2dc586c325
Merge pull request #13660 from jribal/patch-2
...
add project object dependency
2020-04-22 18:02:42 +02:00
Laurent Destailleur
16e46c672c
Clean code
2020-04-20 15:06:27 +02:00
jribal
924b8fd138
add project object dependency
...
Dependency was missing. Webapp seems fine but api fails.
2020-04-20 13:21:12 +01:00
Laurent Destailleur
fa056e59df
Look and feel v12
2020-04-20 02:14:43 +02:00
Laurent Destailleur
f3de300483
Merge pull request #13626 from ptibogxiv/patch-334
...
NEW API filter projects by category
2020-04-16 01:01:58 +02:00
Scrutinizer Auto-Fixer
d021559b16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-15 22:42:57 +00:00
ptibogxiv
84989c5cf0
Update api_projects.class.php
2020-04-15 19:33:33 +02:00
stickler-ci
c92263ea77
Fixing style errors.
2020-04-15 17:30:39 +00:00
ptibogxiv
0379f0fa16
NEW API filter projects by category
2020-04-15 19:29:00 +02:00
Laurent Destailleur
95cf8b6359
FIX Non expected switch from tab timesptent to tab tasks
2020-04-15 14:54:54 +02:00
Laurent Destailleur
b54e3fb18c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-13 14:39:10 +02:00
Laurent Destailleur
1c6faf79a9
FIX #13595
2020-04-13 14:23:57 +02:00
Laurent Destailleur
d0dbf323ed
css
2020-04-13 01:42:10 +02:00
Laurent Destailleur
db11f0f58d
CSS
2020-04-13 01:17:51 +02:00
Laurent Destailleur
92b6b1a042
Look and feel v12
2020-04-12 18:13:43 +02:00
Tobias Sekan
ef38b5a015
fix wrong delete code line
2020-04-12 13:59:24 +02:00
Sekan, Tobias
ab870dd532
Switch to new category API in project list view
2020-04-12 13:30:02 +02:00
Laurent Destailleur
760121a3d1
Can sort list of answers.
2020-04-11 14:13:16 +02:00
Scrutinizer Auto-Fixer
444c293c01
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3
FIX #11855
2020-04-10 01:37:04 +02:00
Laurent Destailleur
082b205149
WIP Work on Kanban view for module list
2020-04-06 15:12:42 +02:00
Laurent Destailleur
41b2ed8f89
Look and feel v12
2020-04-06 12:03:37 +02:00
Fabian Palacios
3797080ab5
#13446 fix loop for dislplay of OthersNotLinkedToThirdParty
2020-03-31 09:29:59 -05:00
Laurent Destailleur
0b1cfcc0cc
Fix phpcs
2020-03-31 00:13:27 +02:00
Laurent Destailleur
da642823b9
Merge pull request #13445 from cfoellmann/fix-task-creation
...
Fix function to create a task
2020-03-30 19:31:19 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
...
NEW : Project task list, add column selector and extrafields
2020-03-30 18:53:42 +02:00
Christian Foellmann
e27500ce64
Fix function to create a task
2020-03-30 12:24:21 +02:00