2
0
forked from Wavyzz/dolibarr
Commit Graph

3805 Commits

Author SHA1 Message Date
Laurent Destailleur
a44ab5168c Save memory. 2015-09-07 12:43:25 +02:00
Laurent Destailleur
77ef046af4 Start to mutualize the builddoc and remove_file action. 2015-09-06 14:02:21 +02:00
GUERRIER Kevin
692fdbaec4 Adding Document tab into Bank Account 2015-09-04 21:29:16 +02:00
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
9aa60e1ae1 Fix remove warning 2015-08-31 19:02:14 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs
Sync transifex
2015-08-31 17:22:36 +02:00
Laurent Destailleur
3a32b08512 Fix filter on opportunity status 2015-08-31 15:52:54 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
Laurent Destailleur
fb70fbdc06 Merge pull request #3428 from marcosgdf/bug-3426
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
2015-08-31 00:53:04 +02:00
Laurent Destailleur
1e3bc9f822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-08-30 07:39:45 +02:00
Marcos García de La Fuente
b953d2c466 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
Close #3426
2015-08-29 19:42:51 +02:00
Juanjo Menent
25fca6615a Merge pull request #3395 from fmarcet/develop
NEW: Translate extrafield's labels
2015-08-28 16:44:49 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
philippe grand
e9f631d2e3 fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:49:12 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
This reverts commit 2527ae263b.
2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
Laurent Destailleur
09355b0c7b Fix filtering 2015-08-24 16:40:43 +02:00
Laurent Destailleur
2cf10ac05d Fix filtering 2015-08-24 16:32:43 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
1a55159e35 Fix filter on prospect status 2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
aspangaro
a6701aeb69 New: CkEditor add possibility to choose skin 2015-08-23 15:39:55 +02:00
Laurent Destailleur
d409568442 Format code 2015-08-20 15:07:16 +02:00
Laurent Destailleur
936f912216 Fix filter on category 2015-08-20 04:07:07 +02:00
fmarcet
d6b84233ed NEW: Translate extrafield's labels 2015-08-18 16:40:03 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
10d3c41358 Fix Bad value into popup 2015-08-14 20:07:11 +02:00
Laurent Destailleur
2abb90713e Fix list of resource not visible 2015-08-14 17:35:05 +02:00
Laurent Destailleur
0226f53098 Fix When selecting another email template, the topic was not replaced. 2015-08-13 05:09:26 +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
Juanjo Menent
78d1dfae11 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-12 18:41:44 +02:00
Regis Houssin
ebe4969723 Fix: missing entity in cache files names 2015-08-11 10:22:06 +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
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
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
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
Gauthier
556d01ff8a FIX : Line break display as a block 2015-07-28 15:14:54 +02:00
Laurent Destailleur
5ca6593a57 Fix serious deadlock feature. It was possible to link with no way to
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
2015-07-28 12:49:29 +02:00
Laurent Destailleur
ad56cb4aa0 Fix upload of files should be possible on mobile device. 2015-07-21 18:27:34 +02:00
Gauthier
fa26b284a9 FIX : Line break display as a block 2015-07-21 16:39:00 +02:00
Raphaël Doursenaud
0d897a1307 NEW: log hooks loading
This will help debugging bad hooks behavior.
2015-07-20 18:30:49 +02:00