Commit Graph

46233 Commits

Author SHA1 Message Date
Laurent Destailleur
fd93e9f322 Merge branch 'marcosgdf-bug-1812' into 3.6 2015-02-03 12:41:33 +01:00
Laurent Destailleur
41cabeee59 Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 12:40:49 +01:00
Laurent Destailleur
3ad61e4dc8 Merge pull request #2307 from marcosgdf/bug-1819
Fix: [ bug #1819 ] SQL error when searching for an invoice payment
2015-02-03 12:33:04 +01:00
Laurent Destailleur
d626d073dc Merge pull request #2304 from frederic34/tooltip
Tooltip
2015-02-03 12:32:40 +01:00
Laurent Destailleur
43f3d5805e Merge pull request #2301 from frederic34/patch-3
Update 3.7.0-3.8.0.sql
2015-02-03 12:31:06 +01:00
Laurent Destailleur
fe674f8fd5 Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 12:21:30 +01:00
Laurent Destailleur
077fafdb7d Remove log 2015-02-03 12:20:36 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
Raphaël Doursenaud
8fcf0de5d1 Added branches information to contributing guidelines 2015-02-03 10:51:05 +01:00
Sof
493732bdc3 Update action returnb PHP Fatal error: Using $this when not in object context 2015-02-03 10:45:00 +01:00
phf
ad4e5cca0b [CORE] Fix de la suppression d'une demande de prix (#new_ask_price). 2015-02-03 10:09:52 +01:00
phf
c22bbb23d8 [CORE] ré-indentation d'une ligne (#new_ask_price). 2015-02-03 10:09:25 +01:00
Laurent Destailleur
75f451ccc7 Fix class not found 2015-02-03 08:59:57 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
6e57e41fb0 Translation 2015-02-02 21:55:07 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
Laurent Destailleur
7a9a319da7 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-02 21:45:02 +01:00
Laurent Destailleur
5aecfa4cdb Translation 2015-02-02 21:44:40 +01:00
Laurent Destailleur
82dda354cf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-02 21:33:30 +01:00
Laurent Destailleur
e0f86f0270 Oubli sur option PROJECT_HIDE_TASKS 2015-02-02 21:33:09 +01:00
Juanjo Menent
b513aa5455 Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:32:52 +01:00
Juanjo Menent
2389e332db Adapting spanish localtax2 to 2015 fiscal reforms 2015-02-02 21:28:27 +01:00
Laurent Destailleur
c6bfc15031 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-02 21:13:09 +01:00
Laurent Destailleur
b36e40ee4c Fix feature to break by email 2015-02-02 21:12:43 +01:00
frederic34
f69e58cccb Tooltip 2015-02-02 21:09:30 +01:00
Juanjo Menent
2fd38f310a Increase size of localtaxX (10 is not enough in some cases) 2015-02-02 21:06:21 +01:00
Juanjo Menent
ef3dfbf3a1 Increase size of localtaxX (10 is not enough in some cases) 2015-02-02 21:04:00 +01:00
Laurent Destailleur
9747f1fd2a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into origin_dolibarr_develop 2015-02-02 18:38:24 +01:00
Laurent Destailleur
7b209fa0be New: Add hidden option PDF_SHOW_PROJECT to show project ref onto
supplier orders and invoices.
2015-02-02 18:36:49 +01:00
phf
5266542bc9 [CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price). 2015-02-02 17:50:33 +01:00
Raphaël Doursenaud
fb865e8184 FIXED Removed deprecated forcing SSLv3 for CURL
Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol.
This prevented most API calls from working.
2015-02-02 17:13:11 +01:00
Frédéric FRANCE
0cb83c96b7 Can't use function return value in write context
Blank page on /htdocs/product/price.php
2015-02-02 16:23:25 +01:00
phf
d2c4e8c98f [CORE] retrait d'une condition ajout auparavant mais qui est inutile (#new_ask_price). 2015-02-02 16:18:07 +01:00
phf
38551dd468 [CORE] retrait de liens ou champs inutile (#new_ask_price). 2015-02-02 16:17:07 +01:00
phf
4ec611e4b9 [CORE] suppression de fichiers inutile (#new_ask_price). 2015-02-02 16:16:29 +01:00
Laurent Destailleur
7fbf76ee2a Fix phpcs 2015-02-02 15:43:22 +01:00
phf
a3c29f2e9c [CORE] Avancement du fonctionnement du module, correction bug et épuration de l'affichage (#new_ask_price). 2015-02-02 15:41:14 +01:00
frederic34
482eec1cce Merge remote branch 'upstream/develop' into tooltip 2015-02-02 13:48:39 +01:00
frederic34
fb22de1ecd Merge remote branch 'upstream/develop' into tooltip 2015-02-02 13:46:52 +01:00
Laurent Destailleur
9c087e27d0 Fix permissions 2015-02-02 13:45:55 +01:00
Laurent Destailleur
eda2ff7f7b Fix regression in phpunit 2015-02-02 13:37:19 +01:00
Laurent Destailleur
7809013b96 Message is more clear. 2015-02-02 13:33:16 +01:00
Laurent Destailleur
3f042fb558 New: Introduce option PROJECT_HIDE_TASKS for people using project only
as transversal analytic key and not to manage tasks.
2015-02-02 13:27:55 +01:00
Marcos García de La Fuente
a9ba2f3179 Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7 2015-02-02 11:48:57 +01:00
phf
5573c6a250 [CORE] mise en commentaire des champs inutile lors de la 1ere étape de créer de demande de prix (#new_ask_price). 2015-02-02 10:26:04 +01:00
phf
fedf476987 [CORE] ajout d'une traduction pour le bouton créer demande de prix sur la fiche fournisseur (#new_ask_price). 2015-02-02 10:25:27 +01:00
phf
0f7af613f1 [CORE] ajout du bouton "créer une demande de prix" sur la fiche fournisseur (#new_ask_price). 2015-02-02 10:24:42 +01:00
phf
85a4df4ce2 [CORE] maj du pdf, champs PU HT et Total HT vide (#new_ask_price). 2015-02-02 10:06:36 +01:00
frederic34
3206957b99 Tooltip 2015-02-01 20:58:57 +01:00