Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

6147 Commits

Author SHA1 Message Date
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
850b9fd52a Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +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
Frédéric FRANCE
c9c7d60fc0 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +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
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
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
Laurent Destailleur
28ba5abb89 Clean code 2019-09-09 13:31:14 +02:00
VESSILLER
66611f4097 FIX rename "resource" (reserved) by "dolresource" 2019-09-09 09:29:43 +02:00
Frédéric FRANCE
bd4c9a64a8 wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
 2019-09-06 16:10:55 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +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
c32100c714 Merge pull request #11768 from atm-florian/10_fixeventlist 
fix event list with description
 2019-09-03 15:02:22 +02:00
Laurent Destailleur
52a543953c Fix position of tests 2019-09-03 14:58:54 +02:00
Laurent Destailleur
17ccb8fa10 Fix missing tooltip 2019-09-03 14:56:13 +02:00
Laurent Destailleur
a95e02e3f6 FIX #11789 FIX #11790 2019-09-03 14:52:03 +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
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +02:00
Laurent Destailleur
f54d4e3fc2 Replace deprecated code with new one 2019-08-31 02:34:54 +02:00
Laurent Destailleur
4a76dfa6ff Fix link to setup 2019-08-30 18:23:43 +02:00
Jean Traullé
c32c7d48ba Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
05c9e97fe4 The deprecated method get_OutstandingBill has been removed. You can use 
getOutstandingBills() instead.
 2019-08-29 00:45:02 +02:00
Laurent Destailleur
cb8bee7899 Responsive 2019-08-28 19:48:20 +02:00
Laurent Destailleur
9fd4f839ec Use css "pictomodule" for picto of modules 2019-08-28 19:28:50 +02:00
Laurent Destailleur
931586269a Fix td 2019-08-28 18:23:41 +02:00
Laurent Destailleur
042e9df720 Sort 2019-08-28 18:20:19 +02:00
Laurent Destailleur
d668b79738 NEW Add column tms into the table of targets for emailing 2019-08-28 18:14:46 +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
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96 Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
b1be6bf4f2 FIX #11422 Can't edit his own events with standard rights 2019-08-18 01:24:54 +02:00