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
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
