Laurent Destailleur fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php

2016-08-28 02:40:20 +02:00

..

menus

Fix field too small

2016-08-09 15:56:39 +02:00

system

NEW Do not use Functions Aliases

2016-07-15 17:58:14 +02:00

tools

FIX Fatal error if curl not installed

2016-07-27 16:45:13 +02:00

agenda_extrafields.php

…

agenda_extsites.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

agenda_other.php

Update agenda_other.php

2016-07-25 11:31:10 +02:00

agenda_xcal.php

…

agenda.php

…

bank_extrafields.php

…

bank.php

Merge branch 'develop' into oop-refactor-bankaccount-tostring

2016-04-09 23:17:09 +02:00

barcode.php

select engine for code 128 didn't work

2016-06-02 11:41:26 +02:00

boxes.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

chequereceipts.php

NEW #3510 : Working

2016-04-03 12:14:51 +02:00

clicktodial.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

commande.php

Hide feature not yet validated to be ready for a stable 4.0

2016-07-27 20:24:30 +02:00

company.php

FIX link to check prof id was hardcoded instead of using dedicated

2016-07-04 10:28:11 +02:00

compta.php

internationalization of code comment

2016-06-21 17:00:52 +02:00

confexped.php

Move help text at better place.

2016-04-01 12:40:34 +02:00

const.php

…

contract.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

delais.php

FIX Bad value used for task warning delay

2016-06-15 14:05:48 +02:00

dict.php

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

2016-08-01 15:15:32 +02:00

ecm.php

…

events.php

…

expedition_extrafields.php

…

expedition.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

expeditiondet_extrafields.php

…

expensereport.php

Fix better error message when possible refering objects list is empty.

2016-07-16 14:37:35 +02:00

external_rss.php

…

facture.php

FIX : New conf must be in payments tab

2016-06-17 17:26:49 +02:00

fckeditor.php

Fix option not visible when it should

2016-08-02 21:24:14 +02:00

fichinter.php

Fixed interventions from order.

2016-07-25 17:24:57 +02:00

geoipmaxmind.php

…

ihm.php

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

2016-08-28 02:40:20 +02:00

index.php

…

ldap_contacts.php

…

ldap_groups.php

…

ldap_members.php

…

ldap_users.php

NEW Do not use Functions Aliases

2016-07-15 17:58:14 +02:00

ldap.php

Update ldap translation

2016-07-27 17:26:04 +02:00

limits.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

livraison_extrafields.php

…

livraison.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

livraisondet_extrafields.php

…

loan.php

NEW: Loan - Add list to select accounting account in admin

2016-04-23 16:06:33 +02:00

mailing.php

…

mailman.php

…

mails.php

typo

2016-04-19 18:27:56 +02:00

menus.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

modules.php

Fix colspan

2016-07-23 13:37:17 +02:00

multicurrency.php

Fix traduction for multicurrency module

2016-06-04 01:46:10 +02:00

notification.php

Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14

2016-07-15 17:05:12 +02:00

oauth.php

Debug Oauth

2016-06-15 17:20:00 +02:00

order_extrafields.php

…

orderdet_extrafields.php

…

payment.php

FIX : New conf must be in payments tab

2016-06-17 17:26:49 +02:00

pdf.php

Missing translation

2016-05-21 12:21:17 +02:00

perms.php

Fix the repositioning works better with new system class="reposition"

2016-07-23 13:41:06 +02:00

prelevement.php

Fix size of field too small and bad translation

2016-07-30 10:31:56 +02:00

propal.php

Hide feature not yet validated to be ready for a stable 4.0

2016-07-27 20:24:30 +02:00

proxy.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

receiptprinter.php

Fix better perfomance in for

2016-06-04 13:12:05 +02:00

salaries.php

…

security_file.php

Fix pb of responsive design

2016-07-31 18:28:59 +02:00

security_other.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

security.php

…

sms.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

spip.php

…

stock.php

taking account @eldy remarks

2016-08-05 09:46:17 +02:00

supplier_invoice.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

supplier_order.php

NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED

2016-08-04 15:48:34 +02:00

supplier_payment.php

Fix no picto on setup pages

2016-08-04 10:19:30 +02:00

supplier_proposal.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

supplierinvoice_extrafields.php

…

supplierinvoicedet_extrafields.php

…

supplierorder_extrafields.php

…

supplierorderdet_extrafields.php

…

syslog.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

taxes.php

…

translation.php

NEW Can select language from combo list on page to overwrite a

2016-03-29 18:05:03 +02:00

triggers.php

Revert commit that break compatibility of 100% of modules

2016-03-25 15:24:57 +01:00

user.php

…

websites.php

Fix not initialized variables

2016-05-08 12:32:18 +02:00

workflow.php

taking account @eldy remarks

2016-08-05 09:46:17 +02:00