Florian HENRY 344a87f970 Merge branch 'develop' into develop_advtargetemailiing ...

Conflicts:
	htdocs/admin/dict.php
	htdocs/core/class/html.formaccounting.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/install/mysql/tables/llx_c_accounting_category.sql

2016-04-04 14:43:17 +02:00

..

action

…

barcode

Revert commit that break compatibility of 100% of modules

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

cheque

NEW #3510 : Working

2016-04-03 12:22:18 +02:00

commande

Prepare code to be able to download ODT templates

2016-03-25 15:56:50 +01:00

contract

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

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

dons

Fix: Donation some problems with french article

2016-01-10 07:35:00 +01:00

expedition

Prepare code to be able to download ODT templates

2016-03-25 15:56:50 +01:00

expensereport

fix:remove project info in standard document model for expense reports when project module is disabled

2016-01-31 22:35:09 +01:00

export

Traduction

2015-11-06 09:46:18 +01:00

facture

Prepare code to be able to download ODT templates

2016-03-25 15:56:50 +01:00

fichinter

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

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

import

Allow imports from xlsx files

2016-02-21 14:10:19 +01:00

livraison

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

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

mailings

fix travis

2016-04-01 17:09:03 +02:00

member

…

oauth

Update google_oauthcallback.php

2016-02-09 14:05:05 +01:00

payment

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

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

printing

…

printsheet

…

product

Revert commit that break compatibility of 100% of modules

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

project

Merge pull request #4886 from apachler/develop

2016-04-04 00:11:19 +02:00

propale

Revert "Fix regression"

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

rapport

Fix: issue when bank module is disabled

2016-02-16 11:27:58 +01:00

security

Replace function rand with mt_rand (prepare php 8)

2016-03-05 15:01:25 +01:00

societe

Prepare code to be able to download ODT templates

2016-03-25 15:56:50 +01:00

supplier_invoice

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

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

supplier_order

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

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

supplier_payment

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

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

supplier_proposal

Prepare code to be able to download ODT templates

2016-03-25 15:56:50 +01:00

syslog

…

DolibarrModules.class.php

NEW Introduce a predefined job to run database backup

2016-03-29 14:52:27 +02:00

index.html

…

modAccounting.class.php

NEW Introduce property module_position so a module can decide where it

2015-11-17 00:58:12 +01:00

modAdherent.class.php

…

modAgenda.class.php

NEW Introduce property module_position so a module can decide where it

2015-11-17 00:58:12 +01:00

modApi.class.php

…

modBanque.class.php

…

modBarcode.class.php

NEW Merge all admin tools (system and module admin tools) into same

2016-02-16 12:50:15 +01:00

modBookmark.class.php

…

modCashDesk.class.php

…

modCategorie.class.php

…

modClickToDial.class.php

…

modCommande.class.php

NEW Add minimum stock and desired stock into import/export profiles.

2016-02-22 15:30:27 +01:00

modComptabilite.class.php

…

modContrat.class.php

…

modCron.class.php

NEW Introduce a predefined job to run database backup

2016-03-29 14:52:27 +02:00

modDeplacement.class.php

Update doc

2015-11-22 18:41:35 +01:00

modDocumentGeneration.class.php

…

modDon.class.php

…

modDynamicPrices.class.php

translations missing

2015-09-07 15:40:55 +02:00

modECM.class.php

Merge remote-tracking branch 'origin/3.8' into 3.9

2016-01-30 15:59:40 +01:00

modExpedition.class.php

FIX Extrafields of shipments was not included into export fields

2016-02-25 15:46:14 +01:00

modExpenseReport.class.php

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

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

modExport.class.php

Better position for modules

2016-02-19 20:05:25 +01:00

modExternalRss.class.php

…

modExternalSite.class.php

…

modFacture.class.php

Tons of fixes and enhancement on recurring invoice generation

2016-02-16 00:31:05 +01:00

modFckeditor.class.php

…

modFicheinter.class.php

new:advanced permissions to validate and unvalidate interventions

2016-02-29 19:16:09 +01:00

modFournisseur.class.php

Add category Supplier Relationship Manager

2016-02-19 19:20:21 +01:00

modFTP.class.php

…

modGeoIPMaxmind.class.php

…

modGravatar.class.php

Removed duplicated code from core modules

2015-07-07 13:08:26 +02:00

modHoliday.class.php

NEW Introduce property module_position so a module can decide where it

2015-11-17 00:58:12 +01:00

modHRM.class.php

NEW: Move HRM dictionary from module to core dictionaries

2016-03-24 06:28:12 +01:00

modImport.class.php

Better position for modules

2016-02-19 20:05:25 +01:00

modIncoterm.class.php

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

2016-03-18 11:54:14 +01:00

modLabel.class.php

Work on a better way to manage modules. All one page. Introduce a way to

2015-10-07 08:13:23 +02:00

modLdap.class.php

…

modLoan.class.php

NEW Move load module to status experimental

2016-02-07 22:47:16 +01:00

modMailing.class.php

…

modMailmanSpip.class.php

translations missing

2015-09-07 15:55:26 +02:00

modMargin.class.php

…

modMultiCurrency.class.php

…

modNotification.class.php

translations missing

2015-09-07 15:55:26 +02:00

modOauth.class.php

NEW Merge all admin tools (system and module admin tools) into same

2016-02-16 12:50:15 +01:00

modOpenSurvey.class.php

…

modPaybox.class.php

…

modPaypal.class.php

…

modPrelevement.class.php

…

modPrinting.class.php

NEW Merge all admin tools (system and module admin tools) into same

2016-02-16 12:50:15 +01:00

modProduct.class.php

Fix translation export/import

2016-02-22 17:42:41 +01:00

modProductBatch.class.php

Add missing phpunit tests

2016-02-02 17:26:14 +01:00

modProjet.class.php

…

modPropale.class.php

Fix: when doing an export of extrafields, we must use different table

2015-12-17 20:40:33 +01:00

modReceiptPrinter.class.php

NEW Merge all admin tools (system and module admin tools) into same

2016-02-16 12:50:15 +01:00

modResource.class.php

…

modSalaries.class.php

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

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

modService.class.php

Secure migration for people using a RC

2016-02-20 03:14:29 +01:00

modSkype.class.php

…

modSociete.class.php

NEW Include sales representative into export of thirdparties

2016-02-24 16:56:24 +01:00

modStock.class.php

FIX PMP is deprecated at warehouse level

2016-03-30 18:08:08 +02:00

modSupplierProposal.class.php

Add category Supplier Relationship Manager

2016-02-19 19:20:21 +01:00

modSyslog.class.php

…

modTax.class.php

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

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

modUser.class.php

…

modWebServices.class.php

…

modWebServicesClient.class.php

…

modWebsites.class.php

Work on CMS module

2016-01-24 21:35:41 +01:00

modWorkflow.class.php

…