Laurent Destailleur dc050d39eb Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	build/makepack-dolibarr.pl
	htdocs/adherents/type.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/js/lib_batch.js
	htdocs/core/modules/modUser.class.php
	htdocs/fichinter/card.php
	htdocs/fourn/commande/card.php
	htdocs/societe/consumption.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
	htdocs/user/perms.php

2015-06-29 00:09:28 +02:00

..

action

Scrutinizer Auto-Fixes

2015-03-16 23:21:17 +00:00

askpricesupplier

Qual: added deprecation hinting

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

barcode

[Qual] Fixed HTML input form disabled attribute

2015-05-07 14:21:14 +02:00

cheque

Prepare code for generic solution where all path are forged using

2015-05-18 22:25:51 +02:00

commande

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

contract

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

dons

Fix: input of french article is disabled by default

2015-06-03 06:01:05 +02:00

expedition

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

expensereport

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

2015-06-23 18:34:39 +02:00

export

Minor fixes

2015-05-13 07:46:12 +02:00

facture

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

fichinter

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

import

fix syntax errors

2015-04-18 18:07:41 +02:00

livraison

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

mailings

Use rfc6761 example.com domain instead of domain.com in examples

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

member

Prepare code for generic solution where all path are forged using

2015-05-18 22:25:51 +02:00

printing

Uniformize code

2015-06-06 14:34:57 +02:00

printsheet

Apply correct tabulation

2015-05-03 11:51:54 +02:00

product

[Qual] Fixed HTML input form disabled attribute

2015-05-07 14:21:14 +02:00

project

Qual: added deprecation hinting

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

propale

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

rapport

Restore correct filling of page

2015-04-12 19:37:49 +02:00

security

…

societe

[Qual] Fixed HTML input form disabled attribute

2015-05-07 14:21:14 +02:00

supplier_invoice

Merge branch 'develop' into commercial-name

2015-05-25 15:09:46 +02:00

supplier_order

Merge branch 'develop' into commercial-name

2015-06-13 02:45:42 +02:00

syslog

NEW Can install an external module from admin pages, if web server has

2015-04-04 00:19:03 +02:00

DolibarrModules.class.php

Merge pull request #2708 from GPCsolutions/deprecated

2015-06-05 15:44:08 +02:00

index.html

…

modAccounting.class.php

Accountancy - Add key language & prepare journal for expense report

2015-05-02 06:42:06 +02:00

modAdherent.class.php

Merge pull request #2752 from fappels/develop-tcpdfbarcode

2015-05-03 21:19:01 +02:00

modAgenda.class.php

added new trigger for supplier invoice unvalidation in Agenda

2015-05-23 15:09:44 +01:00

modApi.class.php

Module descriptor for API module

2015-05-03 14:53:40 +02:00

modAskPriceSupplier.class.php

Doxygen

2015-03-17 11:23:45 +01:00

modBanque.class.php

Update modBanque.class.php

2015-04-14 10:19:41 +02:00

modBarcode.class.php

Apply correct tabulation

2015-05-03 11:51:54 +02:00

modBookmark.class.php

…

modCashDesk.class.php

…

modCategorie.class.php

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

2015-06-05 18:31:53 +02:00

modClickToDial.class.php

…

modCommande.class.php

Fix error into export filter step

2015-05-05 12:45:38 +02:00

modComptabilite.class.php

…

modContrat.class.php

FIX We did a test on a permission to export contract when permission did

2015-05-10 23:46:34 +02:00

modCron.class.php

…

modDeplacement.class.php

Finished new module to manage expense reports !

2015-02-22 13:16:49 +01:00

modDocumentGeneration.class.php

…

modDon.class.php

NEW: Add a tab document in donation card

2015-06-08 21:28:32 +02:00

modDynamicPrices.class.php

Configuration page of dinamic prices and price global variables editor

2015-03-14 16:51:38 +01:00

modECM.class.php

…

modExpedition.class.php

Finished new module to manage expense reports !

2015-02-22 13:16:49 +01:00

modExpenseReport.class.php

Review ER : remove fk_c_tva and add option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT

2015-06-20 09:06:20 +02:00

modExport.class.php

…

modExternalRss.class.php

…

modExternalSite.class.php

…

modFacture.class.php

Fix missing payment mode into export invoice profile

2015-06-23 23:58:04 +02:00

modFckeditor.class.php

…

modFicheinter.class.php

Doxygen

2015-03-17 11:23:45 +01:00

modFournisseur.class.php

NEW Add ref and label of project into export

2015-06-03 16:40:02 +02:00

modFTP.class.php

Doxygen

2015-03-17 11:23:45 +01:00

modGeoIPMaxmind.class.php

Doxygen

2015-03-17 11:23:45 +01:00

modGravatar.class.php

NEW A module can add its entries into cron module.

2015-06-05 03:32:09 +02:00

modHoliday.class.php

NEW Can upload files on leave requests. Use more standard permissions.

2015-06-27 11:45:23 +02:00

modImport.class.php

…

modIncoterm.class.php

Fix correct id of core modules

2015-05-04 12:02:09 +02:00

modLabel.class.php

…

modLdap.class.php

…

modLoan.class.php

…

modMailing.class.php

…

modMailmanSpip.class.php

Use rfc6761 example.com domain instead of domain.com in examples

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

modMargin.class.php

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

2015-02-23 14:59:24 +01:00

modNotification.class.php

…

modOpenSurvey.class.php

…

modPaybox.class.php

…

modPaypal.class.php

…

modPrelevement.class.php

…

modPrinting.class.php

Use dedicated picto

2015-05-30 15:21:48 +02:00

modProduct.class.php

add extrafields into import product

2015-06-24 12:40:56 +02:00

modProductBatch.class.php

Make module productbatch stable

2015-04-10 11:59:41 +02:00

modProjet.class.php

NEW Filter "active" by default on user list.

2015-06-20 20:35:57 +02:00

modPropale.class.php

Fix error into export filter step

2015-05-05 12:45:38 +02:00

modResource.class.php

NEW Use new select2 component for juridical status, country and state

2015-05-31 12:25:33 +02:00

modSalaries.class.php

Fix: lot of typo to export salaries

2015-05-28 06:41:01 +02:00

modService.class.php

Fix filters for exports

2015-04-02 16:58:36 +02:00

modSkype.class.php

…

modSociete.class.php

Fix filters for exports

2015-04-02 16:58:36 +02:00

modStock.class.php

Make module productbatch stable

2015-04-10 11:59:41 +02:00

modSyncSupplierWebServices.class.php

Use a dedicated icon instead of generic one

2015-05-30 17:32:50 +02:00

modSyslog.class.php

…

modTax.class.php

Finished new module to manage expense reports !

2015-02-22 13:16:49 +01:00

modUser.class.php

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

2015-06-29 00:09:28 +02:00

modWebServices.class.php

…

modWorkflow.class.php

…