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
1e9cee1b07
Fix bug reported by scrutinizer
2016-06-29 11:48:28 +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
5cd43d2df0
Some debug on new features
2015-12-04 20:51: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