Commit Graph

50173 Commits

Author SHA1 Message Date
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
Laurent Destailleur
e01bdebc49 Fix translation 2015-10-30 14:37:19 +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
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
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
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
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
jfefe
7940b249f5 Update Readme.md
Add badges to show build status and downloads per day.
2015-10-29 09:58:43 +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
Laurent Destailleur
8c84ce1576 Create table llx_stock_serial. This table may be used to store eatby and
sellby date for a couple product-batch number in one place only.
2015-10-28 22:05:37 +01:00
philippe grand
d517595f82 [Qual] Uniformize code 2015-10-28 19:28:18 +01:00
Juanjo Menent
0bcb9dde10 Merge pull request #3810 from grandoc/develop
[Qual] Uniformize code
2015-10-28 16:11:40 +01:00
Juanjo Menent
a36559c55c Merge pull request #3809 from aspangaro/develop-hrm
HRM module : continue to work
2015-10-28 16:11:17 +01:00
Maxime Kohlhaas
31d5dc6658 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-10-28 15:31:31 +01:00
BENKE Charlie
8cf2aa456b Missing argument 1 for CommonDocGenerator::__construct()
add _construct on htdocs/core/class/commondocgenerator.class.php class need to send $db as parameters
2015-10-28 13:59:05 +01:00
Laurent Destailleur
f9c9c58cba Label must be cheque or transfer 2015-10-27 20:36:27 +01:00
Laurent Destailleur
76ded0acea Fix using DATE_FORMAT is forbidden 2015-10-27 19:26:33 +01:00
Laurent Destailleur
fb28586f32 Better visible of what is possible for stock management 2015-10-27 19:18:22 +01:00
fappels
8992cfaeb4 move require_once 2015-10-27 15:50:55 +01:00
philippe grand
12e7c7b9e4 [Qual] Uniformize code 2015-10-27 13:42:00 +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
Maxime Kohlhaas
8e04a3d63a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2015-10-27 09:04:52 +01:00
aspangaro
93d340e497 HRM module : continue to work 2015-10-27 07:26:57 +01:00
aspangaro
b90c56fbb5 HRM : move migration into 3.8 to 3.9 2015-10-27 06:29:18 +01:00
Laurent Destailleur
0a3ba3a0c6 Fix picto 2015-10-26 23:36:05 +01:00
Laurent Destailleur
f4184c9dfe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-10-26 23:33:51 +01:00
Laurent Destailleur
7d8fab73e1 Merge pull request #3792 from grandoc/develop
[Qual] Uniformize code
2015-10-26 23:03:30 +01:00
Laurent Destailleur
24c3491ff7 Code comment 2015-10-26 22:56:54 +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
Laurent Destailleur
0c83d152fc Merge pull request #3795 from grandoc/patch-1
Update index.php
2015-10-26 22:39:32 +01:00
Laurent Destailleur
eb42e0fc4f Merge pull request #3799 from aspangaro/develop-69
Typo
2015-10-26 22:39:14 +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
6f1d758eae Fix print feature for md theme 2015-10-26 16:42:31 +01:00