lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99,615 Commits 43 Branches 150 Tags 886 MiB
38ef028310
Commit Graph

2862 Commits

Author SHA1 Message Date
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