Marcos García de La Fuente 0955432de3 Merge branch '3.7' into bug-iban-whitespaces-37 ...

# Conflicts:
#	ChangeLog

2015-09-03 12:02:23 +02:00

..

accountancy

FIXED: Bankjournal is generated from id_account now

2015-02-22 15:04:18 +01:00

adherents

FIX : #3318

2015-07-27 13:03:47 +02:00

admin

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-08-10 20:16:05 +02:00

asterisk

PHPDoc and misc fixes for several folders

2015-02-10 11:02:11 +01:00

barcode

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

2015-02-18 22:54:02 +01:00

bookmarks

PHPDoc and misc fixes for several folders

2015-02-10 11:02:11 +01:00

cashdesk

Fix phpcs

2015-06-14 15:16:29 +02:00

categories

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-06-14 17:11:36 +02:00

comm

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-08-13 03:58:32 +02:00

commande

Fix: wrong logical operator

2015-09-02 14:09:19 +02:00

compta

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-09-03 10:44:40 +02:00

conf

Better comments

2015-03-23 03:50:55 +01:00

contact

Fix remove a bad log reporting error when not

2015-08-29 13:45:23 +02:00

contrat

Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object instead of ContratLigne

2015-07-20 11:19:40 +02:00

core

Merge branch '3.7' into bug-iban-whitespaces-37

2015-09-03 12:02:23 +02:00

cron

Fix translation

2015-03-24 11:19:51 +01:00

custom

Ignore content of directory custom

2015-01-18 13:07:39 +01:00

ecm

PHPDoc and misc fixes for several folders

2015-02-10 13:41:59 +01:00

expedition

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-08-13 03:58:32 +02:00

exports

FIX Save of filters into export profiles failed.

2015-06-24 18:29:29 +02:00

externalsite

#1704 Untranslatable token in externalsite module admin

2014-11-20 06:34:50 +01:00

fichinter

Fix: no error message if extrafield is require

2015-06-16 16:42:33 +02:00

fourn

FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly

2015-07-19 15:13:27 +02:00

ftp

Revert "Scrutinizer Auto-Fixes"

2014-07-21 19:07:56 +02:00

holiday

Fix: error reported by scrutinizer

2014-12-20 15:42:03 +01:00

imports

Fix missing profid5 and 6

2015-02-24 13:35:37 +01:00

includes

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-09-03 10:44:40 +02:00

install

Update llx_c_type_resource.sql

2015-08-11 22:38:21 +02:00

langs

Fix [ bug #3286 ]: Payment types are not translated to English

2015-08-09 13:24:23 +02:00

livraison

Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice

2014-12-25 23:08:07 +01:00

mailmanspip

Misc Adherents PHPDoc corrections

2015-02-10 10:45:48 +01:00

margin

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-09-03 10:44:40 +02:00

opensurvey

Fix remove warning when posting a vote

2015-04-12 11:45:50 +02:00

paybox

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00

paypal

Fix: broken feature: Check the entity because He may be the same

2015-07-03 08:18:32 +02:00

printipp

hide password

2015-04-28 16:34:03 +03:00

product

Fix: place the form outside the table for avoid errors

2015-08-13 12:47:04 +02:00

projet

FIX: Not showing task extrafields when creating from left menu

2015-08-04 13:32:44 +02:00

public

Fix #2994

2015-06-08 18:17:13 +02:00

resource

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-01-18 17:13:42 +01:00

societe

Fix #3309

2015-08-20 16:05:29 +02:00

support

Fixed: missing css

2014-12-08 02:51:26 +01:00

theme

FIX Better management error into the color conversion functions

2015-06-12 14:37:27 +02:00

user

Fix #3309

2015-08-20 16:05:29 +02:00

webservices

FIX #3262 Webservice getProductsForCategory()

2015-07-17 18:02:44 +02:00

.gitignore

Exclude tested module

2015-07-20 12:21:15 +02:00

cache.manifest

Fixed: bad url

2015-01-22 23:49:32 +01:00

disabled.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

document.php

…

favicon.ico

…

filefunc.inc.php

3.5.8

2015-08-14 16:12:36 +02:00

index.php

Fix link does not return same number that nmber into link

2015-02-23 01:00:07 +01:00

main.inc.php

FIX : if multicompany enabled, call to undifend method _setCookie

2015-07-27 22:08:33 +02:00

master.inc.php

trigger on total

2014-08-12 11:40:24 +02:00

robots.txt

…

viewimage.php

…