Commit Graph

52175 Commits

Author SHA1 Message Date
Juanjo Menent
456913e381 Merge pull request #3826 from jfefe/patch-9
Update Readme.md
2015-10-30 22:40:01 +01:00
Juanjo Menent
6f1acf8327 Merge pull request #3842 from grandoc/develop
[Qual] Uniformize code
2015-10-30 22:25:37 +01:00
Juanjo Menent
2f8afda29d Merge pull request #3833 from grandoc/3.8
[Qual] Prevent warning
2015-10-30 22:19:44 +01:00
Juanjo Menent
64ff12c009 Merge pull request #3835 from atm-maxime/fix_product_stats
Fix : stats were wrong if same product on several lines
2015-10-30 22:18:48 +01:00
Juanjo Menent
1ff29e9f66 Merge pull request #3838 from atm-maxime/develop
Fix : migration wrong index
2015-10-30 22:18:00 +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
philippe grand
975fe064ae [Qual] Uniformize code 2015-10-30 21:59:22 +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
Laurent Destailleur
e01bdebc49 Fix translation 2015-10-30 14:37:19 +01:00
Ferran Marcet
5862037d34 FIX Bad parameters 2015-10-30 13:03:34 +01:00
Maxime Kohlhaas
59714e4b32 Fix : migration wrong index 2015-10-30 12:41:36 +01:00
Maxime Kohlhaas
907a0ea216 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-10-30 11:15:26 +01:00
Maxime Kohlhaas
c46f9350a5 Fix : stats were wrong if same product on several lines with same quantity because of distinct 2015-10-30 09:50:04 +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
philippe grand
c26c8c7fcc [Qual] Prevent warning 2015-10-30 08:47:30 +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
Laurent Destailleur
2b5746aec3 Add field position into some dictionaries tables 2015-10-29 21:25:18 +01:00
Laurent Destailleur
c481dc88ce Clean dead code 2015-10-29 20:25:07 +01:00
Laurent Destailleur
8c8019ee99 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-29 19:18:59 +01:00
Laurent Destailleur
282972784e Prepare table for budget lines 2015-10-29 19:18:41 +01:00
Frédéric FRANCE
ff9648eed9 Update card.php 2015-10-29 19:09:37 +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
Juanjo Menent
35145cd739 Merge pull request #3830 from fmarcet/3.8
FIX: Show products image on getNomUrl()
2015-10-29 15:52:36 +01:00
Juanjo Menent
94534f1ed8 Merge pull request #3831 from grandoc/develop
[Qual] Uniformize code
2015-10-29 15:51:19 +01:00
philippe grand
aa6b5bc1ce [Qual] Uniformize code 2015-10-29 13:58:16 +01:00
fmarcet
440df980ea Fix SQL Query 2015-10-29 13:43:07 +01:00
Regis Houssin
6373c82559 Fix: broken features !!! 2015-10-29 13:14:38 +01:00
fmarcet
dba952e596 Fix: Products image on getNomUrl 2015-10-29 12:51:25 +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
Juanjo Menent
4e937a0252 Merge pull request #3816 from defrance/patch-61
Missing argument 1 for CommonDocGenerator::__construct()
2015-10-29 10:55:20 +01:00
Juanjo Menent
de6bef82dd Merge pull request #3820 from grandoc/develop
[Qual] Uniformize code
2015-10-29 10:54:36 +01:00
Juanjo Menent
b6b8a9e0f0 Merge pull request #3824 from aspangaro/3.8-23
Review 3.8
2015-10-29 10:54:01 +01:00
Juanjo Menent
eb497960fc Merge pull request #3827 from fmarcet/3.8
FIX #3726 Not showing images on product card
2015-10-29 10:53:43 +01:00
fmarcet
6469a31a32 Style corrections 2015-10-29 10:38:21 +01:00
fmarcet
62dc6814a3 FIX #3726 Not showing images on product card 2015-10-29 10:14:54 +01:00
jfefe
7940b249f5 Update Readme.md
Add badges to show build status and downloads per day.
2015-10-29 09:58:43 +01:00
aspangaro
4e9d06785c Fix #3818 & presentation 2015-10-29 06:47:42 +01:00
aspangaro
e2ba24826f Review 3.8 2015-10-29 06:06:56 +01:00
Laurent Destailleur
4042c6d5cc Minor fixes 2015-10-28 23:02:02 +01:00
Laurent Destailleur
f5eaeb2fb5 Some minor fixes 2015-10-28 22:51:06 +01:00
Laurent Destailleur
8e1fd5c3ed Uniformize labels and css style 2015-10-28 22:25:15 +01:00
Laurent Destailleur
8f52d426d0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-10-28 22:08:28 +01:00