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
Laurent Destailleur
414404e854
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/class/commonobject.class.php
2015-04-26 16:30:33 +02:00
Laurent Destailleur
13b4d86064
Better fix for #2709
2015-04-24 21:29:02 +02:00
Alexis Algoud
7d3482036d
FIX event not linked to contact on creation
2015-04-24 17:40:53 +02:00
jfefe
f5db4d5bb7
Fix: missing getEntity function
2015-04-19 03:05:37 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Juanjo Menent
4588b2bb4c
Merge pull request #2517 from frederic34/patch-12
...
Closes #2509 Bug: Ref is not shown in the bubble that appears when the mouse is over an agenda link
2015-04-02 00:56:42 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
16a620f926
Fix: Deadlock situation (when order were canceled, no way to make
...
nothing on it)
Fix: Don't know how I forgot this events into trigger system.
2015-04-01 16:07:22 +02:00
Frédéric FRANCE
08e7cb2e84
Correction for tooltip
2015-03-31 21:57:48 +02:00
Frédéric FRANCE
f0ed848609
Update actioncomm.class.php
2015-03-31 21:38:38 +02:00
Frédéric FRANCE
9ee6fdd163
Tooltip of actioncomm show empty ref
2015-03-31 21:07:17 +02:00
Florian HENRY
26c29216d9
syntax
2015-03-26 16:55:13 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
76640b6b77
Fix removed warning
2015-02-25 15:01:25 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
2d2930b421
Merge pull request #2348 from tiaris/3.7_actionclassbug
...
fetch must contain an left join on c_actioncom for correct function
2015-02-18 23:02:44 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
jean
1f31ff338c
correction for fetch sql
2015-02-11 14:39:32 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
2015-02-10 21:33:43 +01:00
jean
2820bd24ac
fetch must contain an left join on c_actioncom for correct function
2015-02-10 16:03:31 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
Laurent Destailleur
87b75126aa
Fix missing set into specimen
2015-01-31 16:52:34 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
ef802d9c39
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a
Fixed: Better fix for backward compatibility
2015-01-18 12:29:55 +01:00
Laurent Destailleur
012c571a6c
Fixed: Backward compatibility
2015-01-18 11:50:53 +01:00
Laurent Destailleur
b53b8d2e45
Fixed: Backward compatibility
2015-01-18 11:48:52 +01:00
Laurent Destailleur
c54355b63a
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-16 10:44:41 +01:00
Laurent Destailleur
d16ce7eb96
Fix: Bad var
2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319
Fixed: Export was not using user assigned
2015-01-15 02:32:15 +01:00
Laurent Destailleur
ba49cce47a
Fix: The filter into event views on user must be done on assigned
...
resource, not only owner.
2015-01-15 02:06:04 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Laurent Destailleur
1e8e7474d8
Fixed: specimen init did not include new vars of 3.7
2014-12-07 21:22:43 +01:00
Laurent Destailleur
a59ac280bc
Doxygen
2014-12-07 02:19:57 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
8d964e03d2
Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into
...
AMMD-agenda-export-by-project
Conflicts:
htdocs/admin/agenda_xcal.php
2014-10-30 18:19:13 +01:00
Laurent Destailleur
866b2a7a88
Fix: Label
2014-10-20 13:14:33 +02:00
Laurent Destailleur
881d338fca
Fix: label of events
2014-10-20 13:07:54 +02:00
Laurent Destailleur
6bbeaee8fe
Fix: Selection of users color was not user owner of event.
2014-10-18 15:35:32 +02:00
Laurent Destailleur
536b579b35
Clean code
2014-10-14 00:27:23 +02:00
Laurent Destailleur
cd8936a224
Clean deprecated code.
2014-10-11 15:04:42 +02:00
Regis Houssin
c01edd76f6
Fix: avoid warning
2014-10-10 16:53:21 +02:00
Laurent Destailleur
06cc08026b
Some fix on per user view.
2014-10-09 17:05:57 +02:00
Laurent Destailleur
85f0d6c3ea
Fix: Edition of event
2014-10-05 04:51:34 +02:00
Laurent Destailleur
dde3b3ef65
Fix: Event update
2014-10-03 18:25:38 +02:00
Laurent Destailleur
e7a9447d94
Add hook formatEvent and fix bug into per user view.
2014-10-03 15:58:08 +02:00
Laurent Destailleur
8ccb581185
Fix: Change for php 5.6
...
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
2014-09-29 13:21:03 +02:00
Laurent Destailleur
6a570222cc
Fix: Missing fields into select
2014-09-28 14:21:57 +02:00
Laurent Destailleur
52340e9176
Fix: Missing fields into select
2014-09-28 14:18:04 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
bf4b99fa64
Assignation of event to several users is on a very good way for 3.7
2014-09-26 12:27:18 +02:00
Laurent Destailleur
a4d8739477
Qual: Clean a lot of deprecated code
2014-09-24 01:35:29 +02:00
Laurent Destailleur
dd86453020
Add field color into table of type of events
2014-09-23 17:54:03 +02:00
Laurent Destailleur
7224f64224
Work on multi user for events.
...
Fix: Modules must be reloaded after migration.
2014-09-23 16:15:15 +02:00
Laurent Destailleur
640bf7c34b
Uniformize field name
2014-09-23 12:18:42 +02:00
Laurent Destailleur
08d4195504
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767
Missing hook to add button on intervention
...
Prepare to move location into resource
Can select which king of contact show into contact tab.
2014-09-22 20:16:58 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
dfa071e093
Fix: Are description too large
2014-09-18 01:43:50 +02:00
Laurent Destailleur
9ea3e33f94
Fix: Can edit status of event.
...
New: Onto event summary of elements, end date and status are visible.
2014-09-15 19:04:30 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Florian HENRY
832d1b37c1
Save also code of event
2014-09-02 11:32:38 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
KreizIT
538cf90f5e
FIX : [ bug #1496 ] ACTION_DELETE trigger does not show trigger error
...
-Add ACTION_* trigger in interface_90_all
2014-07-03 15:39:40 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02:00
philippe
e2b29bb108
fix english misspelling
2014-03-05 09:57:36 +01:00
Laurent Destailleur
46e9b5d550
Merge branch 'develop' of https://github.com/grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/langs/ar_SA/admin.lang
htdocs/langs/el_GR/admin.lang
htdocs/langs/es_ES/admin.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/tr_TR/admin.lang
2014-02-10 01:30:48 +01:00
Gregory DAVID
3a053e3fed
Donne la possibilité de faire un filtrage sur les agenda en fonction du numéro de projet passé en GET : &project=XX
2014-02-07 18:08:25 +01:00
Laurent Destailleur
d1951393c7
Fix: priority is a field smallint.
...
Conflicts:
htdocs/comm/action/fiche.php
2014-02-06 17:09:41 +01:00
Laurent Destailleur
88ae0a7945
Fix: the rename function is bugged with some windows. I add a
...
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
2013-11-28 12:58:02 +01:00
Laurent Destailleur
e45406694b
Fix: no filter is value is ''
2013-11-23 19:28:41 +01:00
Raphaël Doursenaud
8907c9944d
Assigments in conditions is often considered bad practice
...
So let's put a comment, just in case
2013-11-07 20:51:30 +01:00
Laurent Destailleur
a4abfe1abc
New: Can add an event automatically when a projet is create.
2013-07-10 14:46:16 +02:00
Laurent Destailleur
7778a17a89
Qual: clean code from deprecated vars
2013-06-24 16:41:31 +02:00
Regis Houssin
c9a71439b2
Fix: EOF
2013-06-05 16:24:32 +02:00
fhenry
cb182752cc
Report divert bug fixing from 3.4
2013-05-19 18:47:14 +02:00
Regis Houssin
34036c2a5c
Fix: big security problem with multicompany
2013-04-26 16:07:35 +02:00
Laurent Destailleur
88858136fc
New: Enhance agenda module to reach RFC2445 (add busy information).
2013-04-06 17:39:31 +02:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Laurent Destailleur
746e005726
Fix: Fix ton of regression due to field name change
2013-03-09 20:34:38 +01:00
Laurent Destailleur
2a67af3c94
New: when adding an action, we can define a free code to tag it for
...
a specific need.
2013-03-08 12:04:01 +01:00
Laurent Destailleur
b9848702a8
Merge remote-tracking branch 'origin/3.3' into develop
2013-02-27 19:44:22 +01:00
Laurent Destailleur
d190e924b3
Fix: Update of type was not working.
2013-02-27 19:43:40 +01:00