Laurent Destailleur
edcf39cd58
Merge pull request #2300 from aschio/develop
...
NEW: search filter fields in list project page
2015-01-31 20:24:48 +01:00
Laurent Destailleur
324ded162d
Merge pull request #2297 from ndrosis/patch-15
...
translate UpdateServerOffline live last version
2015-01-31 20:20:18 +01:00
Laurent Destailleur
7721f4928d
Merge pull request #2295 from grandpaul/fix_webservice_product_price
...
Fix: webservices productorservice not updating the price.
2015-01-31 20:18:08 +01:00
Laurent Destailleur
ece70dbd2c
Merge pull request #2293 from frederic34/patch-4
...
Error message is ErrorCounterMustHaveMoreThan3Digits
2015-01-31 19:44:09 +01:00
Laurent Destailleur
c19ff003ea
Merge pull request #2292 from FHenry/develop_contract_line_extrafileds
...
NEW: contract lines extrafileds
2015-01-31 19:43:37 +01:00
Laurent Destailleur
0253f952d4
Merge pull request #2288 from accett/patch-1
...
Add MXN
2015-01-31 19:39:19 +01:00
Laurent Destailleur
963b9e8583
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 19:37:25 +01:00
Laurent Destailleur
9188be57ce
Select2 component creates problem of sizing with jmobile.
2015-01-31 19:25:26 +01:00
Laurent Destailleur
2788a352cf
Missing lang loading
2015-01-31 19:00:00 +01:00
Laurent Destailleur
21f72c7594
Fix regression
2015-01-31 17:10:19 +01:00
Laurent Destailleur
13019f1f33
Clean code introduced by last PR.
2015-01-31 17:02:36 +01:00
Laurent Destailleur
d32f52cc50
Fix date of delivery, and avoid duplicate tracking number.
2015-01-31 16:23:23 +01:00
Laurent Destailleur
1e72d49858
Merge pull request #2286 from accett/patch-1
...
New: Introduce num to text function and use sign before amout for mexico currency
2015-01-31 15:55:16 +01:00
Laurent Destailleur
a84dd26352
Merge branch 'frederic34-tooltip' into develop
2015-01-31 15:42:15 +01:00
Laurent Destailleur
d66d4f53a5
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
...
frederic34-tooltip
Conflicts:
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/product/index.php
2015-01-31 15:41:33 +01:00
Laurent Destailleur
56c00ae9e2
Merge branch 'IonAgorria-dinamic-prices-product' into develop
2015-01-31 14:53:48 +01:00
Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
Laurent Destailleur
0aab43c728
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-01-31 14:30:11 +01:00
Laurent Destailleur
2af504c020
Merge branch 'marcosgdf-task-1793' into develop
2015-01-31 14:29:56 +01:00
Laurent Destailleur
770ddb6b0f
Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-task-1793
Conflicts:
ChangeLog
htdocs/margin/lib/margins.lib.php
2015-01-31 14:29:15 +01:00
Laurent Destailleur
f270371716
Merge pull request #2281 from frederic34/patch-3
...
Update README.md
2015-01-31 14:27:02 +01:00
Laurent Destailleur
ce8ad39a8e
Remove test code and restore prod code.
2015-01-31 13:00:51 +01:00
Laurent Destailleur
720caf8e31
Missing XPF currency
2015-01-31 12:19:06 +01:00
frederic34
c1943f989b
Tooltip
2015-01-31 10:58:03 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
d0cc56d616
Showing price without tax also.
2015-01-31 01:12:05 +01:00
Laurent Destailleur
74dafbe034
Fix missing class
2015-01-31 00:45:55 +01:00
Laurent Destailleur
03cc1bd039
Fixed bad sql error
2015-01-31 00:27:35 +01:00
Laurent Destailleur
a35bd9a3e4
Fixed bad sql request
2015-01-31 00:27:11 +01:00
Laurent Destailleur
2684b327e5
Fixed bad sql error
2015-01-31 00:23:10 +01:00
Laurent Destailleur
29d399ba79
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
291340a39f
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-30 16:34:18 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
d6dc495a42
Removed bad print
2015-01-30 16:01:56 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
67c1ae8593
Fixed: condition to show menus
2015-01-30 15:47:27 +01:00
cla
0501153835
Update list project page: add sales rapresentatives and linked user.
2015-01-30 11:08:49 +01:00
cla
0d0c10be1f
ADD filter fields in list project page
2015-01-29 18:17:43 +01:00
Laurent Destailleur
16fa19be87
Doc to send unblock requests
2015-01-28 23:06:05 +01:00
Drosis Nikos
831bc5393d
translate UpdateServerOffline live last version
2015-01-28 23:17:46 +02:00
Laurent Destailleur
14be79d3e8
Better help
...
Bad var
2015-01-28 20:04:18 +01:00
Laurent Destailleur
9850b753fa
Tooltip at wrong place.
2015-01-28 19:37:09 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
Ying-Chun Liu (PaulLiu)
7569b32281
Fix: webservices productorservice not updating the price.
...
The product.php.class provides another method updatePrice() to update the
price of products or services. We should call updatePrice() when we found the
SOAP client changes the price or price_net.
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
2015-01-29 00:57:54 +08:00
Frédéric FRANCE
a560b582f5
Update functions2.lib.php
2015-01-28 00:02:57 +01:00
Florian HENRY
66c73ca336
add missing files for contract line extrafields
2015-01-27 12:57:36 +01:00
