Laurent Destailleur 1d8b9949d6 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/compta/bank/categ.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/contacts.tpl.php
	htdocs/cron/list.php
	htdocs/main.inc.php
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/theme/bureau2crea/style.css.php
	htdocs/theme/eldy/style.css.php
	htdocs/user/class/user.class.php
	htdocs/viewimage.php

2013-06-24 20:02:02 +02:00

..

admin.lib.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

agenda.lib.php

Start normalize project module : create html.formprojet.class.php with

2013-06-14 22:33:01 +02:00

ajax.lib.php

CR fix

2013-06-16 21:33:05 +02:00

bank.lib.php

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

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

barcode.lib.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

categories.lib.php

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

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

company.lib.php

Merge pull request #1063 from grandoc/develop

2013-06-21 08:10:01 -07:00

contact.lib.php

Fix: EOF

2013-06-05 16:24:32 +02:00

contract.lib.php

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

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

cron.lib.php

Fix: convert lines delimiters

2013-06-24 17:36:33 +02:00

date.lib.php

Qual: Clean code. Removed useless functions and params

2013-06-17 14:12:59 +02:00

doc.lib.php

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

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

ecm.lib.php

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

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

emailing.lib.php

Fix mass maling tabs regression

2013-02-18 15:25:13 +01:00

fichinter.lib.php

[ task #901 ] Add Extrafeild on Fiche Inter

2013-05-18 13:00:36 +02:00

files.lib.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

format_cards.lib.php

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

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

fourn.lib.php

Fix: Fix tons of pb with num ref system of supplier invoices.

2013-04-12 00:00:31 +02:00

functions2.lib.php

Merge remote-tracking branch 'origin/3.4' into develop

2013-06-24 20:02:02 +02:00

functions_ch.lib.php

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

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

functions.lib.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

geturl.lib.php

Fix bug into script that fix CRLF into LF

2013-06-12 11:59:55 +02:00

holiday.lib.php

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

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

images.lib.php

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

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

import.lib.php

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

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

index.php

Add empty index file

2011-10-24 10:33:55 +02:00

invoice2.lib.php

Merge remote-tracking branch 'origin/3.4' into develop

2013-06-24 20:02:02 +02:00

invoice.lib.php

- New: [ task #926 ] Add extrafield feature on order lines

2013-06-10 16:05:41 +02:00

json.lib.php

Fix: regression

2013-05-22 12:02:39 +02:00

ldap.lib.php

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

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

mailmanspip.lib.php

New: Module mailman can subscribe/unsubscribe to ML according to

2013-06-05 15:44:42 +02:00

member.lib.php

fix : trad error

2013-03-24 07:11:44 +01:00

memory.lib.php

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

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

order.lib.php

- New: [ task #926 ] Add extrafield feature on order lines

2013-06-10 16:05:41 +02:00

pdf.lib.php

Fix bug into script that fix CRLF into LF

2013-06-12 11:59:55 +02:00

prelevement.lib.php

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

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

price.lib.php

Fix: function to get localtax1 or 2 value from vat rate return bad value

2013-05-31 21:33:48 +02:00

product.lib.php

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

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

project.lib.php

Start normalize project module : create html.formprojet.class.php with

2013-06-14 22:33:01 +02:00

propal.lib.php

- New: [ task #926 ] Add extrafield feature on order lines

2013-06-10 16:05:41 +02:00

report.lib.php

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

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

security2.lib.php

Fix: convert line delimiters

2013-06-24 17:34:22 +02:00

security.lib.php

Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur

2013-05-01 17:09:08 +02:00

sendings.lib.php

standardize code

2013-06-20 09:18:12 +02:00

stock.lib.php

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

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

tax.lib.php

Fix: not complete renaming

2013-04-11 23:04:25 +02:00

treeview.lib.php

New: enhance tool fixdosfiles.sh

2013-03-30 14:27:13 +01:00

trip.lib.php

Fix: wrong EOL

2013-01-26 10:38:11 +01:00

usergroups.lib.php

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

ws.lib.php

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

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

xcal.lib.php

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

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