dolibarr/htdocs/compta/prelevement
Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
..
class Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
bons.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
card.php Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
create.php Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
demandes.php Debug of module withdraw. 2014-11-05 17:32:42 +01:00
factures.php Fix: Missing translation 2014-11-05 16:21:17 +01:00
fiche-rejet.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
fiche-stat.php Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
index.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
ligne.php Merge remote-tracking branch 'origin/3.7' into develop 2014-12-14 12:35:13 +01:00
lignes.php Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
list.php Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
rejets.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
stats.php Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00