Laurent Destailleur
|
563a020595
|
NEW Free text for cheque deposit receipt can be HTML content.
|
2015-11-02 20:35:33 +01:00 |
|
Laurent Destailleur
|
ffe1284a85
|
Merge pull request #3840 from frederic34/printgcp
Printing with Google Cloud Print
|
2015-11-02 20:09:13 +01:00 |
|
Laurent Destailleur
|
b8ffa56497
|
Fix #3857
|
2015-11-02 19:49:00 +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
|
958c3851d7
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-11-02 19:17:32 +01:00 |
|
Laurent Destailleur
|
055fe5e275
|
FIX #3786 Translation of select box.
|
2015-11-02 19:17:22 +01:00 |
|
Laurent Destailleur
|
67a2f6ee91
|
Merge pull request #3854 from fmarcet/3.8
FIX: Send emails to contacts who should not receive emails
|
2015-11-02 18:03:59 +01:00 |
|
Laurent Destailleur
|
f928062e2b
|
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
|
2015-11-02 17:56:32 +01:00 |
|
Laurent Destailleur
|
e12a38d584
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-02 15:44:57 +01:00 |
|
Laurent Destailleur
|
d0d4c5e7f8
|
NEW The conditional IF into ODT templates works also on not defined var
so we can show data only if defined. Close #3819
|
2015-11-02 15:44:47 +01:00 |
|
Laurent Destailleur
|
c06c2d0464
|
FIX #3841 creation of a task completed has not status set to finished by
default
|
2015-11-02 14:21:45 +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 |
|
fmarcet
|
3c5903f75a
|
FIX: Contacts are not added to the list with the status "no contact"
|
2015-11-02 11:52:58 +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 |
|
frederic34
|
9149032a03
|
Merge remote branch 'upstream/develop' into printgcp
Conflicts:
htdocs/core/actions_printing.inc.php
|
2015-11-02 11:43:34 +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
|
a14fee7296
|
Merge pull request #3852 from hregis/develop_origin
FIX add Mac OS detection and show it into OS information of user popup
|
2015-11-02 11:26:20 +01:00 |
|
Laurent Destailleur
|
bc29898621
|
Merge pull request #3814 from FHenry/3.8
FIX : missing tag myuser_job into ODT replacement
|
2015-11-02 11:22:52 +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 |
|
Laurent Destailleur
|
37f01f995c
|
Merge pull request #3853 from aspangaro/develop-71
Salaries : Replace "label for" by the function fieldLabel & add some notes & correct typo
|
2015-11-02 10:42:19 +01:00 |
|
Laurent Destailleur
|
a161e6d47a
|
Continue debug of PRODUIT_MULTIPRICES option.
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
|
2015-11-02 10:09:09 +01:00 |
|
frederic34
|
3e752ed5c8
|
Typo
|
2015-11-02 09:46:21 +01:00 |
|
Laurent Destailleur
|
6fe43cbbeb
|
Removed dead code
|
2015-11-02 09:08:08 +01:00 |
|
Laurent Destailleur
|
3409686405
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-02 08:57:01 +01:00 |
|
aspangaro
|
ac47c2f22e
|
Merge remote-tracking branch 'Upstream/develop' into develop-71
|
2015-11-02 06:44:16 +01:00 |
|
aspangaro
|
6df524bcb0
|
Remove blank page
|
2015-11-01 22:54:04 +01:00 |
|
Regis Houssin
|
0fd7ba478a
|
Fix: add Mac OS
|
2015-11-01 17:27:41 +01:00 |
|
frederic34
|
b9367bb196
|
Errors management
|
2015-11-01 11:24:51 +01:00 |
|
frederic34
|
2b4224d4c4
|
List Jobs
|
2015-11-01 10:10:14 +01:00 |
|
frederic34
|
2f3e6958f9
|
Receipt Printer
|
2015-11-01 00:58:08 +01:00 |
|
frederic34
|
bb06a55844
|
Work on list jobs
|
2015-10-31 23:27:10 +01:00 |
|
frederic34
|
0836a84c0e
|
Somme cleaning
|
2015-10-31 18:06:49 +01:00 |
|
Marcos García de La Fuente
|
e1f2efee4d
|
Merge branch 'develop' into multiprice-generator
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
|
2015-10-31 11:46:14 +01:00 |
|
Juanjo Menent
|
efb6e87f3f
|
Merge pull request #3839 from fmarcet/3.8
FIX Bad parameter on calling get_exdir function
|
2015-10-30 22:13:36 +01:00 |
|
Laurent Destailleur
|
6482a4ee04
|
Minor css fix
|
2015-10-30 20:04:03 +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 |
|
frederic34
|
b6be372c4b
|
Merge remote branch 'upstream/develop' into printgcp
|
2015-10-30 18:12:34 +01:00 |
|
frederic34
|
e90f68906e
|
SQL tables for oauth
|
2015-10-30 17:59:45 +01:00 |
|
frederic34
|
1694c690ed
|
Printing with Google Cloud Print
|
2015-10-30 17:22:06 +01:00 |
|
Ferran Marcet
|
5862037d34
|
FIX Bad parameters
|
2015-10-30 13:03:34 +01:00 |
|
Laurent Destailleur
|
2c682022cf
|
NEW The search box and the bookmarks are now rendered by the menu
manager.
|
2015-10-30 09:36:57 +01:00 |
|
Laurent Destailleur
|
6cc3df7e71
|
NEW Quick searh filter works on invoice, proposal, order, intervention,
contract
|
2015-10-30 08:35:56 +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 |
|
Frédéric FRANCE
|
e5063010b2
|
Update actions_printing.inc.php
|
2015-10-29 19:07:00 +01:00 |
|
Juanjo Menent
|
c14349f1ea
|
Merge pull request #3829 from hregis/3.8_bug
Fix: add missing hooks
|
2015-10-29 16:05:35 +01:00 |
|
Regis Houssin
|
6373c82559
|
Fix: broken features !!!
|
2015-10-29 13:14:38 +01:00 |
|