lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

906 Commits

Author SHA1 Message Date
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
46d993c9a6 Clean code 2021-08-27 22:42:04 +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
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
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +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
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
Florian HENRY
a7cef1aa15 FIX: cannot add time spend when column ref is not displayed 2021-07-26 10:20:11 +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
202ee8340a FIX #18091 2021-07-12 23:01:34 +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
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
aec4d6016c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-30 17:27:40 +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
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
34cebe6aa3 Look and feel v14 2021-06-14 01:11:39 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
7569275d28 Fix generation of invoice 2021-05-18 13:36:07 +02:00
Laurent Destailleur
e6729355b8 Look and feel v14 2021-04-30 17:56:42 +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
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
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +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
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
Laurent Destailleur
5b64a517ea Fix label 2021-03-27 14:30:10 +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
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
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
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
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
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
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Frédéric FRANCE
a82df7e6ea
code syntax project 2021-02-26 18:49:22 +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
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
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
512745920a css 2021-01-18 13:47:29 +01:00
Laurent Destailleur
6e860efa44 CSS 2021-01-11 20:53:18 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
lmarcouiller
d7f56b42cf Fix #15646 : patch of this bug 2020-12-04 15:29:57 +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
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
7c4599a5c5 Look and feel v13 2020-11-28 01:15:23 +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
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
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
57bb6506a3 Fix POST moved into GETPOST 2020-11-05 14:33:41 +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
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
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
d831edb481 Fix bad popup 2020-10-12 12:33:58 +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
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
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +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
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00