Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Marcos García de La Fuente
7185cfeb84
Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
2015-07-18 14:48:59 +02:00
Gauthier
244d1839e4
FIX : load propal langs for availability traduction
2015-07-17 17:24:11 +02:00
Fab
3adf6b1a73
Missing space after title tag.
...
When using textwithpicto() from core/class/html.form.class.php, if you
are reading source code with firefox, you will see that a part of the
generated html is highlighted in red.
<td class="classfortooltip" title="title text"valign="top" width="14">
should be :
<td class="classfortooltip" title="title text" valign="top" width="14">
2015-06-25 08:50:48 +02:00
Laurent Destailleur
05a653ee5f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/html.form.class.php
2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-08 18:18:37 +02:00
Raphaël Doursenaud
08c9dd358d
FIX #2983 Load gravatar avatar images securely over HTTPS
2015-06-08 15:51:41 +02:00
phf
33ad86261a
FIX : width multiselect
2015-05-25 16:42:51 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Maxime Kohlhaas
51522decf3
Fix : price in editkeyval function was forcing a price rounding
2015-04-18 18:33:46 +02:00
Laurent Destailleur
7ef11b2f38
Fix selected attribute not set correctly
2015-03-18 13:16:59 +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
Laurent Destailleur
eef1e17c61
Fix: default vat
2015-02-15 19:38:20 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
ca939bf8a5
PHPDoc and misc fixes for several folders
2015-02-10 11:02:11 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
eb524cfd29
Copyright info
2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd
Fix: [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-25 22:50:15 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
268723be7b
Fixed: sql syntax error
2014-12-21 01:39:20 +01:00
Laurent Destailleur
c9f3267649
Fixed: bad conditions
2014-12-20 11:34:37 +01:00
Laurent Destailleur
854ed90a62
Fixed: bad place for the ajaxcombo.
2014-12-20 11:15:10 +01:00
Laurent Destailleur
0b6ff8f9bc
Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not
...
be finished. We keep it as development status.
2014-12-14 20:41:11 +01:00
Laurent Destailleur
7834a9b099
Add hidden constant to solve bug of too low size to see products label.
2014-12-10 00:51:57 +01:00
Laurent Destailleur
ff23b0c0a6
Fix: No print
2014-12-07 12:10:50 +01:00
Laurent Destailleur
6843bfcc15
Fix typo
2014-11-28 00:01:59 +01:00
Laurent Destailleur
b644075faa
Fix: doxygen
2014-11-20 23:41:58 +01:00
Laurent Destailleur
f7a74a9ac9
Fix: CRLF
2014-11-20 16:16:15 +01:00
Laurent Destailleur
95de38e102
Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les
...
autres module pour affectation but it is a too important change.
2014-11-20 15:32:10 +01:00
Laurent Destailleur
d4ad7236e5
Clean old code for multiselect (replaced with select2 plugin).
2014-11-16 00:46:27 +01:00
Laurent Destailleur
a46a6cccaf
Fix: Screen page tests. Page tests are now ok with 3.7.
2014-11-15 00:57:31 +01:00
Laurent Destailleur
6bac744709
Fix: Missing event management into select when combo not selected
2014-11-13 16:46:40 +01:00
Laurent Destailleur
5c2862dae3
Merge pull request #1976 from frederic34/patch-2
...
Add a little delay in ajax_autocompleter
2014-11-04 17:41:23 +01:00
Laurent Destailleur
0b41df7c35
Clean code to manage multiselect jquery: All code is centralized
...
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
2014-11-04 00:33:50 +01:00
Laurent Destailleur
b6b6cced30
Fix: Test sur user assigned not filled
...
Can use empty line into select boolean form.
2014-11-03 20:02:11 +01:00
Frédéric FRANCE
f18e513046
Update html.form.class.php
2014-10-30 18:44:56 +01:00
Laurent Destailleur
750944d718
Fix: var not initialised
2014-10-30 11:16:01 +01:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
Laurent Destailleur
13590a876b
Fix: A little clean of dol_hash usage.
2014-10-18 16:08:15 +02:00
Laurent Destailleur
873f8a6f27
If there is at least one favorite into countries, then add a separator
...
into list to show limit between sorted entries and not sorted entries.
2014-10-18 15:53:42 +02:00
aspangaro
9f6a460d42
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
...
Resolve conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:32:50 +02:00
Laurent Destailleur
b43d96f86c
New: Add id into select_category method.
2014-10-18 02:12:10 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
aspangaro
71dafac03c
Add favorite button into country dictionary to put value on top select list
2014-10-12 15:28:01 +02:00
Laurent Destailleur
2b479aa0b4
Qual: Uniformize translated label of progress on all pages.
...
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
2014-10-12 01:04:34 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +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
