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

Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php

2013-06-25 23:22:00 +02:00

..

menus

Fix: Uniformize menu conditions

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

system

Fix: convert line delimiters

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

tools

standardize code

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

accounting.php

Fix: Fix ton of regression due to field name change

2013-03-09 20:34:38 +01:00

agenda_extrafields.php

Reveiw extrafield for womplaiance with wiki

2013-04-26 10:29:14 +02:00

agenda_extsites.php

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

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

agenda_other.php

Move option ate better place

2013-04-21 16:01:36 +02:00

agenda_xcal.php

New: enhance tool fixdosfiles.sh

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

agenda.php

Move option ate better place

2013-04-21 16:01:36 +02:00

bank.php

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

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

barcode.php

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

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

boxes.php

Fix: convert line delimiters

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

clicktodial.php

Fix: convert line delimiters

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

commande.php

Fix: convert line delimiters

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

company.php

Hide upload on smartphones

2013-04-09 01:27:41 +02:00

compta.php

Refactor + es_ES translations improvement + minor stetic change

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

confexped.php

Change carrier config into dict instead of dedicated conf page

2013-04-19 20:20:10 +02:00

const.php

New: enhance tool fixdosfiles.sh

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

contract.php

Corrected translations of info tooltips in document models description

2013-05-07 22:04:08 +02:00

delais.php

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

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

dict.php

Added missing translations

2013-05-08 17:56:32 +02:00

dons.php

Corrected translations of info tooltips in document models description

2013-05-07 22:04:08 +02:00

ecm.php

fix : trad error

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

events.php

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

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

expedition.php

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop

2013-05-08 15:37:41 +02:00

external_rss.php

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

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

facture.php

Fix: EOF

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

fckeditor.php

task #768:

2013-03-16 09:23:34 +01:00

fichinter.php

add ability to include products on intervention card (some companies prefer to have both products and services on the intervention card that they give to their consultant)

2013-05-21 11:44:11 +02:00

geoipmaxmind.php

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

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

ihm.php

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

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

index.php

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

2013-06-25 21:31:24 +02:00

ldap_contacts.php

english standardization

2013-02-22 16:14:52 +01:00

ldap_groups.php

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

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

ldap_members.php

change birth instead of naiss

2013-03-13 22:17:03 +01:00

ldap_users.php

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

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

ldap.php

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

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

limits.php

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

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

livraison.php

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop

2013-05-08 15:37:41 +02:00

mailing.php

fix : trad error

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

mailman.php

merge

2013-06-06 18:31:33 +02:00

mails.php

Look: Minor enhancement

2013-06-03 22:06:28 +02:00

menus.php

New: enhance tool fixdosfiles.sh

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

modules.php

New: Add property hidden into module descriptor to allow to hide a

2013-06-24 18:31:56 +02:00

notification.php

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

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

order_extrafields.php

Reveiw extrafield for womplaiance with wiki

2013-04-26 10:29:14 +02:00

orderdet_extrafields.php

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

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

osc-languages.php

standardize code

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

pdf.php

PDF admin : Add option to hide num TVA intra into adress of customer

2013-04-26 13:25:51 +02:00

perms.php

Fix: $modules not loaded

2013-01-21 18:20:14 +01:00

prelevement.php

Merge

2013-03-22 17:10:17 +01:00

propal.php

Qual: Mutualized and uniformize code

2013-06-05 11:21:45 +02:00

proxy.php

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

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

security_other.php

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

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

security.php

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

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

sms.php

Look: Minor enhancement

2013-06-03 22:06:28 +02:00

spip.php

merge

2013-06-06 18:31:33 +02:00

stock.php

Fix: Remove not used constant

2013-05-15 17:30:18 +02:00

supplier_invoice.php

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into translations-develop

2013-05-08 15:37:41 +02:00

supplier_order.php

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

2013-06-03 11:15:15 +02:00

supplierinvoice_extrafields.php

Reveiw extrafield for womplaiance with wiki

2013-04-26 10:29:14 +02:00

supplierorder_extrafields.php

Reveiw extrafield for womplaiance with wiki

2013-04-26 10:29:14 +02:00

syslog.php

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

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

taxes.php

fix : trad error

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

translation.php

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

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

triggers.php

Fix: convert line delimiters

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

user.php

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

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

workflow.php

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

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