aspangaro
5f861c1067
Merge remote-tracking branch 'Upstream/develop' into 5.0-17
2016-12-27 15:07:29 +01:00
aspangaro
4705a87548
Finish work
2016-12-27 14:48:14 +01:00
Marcos García de La Fuente
98599b0bbf
FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish
2016-12-27 12:56:49 +01:00
aspangaro
8a24f2fc91
Work in progress
2016-12-27 08:14:05 +01:00
aspangaro
c21300f0fa
Expense report - Remove DEPLACEMENT_TO_CLEAN
2016-12-27 06:45:36 +01:00
aspangaro
e11db44b6d
Merge remote-tracking branch 'Upstream/develop' into 5.0-18
2016-12-27 05:49:57 +01:00
aspangaro
1338237d7c
Expense report - Better presentation - return list order by date
2016-12-27 05:48:18 +01:00
Laurent Destailleur
7dd06a1ae6
Fix margin pagination
2016-12-27 02:01:27 +01:00
Laurent Destailleur
6e00d7fee3
Fix date modification not visible
2016-12-27 01:41:04 +01:00
Laurent Destailleur
003045525f
Fix css
2016-12-27 01:32:29 +01:00
Laurent Destailleur
3e28f22bad
Fix style
2016-12-27 00:08:43 +01:00
Laurent Destailleur
c5850d29e7
Fix checksum integrity. Also add a global checksum.
2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9
Fix filecheck tool.
2016-12-26 19:01:24 +01:00
Laurent Destailleur
374a6d7783
Fix filecheck tool.
2016-12-26 18:50:20 +01:00
Laurent Destailleur
82052450a6
Complete work on dol_banner
2016-12-26 18:21:18 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Laurent Destailleur
b9e362833f
More complete label
2016-12-26 13:15:14 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
635157be4c
Fix bad translation
2016-12-26 12:36:30 +01:00
Laurent Destailleur
e297b64722
Several security fix in using mailings.
2016-12-26 12:35:10 +01:00
Laurent Destailleur
c9c8079c3d
Can add additionnal paramon mail to solve rare sendmail problems
2016-12-26 00:00:28 +01:00
Laurent Destailleur
45028de51f
Better fix for install on distant server
2016-12-25 23:47:25 +01:00
Laurent Destailleur
c16489a3c0
Fix add message to explain why some emails fails
2016-12-25 23:14:51 +01:00
Laurent Destailleur
b2fbef4a91
Prepare 4.0.3
2016-12-25 23:04:59 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
Gustavo Novaro
e71f216f16
var to public
...
Improve code style
2016-12-23 14:21:15 -03:00
Gustavo Novaro
191f69ec79
var to public
...
Improve code style
2016-12-23 14:06:11 -03:00
Laurent Destailleur
cdcbf58ca8
Prepare 3.9.5
2016-12-23 17:33:54 +01:00
Gustavo Novaro
76999cf41e
Var to public
...
Improve code style
2016-12-23 12:44:07 -03:00
Gustavo Novaro
3557e4eb37
Var to public
2016-12-23 12:40:13 -03:00
Laurent Destailleur
9cc2a74221
Update changelog
2016-12-23 16:29:15 +01:00
Laurent Destailleur
7e2b41402e
Fix bad balance of form
2016-12-23 16:24:07 +01:00
Laurent Destailleur
a9beeec0b3
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-23 16:03:09 +01:00
Laurent Destailleur
8ce5ed0192
Fix position of discount on PDF with US letter format
2016-12-23 15:57:31 +01:00
Laurent Destailleur
46a8041143
Clean orphelins
2016-12-23 15:22:25 +01:00
Laurent Destailleur
cb4e0233b9
Fix orphelins
2016-12-23 15:21:38 +01:00
florian HENRY
337897e0a1
NEW : Allow extrafields list select to be dependands on other standard
...
list and not only other extrafields list
2016-12-23 15:01:49 +01:00
Laurent Destailleur
24cad7cfdf
Fix return code REST similar for all api with POST
2016-12-23 14:57:00 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2
Fix css and fix navigation on resource tab.
2016-12-23 13:04:46 +01:00
florian HENRY
30b4d9e2e5
fix : avoid bug when batch number is not trimmed
2016-12-23 12:10:55 +01:00
Laurent Destailleur
b777ec79f2
Fix contextpage implementation into skeleton
2016-12-23 10:38:27 +01:00
aspangaro
b97135240c
Complete dol_banner_tab
2016-12-23 07:37:34 +01:00
BENKE Charlie
ed5ac9c617
Update images.lib.php
2016-12-23 07:11:35 +01:00
aspangaro
ab8341cc8b
Presentation
2016-12-23 06:33:58 +01:00
Laurent Destailleur
da1d4d80f2
Fix return code REST similar for all api with POST
2016-12-23 02:09:26 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Laurent Destailleur
5535a126d2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-23 01:25:51 +01:00
Laurent Destailleur
f9d29bbe25
Complete sample of setup files
2016-12-23 01:25:40 +01:00
Raphaël Doursenaud
ac92e23b59
[Qual] Optimize language file loading
...
Using fscanf() and the proper format is about twice as fast as
using fgets() followed by explode() and trim().
This is a small optimization per se but since this code is
called often it yields about 33% rendering time improvement on
the homepage where about 50% of the time is spent on loading the
translation files.
2016-12-23 01:11:50 +01:00
