Choix station réparé
Détection droit pour "Calcul_production"
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/views/B2E/Dossier_Archives/Devis/devis.php
Merge remote-tracking branch 'origin/Developpement' into Developpement

Conflicts:
	Nextwatt/application/models/Mappage/article.php
Détection droit pour "Calcul_production"