Commit Graph

50146 Commits

Author SHA1 Message Date
Laurent Destailleur
1a0179dd1f More complete help 2015-11-02 11:08:36 +01:00
Laurent Destailleur
200e4638f4 Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
Fix: #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
Laurent Destailleur
465ad6b3a7 Merge pull request #3802 from olsesacl/develop-hook
hooks correctly implemented , printObjectLine, printObjectSubLine
2015-11-02 10:44:59 +01:00
Laurent Destailleur
8f2fb3cbee Merge pull request #3845 from frederic34/patch-19
Remove incomplete llx_stock_lotserial migration
2015-11-02 10:43:55 +01:00
Laurent Destailleur
37f01f995c Merge pull request #3853 from aspangaro/develop-71
Salaries : Replace "label for" by the function fieldLabel & add some notes & correct typo
2015-11-02 10:42:19 +01:00
Laurent Destailleur
a161e6d47a Continue debug of PRODUIT_MULTIPRICES option.
Introduce option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL to have
relative caculation of multiprice not yet visible.
2015-11-02 10:09:09 +01:00
Laurent Destailleur
6fe43cbbeb Removed dead code 2015-11-02 09:08:08 +01:00
Laurent Destailleur
3409686405 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 08:57:01 +01:00
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
f3f83fa6c1 Remove incomplete llx_stock_lotserial migration
There is two creation of this table in migration script, keeping the more complete
2015-10-31 10:32:41 +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
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
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