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

1673 Commits

Author SHA1 Message Date
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
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +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
ecac1f9f40
wip 2019-09-17 08:02:55 +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
Frédéric FRANCE
67b73cf0e6
Update actioncomm.class.php 2019-09-16 20:57:20 +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
4d0ef33471 FIX #11857 2019-09-15 15:43:03 +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
750182f9cd Removed deprecated method actioncomm->add(), use create() instead 2019-09-04 13:54:36 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +02:00
florian HENRY
243fca9a1a fix event list with description 2019-08-27 16:12:07 +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
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
9f95b10d0e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/comm/action/peruser.php
	htdocs/compta/prelevement/card.php
	htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
 2019-07-22 19:11:27 +02:00
Laurent Destailleur
f39f710fd9
Merge pull request #11538 from atm-maxime/fix_agenda_list_filter 
Fix lost filter in action list
 2019-07-22 18:44:22 +02:00
Maxime Kohlhaas
7ec8b48b18 Fix lost filter in action list 2019-07-21 22:21:11 +02:00
florian HENRY
b046bcc197 fix warning php 2019-07-20 15:19:25 +02:00
florian HENRY
d03d79222e fix warning php 2019-07-20 15:15:48 +02:00
florian HENRY
d88fec52bf fix warining message 2019-07-20 15:07:59 +02:00
Laurent Destailleur
fc31a1182b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-18 18:54:50 +02:00
Laurent Destailleur
58428cefc0 Fix phpcs 2019-07-18 18:53:51 +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
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
John Botella
b5d348356d Fix socpeople assigned list in action com list 2019-07-17 16:49:41 +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
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
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00