Christophe Battarel
44882f4035
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +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
420de76b4b
Merge pull request #1993 from aspangaro/3.6-patch
...
GPLv3
2014-11-04 17:40:38 +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
Laurent Destailleur
cf6a0df3e4
A lot of fix in missing intervention trigger. Align key to use same name
...
to avoid future bugs.
2014-11-03 17:23:02 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
Laurent Destailleur
53dfda1413
Fix: Chars - is no more allowed into value for code for extra fields.
2014-11-01 19:34:20 +01:00
Laurent Destailleur
9c51effe5c
Ajout plus d'info dans description audit.
2014-10-31 15:42:35 +01:00
aspangaro
57f49ec5d4
GPLv3
2014-10-30 20:41:08 +01:00
Frédéric FRANCE
f18e513046
Update html.form.class.php
2014-10-30 18:44:56 +01:00
Laurent Destailleur
82812aa679
Merge pull request #1970 from FHenry/develop
...
Add hook method to simply display child lines in order/invoice/propal
2014-10-30 18:11:41 +01:00
Laurent Destailleur
3e12239f11
Merge pull request #1971 from defrance69/patch-25
...
Update commondocgenerator.class.php
2014-10-30 18:10:52 +01:00
Laurent Destailleur
9d9a1e0701
Merge pull request #1974 from grandoc/develop
...
encrease name length for societe
2014-10-30 18:04:38 +01:00
Laurent Destailleur
750944d718
Fix: var not initialised
2014-10-30 11:16:01 +01:00
Laurent Destailleur
a0c9af2385
New: Can filter on date into tab "Referring object" of a project.
2014-10-29 20:21:24 +01:00
Laurent Destailleur
0abeea059e
Uniformize and clean boxes behaviour and translation.
2014-10-27 21:48:28 +01:00
Florian HENRY
d846dd2431
Fix extrafield from list feature where filter is provided
2014-10-27 19:38:27 +01:00
Alexis Algoud
eebf107d5f
includes and show_documents
2014-10-27 10:54:50 +01:00
Laurent Destailleur
a1a03a8061
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 00:42:52 +02:00
Philippe GRAND
463904706b
better display margin infos
2014-10-23 15:02:49 +02:00
BENKE Charles
10f419e372
error on adding fields (bad function
2014-10-23 13:08:39 +02:00
jfefe
29db45c763
Avoid missing class error for fetch_thirdparty method
2014-10-23 01:15:05 +02:00
BENKE Charles
c103a5927a
Update commondocgenerator.class.php
...
add : outstanding limit on ODT
fix : only public note are display on ODT (private stay private)
2014-10-20 22:28:08 +02:00
Florian HENRY
1eba744e8b
Add hook method to simply display child lines in order/invoice/propal
2014-10-20 13:15:48 +02:00
Laurent Destailleur
4df9fb38fb
Add option AGENDA_ALWAYS_HIDE_AUTO
2014-10-20 12:29:35 +02:00
Laurent Destailleur
0fba70d4d1
Fix: Triggers sending email for intervention and classify billed
2014-10-20 11:35:34 +02:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b
Fix: Better layout detection
2014-10-19 12:24:36 +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
Laurent Destailleur
e53c328767
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
ChangeLog
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:45:44 +02:00
Laurent Destailleur
ad0f842b60
Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into
...
atm-maxime-mkoevols
Conflicts:
htdocs/commande/card.php
2014-10-18 15:38:49 +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
58b15fa736
Fix: Solve some regressions
2014-10-18 01:32:38 +02:00
Laurent Destailleur
a2d23fd699
Fix: Error management of hook was duplicating errors.
2014-10-18 00:33:30 +02:00
Laurent Destailleur
8581e953f9
Doxygen
2014-10-17 14:45:12 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Maxime Kohlhaas
8e3a3500c2
Add comments (for travis' sake)
2014-10-16 13:28:39 +02:00
Laurent Destailleur
c8dd0383d8
New: Function getCurrencyAmount is marked as deprecated. Use function
...
price to output a price including currency symbol.
2014-10-16 01:26:44 +02:00
Maxime Kohlhaas
452636b0e4
New : Add option to allow extrafield to be modified regardless of the document status
2014-10-14 15:27:40 +02:00
aspangaro
861583bb77
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-14 06:12:46 +02:00
Laurent Destailleur
2cf21f856c
Fix: table name differs.
2014-10-14 01:47:31 +02:00
Laurent Destailleur
536b579b35
Clean code
2014-10-14 00:27:23 +02:00
Laurent Destailleur
e101bfceea
Use language to find template email.
2014-10-12 21:24:51 +02:00
aspangaro
dc6817813e
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-12 20:23:08 +02:00
