lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code comment to add some explanations

Browse Source
This commit is contained in:
Laurent Destailleur 2016-11-23 12:29:42 +01:00
parent 52fac193ad
commit c1628be9c0
3 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/commande/card.php
View File

@ -2217,7 +2217,7 @@ if ($action == 'create' && $user->rights->commande->creer)
}
print '</td></tr>';
// Origin
// Source reason (why we have an ordrer)
print '<tr><td height="10">';
print '<table class="nobordernopadding" width="100%"><tr><td>';
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 '</td><td>';
// print '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=22&origin=order&originid='.$object->id.'">'.$langs->trans("DictionarySource").'</a>';
print '</td></tr>';
// TODO Order mode (how we receive order). Not yet implemented
/*
print '<tr><td height="10">';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('SourceMode');
print '</td>';
if ($action != 'editinputmode')
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editinputmode&amp;id=' . $object->id . '">' . img_edit($langs->trans('SetInputMode'), 1) . '</a></td>';
print '</tr></table>';
print '</td><td>';
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 '</td></tr>';
*/
$tmparray=$object->getTotalWeightVolume();
$totalWeight=$tmparray['weight'];
$totalVolume=$tmparray['volume'];

6
htdocs/commande/class/commande.class.php
View File

@ -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();

20
htdocs/langs/en_US/orders.lang
View File

@ -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.