Commit Graph

245 Commits

Author SHA1 Message Date
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
9c5e17d676
Merge pull request #12214 from homer8173/patch-8
Implement new now feature
2019-11-02 15:09:06 +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
1a10b30a76
clean indent in comm directory 2019-10-26 14:28:40 +02:00
Norbert Penel
a67b3d8cf5
Implement new now feature
8d75e83e55
2019-10-24 18:55:43 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Laurent Destailleur
d4f4f33122
Merge pull request #12048 from frederic34/patch-17
Update card.php
2019-10-07 10:23:51 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
bfd8bc839e
Update card.php 2019-10-06 10:28:09 +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
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
c5e7413ed2
Merge branch 'develop' into fix-resource-event-move-check-busy 2019-09-27 15:35:14 +02:00
Laurent Destailleur
34813a931f
Merge branch 'develop' into patch-10 2019-09-27 14:45:09 +02:00
Laurent Destailleur
f90bfb54d4
Merge pull request #11913 from frederic34/actioncommcarddoaction
add doaction to actioncommcard
2019-09-27 14:34:49 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
VESSILLER
ea5ff59076 FIX check if a resource is in use after a drag and drop from events 2019-09-17 16:43:36 +02:00
Frédéric FRANCE
155e8fb500
fix syntax 2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd
add doaction to actioncommcard 2019-09-17 08:15:01 +02:00
Frédéric FRANCE
a2d3cde291
some update after night 2019-09-17 07:59:46 +02:00
Frédéric FRANCE
fb7ef3cefc
Update card.php 2019-09-16 23:12:11 +02:00
Frédéric FRANCE
f369c1a80a
Update card.php 2019-09-16 20:59:13 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
NEW check if a resource is in use in an event
2019-09-15 15:47:07 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
db900cb5ea FIX EDB-ID:47370 2019-09-11 17:51:50 +02:00
VESSILLER
66611f4097 FIX rename "resource" (reserved) by "dolresource" 2019-09-09 09:29:43 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
VESSILLER
815d0bbc20 FIX rename "dolresource" into "resource" for compatibility with PR 11822 2019-09-05 11:57:12 +02:00
VESSILLER
9ed09db93c FIX replace "<br />" by "<br>" 2019-09-05 09:41:15 +02:00
VESSILLER
4ef7e755ad FIX only check on busy resources before updating an event 2019-09-05 09:29:40 +02:00
VESSILLER
b70587c150 NEW check if a resource is in use in an event 2019-09-04 15:14:16 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
Ferran Marcet
433835860c FIX: When saving an action it didn't save the label based on the type of event if the label is empty and the type is customized 2019-07-03 13:12:41 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
2be5e9615d Fix look and field v10 2019-06-12 19:03:22 +02:00
Laurent Destailleur
f6d8b46b40 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/comm/action/card.php
	htdocs/fichinter/card.php
2019-06-07 22:58:58 +02:00
Frédéric FRANCE
ad95b66842
Warning: A non-numeric value encountered 2019-06-06 10:12:01 +02:00
Laurent Destailleur
ee5d50b905 css 2019-04-27 13:25:21 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Lionel VESSILLER
b56cd11f02 Fix default contact id for update and clone actions in event card 2019-03-06 12:00:55 +01:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00