diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 472cbb27eb4..1144a3dc120 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -223,7 +223,7 @@ class Commande extends CommonObject $sql.= " fk_user_valid = ".$user->id; $sql.= " WHERE rowid = ".$this->id; - dol_syslog("Commande::valid() sql=".$sql); + dol_syslog(get_class($this)."::valid() sql=".$sql); $resql=$this->db->query($sql); if (! $resql) { @@ -246,7 +246,6 @@ class Commande extends CommonObject { if ($this->lines[$i]->fk_product > 0) { - $langs->load("agenda"); $mouvP = new MouvementStock($this->db); // We decrement stock of product (and sub-products) $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr",$num)); diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 19bd0408673..84c301428e6 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1479,6 +1479,7 @@ else $text.='
'; $text.=$notify->confirmMessage('NOTIFY_VAL_ORDER',$object->socid); } + $formquestion=array(); if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) { $langs->load("stocks"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 285b44f38be..7975dcfe656 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -315,27 +315,43 @@ if ($action == 'set_ref_client') // Classify to validated if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->facture->valider) { + $idwarehouse=GETPOST('idwarehouse'); + $object->fetch($id); $object->fetch_thirdparty(); - $result = $object->validate($user); - if ($result >= 0) + // Check parameters + if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1)) { - // Define output language - $outputlangs = $langs; - $newlang=''; - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; - if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; - if (! empty($newlang)) + if (! $idwarehouse || $idwarehouse == -1) { - $outputlangs = new Translate("",$conf); - $outputlangs->setDefaultLang($newlang); + $error++; + $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")); + $action=''; } - if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); } - else + + if (! $error) { - $mesg='
'.$object->error.'
'; + $result = $object->validate($user,'',$idwarehouse); + if ($result >= 0) + { + // Define output language + $outputlangs = $langs; + $newlang=''; + if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; + if (! empty($newlang)) + { + $outputlangs = new Translate("",$conf); + $outputlangs->setDefaultLang($newlang); + } + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, '', $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + } + else + { + $mesg='
'.$object->error.'
'; + } } } @@ -1440,6 +1456,7 @@ if ($action == 'create') print_fiche_titre($langs->trans('NewBill')); dol_htmloutput_mesg($mesg); + dol_htmloutput_errors('',$errors); $soc = new Societe($db); if ($socid) $res=$soc->fetch($socid); @@ -1878,6 +1895,7 @@ else if ($id > 0 || ! empty($ref)) { dol_htmloutput_mesg($mesg); + dol_htmloutput_errors('',$errors); $result=$object->fetch($id,$ref); if ($result > 0) @@ -1966,8 +1984,20 @@ else $text.='
'; $text.=$notify->confirmMessage('NOTIFY_VAL_FAC',$object->socid); } + $formquestion=array(); + if (! empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->hasProductsOrServices(1)) + { + $langs->load("stocks"); + require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + $formproduct=new FormProduct($db); + $formquestion=array( + //'text' => $langs->trans("ConfirmClone"), + //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), + //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), + array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); + } - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ValidateBill'),$text,'confirm_valid','',"yes",($conf->notification->enabled?0:2)); + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id,$langs->trans('ValidateBill'),$text,'confirm_valid',$formquestion,"yes",($conf->notification->enabled?0:2)); } // Confirmation du classement paye diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d4519f9a943..85874a9c2a0 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1474,12 +1474,14 @@ class Facture extends CommonObject } /** - * Tag invoice as validated + call trigger BILL_VALIDATE - * @param user Object user that validate - * @param force_number Reference to force on invoice - * @return int <0 if KO, >0 if OK + * Tag invoice as validated + call trigger BILL_VALIDATE + * + * @param User $user Object user that validate + * @param string $force_number Reference to force on invoice + * @param int $idwarehouse Id of warehouse to use for stock decrease + * @return int <0 if KO, >0 if OK */ - function validate($user, $force_number='') + function validate($user, $force_number='', $idwarehouse=0) { global $conf,$langs; require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); @@ -1613,8 +1615,7 @@ class Facture extends CommonObject { $mouvP = new MouvementStock($this->db); // We decrease stock for product - $entrepot_id = "1"; // TODO ajouter possibilite de choisir l'entrepot - $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $entrepot_id, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num)); + $result=$mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceValidatedInDolibarr",$num)); if ($result < 0) { $error++; } } } @@ -1950,14 +1951,14 @@ class Facture extends CommonObject // Clean parameters if (empty($qty)) $qty=0; if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0; - + $remise_percent = price2num($remise_percent); $qty = price2num($qty); $pu = price2num($pu); $txtva = price2num($txtva); $txlocaltax1 = price2num($txlocaltax1); $txlocaltax2 = price2num($txlocaltax2); - + // Check parameters if ($type < 0) return -1; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 0983d2940da..ecdd89e457f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -79,9 +79,9 @@ class Form function editfieldkey($text,$htmlname,$preselected,$object,$perm,$typeofdata='string') { global $conf,$langs; - + $ret=''; - + if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) { if ($perm) @@ -104,7 +104,7 @@ class Form if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='id.'">'.img_edit($langs->trans('Edit'),1).''; $ret.=''; } - + return $ret; } @@ -236,11 +236,11 @@ class Form $inputType = 'textarea'; } } - + $out.= ''."\n"; $out.= ''."\n"; $out.= ''."\n"; - + $out.= '
'.$value.'
'."\n"; } else @@ -2203,7 +2203,7 @@ class Form $formconfirm=''; $inputarray=array(); - if ($formquestion) + if (is_array($formquestion) && count($formquestion) > 0) { $more.=''."\n"; $more.=''."\n"; diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang index c5c70651098..edeba14a23e 100644 --- a/htdocs/langs/ar_SA/stocks.lang +++ b/htdocs/langs/ar_SA/stocks.lang @@ -52,10 +52,6 @@ QtyDispatched=ارسال كمية OrderDispatch=ارسال الأسهم RuleForStockManagementDecrease=قاعدة لإدارة المخزون النقصان RuleForStockManagementIncrease=قاعدة لإدارة المخزون وزيادة -DeStockOnBill=انخفاض الاسهم الحقيقي على الفواتير / الائتمان وتلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) -DeStockOnValidateOrder=انخفاض الاسهم الحقيقية بناء على أوامر تلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) -ReStockOnBill=زيادة مخزونات الحقيقي على الفواتير / الائتمان وتلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) -ReStockOnValidateOrder=زيادة مخزونات الحقيقي على أوامر تلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) StockLimitShort=الحد StockLimit=الأسهم للحد من التنبيهات PhysicalStock=المخزون المادي diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index 0ed90f067ad..1c370dc4d61 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -43,8 +43,8 @@ QtyDispatched=Quantitat desglossada OrderDispatch=Recepció d'estocs RuleForStockManagementDecrease=Regla de gestió de decrements d'estoc RuleForStockManagementIncrease=Regla de gestió d'increments d'estoc -DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1) -DeStockOnValidateOrder=Decrementar els estocs físics sobre les comandes de clients (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1) +DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients +DeStockOnValidateOrder=Decrementar els estocs físics sobre les comandes de clients DeStockOnShipment=Decrementar els estocs físics sobre els enviaments ReStockOnBill=Incrementar els estocs físics sobre les factures/abonaments de proveïdors (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1) ReStockOnValidateOrder=Incrementar els estocs físics sobre les comandes a proveïdors (atenció, en aquesta versió, encara es fa l'ajustament sobre el magatzem número 1) diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang index d247e239e80..172f04f9b5e 100644 --- a/htdocs/langs/da_DK/stocks.lang +++ b/htdocs/langs/da_DK/stocks.lang @@ -53,8 +53,8 @@ QtyDispatched=Afsendte mængde OrderDispatch=Bestil lastfordelingen RuleForStockManagementDecrease=Reglen for lagerstyring fald RuleForStockManagementIncrease=Reglen for lagerstyring stigning -DeStockOnBill=Fraførsel reelle bestande på fakturaer / kreditnotaer (advarsel, i denne version, er det kun i oplag nummer 1, at bestanden er ændret) -DeStockOnValidateOrder=Fraførsel reelle bestande om ordrer noter (advarsel, i denne version, er det kun i oplag nummer 1, at bestanden er ændret) +DeStockOnBill=Fraførsel reelle bestande på fakturaer / kreditnotaer +DeStockOnValidateOrder=Fraførsel reelle bestande om ordrer noter ReStockOnBill=Forhøjelse reelle bestande på fakturaer / kreditnotaer (advarsel, i denne version, er det kun i oplag nummer 1, at bestanden er ændret) ReStockOnValidateOrder=Forhøjelse reelle bestande om ordrer noter (advarsel, i denne version, er det kun i oplag nummer 1, at bestanden er ændret) StockLimitShort=Limit diff --git a/htdocs/langs/de_AT/stocks.lang b/htdocs/langs/de_AT/stocks.lang index ca6fa280d93..1b2a09992c7 100644 --- a/htdocs/langs/de_AT/stocks.lang +++ b/htdocs/langs/de_AT/stocks.lang @@ -49,8 +49,8 @@ QtyDispatched=Menge OrderDispatch=Bestellabwicklung RuleForStockManagementDecrease=Regel für Lagerstandsanpassung (Verringerung) RuleForStockManagementIncrease=Regel für Lagerstandsanpassung (Erhöhung) -DeStockOnBill=Verringere realen Bestände in den Rechnungen / Gutschriften (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) -DeStockOnValidateOrder=Decrease realen Bestände auf Bestellungen stellt fest (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) +DeStockOnBill=Verringere realen Bestände in den Rechnungen / Gutschriften +DeStockOnValidateOrder=Decrease realen Bestände auf Bestellungen stellt fest DeStockOnShipment=Verringere Lagerstände nach erfolgtem Versand (empfohlen) ReStockOnBill=Erhöhung der tatsächlichen Bestände in den Rechnungen / Gutschriften (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) ReStockOnValidateOrder=Erhöhung der realen Bestände auf Bestellungen stellt fest (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index ca6fa280d93..1b2a09992c7 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -49,8 +49,8 @@ QtyDispatched=Menge OrderDispatch=Bestellabwicklung RuleForStockManagementDecrease=Regel für Lagerstandsanpassung (Verringerung) RuleForStockManagementIncrease=Regel für Lagerstandsanpassung (Erhöhung) -DeStockOnBill=Verringere realen Bestände in den Rechnungen / Gutschriften (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) -DeStockOnValidateOrder=Decrease realen Bestände auf Bestellungen stellt fest (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) +DeStockOnBill=Verringere realen Bestände in den Rechnungen / Gutschriften +DeStockOnValidateOrder=Decrease realen Bestände auf Bestellungen stellt fest DeStockOnShipment=Verringere Lagerstände nach erfolgtem Versand (empfohlen) ReStockOnBill=Erhöhung der tatsächlichen Bestände in den Rechnungen / Gutschriften (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) ReStockOnValidateOrder=Erhöhung der realen Bestände auf Bestellungen stellt fest (Achtung: In dieser Version werden nur die Lagerstände des Lagers 1 aktualisiert) diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang index 7daaba13781..8c85bd5a588 100644 --- a/htdocs/langs/el_GR/stocks.lang +++ b/htdocs/langs/el_GR/stocks.lang @@ -52,8 +52,8 @@ QtyDispatched=Ποσότητα αποστέλλονται OrderDispatch=Χρηματιστήριο αποστολή RuleForStockManagementDecrease=Κανόνας για μείωση της διαχείρισης των αποθεμάτων RuleForStockManagementIncrease=Κανόνας για την αύξηση της διαχείρισης των αποθεμάτων -DeStockOnBill=Μείωση πραγματικών αποθεμάτων για τους πελάτες τιμολόγια / πιστωτικά επικύρωση σημειώσεις (προειδοποίηση, σε αυτή την έκδοση, είναι μόνο σε αριθμό Αποθήκη 1 του εν λόγω αποθέματος έχει τροποποιηθεί) -DeStockOnValidateOrder=Μείωση πραγματικών αποθεμάτων σχετικά με τις παραγγελίες των πελατών επικύρωσης (προειδοποίηση, σε αυτή την έκδοση, είναι μόνο σε αριθμό Αποθήκη 1 του εν λόγω αποθέματος έχει τροποποιηθεί) +DeStockOnBill=Μείωση πραγματικών αποθεμάτων για τους πελάτες τιμολόγια / πιστωτικά επικύρωση σημειώσεις +DeStockOnValidateOrder=Μείωση πραγματικών αποθεμάτων σχετικά με τις παραγγελίες των πελατών επικύρωσης DeStockOnShipment=Μείωση πραγματικών αποθεμάτων για την επικύρωση αποστολή ReStockOnBill=Αύξηση πραγματικού αποθέματα για τους προμηθευτές τιμολόγια / πιστωτικά επικύρωση σημειώσεις (προειδοποίηση, σε αυτή την έκδοση, είναι μόνο σε αριθμό Αποθήκη 1 του εν λόγω αποθέματος είναι τροποποιημένο) ReStockOnValidateOrder=Αύξηση πραγματικού αποθεμάτων σχετικά με τις παραγγελίες τους προμηθευτές επιδοκιμασίας (προειδοποίηση, σε αυτή την έκδοση, είναι μόνο σε αριθμό Αποθήκη 1 του εν λόγω αποθέματος έχει τροποποιηθεί) diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 21e0799ac6e..70687e960a1 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -44,8 +44,8 @@ QtyDispatched=Quantity dispatched OrderDispatch=Stock dispatching RuleForStockManagementDecrease=Rule for stock management decrease RuleForStockManagementIncrease=Rule for stock management increase -DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation (warning, in this version, it's only in warehouse number 1 that stock is modified) -DeStockOnValidateOrder=Decrease real stocks on customers orders validation (warning, in this version, it's only in warehouse number 1 that stock is modified) +DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation +DeStockOnValidateOrder=Decrease real stocks on customers orders validation DeStockOnShipment=Decrease real stocks on shipment validation ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation (warning, in this version, it's only in warehouse number 1 that stock is modified) ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation (warning, in this version, it's only in warehouse number 1 that stock is modified) diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang index b9610dd6029..4f671682f7d 100644 --- a/htdocs/langs/es_AR/stocks.lang +++ b/htdocs/langs/es_AR/stocks.lang @@ -1,4 +1,4 @@ # Dolibarr language file - es_AR - stocks CHARSET=UTF-8 -DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) -ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) +DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes +ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang index 29516b17da8..556e983efc6 100644 --- a/htdocs/langs/es_ES/stocks.lang +++ b/htdocs/langs/es_ES/stocks.lang @@ -43,8 +43,8 @@ QtyDispatched=Cantidad desglosada OrderDispatch=Recepción de stocks RuleForStockManagementDecrease=Regla de gestión de decrementos de stock RuleForStockManagementIncrease=Regla de gestión de incrementos de stock -DeStockOnBill=Decrementar los stocks físicos sobre las facturas/abonos a clientes (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) -DeStockOnValidateOrder=Decrementar los stocks físicos sobre los pedidos de clientes (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) +DeStockOnBill=Decrementar los stocks físicos sobre las facturas/abonos a clientes +DeStockOnValidateOrder=Decrementar los stocks físicos sobre los pedidos de clientes DeStockOnShipment=Decrementar los stocks físicos sobre los envíos ReStockOnBill=Incrementar los stocks físicos sobre las facturas/abonos de proveedores (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) ReStockOnValidateOrder=Incrementar los stocks físicos sobre los pedidos a proveedores (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang index 2d528661021..c686b50a9a2 100644 --- a/htdocs/langs/es_MX/stocks.lang +++ b/htdocs/langs/es_MX/stocks.lang @@ -1,4 +1,4 @@ # Dolibarr language file - es_MX - stocks CHARSET=UTF-8 -DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) -ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores (atención, en esta versión, todavía se realiza el ajuste sobre el almacén número 1) +DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes +ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang index c5c70651098..edeba14a23e 100644 --- a/htdocs/langs/fa_IR/stocks.lang +++ b/htdocs/langs/fa_IR/stocks.lang @@ -52,10 +52,6 @@ QtyDispatched=ارسال كمية OrderDispatch=ارسال الأسهم RuleForStockManagementDecrease=قاعدة لإدارة المخزون النقصان RuleForStockManagementIncrease=قاعدة لإدارة المخزون وزيادة -DeStockOnBill=انخفاض الاسهم الحقيقي على الفواتير / الائتمان وتلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) -DeStockOnValidateOrder=انخفاض الاسهم الحقيقية بناء على أوامر تلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) -ReStockOnBill=زيادة مخزونات الحقيقي على الفواتير / الائتمان وتلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) -ReStockOnValidateOrder=زيادة مخزونات الحقيقي على أوامر تلاحظ المصادقة (تحذير ، في هذه الرواية ، إلا انه في المخزن رقم 1 أن رصيد تعديل) StockLimitShort=الحد StockLimit=الأسهم للحد من التنبيهات PhysicalStock=المخزون المادي diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang index fa3199d973b..4b64ba1d7fd 100644 --- a/htdocs/langs/fi_FI/stocks.lang +++ b/htdocs/langs/fi_FI/stocks.lang @@ -51,8 +51,8 @@ QtyDispatched=Määrä lähetysolosuhteita OrderDispatch=Tilaa lähetyskeskukset RuleForStockManagementDecrease=Sääntö varaston hallintaan lasku RuleForStockManagementIncrease=Sääntö varaston hallintaan lisätä -DeStockOnBill=Decrease todellinen varastot laskuista / hyvityslaskuja (varoitus, tässä versiossa, se on vain varasto numero 1, että varastossa on muutettu) -DeStockOnValidateOrder=Decrease todellinen varastot tilaukset toteaa (varoitus, tässä versiossa, se on vain varasto numero 1, että varastossa on muutettu) +DeStockOnBill=Decrease todellinen varastot laskuista / hyvityslaskuja +DeStockOnValidateOrder=Decrease todellinen varastot tilaukset toteaa ReStockOnBill=Lisäys todellinen varastot laskuista / hyvityslaskuja (varoitus, tässä versiossa, se on vain varasto numero 1, että varastossa on muutettu) ReStockOnValidateOrder=Lisäys todellinen varastot tilaukset toteaa (varoitus, tässä versiossa, se on vain varasto numero 1, että varastossa on muutettu) StockLimitShort=Limit diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 4c4d43e14a0..1f393d63714 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -44,7 +44,7 @@ QtyDispatched=Quantité ventilée OrderDispatch=Réception vers stocks RuleForStockManagementDecrease=Règle de gestion des décrémentations de stock RuleForStockManagementIncrease=Règle de gestion des incrémentations de stock -DeStockOnBill=Décrémente les stocks physiques sur validation des factures/avoirs clients (attention, dans cette version, c'est toujours dans le premier entrepôt que se fait l'ajustement) +DeStockOnBill=Décrémente les stocks physiques sur validation des factures/avoirs clients DeStockOnValidateOrder=Décrémente les stocks physiques sur validation des commandes clients DeStockOnShipment=Décrémente les stocks physiques sur validation des expéditions ReStockOnBill=Incrémente les stocks physiques sur validation des factures/avoirs fournisseurs (attention, dans cette version, c'est toujours dans le premier entrepôt que se fait l'ajustement) diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang index dc42bd1e2e6..fa95fd5c3b8 100644 --- a/htdocs/langs/hu_HU/stocks.lang +++ b/htdocs/langs/hu_HU/stocks.lang @@ -44,8 +44,8 @@ QtyDispatched=Mennyiség kiküldése OrderDispatch=Készlet kiküldése RuleForStockManagementDecrease=Készlet kerezelés szabály csökkentése RuleForStockManagementIncrease=Készlet kerezelés szabály emelése -DeStockOnBill=Tényleges készlet csökkentése számla/hitel jóváhagyásakor (Figyelem, ebben a verzióban, csak az 1-es számú raktár készlete módosúl) -DeStockOnValidateOrder=Tényleges készlet csökkentése ügyfél rendelés jóváhagyásakor (Figyelem, ebben a verzióban, csak az 1-es számú raktár készlete módosúl) +DeStockOnBill=Tényleges készlet csökkentése számla/hitel jóváhagyásakor +DeStockOnValidateOrder=Tényleges készlet csökkentése ügyfél rendelés jóváhagyásakor DeStockOnShipment=Tényleges készlet csökkentése szállítás jóváhagyásakor ReStockOnBill=Tényleges készlet növelése számla/hitel jóváhagyásakor (Figyelem, ebben a verzióban, csak az 1-es számú raktár készlete módosúl) ReStockOnValidateOrder=Tényleges készlet növelése beszállítótól való rendelés jóváhagyásakor (Figyelem, ebben a verzióban, csak az 1-es számú raktár készlete módosúl) diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang index 475d2a076da..b08d2365286 100644 --- a/htdocs/langs/is_IS/stocks.lang +++ b/htdocs/langs/is_IS/stocks.lang @@ -51,8 +51,8 @@ QtyDispatched=Magn send OrderDispatch=Kauphöll dispatching RuleForStockManagementDecrease=Regla fyrir lager stjórnun lækka RuleForStockManagementIncrease=Regla fyrir lager stjórnun aukast -DeStockOnBill=Minnka raunverulegur birgðir á viðskiptavini reikningum / kredit athugasemdir löggilding (aðvörun, í þessari útgáfu, er það aðeins í fjölda vöruhús 1 sem birgðir er breytt) -DeStockOnValidateOrder=Minnka raunverulegur birgðir á viðskiptavini pantanir löggilding (aðvörun, í þessari útgáfu, er það aðeins í fjölda vöruhús 1 sem birgðir er breytt) +DeStockOnBill=Minnka raunverulegur birgðir á viðskiptavini reikningum / kredit athugasemdir löggilding +DeStockOnValidateOrder=Minnka raunverulegur birgðir á viðskiptavini pantanir löggilding DeStockOnShipment=Minnka alvöru stofnum á sendingunni löggilding ReStockOnBill=Auka raunverulegur birgðir birgja reikningum / kredit athugasemdir löggilding (aðvörun í þessari útgáfu er það aðeins í fjölda vöruhús 1 sem birgðir er breytt) ReStockOnValidateOrder=Auka raunverulegur birgðir birgja pantanir approbation (aðvörun í þessari útgáfu er það aðeins í fjölda vöruhús 1 sem birgðir er breytt) diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang index f1442d5fee6..a5b5c581338 100644 --- a/htdocs/langs/it_IT/stocks.lang +++ b/htdocs/langs/it_IT/stocks.lang @@ -40,8 +40,8 @@ UserWarehouseAutoCreate =Creare un magazzino automaticamente durante la cr QtyDispatched =Quantità spedita OrderDispatch =Spedizione dell'ordine RuleForStockManagement =Regola per la gestione delle scorte -DeStockOnBill =Diminuzione delle scorte effettive all'emissione di fatture / note di credito
(attenzione: con questa opzione vengono modificate solo le scorte del magazzino 1) -DeStockOnValidateOrder =Diminuzione delle scorte effettive su convalida ordini
(attenzione: con questa opzione vengono modificate solo le scorte del magazzino 1) +DeStockOnBill =Diminuzione delle scorte effettive all'emissione di fatture / note di credito +DeStockOnValidateOrder =Diminuzione delle scorte effettive su convalida ordini DeStockOnShipment =Diminuzione delle scorte effettive con la spedizione (Raccomandato) ReStockOnBill =Aumento delle scorte effettive con fatture / note di credito
(attenzione: con questa opzione vengono modificate solo le scorte del magazzino 1) ReStockOnValidateOrder =Aumente delle scorte effettive su convalida ordini
(attenzione: con questa opzione vengono modificate solo le scorte del magazzino 1) diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang index afa521f1563..4ad62aa8200 100644 --- a/htdocs/langs/nb_NO/stocks.lang +++ b/htdocs/langs/nb_NO/stocks.lang @@ -41,8 +41,8 @@ QtyDispatched=Antall sendt OrderDispatch=Ordre sendt RuleForStockManagementDecrease=Regel for lagerreduksjon RuleForStockManagementIncrease=Regel for lagerøkning -DeStockOnBill=Reduser virkelig beholdning ut fra faktura/kreditnota (obs! i denne versjonen blir kun lager nummer 1 endret) -DeStockOnValidateOrder=Reduser virkelig beholdning ut fra ordre (obs! i denne versjonen blir kun lager nummer 1 endret) +DeStockOnBill=Reduser virkelig beholdning ut fra faktura/kreditnota +DeStockOnValidateOrder=Reduser virkelig beholdning ut fra ordre DeStockOnShipment=reduser virkelig beholdning ved forsendelse (anbefalt) ReStockOnBill=Øk virkelig beholdning ut fra faktura/kreditnota (obs! i denne versjonen blir kun lager nummer 1 endret) ReStockOnValidateOrder=Øk virkelig beholdning ut fra ordre (obs! i denne versjonen blir kun lager nummer 1 endret) diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang index d00cbbb27b9..e84ff98e2ed 100644 --- a/htdocs/langs/nl_BE/stocks.lang +++ b/htdocs/langs/nl_BE/stocks.lang @@ -42,8 +42,8 @@ QtyDispatched=Hoeveelheid verzonden OrderDispatch=Bestel dispatching RuleForStockManagementDecrease=Regel voor voorraadbeheer daling RuleForStockManagementIncrease=Regel voor voorraadbeheer verhogen -DeStockOnBill=Daling van de reële voorraad op de facturen / creditnota's (waarschuwing, in deze versie, het is alleen in het magazijn nummer 1 dat bestand is gewijzigd) -DeStockOnValidateOrder=Daling van de reële voorraad op bestellingen notities (waarschuwing, in deze versie, het is alleen in het magazijn nummer 1 dat bestand is gewijzigd) +DeStockOnBill=Daling van de reële voorraad op de facturen / creditnota's +DeStockOnValidateOrder=Daling van de reële voorraad op bestellingen notities DeStockOnShipment=Daling van de reële voorraad op overbrenging (aanbevolen) ReStockOnBill=Toename echte voorraden op facturen / creditnota's (waarschuwing, in deze versie, het is alleen in het magazijn nummer 1 dat bestand is gewijzigd) ReStockOnValidateOrder=Toename voorraden echt op bestellingen notities (waarschuwing, in deze versie, het is alleen in het magazijn nummer 1 dat bestand is gewijzigd) diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang index b1e10d54af3..cb4f85f5d45 100644 --- a/htdocs/langs/nl_NL/stocks.lang +++ b/htdocs/langs/nl_NL/stocks.lang @@ -44,8 +44,8 @@ QtyDispatched = Hoeveelheid verzonden OrderDispatch = Voorraadverzending RuleForStockManagementDecrease = Regel voor voorraadbeheerafname RuleForStockManagementIncrease = Regel voor voorraadbeheertoename -DeStockOnBill = Verlaag de echte voorraad na het valideren van afnemersfacturen / creditnota's (waarschuwing, in deze versie, wordt de vooraad alleen in magazijn nummer 1 aangepast) -DeStockOnValidateOrder = Verlaag de echte voorraad na het valideren van opdrachten (waarschuwing, in deze versie, wordt de vooraad alleen in magazijn nummer 1 aangepast) +DeStockOnBill = Verlaag de echte voorraad na het valideren van afnemersfacturen / creditnota's +DeStockOnValidateOrder = Verlaag de echte voorraad na het valideren van opdrachten DeStockOnShipment = Verlaag de echte voorraad na het valideren van verzendingen (waarschuwing, in deze versie, wordt de vooraad alleen in magazijn nummer 1 aangepast) ReStockOnBill = Verhoog de echte voorraad na het valideren van leveranciersfacturen / -creditnota's (waarschuwing, in deze versie, wordt de vooraad alleen in magazijn nummer 1 aangepast) ReStockOnValidateOrder = Verhoog de echte voorraad na het valideren van leveranciersopdrachten (waarschuwing, in deze versie, wordt de vooraad alleen in magazijn nummer 1 aangepast) diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang index 55ba46dd480..30493de4f87 100644 --- a/htdocs/langs/pl_PL/stocks.lang +++ b/htdocs/langs/pl_PL/stocks.lang @@ -53,8 +53,8 @@ QtyDispatched=Ilość wysyłanych OrderDispatch=Postanowienie wysyłkowe RuleForStockManagementDecrease=Artykuł na zarządzanie zapasami spadek RuleForStockManagementIncrease=Artykuł na zarządzanie zapasami wzrost -DeStockOnBill=Spadek realnych zasobów faktur / not kredytowych (uwaga, w tej wersji, to tylko w magazynie nr 1 tego zasobu zostanie zmodyfikowany) -DeStockOnValidateOrder=Spadek realnych zasobów zamówień notatek (uwaga, w tej wersji, to tylko w magazynie nr 1 tego zasobu zostanie zmodyfikowany) +DeStockOnBill=Spadek realnych zasobów faktur / not kredytowych +DeStockOnValidateOrder=Spadek realnych zasobów zamówień notatek DeStockOnShipment=Spadek realnych zasobów wysyłką (zaleciły) ReStockOnBill=Wzrost realnego zasobów faktur / not kredytowych (uwaga, w tej wersji, to tylko w magazynie nr 1 tego zasobu zostanie zmodyfikowany) ReStockOnValidateOrder=Wzrost realnego zasobów zamówień notatek (uwaga, w tej wersji, to tylko w magazynie nr 1 tego zasobu zostanie zmodyfikowany) diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index e32ddd020bf..4310897f3d5 100644 --- a/htdocs/langs/pt_BR/stocks.lang +++ b/htdocs/langs/pt_BR/stocks.lang @@ -43,8 +43,8 @@ QtyDispatched=Quantidade desagregada OrderDispatch=Recepção de estoques RuleForStockManagementDecrease=Regra de Administração de decrementos de estoque RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque -DeStockOnBill=Decrementar os estoques físicos sobre as faturas/recibos (Atenção, nesta Versão, todavía realiza-se o ajuste sobre o armazém número 1) -DeStockOnValidateOrder=Decrementar os estoques físicos sobre os pedidos (Atenção, nesta Versão, todavía realiza-se o ajuste sobre o armazém número 1) +DeStockOnBill=Decrementar os estoques físicos sobre as faturas/recibos +DeStockOnValidateOrder=Decrementar os estoques físicos sobre os pedidos DeStockOnShipment=Decrementar os estoques físicos sobre os envios (recomendado) ReStockOnBill=Incrementar os estoques físicos sobre as faturas/recibos (Atenção, nesta Versão, todavía realiza-se o ajuste sobre o armazém número 1) ReStockOnValidateOrder=Incrementar os estoques físicos sobre os pedidos (Atenção, nesta Versão, todavía se realiza o ajuste sobre o armazém número 1) diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang index 47bae772efb..57184a02b54 100644 --- a/htdocs/langs/pt_PT/stocks.lang +++ b/htdocs/langs/pt_PT/stocks.lang @@ -43,8 +43,8 @@ QtyDispatched=Quantidade desagregada OrderDispatch=Recepção de stocks RuleForStockManagementDecrease=Regra de Gestão de decrementos de stock RuleForStockManagementIncrease=Regra de Gestão de incrementos de stock -DeStockOnBill=Decrementar os stocks físicos sobre as facturas/recibos (Atenção, em esta Versão, todavía realiza-se o ajuste sobre o armazem número 1) -DeStockOnValidateOrder=Decrementar os stocks físicos sobre os pedidos (Atenção, em esta Versão, todavía realiza-se o ajuste sobre o armazem número 1) +DeStockOnBill=Decrementar os stocks físicos sobre as facturas/recibos +DeStockOnValidateOrder=Decrementar os stocks físicos sobre os pedidos DeStockOnShipment=Decrementar os stocks físicos sobre os envíos (recomendado) ReStockOnBill=Incrementar os stocks físicos sobre as facturas/recibos (Atenção, em esta Versão, todavía realiza-se o ajuste sobre o armazem número 1) ReStockOnValidateOrder=Incrementar os stocks físicos sobre os pedidos (Atenção, em esta Versão, todavía se realiza o ajuste sobre o armazem número 1) diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index 896964abf1b..6e60df216ea 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -51,8 +51,8 @@ QtyDispatched=Cantitate expediate OrderDispatch=Ordinul de expediţie RuleForStockManagementDecrease=Norma de management al stocurilor scădere RuleForStockManagementIncrease=Norma de management al stocurilor creştere -DeStockOnBill=Reducerea real stocurile de pe facturi / note de credit (avertisment, în această versiune, este doar în depozit numărul 1, care stocul este modificat) -DeStockOnValidateOrder=Reducerea real stocurile de pe ordinele de note (avertisment, în această versiune, este doar în depozit numărul 1, care stocul este modificat) +DeStockOnBill=Reducerea real stocurile de pe facturi / note de credit +DeStockOnValidateOrder=Reducerea real stocurile de pe ordinele de note ReStockOnBill=Creşterea reală stocurile de pe facturi / note de credit (avertisment, în această versiune, este doar în depozit numărul 1, care stocul este modificat) ReStockOnValidateOrder=Creşterea reală stocurile de pe ordinele de note (avertisment, în această versiune, este doar în depozit numărul 1, care stocul este modificat) StockLimitShort=Limita de diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang index 9811a0ecb72..0a0a3cbe4a0 100644 --- a/htdocs/langs/ru_RU/stocks.lang +++ b/htdocs/langs/ru_RU/stocks.lang @@ -51,8 +51,8 @@ QtyDispatched=Количество направил OrderDispatch=Приказ диспетчерского RuleForStockManagementDecrease=Правило для управления запасами сокращение RuleForStockManagementIncrease=Правило для управления запасами увеличить -DeStockOnBill=Снижение реальных запасов на счета / кредитных нот (предупреждение, в этой версии, это только на склад № 1, что запас изменяется) -DeStockOnValidateOrder=Снижение реальных запасов по заказам записки (предупреждение, в этой версии, это только на склад № 1, что запас изменяется) +DeStockOnBill=Снижение реальных запасов на счета / кредитных нот +DeStockOnValidateOrder=Снижение реальных запасов по заказам записки ReStockOnBill=Увеличение реальных запасов на счета / кредитных нот (предупреждение, в этой версии, это только на склад № 1, что запас изменяется) ReStockOnValidateOrder=Увеличение реальных запасов по заказам записки (предупреждение, в этой версии, это только на склад № 1, что запас изменяется) StockDiffPhysicTeoric=Причина разницы запас физических и теоретических diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang index 310c178f57e..4370fbb6ac8 100644 --- a/htdocs/langs/sl_SI/stocks.lang +++ b/htdocs/langs/sl_SI/stocks.lang @@ -44,8 +44,8 @@ QtyDispatched=Prejeta količina OrderDispatch=Dobavljena naročila RuleForStockManagementDecrease=Pravilo za upravljanje zmanjšanja zalog RuleForStockManagementIncrease= Pravilo za upravljanje povečanja zalog -DeStockOnBill=Zmanjšanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1) -DeStockOnValidateOrder=Zmanjšanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1) +DeStockOnBill=Zmanjšanje dejanske zaloge po potrditvi fakture/dobropisa +DeStockOnValidateOrder=Zmanjšanje dejanske zaloge po potrditvi naročila DeStockOnShipment= Zmanjšanje dejanske zaloge po potrditvi odpreme (priporočeno) ReStockOnBill=Povečanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1) ReStockOnValidateOrder=Povečanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1) diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang index 5ce3d5a10aa..821eb8bfb33 100644 --- a/htdocs/langs/sv_SE/stocks.lang +++ b/htdocs/langs/sv_SE/stocks.lang @@ -52,8 +52,8 @@ QtyDispatched=Kvantitet sänds OrderDispatch=Stock avsändning RuleForStockManagementDecrease=Regel för lagerhantering minska RuleForStockManagementIncrease=Regel för lagerhantering öka -DeStockOnBill=Minska riktiga lager kunder fakturor / kreditnotor validering (varning, i denna version, det är bara i lager nummer 1 att materielen är modifierad) -DeStockOnValidateOrder=Minska riktiga lager på kunder order validering (varning, i denna version, det är bara i lager nummer 1 att materielen är modifierad) +DeStockOnBill=Minska riktiga lager kunder fakturor / kreditnotor validering +DeStockOnValidateOrder=Minska riktiga lager på kunder order validering DeStockOnShipment=Minska riktiga lager på transporten validering ReStockOnBill=Reell ökning av lager på leverantörer fakturor / kreditnotor validering (varning, i denna version, det är bara i lager nummer 1 att materielen är modifierad) ReStockOnValidateOrder=Reell ökning av lagren av leverantörer order gillande (varning, i denna version, det är bara i lager nummer 1 att materielen är modifierad) diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang index 762fdb32538..3cc7e95d414 100644 --- a/htdocs/langs/tr_TR/stocks.lang +++ b/htdocs/langs/tr_TR/stocks.lang @@ -51,8 +51,8 @@ QtyDispatched=Miktar gönderdi OrderDispatch=Stok sevketme RuleForStockManagementDecrease=Stok yönetimi azaltmak için Kural RuleForStockManagementIncrease=Stok yönetimi artış Kural -DeStockOnBill=Faturaların gerçek stokları azaltın / kredi notları doğrulama (uyarı, bu sürümde, bu hisse senedi olarak bir depo sayısı 1 sadece) -DeStockOnValidateOrder=Emir notları doğrulama (uyarısı, bu sürüm gerçek stokları azaltın, bu hisse senedi olarak bir depo sayısı 1 sadece) +DeStockOnBill=Faturaların gerçek stokları azaltın / kredi notları doğrulama +DeStockOnValidateOrder=Emir notları doğrulama DeStockOnShipment=Gönderi doğrulama gerçek stokları azaltın (önerilir) ReStockOnBill=Faturaların gerçek hisse arttır / kredi notları doğrulama (uyarı, bu sürümde, bu hisse senedi olarak bir depo sayısı 1 sadece) ReStockOnValidateOrder=Emir notları doğrulama (uyarısı, bu sürüm gerçek stokları artış, bu hisse senedi olarak bir depo sayısı 1 sadece) diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang index fda097b0de2..1ef5f628968 100644 --- a/htdocs/langs/zh_CN/stocks.lang +++ b/htdocs/langs/zh_CN/stocks.lang @@ -51,8 +51,8 @@ QtyDispatched=派出数量 OrderDispatch=联合调度 RuleForStockManagementDecrease=为减少库存管理规则 RuleForStockManagementIncrease=增加的库存管理规则 -DeStockOnBill=减少对客户的实际库存发票/信用票据验证(警告在此版本,它只有在仓库数1,股票被修改) -DeStockOnValidateOrder=减少对客户的订单确认(警告在此版本中,真正的股票,它只有在仓库数1,股票被修改) +DeStockOnBill=减少对客户的实际库存发票/信用票据验证 +DeStockOnValidateOrder=减少对客户的订单确认 DeStockOnShipment=减少对实际装运验证股票(推荐) ReStockOnBill=增加对供应商发票的实际库存/信用票据验证(警告在此版本中,它只有在仓库数1,股票被修改) ReStockOnValidateOrder=对供应商的订单增加赞许(警告在此版本中,真正的股票,它只有在仓库数1,股票被修改)
'.$formquestion['text'].'