Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
This commit is contained in:
Laurent Destailleur
2013-03-05 18:32:01 +01:00
parent faf1f440e4 ae2355fda5
commit c37e873ab4
7 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/modCommande.class.php
View File

@@ -80,14 +80,14 @@ class modCommande extends DolibarrModules
$this->const[$r][0] = "COMMANDE_ADDON_PDF";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "einstein";
$this->const[$r][3] = 'Nom du gestionnaire de generation des commandes en PDF';
$this->const[$r][3] = 'Name of PDF model of order';
$this->const[$r][4] = 0;
$r++;
$this->const[$r][0] = "COMMANDE_ADDON";
$this->const[$r][1] = "chaine";
$this->const[$r][2] = "mod_commande_marbre";
$this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes';
$this->const[$r][3] = 'Name of numbering numerotation rules of order';
$this->const[$r][4] = 0;
$r++;