Fix trans in comments
This commit is contained in:
parent
62c3d3b2f0
commit
9fa00c1771
@ -12,3 +12,11 @@ Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% =
|
||||
411xxx 3,60 € TTC
|
||||
|
||||
Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.
|
||||
|
||||
|
||||
|
||||
|
||||
Un compte comptable de Tiers vente = Acount Receivable
|
||||
Un compte comptable de Tiers achat = Acount Payable
|
||||
|
||||
|
||||
@ -321,7 +321,7 @@ if (isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire)
|
||||
|
||||
|
||||
/*
|
||||
* Draft customer orders
|
||||
* Draft sales orders
|
||||
*/
|
||||
|
||||
if (isModEnabled('commande') && $user->rights->commande->lire) {
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
/**
|
||||
* \file htdocs/commande/card.php
|
||||
* \ingroup commande
|
||||
* \brief Page to show customer order
|
||||
* \brief Page to show sales order
|
||||
*/
|
||||
|
||||
// Load Dolibarr environment
|
||||
|
||||
@ -3395,7 +3395,7 @@ class Commande extends CommonOrder
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete the customer order
|
||||
* Delete the sales order
|
||||
*
|
||||
* @param User $user User object
|
||||
* @param int $notrigger 1=Does not execute triggers, 0= execute triggers
|
||||
@ -4062,7 +4062,7 @@ class Commande extends CommonOrder
|
||||
}
|
||||
|
||||
/**
|
||||
* Is the customer order delayed?
|
||||
* Is the sales order delayed?
|
||||
*
|
||||
* @return bool true if late, false if not
|
||||
*/
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
/**
|
||||
* \file htdocs/commande/index.php
|
||||
* \ingroup commande
|
||||
* \brief Home page of customer order module
|
||||
* \brief Home page of sales order module
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@ -9133,10 +9133,10 @@ function getLanguageCodeFromCountryCode($countrycode)
|
||||
* @param string $type Value for object where objectvalue can be
|
||||
* 'thirdparty' to add a tab in third party view
|
||||
* 'intervention' to add a tab in intervention view
|
||||
* 'supplier_order' to add a tab in supplier order view
|
||||
* 'supplier_invoice' to add a tab in supplier invoice view
|
||||
* 'invoice' to add a tab in customer invoice view
|
||||
* 'order' to add a tab in customer order view
|
||||
* 'supplier_order' to add a tab in purchase order view
|
||||
* 'supplier_invoice' to add a tab in purchase invoice view
|
||||
* 'invoice' to add a tab in sales invoice view
|
||||
* 'order' to add a tab in sales order view
|
||||
* 'contract' to add a tabl in contract view
|
||||
* 'product' to add a tab in product view
|
||||
* 'propal' to add a tab in propal view
|
||||
|
||||
@ -189,7 +189,7 @@ function order_admin_prepare_head()
|
||||
|
||||
|
||||
/**
|
||||
* Return a HTML table that contains a pie chart of customer orders
|
||||
* Return a HTML table that contains a pie chart of sales orders
|
||||
*
|
||||
* @param int $socid (Optional) Show only results from the customer with this id
|
||||
* @return string A HTML table that contains a pie chart of customer invoices
|
||||
|
||||
@ -448,7 +448,7 @@ function show_stats_for_company($product, $socid)
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
// Customer orders
|
||||
// Sales orders
|
||||
if (isModEnabled('commande') && $user->rights->commande->lire) {
|
||||
$nblines++;
|
||||
$ret = $product->load_stats_commande($socid);
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/modules/asset/modules_asset.php';
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for Asset
|
||||
*/
|
||||
class mod_asset_standard extends ModeleNumRefAsset
|
||||
{
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/modules/bom/modules_bom.php';
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for BOM
|
||||
*/
|
||||
class mod_bom_standard extends ModeleNumRefboms
|
||||
{
|
||||
|
||||
@ -20,12 +20,12 @@
|
||||
/**
|
||||
* \file htdocs/core/modules/commande/mod_commande_marbre.php
|
||||
* \ingroup commande
|
||||
* \brief File of class to manage customer order numbering rules Marbre
|
||||
* \brief File of class to manage Sales Order numbering rules Marbre
|
||||
*/
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules Marbre
|
||||
* Class to manage Sales Order numbering rules Marbre
|
||||
*/
|
||||
class mod_commande_marbre extends ModeleNumRefCommandes
|
||||
{
|
||||
|
||||
@ -23,14 +23,14 @@
|
||||
/**
|
||||
* \file htdocs/core/modules/commande/mod_commande_saphir.php
|
||||
* \ingroup commande
|
||||
* \brief Fichier contenant la classe du modele de numerotation de reference de commande Saphir
|
||||
* \brief File of class to manage Sales Order numbering rules Saphir
|
||||
*/
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules Saphir
|
||||
* Class to manage Sales Order numbering rules Saphir
|
||||
*/
|
||||
class mod_commande_saphir extends ModeleNumRefCommandes
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@ dol_include_once('/core/modules/hrm/modules_evaluation.php');
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for HR evaluation
|
||||
*/
|
||||
class mod_evaluation_standard extends ModeleNumRefEvaluation
|
||||
{
|
||||
|
||||
@ -107,7 +107,7 @@ class modApi extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -137,7 +137,7 @@ class modAsset extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -156,7 +156,7 @@ class modBom extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -34,11 +34,10 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
|
||||
|
||||
|
||||
/**
|
||||
* Class to describe module customer orders
|
||||
* Class to describe module Sales Orders
|
||||
*/
|
||||
class modCommande extends DolibarrModules
|
||||
{
|
||||
|
||||
/**
|
||||
* Constructor. Define names, constants, directories, boxes, permissions
|
||||
*
|
||||
|
||||
@ -162,7 +162,7 @@ class modDataPolicy extends DolibarrModules {
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -131,7 +131,7 @@ class modDav extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -131,7 +131,7 @@ class modEmailCollector extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -169,7 +169,7 @@ class modEventOrganization extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -141,7 +141,7 @@ class modHRM extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -184,7 +184,7 @@ class modKnowledgeManagement extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -168,7 +168,7 @@ class modMrp extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -113,7 +113,7 @@ class modMultiCurrency extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -199,7 +199,7 @@ class modPartnership extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -177,7 +177,7 @@ class modRecruitment extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -120,7 +120,7 @@ class modResource extends DolibarrModules
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'invoice' to add a tab in customer invoice view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'product' to add a tab in product view
|
||||
// 'stock' to add a tab in stock view
|
||||
// 'propal' to add a tab in propal view
|
||||
|
||||
@ -166,7 +166,7 @@ class modStockTransfer extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -142,7 +142,7 @@ class modTakePos extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -183,7 +183,7 @@ class modWebhook extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -166,7 +166,7 @@ class modWorkstation extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -172,7 +172,7 @@ class modZapier extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sales order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules Marbre
|
||||
* Class to manage business proposition rules Marbre
|
||||
*/
|
||||
class mod_propale_marbre extends ModeleNumRefPropales
|
||||
{
|
||||
|
||||
@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktrans
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for Stock
|
||||
*/
|
||||
class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
|
||||
{
|
||||
|
||||
@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules Marbre
|
||||
* Class to manage the Marbre numbering rule for Request for quotation
|
||||
*/
|
||||
class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
require_once DOL_DOCUMENT_ROOT . '/core/modules/workstation/modules_workstation.php';
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for Workstation
|
||||
*/
|
||||
class mod_workstation_standard extends ModeleNumRefWorkstation
|
||||
{
|
||||
|
||||
@ -203,7 +203,7 @@ class InterfaceZapierTriggers extends DolibarrTriggers
|
||||
// case 'MYECMDIR_CREATE':
|
||||
// case 'MYECMDIR_MODIFY':
|
||||
|
||||
// Customer orders
|
||||
// Sales orders
|
||||
case 'ORDER_CREATE':
|
||||
$resql = $this->db->query($sql);
|
||||
while ($resql && $obj = $this->db->fetch_array($resql)) {
|
||||
|
||||
@ -28,12 +28,12 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
|
||||
|
||||
require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php'; // Customer Proposal
|
||||
require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; // Customer Order
|
||||
require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; // Sale Order
|
||||
require_once DOL_DOCUMENT_ROOT .'/compta/facture/class/facture.class.php'; // Customer Invoice
|
||||
require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php'; // Contact / Address
|
||||
require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php'; // Shipping / Delivery
|
||||
require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.commande.class.php'; // Supplier Order
|
||||
require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.facture.class.php'; // Supplier Invoice
|
||||
require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.commande.class.php'; // Purchase Order
|
||||
require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.facture.class.php'; // Purchase Invoice
|
||||
require_once DOL_DOCUMENT_ROOT .'/projet/class/project.class.php'; // Project
|
||||
require_once DOL_DOCUMENT_ROOT .'/reception/class/reception.class.php'; // Reception
|
||||
require_once DOL_DOCUMENT_ROOT .'/recruitment/class/recruitmentcandidature.class.php'; // Recruiting
|
||||
@ -1766,7 +1766,7 @@ class EmailCollector extends CommonObject
|
||||
if ($reg[1] == 'pro') { // Customer Proposal
|
||||
$objectemail = new Propal($this->db);
|
||||
}
|
||||
if ($reg[1] == 'ord') { // Customer Order
|
||||
if ($reg[1] == 'ord') { // Sale Order
|
||||
$objectemail = new Commande($this->db);
|
||||
}
|
||||
if ($reg[1] == 'shi') { // Shipment
|
||||
|
||||
@ -1832,7 +1832,7 @@ class CommandeFournisseur extends CommonOrder
|
||||
// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
|
||||
$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', (isset($this->fk_soc) ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
|
||||
|
||||
// If supplier order created from customer order, we take best supplier price
|
||||
// If supplier order created from sales order, we take best supplier price
|
||||
// If $pu (defined previously from pu_ht or pu_ttc) is not defined at all, we also take the best supplier price
|
||||
if ($result > 0 && ($origin == 'commande' || $pu === '')) {
|
||||
$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
|
||||
@ -2608,11 +2608,11 @@ class CommandeFournisseur extends CommonOrder
|
||||
}
|
||||
|
||||
/**
|
||||
* Update a supplier order from a customer order
|
||||
* Update a supplier order from a sales order
|
||||
*
|
||||
* @param User $user User that create
|
||||
* @param int $idc Id of supplier order to update
|
||||
* @param int $comclientid Id of customer order to use as template
|
||||
* @param int $idc Id of purchase order to update
|
||||
* @param int $comclientid Id of sale order to use as template
|
||||
* @return int <0 if KO, >0 if OK
|
||||
*/
|
||||
public function updateFromCommandeClient($user, $idc, $comclientid)
|
||||
|
||||
@ -527,7 +527,7 @@ if (empty($reshook)) {
|
||||
}
|
||||
}
|
||||
|
||||
$cmd->classifyBilled($user); // TODO Move this in workflow like done for customer orders
|
||||
$cmd->classifyBilled($user); // TODO Move this in workflow like done for sales orders
|
||||
|
||||
if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
|
||||
$TFactThird[$cmd->socid] = $objecttmp;
|
||||
|
||||
@ -194,7 +194,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
|
||||
$dashboardlines[$board->element.'_signed'] = $board->load_board($user, "signed");
|
||||
}
|
||||
|
||||
// Number of customer orders a deal
|
||||
// Number of sales orders a deal
|
||||
if (isModEnabled('commande') && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('commande', 'lire')) {
|
||||
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
|
||||
$board = new Commande($db);
|
||||
|
||||
@ -26,7 +26,7 @@ dol_include_once('/knowledgemanagement/core/modules/knowledgemanagement/modules_
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the knowledgerecord numbering rules standard
|
||||
*/
|
||||
class mod_knowledgerecord_standard extends ModeleNumRefKnowledgeRecord
|
||||
{
|
||||
|
||||
@ -188,7 +188,7 @@ class modMyModule extends DolibarrModules
|
||||
// 'invoice_supplier' to add a tab in supplier invoice view
|
||||
// 'member' to add a tab in fundation member view
|
||||
// 'opensurveypoll' to add a tab in opensurvey poll view
|
||||
// 'order' to add a tab in customer order view
|
||||
// 'order' to add a tab in sale order view
|
||||
// 'order_supplier' to add a tab in supplier order view
|
||||
// 'payment' to add a tab in payment view
|
||||
// 'payment_supplier' to add a tab in supplier payment view
|
||||
|
||||
@ -30,7 +30,7 @@ dol_include_once('/mymodule/core/modules/mymodule/modules_myobject.php');
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer Bom numbering rules advanced
|
||||
* Class to manage the Advanced numbering rule for MyObject
|
||||
*/
|
||||
class mod_myobject_advanced extends ModeleNumRefMyObject
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@ dol_include_once('/mymodule/core/modules/mymodule/modules_myobject.php');
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for MyObject
|
||||
*/
|
||||
class mod_myobject_standard extends ModeleNumRefMyObject
|
||||
{
|
||||
|
||||
@ -155,7 +155,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
|
||||
//case 'MYECMDIR_MODIFY':
|
||||
//case 'MYECMDIR_DELETE':
|
||||
|
||||
// Customer orders
|
||||
// Sales orders
|
||||
//case 'ORDER_CREATE':
|
||||
//case 'ORDER_MODIFY':
|
||||
//case 'ORDER_VALIDATE':
|
||||
|
||||
@ -30,7 +30,7 @@ dol_include_once('/partnership/core/modules/partnership/modules_partnership.php'
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer Bom numbering rules advanced
|
||||
* Class to manage the Advanced numbering rule for Partnership
|
||||
*/
|
||||
class mod_partnership_advanced extends ModeleNumRefPartnership
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@ dol_include_once('/partnership/core/modules/partnership/modules_partnership.php'
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for Partnership
|
||||
*/
|
||||
class mod_partnership_standard extends ModeleNumRefPartnership
|
||||
{
|
||||
|
||||
@ -761,7 +761,7 @@ if ($id > 0 || $ref) {
|
||||
|
||||
$found = 0;
|
||||
$helpondiff = '<strong>'.$langs->trans("StockDiffPhysicTeoric").':</strong><br>';
|
||||
// Number of customer orders running
|
||||
// Number of sales orders running
|
||||
if (isModEnabled('commande')) {
|
||||
if ($found) {
|
||||
$helpondiff .= '<br>';
|
||||
@ -776,7 +776,7 @@ if ($id > 0 || $ref) {
|
||||
$helpondiff .= ' <span class="opacitymedium">('.$langs->trans("ProductQtyInDraft").': '.$object->stats_commande['qty'].')</span>';
|
||||
}
|
||||
|
||||
// Number of product from customer order already sent (partial shipping)
|
||||
// Number of product from sales order already sent (partial shipping)
|
||||
if (isModEnabled("expedition")) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
|
||||
$filterShipmentStatus = '';
|
||||
|
||||
@ -43,7 +43,7 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
|
||||
$valsnb = array();
|
||||
$valsamount = array();
|
||||
$dataseries = array();
|
||||
// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
|
||||
// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for sale orders), 3=Closed (Sent/Received, billed or not)
|
||||
while ($i < $num) {
|
||||
$obj = $db->fetch_object($resql);
|
||||
if ($obj) {
|
||||
|
||||
@ -1005,7 +1005,7 @@ if (!$source) {
|
||||
}
|
||||
|
||||
|
||||
// Payment on customer order
|
||||
// Payment on sales order
|
||||
if ($source == 'order') {
|
||||
$found = true;
|
||||
$langs->load("orders");
|
||||
|
||||
@ -30,7 +30,7 @@ dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentcandi
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer Bom numbering rules advanced
|
||||
* Class to manage the Advanced numbering rule for Job application
|
||||
*/
|
||||
class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandidature
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@ dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentcandi
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for Job application
|
||||
*/
|
||||
class mod_recruitmentcandidature_standard extends ModeleNumRefRecruitmentCandidature
|
||||
{
|
||||
|
||||
@ -30,7 +30,7 @@ dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobpo
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer Bom numbering rules advanced
|
||||
* Class to manage the Advanced numbering rule for Job position
|
||||
*/
|
||||
class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosition
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@ dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobpo
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage customer order numbering rules standard
|
||||
* Class to manage the Standard numbering rule for Job positions
|
||||
*/
|
||||
class mod_recruitmentjobposition_standard extends ModeleNumRefRecruitmentJobPosition
|
||||
{
|
||||
|
||||
@ -90,7 +90,7 @@ if ($resql) {
|
||||
$dataseries = array();
|
||||
$colorseries = array();
|
||||
$vals = array();
|
||||
// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
|
||||
// -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for sales orders), 3=Closed (Sent/Received, billed or not)
|
||||
while ($i < $num) {
|
||||
$row = $db->fetch_row($resql);
|
||||
if ($row) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user