lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,129 Commits 43 Branches 150 Tags 886 MiB
ac47c2f22e
Commit Graph

50129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
ac47c2f22e Merge remote-tracking branch 'Upstream/develop' into develop-71 2015-11-02 06:44:16 +01:00
aspangaro
d8f77f58d7 Salaries : Replace "label for" by the function fieldLabel & add some notes 2015-11-02 06:42:17 +01:00
aspangaro
cc257d8abc Typo 2015-11-01 22:54:33 +01:00
aspangaro
6df524bcb0 Remove blank page 2015-11-01 22:54:04 +01:00
Juanjo Menent
a58b5f26f6 Merge pull request #3774 from marcosgdf/multiprice-generator 
NEW Level multiprice generator based on per cent variations over base price
 2015-10-31 23:03:19 +01:00
Juanjo Menent
fb03643f42 Merge pull request #3850 from frederic34/paypal 
Translation in paypal lib
 2015-10-31 22:59:19 +01:00
Juanjo Menent
c096114155 Merge pull request #3849 from grandoc/develop 
[Qual] Uniformize code
 2015-10-31 22:58:16 +01:00
Juanjo Menent
b95108dc58 Merge pull request #3844 from frederic34/patch-18 
Correct llx_c_hrm_function.sql and migration
 2015-10-31 22:56:12 +01:00
Juanjo Menent
18f24c56f4 Merge pull request #3843 from frederic34/patch-17 
Update COPYRIGHT - 404 - Page introuvable
 2015-10-31 22:55:14 +01:00
frederic34
22d1cf860c Add translation 2015-10-31 22:09:50 +01:00
frederic34
df3af6979e Translation in paypal lib 2015-10-31 21:43:59 +01:00
philippe grand
ff5fcbbc10 [Qual] Uniformize code 2015-10-31 17:21:48 +01:00
Marcos García de La Fuente
592348850f Added missing SQL statements + reordered them 2015-10-31 11:48:17 +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
Frédéric FRANCE
4108f55c1e Update 3.8.0-3.9.0.sql 2015-10-31 10:07:13 +01:00
Frédéric FRANCE
4160342656 Update llx_c_hrm_function.sql 2015-10-31 10:05:34 +01:00
Frédéric FRANCE
8602d41a28 Update COPYRIGHT 2015-10-31 09:46:56 +01:00
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
1ff29e9f66 Merge pull request #3838 from atm-maxime/develop 
Fix : migration wrong index
 2015-10-30 22:18:00 +01:00
philippe grand
975fe064ae [Qual] Uniformize code 2015-10-30 21:59:22 +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
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
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