Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-09 19:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

1879 Commits

Author SHA1 Message Date
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
atm-greg
b1469ba761 add doActions hook on projettaskcard 2018-04-09 07:06:20 +02:00
Laurent Destailleur
f659b62316 CSS 2018-04-07 17:14:23 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/company.php
 2018-04-07 12:30:30 +02:00
Laurent Destailleur
920891ba70 Fix edit of default opportunit percent 2018-04-06 00:01:24 +02:00
Laurent Destailleur
9d9f3ddf85 Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Laurent Destailleur
b59d8a6473 Merge pull request #8501 from ATM-Consulting/develop_atm 
NEW: send mails from project card
 2018-04-05 16:39:06 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Marc de Lima Lucio
913135cb20 FIX: project mail: templates + hide actions when in presend 2018-03-28 17:10:12 +02:00
Marc de Lima Lucio
f5324bb15e FIX: only send mail from open project 2018-03-28 16:07:02 +02:00
Marc de Lima Lucio
f9bc5bf931 NEW: can send mail from project card 2018-03-28 15:22:47 +02:00
Laurent Destailleur
0c45760dd4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step5.php
	htdocs/langs/en_US/holiday.lang
	htdocs/public/payment/newpayment.php
	htdocs/public/stripe/newpayment.php
 2018-03-19 17:58:19 +01:00
Laurent Destailleur
5db718448f Delete at end 2018-03-19 11:29:06 +01:00
Laurent Destailleur
b4881645d8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-03-18 20:21:59 +01:00
philippe-opendsi
452c9e22bb Add mass action on project's list to close projects 2018-03-16 15:24:49 +01:00
Laurent Destailleur
c962b89495 NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull 2018-03-15 20:46:55 +01:00
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
ATM-Nicolas
e801b5a431 FIX : Delete tasks on project delete will now trigger TASK_DELETE 2018-03-14 11:38:42 +01:00
Laurent Destailleur
e7a315958d Merge pull request #8381 from fmarcet/7.0 
FIX Can't activate tasks on projects configuration
 2018-03-14 10:42:45 +01:00
Ferran Marcet
304595ee4f Fix: Can't activate tasks on projects configuration 2018-03-14 09:48:39 +01:00
Laurent Destailleur
0258d3aeeb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
Laurent Destailleur
d8dcebfa9a FIX Do not lose filter when editing comment of a time spent in task view 2018-03-07 20:12:40 +01:00
Laurent Destailleur
c1497b065c CSS 2018-03-07 14:13:55 +01:00
Laurent Destailleur
7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/comment.php
 2018-03-07 13:06:29 +01:00
Laurent Destailleur
f7f9f0e605 Update comment.php 2018-03-07 12:40:09 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
florian HENRY
bb73a715a8 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fix_comment_task 2018-03-07 08:49:08 +01:00
florian HENRY
03873038d5 fix comment task 2018-03-07 08:47:34 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00
Laurent Destailleur
01b0336e9b Fix tooltip on delete button 2018-03-03 12:10:27 +01:00
Laurent Destailleur
85dfc2cdf6 Merge pull request #8252 from ruistrecht-alt/Fix_missing_row_on_project_insert 
Fix missing insert bill_time in project.class on create
 2018-03-02 17:59:56 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Rui Strecht
e58cf4db42 Fix missing insert bill_time in project.class on create 2018-02-27 11:44:03 +00:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15 FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +01:00
Laurent Destailleur
82475e2e5f WIP Option PROJECT_BILL_TIME_SPENT 2018-02-26 14:28:51 +01:00
Laurent Destailleur
de89893d57 NEW Show total of time consumed in week in time spent entry page 2018-02-26 14:09:56 +01:00
Laurent Destailleur
cb45c86711 WIP Option PROJECT_BILL_TIME_SPENT 2018-02-26 13:21:16 +01:00
Laurent Destailleur
229ee5c12f Fix search criteria lost 2018-02-26 12:32:56 +01:00
Laurent Destailleur
ce928d9150 Fix search criteria lost 2018-02-26 12:32:26 +01:00
Laurent Destailleur
46c2f098e0 NEW Can enter time spent from the list of time spent of project 2018-02-26 12:21:01 +01:00
Laurent Destailleur
d1e846385a FIX Useless clean of tree 2018-02-26 12:01:36 +01:00
Laurent Destailleur
46f70ebf8e FIX Useless clean of tree 2018-02-26 12:01:13 +01:00
Laurent Destailleur
0d12552445 NEW Can enter time spent from the list of time spent of project 2018-02-26 11:57:29 +01:00
Laurent Destailleur
667c9045a2 FIX duplicate confirm message. Missing reposition class 2018-02-26 10:33:39 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Rui Strecht
7b448a2d18 Fixed issue with elementarray null if num_rows = 0 2018-02-25 12:29:15 +01:00