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
fmarcet
310ecb1e09
FIX: Show product image on getNomUrl()
2015-10-29 12:28:28 +01:00
Regis Houssin
e5b1e214bc
Fix: add missing hooks
2015-10-29 11:50:16 +01:00
fmarcet
62dc6814a3
FIX #3726 Not showing images on product card
2015-10-29 10:14:54 +01:00
Florian HENRY
9a95401473
FIX : add tag myuser_job into ODT replacement
2015-10-28 11:27:39 +01:00
Laurent Destailleur
87c240252c
FIX Can export a field into task time table with export project profile
2015-10-27 22:24:18 +01:00
Laurent Destailleur
76ded0acea
Fix using DATE_FORMAT is forbidden
2015-10-27 19:26:33 +01:00
fappels
8992cfaeb4
move require_once
2015-10-27 15:50:55 +01:00
Marcos García de La Fuente
eff1f73950
Merge branch 'develop' into multiprice-generator
...
# Conflicts:
# htdocs/install/mysql/migration/3.8.0-3.9.0.sql
# htdocs/product/price.php
2015-10-27 10:41:50 +01:00
Sergio Sanchis Climent
b1bc000bae
standardize
2015-10-27 09:19:39 +01:00
Laurent Destailleur
4f04775b41
Merge pull request #3800 from olsesacl/develop
...
error this.price > 0 always false
2015-10-26 22:40:26 +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
Laurent Destailleur
6493438e87
NEW The clicktodial module is now able to provide link "tel:" on phone
...
numbers. So it is also possible to use clicktodial with a client
solution like the "xivo" local client.
2015-10-26 16:20:09 +01:00
Sergio Sanchis Climent
990fbf3ef4
hooks correctly implemented , printObjectLine, printObjectSubLine
...
In hook can change correctly label and ref (for my module need if is posible)
2015-10-26 14:00:43 +01:00
Laurent Destailleur
5c4ac0bf62
NEW Merge all left menu search boxes into one.
2015-10-26 12:18:22 +01:00
Sergio Sanchis Climent
2696369470
Merge remote-tracking branch 'upstream/develop' into develop
2015-10-26 11:38:52 +01:00
Sergio Sanchis Climent
4fd0086862
Fix: error this.price > 0
...
if no parse this.price when compare this.price and 0 always false
2015-10-26 11:33:43 +01:00
Laurent Destailleur
71da059ef0
NEW Add a new widget $form->selectArrayAjax() to use combo list with
...
content coming from an Ajax URL.
2015-10-26 11:23:31 +01:00
Maxime Kohlhaas
bd831b1f24
Merge branch 'new_creditnote' of github.com:atm-maxime/dolibarr into new_creditnote
2015-10-26 09:40:50 +01:00
Laurent Destailleur
77a0359cfc
Fix bad test
2015-10-25 20:17:43 +01:00
