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

3199 Commits

Author SHA1 Message Date
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
Laurent Destailleur
d5b107211f Look and feel v12 2020-03-28 15:20:26 +01:00
stickler-ci
208049a8f2 Fixing style errors. 2020-03-26 07:27:10 +00:00
florian HENRY
aded72a6fa Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields 2020-03-26 08:24:39 +01:00
florian HENRY
21b98a7c4c set as global 2020-03-26 08:24:20 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
 2020-03-26 00:14:06 +01:00
florian HENRY
8662c864d2 remove not use column from arrayfields 2020-03-25 12:14:42 +01:00
florian HENRY
46a4184f15 NEW : Project task list, add column selector and extrafields 2020-03-24 19:50:01 +01:00
Juanjo Menent
fec3377f24 FIX: Compatibility with multicompany, bad numerotation of task. 2020-03-24 18:49:16 +01:00
Laurent Destailleur
2b33ef7e46 Align color of graph of status on status color 2020-03-24 13:06:59 +01:00
Laurent Destailleur
f56de9f177 Fix autocalculation of timespent in monthy mode 2020-03-23 22:04:40 +01:00
Laurent Destailleur
c2f0cdc0f6 Look and feel v12. Several minor fixes 2020-03-23 19:35:14 +01:00
Laurent Destailleur
16ddc56353 FIX #12277 2020-03-23 17:47:30 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-23 14:54:02 +00:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
 2020-03-18 18:50:55 +01:00
Laurent Destailleur
f92943bee2 css 2020-03-14 03:24:46 +01:00
Laurent Destailleur
0d2d2302d5 Removed not relevant graph on stats on project 2020-03-14 03:18:49 +01:00
Laurent Destailleur
8192e9dc67 FIX Missing token in form 2020-03-14 03:02:49 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
eeb219cb55
Revert "NEW sorting elements on project overview" 2020-03-06 14:52:29 +01:00
Laurent Destailleur
48661ad88e
Merge pull request #13290 from TobiasSekan/NewSortingForProjectOverview 
NEW sorting elements on project overview
 2020-03-06 14:44:48 +01:00
Laurent Destailleur
d0f22c7bff Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_graph_product_distribution.php
 2020-03-06 14:22:42 +01:00
Laurent Destailleur
d4b67a6cef Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/core/lib/functions.lib.php
 2020-03-06 14:19:30 +01:00
Laurent Destailleur
aaf9aef5c8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/contrat/list.php
 2020-03-06 14:17:21 +01:00
Tobias Sekan
eceaf5b321
Fix Travis CI error 2020-03-06 12:09:50 +01:00
Tobias Sekan
8c115a07b0
Fix lint errors 2020-03-06 11:49:49 +01:00
stickler-ci
03b8c86c06 Fixing style errors. 2020-03-06 10:45:35 +00:00
Tobias Sekan
acd7366d64
fix not working unlink 2020-03-06 11:33:42 +01:00
Tobias Sekan
3e58cc4c02
Fix build errors 2020-03-06 11:25:02 +01:00
Tobias Sekan
05e76ba122
Fix wrong merge (new MRP things was missing) 2020-03-06 10:21:34 +00:00
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +01:00
Laurent Destailleur
0bd2740779 NEW Can force position of legend of graph on right (instead of top) 2020-03-05 17:23:19 +01:00
Tobias Sekan
a155409bc2
Add sorting for project overview columns 2020-03-05 14:16:56 +01:00
Laurent Destailleur
fc31680bd0 Several fix for chart.js graphs 2020-03-05 02:55:06 +01:00
Laurent Destailleur
aa1552dbc0 Enhance graphs 2020-03-05 00:17:16 +01:00
Laurent Destailleur
a6d340a22c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2020-03-04 19:28:15 +01:00
Christian Foellmann
55dc3d36ac fix broken categories on "contacts" tab of project 2020-03-04 19:25:48 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
a22296ca72 Trans 2020-03-03 15:19:37 +01:00
Laurent Destailleur
b587ac6936 FIX responsive 2020-03-03 15:14:27 +01:00
Laurent Destailleur
be30667dbe FIX responsive 2020-03-03 15:13:55 +01:00
Laurent Destailleur
61abfb95a5 Look and feel v12 2020-02-25 13:28:11 +01:00
Frédéric FRANCE
327b827fb4 avoid warning if not an array 
Conflicts:
	htdocs/projet/element.php
 2020-02-21 18:01:04 +01:00
Laurent Destailleur
964b8d74f6
Merge pull request #13160 from frederic34/patch-8 
avoid warning if not an array
 2020-02-21 17:58:50 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Frédéric FRANCE
4801117c37
avoid warning if not an array 2020-02-21 09:24:24 +01:00
Laurent Destailleur
0c571c0376 Restore common behaviour: Draft object are on left under graph. 
Open and live objects are on right
 2020-02-19 14:20:55 +01:00
Laurent Destailleur
9883c0b688
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount 
NEW add weighted amount on project/opportunity
 2020-02-19 00:03:03 +01:00
Laurent Destailleur
973539db39
Update index.php 2020-02-18 23:59:53 +01:00
Laurent Destailleur
2ac064059a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/projet/element.php
 2020-02-18 22:40:43 +01:00
Laurent Destailleur
24bb61b5e4 FIX Usage of project not available in export. 2020-02-18 12:51:53 +01:00
Laurent Destailleur
7b4c674bdc Fix css 2020-02-17 21:43:53 +01:00
Laurent Destailleur
1d760f0e42 Add MO in project overwiew 2020-02-17 21:24:59 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Laurent Destailleur
5e4e02337b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-03 02:50:44 +01:00
Laurent Destailleur
90cde17bdb FIX #12986 2020-02-03 02:48:05 +01:00
Laurent Destailleur
fc1d6c1971
Merge pull request #13001 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2020-02-02 20:26:23 +01:00
Laurent Destailleur
12b63606df Fix look and feel of v11 2020-02-02 20:21:16 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
stickler-ci
01b1667eed Fixing style errors. 2020-02-02 08:13:09 +00:00
ATM john
fe009c3842 Fix project profit for loan part 2020-02-02 09:06:02 +01:00
ATM john
e59d118b8c Fix project loan data 2020-02-02 06:36:06 +01:00
atm-quentin
398e83d1cc FIX for stickler 2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5 Fixing style errors. 2020-01-31 10:26:33 +00:00
atm-quentin
a001913751 Debut modification saisie par mois 
NEW hook and data id

NEW visu FROM day TO day in permonth view

FIX
 2020-01-31 11:21:49 +01:00
atm-quentin
ae14814f10 NEW visu FROM day TO day in permonth view 2020-01-31 11:10:40 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
stickler-ci
1de640242f Fixing style errors. 2020-01-28 18:33:01 +00:00
kadogo
9313aabd5c NEW Add duration information for fichinter 2020-01-28 19:28:09 +01:00
Laurent Destailleur
3ece94fb2e Fix class not found 2020-01-27 00:06:10 +01:00
Laurent Destailleur
2177116f83
Merge pull request #12499 from altatof/updtask 
NEW : allow time consumed to be linked to another task
 2020-01-26 23:58:28 +01:00
Norbert Penel
24cb739b7c
FIX : multicompany, impossible to add second task 
due to ref already exists, it was impossible to add a second task on company > 1

this need to be fixed in all Dolibarr versions 

All datas with more than 1 company are corrupted !
 2020-01-20 18:54:35 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
a803feb842
Merge pull request #12474 from openthink-laurent/add-wysiwyg-editor-description-field-projects 
Add WYSIWYG editor to description field of projects
 2020-01-15 14:18:42 +01:00
stickler-ci
eddc38e37f Fixing style errors. 2020-01-15 13:18:25 +00:00
Laurent Destailleur
e15b96c37d
Merge branch 'develop' into updtask 2020-01-15 14:16:43 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
6196f5412b Fix date format 2020-01-15 13:37:04 +01:00
Laurent Destailleur
be9decf06d Fix date format 2020-01-15 13:36:22 +01:00
Laurent Destailleur
0d413c47b1 Fix duplicate info 2020-01-15 13:33:11 +01:00
Laurent Destailleur
43bf0a79e6
Merge pull request #12770 from guillaumematheron/develop 
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
 2020-01-15 13:23:25 +01:00
Scrutinizer Auto-Fixer
8691194627 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-09 23:03:10 +00:00
Laurent Destailleur
14e92bd0be css 2020-01-08 02:39:25 +01:00
Guillaume Matheron
ffa88ad11f Merge remote-tracking branch 'upstream/develop' into develop 2020-01-05 14:51:03 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
stickler-ci
2c68b08e4f Fixing style errors. 2020-01-02 14:27:35 +00:00
Guillaume Matheron
9efdec6c6e Merge branch 'develop' of github.com:guillaumematheron/dolibarr into develop 2020-01-02 15:26:28 +01:00
Guillaume Matheron
19e69dc869 Creating invoice from time spent now takes in to account the product duration to compute the quantity to bill 2020-01-02 15:18:18 +01:00
stickler-ci
92f50f6357 Fixing style errors. 2020-01-02 14:00:39 +00:00
Guillaume Matheron
e9e0aae1ce Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill) 2020-01-02 14:59:53 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto 
FIX remove backward compatibility projectid and uses object id instead
 2019-12-31 17:40:01 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
stickler-ci
458c1e2174 Fixing style errors. 2019-12-29 19:58:38 +00:00
Guillaume Matheron
84d8ca4b33 Made spaces/tab usage more consistent 2019-12-29 20:47:18 +01:00
Guillaume Matheron
5b1ae96ce9 Added two new options when billing time spent on a project : 
- Create one invoice line per timespent entry

 - Create one invoice line per task
 2019-12-29 20:46:53 +01:00
VESSILLER
811adad8c8 FIX notice var nbfield of array not initialized 2019-12-26 10:34:10 +01:00
VESSILLER
792096ad08 FIX url new for task time spent in project element tab 2019-12-23 16:00:35 +01:00
VESSILLER
99e63ad507 FIX uses GETPOSTISSET instead of GETPOST for projectfield 2019-12-23 15:18:45 +01:00
VESSILLER
e7a5d26355 FIX remove backward compatibility projectid and uses object id instead 2019-12-23 14:25:54 +01:00
Laurent Destailleur
e2451bcd26 Update images 
Fix value of delay for warning on project not closed
 2019-12-21 17:11:21 +01:00
Laurent Destailleur
9f86cd8824 Debug v11 2019-12-20 11:14:16 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
3207add2a6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/fourn/class/fournisseur.product.class.php
 2019-12-17 12:52:12 +01:00
Laurent Destailleur
27b1e71cd2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-17 12:45:00 +01:00
Laurent Destailleur
03bb395ad8
Update document.php 2019-12-17 12:14:30 +01:00
florian HENRY
bb6523b75d fix task document banner without thirdparty FATAL 2019-12-17 10:49:56 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Frédéric FRANCE
7eee26cc0f
Update project.php 2019-12-14 16:18:41 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
VESSILLER
7246b63542 NEW add total weighted amount in project list 2019-12-12 17:34:37 +01:00
VESSILLER
4ea042213e NEW show project label in project index 2019-12-11 10:59:19 +01:00
VESSILLER
0396b348f7 NEW add weighted amount on project/opportunity 2019-12-10 09:32:37 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Laurent Destailleur
f549c4fc9c
Merge pull request #12544 from frederic34/select_produits 
Form select_produits returns void
 2019-12-01 00:47:02 +01:00
Laurent Destailleur
dc77b47d7f
Merge pull request #12564 from atm-john/develop_fix_task_extrafield_fatal_error 
Fix Fatal error : task extrafield error
 2019-12-01 00:45:23 +01:00
ATM John BOTELLA
ff55c9da4a Fix task extrafield error 2019-11-30 00:56:45 +01:00
Frédéric FRANCE
7bbd500e81
The property table_element_date does not exist on Project 
see line 612
 2019-11-28 23:02:14 +01:00
Frédéric FRANCE
c214dd0675
Form select_produits returns void 2019-11-28 21:23:53 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
stickler-ci
7f24d1fe40 Fixing style errors. 2019-11-22 14:18:09 +00:00
altairis
bdb2b730af allow time consumed to be linked to another task 2019-11-22 15:14:55 +01:00
Laurent Destailleur
796c13403d
Merge pull request #12486 from TobiasSekan/FixBoardTaskNumberAlwaysZero 
Fix open tasks number on dashboard was always zero
 2019-11-22 14:37:48 +01:00
Scrutinizer Auto-Fixer
b388c6b7a8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:14:59 +00:00
Laurent Destailleur
0fffdd891e Sanitize data 2019-11-21 15:37:59 +01:00
Laurent Destailleur
9a8c5d5c29 Sanitize param 2019-11-21 15:36:30 +01:00
Tobias Sekan
f6c5605fd5
Fix number of tasks on dashboard always zero 2019-11-21 08:29:47 +01:00
Laurent Léonard
dbbcda9e99 Add WYSIWYG editor to description field of projects 2019-11-20 06:38:28 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-16 09:21:57 +01:00
Frédéric FRANCE
67d05cae1b
doxygen 2019-11-14 19:06:14 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:46 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:06 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3 
Scrutinizer Auto-Fixes
 2019-11-14 08:49:53 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:34:37 +00:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2 2019-11-13 19:14:50 +01:00
Laurent Destailleur
d10be4f169 FIX #12409 FIX #12408 2019-11-13 18:40:24 +01:00
Scrutinizer Auto-Fixer
87585c0f2a Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
eb378b45a4 Work on BOM - MO module 2019-11-09 20:35:45 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent 
100% centpercent
 2019-11-07 10:39:09 +01:00
Laurent Destailleur
b3feb6b095 Fix lang not defined 2019-11-06 00:42:29 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
98102e49d2 Fix phpcs 2019-11-05 15:48:41 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
cc51066161
Merge pull request #12273 from frederic34/patch-6 
css
 2019-11-02 13:30:56 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c Fix color of task progression 2019-11-01 23:16:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
c3a9f7ce58
css 2019-10-30 18:49:48 +01:00
Philippe GRAND
e02da55c2d add some comment 2019-10-30 10:08:36 +01:00
Laurent Destailleur
5cbed0a6ed
Merge pull request #12220 from frederic34/patch-8 
css
 2019-10-30 03:13:39 +01:00
VESSILLER
d28242a3c5 FIX remove backward compatibility projectid and uses object id instead 2019-10-29 16:40:47 +01:00
Laurent Destailleur
7fee355fba FIX statistics on MRP page 2019-10-25 10:35:09 +02:00
Frédéric FRANCE
ee21415c6c
Update index.php 2019-10-24 23:12:16 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
15d4a18599
Update document.php 2019-10-14 21:21:04 +02:00
iouston
f6aafea33c
Update document.php 
add 2 hidden options for set a default field and a defaut order on document page
 2019-10-14 15:09:59 +02:00
Frédéric FRANCE
fbb44192e0
fix travis 2019-10-08 18:40:39 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Laurent Destailleur
fb808d830e FIX Look and feel v10 2019-10-06 16:28:14 +02:00
Laurent Destailleur
f6cd3814ac FIX Look and feel v10 2019-10-06 15:08:05 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
stickler-ci
cb34c7e299 Fixing style errors. 2019-10-03 20:08:42 +00:00
ATM john
13e456d992 Fix Project LibStatus langs 2019-10-03 22:05:48 +02:00
ATM john
edc4dc3727 Fix project libStatus to use new dolGetStatus 2019-10-03 21:20:07 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
d6198a1e33 Fix billed time is empty 2019-10-01 13:47:29 +02:00
Laurent Destailleur
cd242523a5 Fix billed time is empty 2019-10-01 13:47:12 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
412e0f193b
Update element.php 2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php 2019-09-27 12:36:15 +02:00
Laurent Destailleur
2eaa910336
Update project.class.php 2019-09-27 12:32:27 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent De Coninck
b4f31d61fa allow to remove one custom referent in the project. 
Allow to remove one custom referent from the project.

When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.

This fix support now the property 'project_field'. And thus set this
column to null.

[see: #11881]
 2019-09-23 17:46:54 +02:00
Laurent Destailleur
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/ligne.php
 2019-09-17 12:23:58 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
9f775ca480 Fix look and feel v10 2019-08-29 01:37:19 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
cb05380f74 Fix look and feel v10 2019-08-21 04:02:30 +02:00
Laurent Destailleur
cb0bb55b3a Label centered 2019-08-19 10:29:59 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00
ATM john
22c4a1b49e Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-11 09:57:13 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
1d7885bc0c FIX We should remove property comments only for project and task api. 2019-07-25 16:58:24 +02:00
Laurent Destailleur
389976699c Fix responsive 2019-07-24 16:29:50 +02:00
Laurent Destailleur
559a902405 FIX summary of time spent in preview tab of projects 2019-07-23 03:39:35 +02:00
Laurent Destailleur
d6d5a93225 Fix css 2019-07-23 03:15:06 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
ddc01b4c27 Removed the method liste_array() of project class. It was not used by 
core code.
 2019-07-18 14:22:05 +02:00
Laurent Destailleur
3b393e818a Fix missing entity property into fetch 2019-07-18 14:17:29 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
1b4507f07d Fix on a hidden option 2019-07-02 11:40:05 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
 2019-06-25 13:03:54 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared 
NEW Add global task declared progression
 2019-06-24 18:12:55 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Maxime Kohlhaas
476df203a7 Add global task declared progression 2019-06-20 13:59:08 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00