Commit Graph

9302 Commits

Author SHA1 Message Date
Laurent Destailleur
4a124c6ee9 Merge pull request #3350 from tomours/develop
FIX #3349 Checking a VAT number with spaces
2015-08-12 23:51:37 +02:00
Laurent Destailleur
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided"
This reverts commit 2cf9d9f583.
2015-08-12 23:18:07 +02:00
Laurent Destailleur
2c791e528d Revert "unit price not used if qty = 1"
This reverts commit fb25f479f2.
2015-08-12 23:15:32 +02:00
Laurent Destailleur
f1e87478ff Fix translation of printing menu 2015-08-12 23:12:15 +02:00
Laurent Destailleur
d4aabf99db Fix permission of module 2015-08-12 22:32:29 +02:00
Ion Agorria
2e1e9017c6 Missed the file 2015-08-12 22:00:51 +02:00
Juanjo Menent
78d1dfae11 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-12 18:41:44 +02:00
Juanjo Menent
993037ec9e Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab
NEW : print event type on third party card tab agenda list (only if A…
2015-08-12 18:25:20 +02:00
BENKE Charlie
6801504755 Update functions.lib.php
some bugs sorry
2015-08-11 23:51:02 +02:00
Regis Houssin
ebe4969723 Fix: missing entity in cache files names 2015-08-11 10:22:06 +02:00
Juanjo Menent
6964f80d8f Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 21:06:27 +02:00
Juanjo Menent
95e8148f78 Merge pull request #3294 from GPCsolutions/totalvalidator
Totalvalidator
2015-08-10 20:56:31 +02:00
Juanjo Menent
a6d7977d4f Merge pull request #3354 from defrance/patch-74
New pdf for project - listing of elements
2015-08-10 20:51:58 +02:00
Juanjo Menent
f3517871a9 Merge pull request #3357 from atm-maxime/new_stats_percent
New : % of evolution on stats
2015-08-10 20:51:08 +02:00
BENKE Charlie
049805e926 Update functions.lib.php
Div enough on sub-menu case (project/task)
2015-08-10 19:47:12 +02:00
tomours
9267fe367e FIX #3372 - Printing issue with Postgres and dates (SQL format)
After connecting to the database, we force datestyle to "ISO, YMD", so dates returned by the db will have a format compatible with Dolibarr functions.
This will fix dates printing issues in mostly all pages, with a postgres db configured with "SQL, DMY" as default.
2015-08-10 15:10:58 +02:00
Juanjo Menent
63d77b2ddd Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 11:11:43 +02:00
Juanjo Menent
b2f5ae7aa8 Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
#	htdocs/core/boxes/box_task.php
2015-08-10 11:09:22 +02:00
Marcos García de La Fuente
f3ef4fed93 Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
Close #3313
2015-08-09 13:58:03 +02:00
Marcos García de La Fuente
cccc543065 Fix: [ bug #3288 ] Tasks box is not properly drawn
Close #3288
2015-08-09 13:16:55 +02:00
Maxime Kohlhaas
1cbb20c89f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_stats_percent 2015-08-07 13:30:12 +02:00
Maxime Kohlhaas
0afd27e3c2 New : % of evolution on stats 2015-08-07 13:29:11 +02:00
Juanjo Menent
f695b5cd11 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 13:01:53 +02:00
Juanjo Menent
38afb1a4e6 Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
#	htdocs/core/modules/modBarcode.class.php
2015-08-07 12:57:16 +02:00
Juanjo Menent
12b83fd3e8 Fix #3304 2015-08-07 12:45:27 +02:00
BENKE Charlie
01671d02d1 New pdf for project - listing of elements 2015-08-07 00:39:44 +02:00
Juanjo Menent
1fdf4b69f8 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 22:14:45 +02:00
Juanjo Menent
eb33624b99 Merge pull request #3291 from GPCsolutions/hookslogging
NEW: log hooks loading
2015-08-06 22:11:40 +02:00
Juanjo Menent
c759a9662a Merge pull request #3345 from defrance/patch-72
unit price not used if qty = 1
2015-08-06 18:38:11 +02:00
Juanjo Menent
b91edcc9d7 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:30:13 +02:00
Juanjo Menent
761c50a885 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-06 18:22:29 +02:00
BENKE Charlie
187c40aca9 Update functions.lib.php 2015-08-06 18:20:09 +02:00
Juanjo Menent
46a9381f0b Merge pull request #3335 from GPCsolutions/3.7-3322
Fix #3322 Use title for alt if no alt is provided
2015-08-06 18:12:25 +02:00
Juanjo Menent
98072ec73e Merge remote-tracking branch 'origin/3.8' into develop 2015-08-06 18:00:59 +02:00
BENKE Charlie
f5d4cc5f89 Update functions.lib.php 2015-08-06 16:23:34 +02:00
BENKE Charlie
4709a51c84 Add number of collected tabs and hook/trigger
Add number of collected tabs 
Add trigger based on tabs name
add hook at end of tabs and at the footer of page
2015-08-05 15:19:00 +02:00
BENKE Charlie
83c4652a16 don't display ref_fourn if it's same as ref
decrease size of the select list
2015-08-04 15:22:36 +02:00
BENKE Charlie
fb25f479f2 unit price not used if qty = 1
this line is too long for add unused information
2015-08-04 13:39:01 +02:00
Florian HENRY
2a7f5da4a7 FIX : export SQL instruction on modProduct with extrafields 2015-08-04 11:49:26 +02:00
Raphaël Doursenaud
2cf9d9f583 Fix #3322 Use title for alt if no alt is provided
alt has priority over title, so it should be filled if title is filled.
Use the title value to fill alt.
Unit test updated accordingly.
2015-08-03 10:30:10 +02:00
Juanjo Menent
1dac1932a9 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:44:16 +02:00
Juanjo Menent
e45d19862a Fix merge menu regresion 2015-08-01 15:43:14 +02:00
Juanjo Menent
9ae31f3a08 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-01 15:01:19 +02:00
Juanjo Menent
05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Laurent Destailleur
6adc3ba604 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
2015-07-30 14:54:33 +02:00
Laurent Destailleur
52b433a3f1 Comment 2015-07-29 13:11:23 +02:00
Laurent Destailleur
a6bac40f0a Fix bad translation 2015-07-29 13:03:52 +02:00
Laurent Destailleur
5cea60cf58 Default price for margin was not set 2015-07-28 19:39:42 +02:00
Laurent Destailleur
ff8969073c Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/main.inc.php
2015-07-28 18:57:13 +02:00