Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Alexis Algoud
d997ac83e7
Add function param description
2015-11-12 09:08:08 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
Laurent Destailleur
2bd0f04d8f
Add feature to get nb of top menu entrie
...
Fix translation of units
2015-11-12 00:48:37 +01:00
Laurent Destailleur
1f4742b77b
Remove useles html generated code. More code comment.
2015-11-11 19:38:19 +01:00
frederic34
cd738ef483
Merge remote branch 'upstream/develop' into fccard
...
Conflicts:
htdocs/commande/card.php
2015-11-11 17:23:37 +01:00
frederic34
01d4bd6cf5
bad invert
2015-11-11 17:19:53 +01:00
Alexis Algoud
99513ac9f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-09 18:31:21 +01:00
frederic34
b8a84d68ec
add messages
2015-11-09 18:19:10 +01:00
Alexis Algoud
68cbd4699b
NEW multi event type for filter and get form in order to allow bookmark
2015-11-09 17:18:23 +01:00
Laurent Destailleur
71fa347e8e
FIX Better compatibility for users that used the not supported option
...
MAIN_USE_JQUERY_MULTISELECT set to 1.
2015-11-08 18:40:12 +01:00
Laurent Destailleur
6ec33a94c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-08 15:39:10 +01:00
Laurent Destailleur
bd56396394
Fix migration error
2015-11-08 15:38:57 +01:00
Juanjo Menent
509b45a0d0
Merge pull request #3936 from marcosgdf/bug-3931
...
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
2015-11-08 11:19:13 +01:00
Laurent Destailleur
3906cb79c5
NEW: Add parameter to add a link to use "date of invoice" in one click
...
when fille a payment card.
2015-11-07 23:46:07 +01:00
Laurent Destailleur
57e162d7f8
The component selectAjaxArray can return javascript part into a global
...
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
0451cc1e73
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
...
Close #3931
2015-11-07 14:31:12 +01:00
Laurent Destailleur
b2d9f21253
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89
Use the new banner for first tab of products.
2015-11-06 18:57:35 +01:00
Maxime Kohlhaas
dac0a7bc50
Fix : finally, autofocus on product search field is a bad idea
2015-11-06 11:09:54 +01:00
Laurent Destailleur
64fb4a30bb
Merge pull request #3899 from grandoc/develop
...
Typo
2015-11-05 21:46:33 +01:00
Laurent Destailleur
f3b8df3ea5
Merge pull request #3889 from frederic34/escpos
...
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
55dfa4859f
Install lib with composer
2015-11-05 21:09:14 +01:00
frederic34
8a765bf5fd
wip
2015-11-05 16:20:35 +01:00
philippe grand
04238da75d
Typo
2015-11-05 14:16:13 +01:00
Laurent Destailleur
11b7d8a44c
Merge pull request #3873 from frederic34/escpos
...
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
frederic34
644a104d5f
start to parse template
2015-11-04 23:14:50 +01:00
frederic34
ece9f68e0c
wip
2015-11-04 20:02:04 +01:00
frederic34
4a67a94704
wip template edit
2015-11-03 23:11:04 +01:00
frederic34
5c725aceb8
sql
2015-11-03 22:12:03 +01:00
frederic34
d362d889f6
wip
2015-11-03 20:50:01 +01:00
Alexis Algoud
e3a42a78f2
FIX all PDF hook must be in addreplace type, not return value to work as expected
2015-11-03 15:14:42 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
Frédéric FRANCE
7b8a33adfe
Update commonobject.class.php
2015-11-02 13:20:51 +01:00
Laurent Destailleur
c119859696
NEW The quick search box on left menu can also search into expense
...
reports.
2015-11-02 13:14:46 +01:00
Laurent Destailleur
269fb87342
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866
FIX IF autocomplete was set on thirdparty list, it was not possible to
...
open list of extrafields.
2015-11-02 11:45:59 +01:00
Laurent Destailleur
a9ddcc1a80
Merge pull request #3832 from frederic34/patch-16
...
NEW Add supplier order to the Direct Printing System
2015-11-02 11:27:00 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
Laurent Destailleur
465ad6b3a7
Merge pull request #3802 from olsesacl/develop-hook
...
hooks correctly implemented , printObjectLine, printObjectSubLine
2015-11-02 10:44:59 +01:00
frederic34
2f3e6958f9
Receipt Printer
2015-11-01 00:58:08 +01:00
Laurent Destailleur
a8d28b5e46
NEW Add a filter field to restrict list of member when doing a LDAP list
...
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
2015-10-30 19:23:23 +01:00
Laurent Destailleur
3760f247a2
NEW Can now select fields to show in product list. Extrafields are also
...
supported.
2015-10-30 00:05:00 +01:00
Frédéric FRANCE
b1c4e032fc
Update html.formfile.class.php
2015-10-29 19:08:38 +01:00
Florian HENRY
9a95401473
FIX : add tag myuser_job into ODT replacement
2015-10-28 11:27:39 +01:00
fappels
8992cfaeb4
move require_once
2015-10-27 15:50:55 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
