Commit Graph

50561 Commits

Author SHA1 Message Date
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
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
phf
4180862fec Merge branch '3.8' into fix_3.8_clone_order 2015-10-28 14:36:31 +01:00
phf
f385f8bcfa FIX better fix to generate a PROV ref after clone 2015-10-28 14:34:34 +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
Florian HENRY
9a95401473 FIX : add tag myuser_job into ODT replacement 2015-10-28 11:27:39 +01:00
Laurent Destailleur
1eca2d33c0 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-10-27 22:24:29 +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
f9c9c58cba Label must be cheque or transfer 2015-10-27 20:36:27 +01:00