Commit Graph

45628 Commits

Author SHA1 Message Date
BENKE Charles
50ff9d2d0c Update paiement.class.php
in case of sql query add error message in log instead of the screen
2015-02-04 02:17:37 +01:00
Laurent Destailleur
6d751ad63b Merge pull request #2317 from GPCsolutions/contributing
Added branches information to contributing guidelines
2015-02-03 13:44:43 +01:00
Laurent Destailleur
91626cfc92 Merge pull request #2316 from mrsof/develop
FIX : Update action return PHP Fatal error: Using $this when not in object context
2015-02-03 13:44:17 +01:00
Laurent Destailleur
f10a4bbdbe Merge pull request #2312 from frederic34/patch-5
Can't use function return value in write context
2015-02-03 13:06:13 +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
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
Laurent Destailleur
75f451ccc7 Fix class not found 2015-02-03 08:59:57 +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
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
Laurent Destailleur
7fbf76ee2a Fix phpcs 2015-02-02 15:43:22 +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
frederic34
3206957b99 Tooltip 2015-02-01 20:58:57 +01:00
Laurent Destailleur
9285897759 Fix: Load priceparser only if required. 2015-02-01 15:08:56 +01:00
Laurent Destailleur
e4c5aa30be Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-01 01:44:01 +01:00
Laurent Destailleur
a43fcdbb14 Missing entries 2015-02-01 01:43:36 +01:00
Laurent Destailleur
968b2b433b Better position for username 2015-02-01 01:43:19 +01:00
Laurent Destailleur
52222ecdfe Avoid tooltip into tooltip 2015-02-01 01:28:15 +01:00
Laurent Destailleur
1e38227c2d Reduce number of new to save memory usage.
Fight table to replace with div
2015-02-01 00:54:26 +01:00
Laurent Destailleur
34cbcad9da Reduce number of new to save memory usage.
Fight table to replace with div
2015-02-01 00:40:42 +01:00
Laurent Destailleur
7501e09738 Fix: Crazy change 2015-01-31 22:29:31 +01:00
Laurent Destailleur
6b27d8d44c Merge pull request #2298 from ndrosis/patch-16
Correct view link
2015-01-31 20:25:11 +01:00
Laurent Destailleur
edcf39cd58 Merge pull request #2300 from aschio/develop
NEW: search filter fields in list project page
2015-01-31 20:24:48 +01:00
Laurent Destailleur
d1957ef8d9 Merge pull request #2299 from FHenry/3.7
Fix contract if only service modules is enabled
2015-01-31 20:20:49 +01:00
Laurent Destailleur
324ded162d Merge pull request #2297 from ndrosis/patch-15
translate UpdateServerOffline live last version
2015-01-31 20:20:18 +01:00
Laurent Destailleur
f52769b586 Merge pull request #2296 from frederic34/patch-5
Speed up listing with Is Order Shippable icon
2015-01-31 20:19:57 +01:00
Laurent Destailleur
7721f4928d Merge pull request #2295 from grandpaul/fix_webservice_product_price
Fix: webservices productorservice not updating the price.
2015-01-31 20:18:08 +01:00
Laurent Destailleur
ece70dbd2c Merge pull request #2293 from frederic34/patch-4
Error message is ErrorCounterMustHaveMoreThan3Digits
2015-01-31 19:44:09 +01:00