diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3a921f97edf..ac80f231e00 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2217,7 +2217,7 @@ if ($action == 'create' && $user->rights->commande->creer)
}
print '';
- // Origin
+ // Source reason (why we have an ordrer)
print '
';
print '| ';
print $langs->trans('Source');
@@ -2231,12 +2231,26 @@ if ($action == 'create' && $user->rights->commande->creer)
} else {
$form->formInputReason($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->demand_reason_id, 'none');
}
- // Removed because using dictionary is an admin feature, not a user feature. There is already the "star" to show info to admin users.
- // This is to avoid too heavy screens and have an uniform look and feel for all screens.
- // print ' | ';
- // print ''.$langs->trans("DictionarySource").'';
print ' | ';
+ // TODO Order mode (how we receive order). Not yet implemented
+ /*
+ print '| ';
+ print '';
+ print ' | ';
+ if ($action == 'editinputmode') {
+ $form->formInputMode($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->source, 'input_mode_id', 1);
+ } else {
+ $form->formInputMode($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->source, 'none');
+ }
+ print ' | ';
+ */
+
$tmparray=$object->getTotalWeightVolume();
$totalWeight=$tmparray['weight'];
$totalVolume=$tmparray['volume'];
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e6423238168..177e58caef9 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -114,7 +114,7 @@ class Commande extends CommonOrder
*/
public $availability;
- public $demand_reason_id;
+ public $demand_reason_id; // Source reason. Why we receive order (after a phone campaign, ...)
public $demand_reason_code;
public $address;
public $date; // Date commande
@@ -123,14 +123,14 @@ class Commande extends CommonOrder
* @see date
*/
public $date_commande;
- public $date_livraison; // Date livraison souhaitee
+ public $date_livraison; // Date expected of shipment (date starting shipment, not the reception that occurs some days after)
public $fk_remise_except;
public $remise_percent;
public $remise_absolue;
public $info_bits;
public $rang;
public $special_code;
- public $source; // Origin of order
+ public $source; // Order mode. How we received order (by phone, by email, ...)
public $extraparams=array();
public $linked_objects=array();
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 2f0579394eb..e515adcea40 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -126,29 +126,19 @@ TypeContact_order_supplier_internal_SHIPPING=Representative following-up shippin
TypeContact_order_supplier_external_BILLING=Supplier invoice contact
TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
-
Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
Error_OrderNotChecked=No orders to invoice selected
-# Sources
-OrderSource0=Commercial proposal
-OrderSource1=Internet
-OrderSource2=Mail campaign
-OrderSource3=Phone compaign
-OrderSource4=Fax campaign
-OrderSource5=Commercial
-OrderSource6=Store
-QtyOrdered=Qty ordered
-# Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
-# Orders modes
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
OrderByMail=Mail
OrderByFax=Fax
OrderByEMail=EMail
OrderByWWW=Online
OrderByPhone=Phone
+# Documents models
+PDFEinsteinDescription=A complete order model (logo...)
+PDFEdisonDescription=A simple order model
+PDFProformaDescription=A complete proforma invoice (logo…)
CreateInvoiceForThisCustomer=Bill orders
NoOrdersToInvoice=No orders billable
CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
|