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

550 Commits

Author SHA1 Message Date
Frédéric FRANCE
bb9b435875
doxygen for actioncomm class 2019-11-01 17:12:07 +01:00
Sekan, Tobias
0bfff92032 Add attendee to ical export + cleanup 2019-11-01 11:59:54 +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
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Laurent Destailleur
b813dfe3c9
Merge pull request #12172 from TobiasSekan/FixMissingIcalAuthor 
Fix missing organizer and contact on ical export
 2019-10-20 13:49:47 +02:00
Laurent Destailleur
89b0730483
Update actioncomm.class.php 2019-10-20 13:49:36 +02:00
Tobias Sekan
28dea51c4a
Fix missing organizer in ical export 2019-10-18 13:18:09 +02:00
Tobias Sekan
daa7f54295
fix - not removed old code line 2019-10-17 08:10:21 +02:00
Tobias Sekan
741627897e
fix interchanged allocation 2019-10-16 13:56:11 +02:00
Tobias Sekan
199fb3be0f
Fix non-numeric value encountered on ical export 2019-10-15 14:29:27 +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
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-25 08:06:44 +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
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
750182f9cd Removed deprecated method actioncomm->add(), use create() instead 2019-09-04 13:54:36 +02:00
Laurent Destailleur
6c96478040 Removed deprecated code 2019-09-02 22:57:55 +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
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
florian HENRY
ebe37df9db scrunitizer 2019-05-18 16:19:44 +02:00
florian HENRY
12a8008107 scrunitizer 2019-05-18 16:18:14 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +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
Frédéric FRANCE
013e536f32
Update actioncomm.class.php 2019-03-19 12:49:54 +01:00
Philippe Grand
7942903548
Update actioncomm.class.php 2019-03-18 12:24:16 +01:00
Philippe GRAND
198cf4af2f add comments 2019-03-18 10:06:22 +01:00
Laurent Destailleur
d4f2a16abf Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2019-03-14 17:10:58 +01:00
John BOTELLA
31e588dbab fix hookmanager global 2019-03-14 16:13:32 +01:00
John BOTELLA
8bc795c055 Fix missing hook for export agenda 2019-03-14 15:19:38 +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
Frédéric FRANCE
9b165f6b3f
add visibility 2019-02-27 20:45:07 +01:00
Laurent Destailleur
88fb491441 Fix note output 2019-02-06 00:40:07 +01:00
Laurent Destailleur
58e6cfd635 Fix popup content 2019-02-06 00:36:11 +01:00
Laurent Destailleur
57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php
 2019-02-03 21:14:44 +01:00
Laurent Destailleur
efe5cd3dd8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 21:13:06 +01:00
Laurent Destailleur
72f78ecf3b FIX #10460 compatibility with MariaDB 10.4 2019-02-03 20:02:05 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
a445e7597d FIX Popup when having notes of events 2018-12-27 06:37:17 +01:00
Inovea Conseil
9bfcabc8c9
NEW: Add note in tooltips 2018-12-10 16:09:56 +01:00
Laurent Destailleur
5f93315097 Clean code 2018-11-19 15:14:46 +01:00
Laurent Destailleur
1e1ccd4c88 Fix pagination in action/event list 2018-11-19 14:25:34 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
68ec172798 Fix setup to enable reminder b email 2018-11-03 12:37:52 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
23a9416c19 Fix deprecated field 2018-10-23 23:51:27 +02:00
Frédéric FRANCE
cab9c81ce2
Update actioncomm.class.php 2018-10-15 21:53:54 +02:00
Frédéric FRANCE
7b37c41cfb
reduce complexity of actioncomm class 2018-09-16 19:04:43 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore 2018-09-02 09:27:59 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
7354e485b0 precise label comment 2018-09-01 13:22:08 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Frédéric FRANCE
343e6ce8b3
typo 2018-08-23 14:34:27 +02:00
Philippe Grand
c626dcb710
Update actioncomm.class.php 2018-08-22 22:38:00 +02:00
Philippe GRAND
449ef9c464 Update and standardize code 2018-08-22 18:12:44 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Laurent Destailleur
85eed6cf80
Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
5a1a6ac095 Fix error message 2018-08-15 14:42:03 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
6113b536a0
remove superfluous spaces 2018-08-12 19:59:39 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Inovea Conseil
30cff2bb36 ADD check user's rights 2018-07-05 11:52:41 +02:00
Laurent Destailleur
8aa7956b4f Fix missing extraparams field in insert action 2018-06-07 12:53:06 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Laurent Destailleur
67ed1e0841 Fix filter criteria when using backto for events 2018-05-16 20:59:45 +02:00
Laurent Destailleur
133e736801 Fix save code 2018-05-16 20:52:45 +02:00
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
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
e639f2a91f Removed deprecated method classer_facturee(). Duplicate of 
classifyBilled
 2018-03-16 10:51:12 +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
0258d3aeeb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response 
the fk_element don't display when the call is made with REST API (reason non found)
 2018-03-13 10:28:44 +01:00
Laurent Destailleur
f800d50fec WIP to show event per hours 2018-03-07 11:53:30 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
f545d2a134 NEW Can add filter actiontype and notactiontype on event ical export 2018-02-28 20:06:28 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
2fbe4637ac Fix bad filter link 2018-02-05 23:05:37 +01:00
Laurent Destailleur
0e3d5ea9e5 Fix missing translation 2018-02-04 11:44:39 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales 
representatives
 2017-12-18 16:13:05 +01:00
Laurent Destailleur
682afe8918 Fix scrutinizer 2017-11-29 16:25:12 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
adce4b5b7b Debug multi contact on event. 
Prepare also code to manage properties of attendees of event
 2017-11-22 14:42:47 +01:00
atm-ph
fbc761cbac Fix rename TContactId into socpeopleassigned 2017-11-18 12:36:03 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
90615a8682 Fix busy tag not set sometimes 2017-11-13 02:44:02 +01:00
Laurent Destailleur
048766bd24 Fix sql error 2017-11-03 17:24:14 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
c226fc69d1
Update actioncomm.class.php 2017-11-02 10:45:27 +01:00
Laurent Destailleur
9458c80c48 Work on reminders 2017-10-31 23:10:29 +01:00
Laurent Destailleur
b29f32171c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/filefunc.inc.php
 2017-10-30 18:22:26 +01:00
Laurent Destailleur
cd5e43483e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php
 2017-10-28 22:08:16 +02:00
Laurent Destailleur
f02e731c67 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/lib/project.lib.php
 2017-10-27 02:32:09 +02:00
Laurent Destailleur
708666349f Minor fix 2017-10-26 18:35:32 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
fb843430bf FIX #7671 2017-10-22 03:22:31 +02:00
Juanjo Menent
75580f253e FIX: Agenda events are not exported in the ICAL, VCAL if begin exactly with the same $datestart 2017-10-20 12:57:32 +02:00
Laurent Destailleur
eb1fdca157 NEW Can create intervention from a proposal 2017-10-17 10:44:18 +02:00
atm-ph
bab43b043e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-10-13 09:52:56 +02:00
gauthier
1694737e0b NEW : new param on load_board() function in ActionComm class to avoid duplicate code 2017-09-27 10:09:21 +02:00
gauthier
7f938bc517 NEW : unexistant function load_state_board() on several objects 2017-09-26 12:32:58 +02:00
tysauron
5643d4e867 Rename "->fk_action" in "->type_id" 
(is old name)
 2017-09-19 17:26:18 +02:00
Laurent Destailleur
fa18e788b5 Fix must use photo of user 2017-09-17 17:29:00 +02:00
Laurent Destailleur
0cf67944fa Clean code 2017-09-16 13:14:46 +02:00
Laurent Destailleur
bd7c4fe940 NEW Summary of last events on a card are sorted on decreasing date. 2017-09-16 10:12:44 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
c44a5ede43 FIX Several problem with the last event box on project/tasks 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7 FIX Several problem with the last event box on project/tasks 2017-09-13 15:12:54 +02:00
Laurent Destailleur
c5567fafd4 Enhancement for smartphone 2017-09-04 09:25:53 +02:00
atm-ph
8188abd4cd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-08-31 11:09:02 +02:00
Laurent Destailleur
2104ab9aed Disable event reminder 2017-08-21 13:11:29 +02:00
Laurent Destailleur
8cd2235b4b Start to introduce cron for email reminder. 2017-08-03 11:42:22 +02:00
Laurent Destailleur
cfebbe3cc4 Fix css 2017-07-31 03:16:28 +02:00
phf
49b8689f2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-07-05 11:02:39 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
phf
711f9696aa New multi contacts on actioncomm 2017-06-08 12:02:39 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Laurent Destailleur
434b3ef643 Uniformize code and look and feel 2016-10-17 17:52:58 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
BENKE Charlie
f6a7838c80 Update actioncomm.class.php 
the variable name defined on the class is type_color
 2016-08-28 07:59:47 +02:00
BENKE Charlie
89e6b5a6cd add color of type for URL background 2016-08-25 12:22:17 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
aspangaro
2e4bebbaf9 FIX Presentation correction 2016-07-27 07:24:36 +02:00
BENKE Charlie
093f1da206 Some indenting and hookmanager feature 2016-07-18 15:07:35 +02:00
BENKE Charlie
427a8c5bf4 Display label and location of event on tooltip 
Think some additionnal info must be show on society too
 2016-07-12 09:56:43 +02:00
Alexis Algoud
a55a166df3 FIX old method add have to return create method result for backward compatibility 2016-06-29 16:30:47 +02:00
Laurent Destailleur
473ab18306 Fix link on workboard 
Fix warning picto is missing on task list
 2016-06-06 15:48:41 +02:00
Marcos García de La Fuente
84b58d27e6 NEW Renamed ActionComm::add function to ActionComm::create 2016-04-16 21:41:06 +02:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
phf
9b682e095f FIX can't clone event 2016-01-13 14:41:32 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Marcos García de La Fuente
d30c64413d FIX #4055 SQL error when trying to access a non-existing expedition 2015-12-24 14:27:12 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
9a9be97c2c Add a log to help diagnose bad usage of method ad of event 2015-11-12 14:36:35 +01:00
Laurent Destailleur
2937ad219a Merge pull request #3682 from tysauron/develop 
For not error Undefined property: stdClass::$id
 2015-10-09 20:25:39 +02:00
tysauron
ea949437ab For not error Undefined property: stdClass::$id 2015-10-07 17:17:32 +02:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
b57c156b60 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/modules/modContrat.class.php
	htdocs/fichinter/card.php
	htdocs/install/upgrade2.php
 2015-10-01 11:16:35 +02:00
Florian HENRY
766b8535ae spacing 2015-09-29 09:47:23 +02:00
Florian HENRY
4f5e207f08 review 2015-09-29 09:45:04 +02:00
Florian HENRY
0f27edad5d FIX : When delete actioncomm also delete actioncomm_resources 2015-09-28 10:14:19 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Marcos García de La Fuente
3c8d02b865 Removed unused variable 2015-09-06 20:49:11 +02:00
Marcos García de La Fuente
9ce8024f1e Merge remote-tracking branch 'upstream/develop' into refactor 2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
f1ea19e09b Created ActionComm:hasDelay function 2015-09-06 18:26:48 +02:00
Laurent Destailleur
10d3c41358 Fix Bad value into popup 2015-08-14 20:07:11 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
 2015-07-28 18:57:13 +02:00
Laurent Destailleur
9e35fd1bc3 Doc comments 2015-07-21 11:04:01 +02:00
Laurent Destailleur
38d30b5590 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2015-07-21 00:17:11 +02:00
Laurent Destailleur
2bebb869fb Fix bad signature of fetch. The ref_ext is missing. 2015-07-20 17:19:44 +02:00
Laurent Destailleur
01fbee0e06 Merge branch 'develop-patch34' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-patch34

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-06-19 11:27:15 +02:00
Laurent Destailleur
44d4d23c00 Fix phpcs 2015-06-19 11:21:36 +02:00
aspangaro
0c01295016 Fix travis 2015-06-19 06:19:10 +02:00
Laurent Destailleur
d3549cc2a0 Merge branch 'add_clone_on_event_agenda' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-add_clone_on_event_agenda

Conflicts:
	htdocs/langs/en_US/agenda.lang
 2015-06-16 11:41:45 +02:00
Gauthier
dd81d3a762 NEW : add all assigned users and all extrafields data in new event when we createFromClone 2015-06-08 15:06:43 +02:00
Gauthier
053cfac262 NEW : clone action on agenda events 2015-06-08 12:39:25 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting 
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
 2015-06-01 11:00:11 +02:00
tysauron
572269bed1 For backward compatibility ON update actioncomm 
For backward compatibility when val=id   ON update actioncomm object
 2015-05-19 15:54:08 +02:00
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00