Commit Graph

50167 Commits

Author SHA1 Message Date
Laurent Destailleur
d0d4c5e7f8 NEW The conditional IF into ODT templates works also on not defined var
so we can show data only if defined. Close #3819
2015-11-02 15:44:47 +01:00
Laurent Destailleur
c119859696 NEW The quick search box on left menu can also search into expense
reports.
2015-11-02 13:14:46 +01:00
Laurent Destailleur
250be086b7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-02 11:36:39 +01:00
Laurent Destailleur
1ee9594e38 Merge pull request #3846 from frederic34/patch-21
Correction double translation which give bad html display
2015-11-02 11:29:04 +01:00
Laurent Destailleur
a9ddcc1a80 Merge pull request #3832 from frederic34/patch-16
NEW Add supplier order to the Direct Printing System
2015-11-02 11:27:00 +01:00
Laurent Destailleur
a14fee7296 Merge pull request #3852 from hregis/develop_origin
FIX add Mac OS detection and show it into OS information of user popup
2015-11-02 11:26:20 +01:00
Laurent Destailleur
72915aa16d Merge pull request #3784 from All-3kcis/develop-patch-11
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
2015-11-02 11:23:49 +01:00
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
All-3kcis
a658ff7e90 add commit or rollback if error 2015-11-02 10:26:07 +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
Regis Houssin
0fd7ba478a Fix: add Mac OS 2015-11-01 17:27:41 +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
0f6a401edd Update list.php 2015-10-31 11:30:11 +01:00
Frédéric FRANCE
ee94aea1ef Update list.php 2015-10-31 11:28:49 +01:00
Frédéric FRANCE
6e2d4aebb1 Update list.php 2015-10-31 11:27:50 +01:00
Frédéric FRANCE
8a07efb995 Update list.php 2015-10-31 11:25:59 +01:00
Frédéric FRANCE
08dccf341c Update list.php 2015-10-31 11:24:49 +01:00
Frédéric FRANCE
d49d3808b9 Update list.php 2015-10-31 11:19:01 +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