diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 007c0eadf9e..babbfa8ad32 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -161,21 +161,6 @@ if ($action == 'setdefaultduration') } } -if ($action == 'setclassifiedinvoiced') -{ - $res = dolibarr_set_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER",$value,'chaine',0,'',$conf->entity); - if (! $res > 0) $error++; - - if (! $error) - { - $mesg = "".$langs->trans("SetupSaved").""; - } - else - { - $mesg = "".$langs->trans("Error").""; - } -} - /*if ($action == 'setusecustomercontactasrecipient') { dolibarr_set_const($db, "PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["value"],'chaine',0,'',$conf->entity); @@ -545,22 +530,6 @@ print "\n"; print ''; */ -if ($conf->commande->enabled) -{ - $var=!$var; - print "
"; - print ''; - print ""; - print ""; - print ''.$langs->trans("ClassifiedInvoicedWithOrder").''; - print ''; - print $form->selectyesno('value',$conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER,1); - print ""; - print ''; - print ''; - print '
'; -} - $var=! $var; print '
'; print ''; diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php index 2e6f9e93733..590ab54c754 100755 --- a/htdocs/admin/workflow.php +++ b/htdocs/admin/workflow.php @@ -78,6 +78,9 @@ clearstatcache(); $workflowcodes=array(); $workflow=array( + 'propal' => array( + 'order' => array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL') + ), 'order' => array( 'propal' => array('WORKFLOW_PROPAL_AUTOCREATE_ORDER') ), diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 27380f62207..380501940d1 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2067,32 +2067,46 @@ class Commande extends CommonObject */ function classifyBilled() { - global $conf; + global $conf, $user, $langs; + + $this->db->begin(); $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1'; - $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;'; + $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > 0'; + + dol_syslog(get_class($this)."::classifyBilled sql=".$sql, LOG_DEBUG); if ($this->db->query($sql)) { - if (! empty($conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER)) - { - $this->fetchObjectLinked('','propal',$this->id,$this->element); - if (! empty($this->linkedObjects)) - { - foreach($this->linkedObjects['propal'] as $element) - { - $element->classifyBilled(); - } - } + // Appel des triggers + include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php"); + $interface=new Interfaces($this->db); + $result=$interface->run_triggers('ORDER_CLASSIFY_BILLED',$this,$user,$langs,$conf); + if ($result < 0) { + $error++; $this->errors=$interface->errors; } + // Fin appel triggers - $this->facturee=1; // deprecated - $this->billed=1; + if (! $error) + { + $this->facturee=1; // deprecated + $this->billed=1; - return 1; + $this->db->commit(); + return 1; + } + else + { + $this->error=$this->db->error(); + dol_syslog(get_class($this)."::classifyBilled ".$this->error, LOG_ERR); + $this->db->rollback(); + return -2; + } } else { - dol_print_error($this->db); + $this->error=$this->db->error(); + dol_syslog(get_class($this)."::classifyBilled Error ".$this->error, LOG_ERR); + $this->db->rollback(); return -1; } } diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php index 3c914faf0e1..757004dc378 100755 --- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php +++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php @@ -130,6 +130,24 @@ class InterfaceWorkflowManager } } + // Order classify billed proposal + if ($action == 'ORDER_CLASSIFY_BILLED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + if (! empty($conf->propal->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL)) + { + $object->fetchObjectLinked('','propal',$object->id,$object->element); + if (! empty($object->linkedObjects)) + { + foreach($object->linkedObjects['propal'] as $element) + { + $ret=$element->classifyBilled(); + } + } + return $ret; + } + } + return 0; } diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index 99b52ce3684..19143edb64a 100755 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -236,6 +236,10 @@ class InterfaceDemo { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); } + elseif ($action == 'ORDER_CLASSIFY_BILLED') + { + dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); + } elseif ($action == 'LINEORDER_INSERT') { dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index e236c8f6ed4..9f608e1e5e7 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -757,7 +757,6 @@ PathDirectory=دليل ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم ProposalsPDFModules=اقتراح نماذج الوثائق التجارية ClassifiedInvoiced=صنف في الفاتورة -ClassifiedInvoicedWithOrder=تصنيف فواتير الاقتراح في الوقت الذي أمر HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة AddShippingDateAbility=إضافة قدرة الشحن والتاريخ AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 36bd248dc94..1997179231a 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -961,7 +961,6 @@ PathDirectory=Catàleg ProposalsNumberingModules=Mòduls de numeració de pressupostos ProposalsPDFModules=Models de documents de pressupostos ClassifiedInvoiced=Classificar facturat -ClassifiedInvoicedWithOrder=Classificar com facturat el pressupost al mateix temps que la comanda HideTreadedPropal=Amaga els pressupostos processats del llistat AddShippingDateAbility=Possibilitat de determinar una data de lliurament AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 46df5eca012..5cc78443296 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -680,7 +680,6 @@ PathDirectory=Directory ProposalsNumberingModules=Kommercielle forslag nummerressourcer moduler ProposalsPDFModules=Kommercielle forslag dokumenter modeller ClassifiedInvoiced=Klassificerede faktureret -ClassifiedInvoicedWithOrder=Klassificere faktureret forslag på samme tid som den rækkefølge HideTreadedPropal=Skjul det behandlede kommercielle forslag på listen AddShippingDateAbility=Tilføj shipping dato evne AddDeliveryAddressAbility=Tilføj leveringsdato evne diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index c3e5bd89519..897fec1ff95 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -673,7 +673,6 @@ PathDirectory=Verzeichnispfad ProposalsNumberingModules=Angebotsnumerierungs-Module ProposalsPDFModules=PDF-Anbebotsmodule ClassifiedInvoiced=Als verrechnet markieren -ClassifiedInvoicedWithOrder=Als zum Zeitpunkt der Bestellung verrechnet markieren HideTreadedPropal=Ausblenden der behandelten Angebote in der Liste AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 284462c4fc8..c32fa50f4a1 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -952,7 +952,6 @@ NumberOfProductLines=Anzahl der Produktlinien ProposalsNumberingModules=Angebotsnumerierungs-Module ProposalsPDFModules=PDF-Anbebotsmodule ClassifiedInvoiced=Als verrechnet markieren -ClassifiedInvoicedWithOrder=Als zum Zeitpunkt der Bestellung verrechnet markieren HideTreadedPropal=Ausblenden der behandelten Angebote in der Liste AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 058fcb739de..78de6ed62c2 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -750,7 +750,6 @@ PathDirectory=Directory ProposalsNumberingModules=Commercial proposal numbering modules ProposalsPDFModules=Commercial proposal documents models ClassifiedInvoiced=Classified invoiced -ClassifiedInvoicedWithOrder=Classify invoiced proposal at the same time as the order HideTreadedPropal=Hide the treated commercial proposals in the list AddShippingDateAbility=Add shipping date ability AddDeliveryAddressAbility=Add delivery date ability diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang index 19d248ef427..38193f2dfb4 100644 --- a/htdocs/langs/en_IN/admin.lang +++ b/htdocs/langs/en_IN/admin.lang @@ -14,7 +14,6 @@ WebCalAddEventOnStatusPropal=Add calendar event on quotations status change PropalSetup=Quotations module setup ProposalsNumberingModules=Quotations numbering modules ProposalsPDFModules=Quotations documents models -ClassifiedInvoicedWithOrder=Classify invoiced quotations at the same time as the order HideTreadedPropal=Hide the treated quotations in the list FreeLegalTextOnProposal=Free text on quotations WatermarkOnDraftProposal=Watermark on draft quotations (any if empty) \ No newline at end of file diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c85a3125765..ba11a2464df 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -952,7 +952,6 @@ NumberOfProductLines=Number of product lines ProposalsNumberingModules=Commercial proposal numbering modules ProposalsPDFModules=Commercial proposal documents models ClassifiedInvoiced=Classified invoiced -ClassifiedInvoicedWithOrder=Classify invoiced proposal at the same time as the order HideTreadedPropal=Hide the treated commercial proposals in the list AddShippingDateAbility=Add shipping date ability AddDeliveryAddressAbility=Add delivery date ability diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang index bfdef03df19..b07b1018819 100644 --- a/htdocs/langs/en_US/workflow.lang +++ b/htdocs/langs/en_US/workflow.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - fr_FR - admin +# Dolibarr language file - en_US - admin CHARSET= UTF-8 WorkflowSetup=Workflow module setup WorkflowDesc=This module is desinged to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in. @@ -6,4 +6,5 @@ ThereIsNoWorkflowToModify=There is no workflow you can modify for module you hav descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated -descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed \ No newline at end of file +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify billed the original proposal along with a customer order \ No newline at end of file diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 6558c66b19e..4700ccbae84 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -959,7 +959,6 @@ NumberOfProductLines=Numero de líneas de productos ProposalsNumberingModules=Módulos de numeración de presupuestos ProposalsPDFModules=Modelos de documentos de presupuestos ClassifiedInvoiced=Clasificar facturado -ClassifiedInvoicedWithOrder=Clasificar como facturado el presupuesto al mismo tiempo que el pedido HideTreadedPropal=Ocultar los presupuestos procesados del listado AddShippingDateAbility=Posibilidad de determinar una fecha de entrega AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 80dabb0ac2a..034456ea9c5 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -939,7 +939,6 @@ NumberOfProductLines=Number tootesarjade ProposalsNumberingModules=Commercial ettepaneku numeratsiooni moodulid ProposalsPDFModules=Commercial ettepaneku dokumentide mudelid ClassifiedInvoiced=Klassifitseeritud arve -ClassifiedInvoicedWithOrder=Liigitada arve ettepaneku samal ajal, et HideTreadedPropal=Peida saanud kaubanduslik ettepanekute nimekirja AddShippingDateAbility=Lisa tarneaeg võime AddDeliveryAddressAbility=Lisa tarnekuupäev võime diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index c8595b83743..e6c8c95e049 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -768,7 +768,6 @@ PathDirectory=دليل ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم ProposalsPDFModules=اقتراح نماذج الوثائق التجارية ClassifiedInvoiced=صنف في الفاتورة -ClassifiedInvoicedWithOrder=تصنيف فواتير الاقتراح في الوقت الذي أمر HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة AddShippingDateAbility=إضافة قدرة الشحن والتاريخ AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 2051799324d..7a824f532bd 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -676,7 +676,6 @@ PathDirectory=Directory ProposalsNumberingModules=Kaupalliset ehdotus numerointiin modules ProposalsPDFModules=Kaupalliset ehdotus asiakirjojen malleja ClassifiedInvoiced=Turvaluokitellut laskutetaan -ClassifiedInvoicedWithOrder=Luokittele laskutetaan ehdotuksen yhtä aikaa, jotta HideTreadedPropal=Piilota käsitelty kaupallisten ehdotuksia luetteloon AddShippingDateAbility=Lisää meriliikenneyhtiön päivämäärä kyky AddDeliveryAddressAbility=Lisää toimituspäivää kyky diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 772007772cf..68f761c4daf 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -959,7 +959,6 @@ NumberOfProductLines= Nombre de lignes produits ProposalsNumberingModules= Modèles de numérotation des propositions commerciales ProposalsPDFModules= Modèles de documents de propositions commerciales ClassifiedInvoiced= Classer facturée -ClassifiedInvoicedWithOrder= Classer la propale facturée en même temps que la commande HideTreadedPropal= Cacher les propositions commerciales traitées de la liste AddShippingDateAbility= Possibilité de déterminer une date de livraison AddDeliveryAddressAbility= Possibilité de sélectionner une adresse de livraison diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang index 06f59ea9e02..ca1546d6789 100644 --- a/htdocs/langs/fr_FR/workflow.lang +++ b/htdocs/langs/fr_FR/workflow.lang @@ -6,4 +6,5 @@ ThereIsNoWorkflowToModify=Il n'y a pas de flux workflow modifiable pour les modu descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Créer une commande client automatiquement à la signature d'une proposition commerciale descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la signature d'une proposition commerciale descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la validation d'un contrat -descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la cloture d'une commande client \ No newline at end of file +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la cloture d'une commande client +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer facturée la proposition commerciale d'origine en même temps que la commande \ No newline at end of file diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index f9384c72a57..defcc81e3ae 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -941,7 +941,6 @@ NumberOfProductLines=מספר קווי מוצרים ProposalsNumberingModules=הצעה מסחרית המונה מודולים ProposalsPDFModules=מסמכי ההצעה מודלים מסחריים ClassifiedInvoiced=סיווג החשבונית -ClassifiedInvoicedWithOrder=לסווג את ההצעה החשבונית באותו זמן שהצו HideTreadedPropal=הסתר את ההצעות המסחריות שטופלו ברשימה AddShippingDateAbility=הוסף תאריך היכולת משלוח AddDeliveryAddressAbility=הוסף תאריך יכולת המסירה diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 42ed69eaf15..395afe551bd 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -939,7 +939,6 @@ NumberOfProductLines=A termék vonalak száma ProposalsNumberingModules=Üzleti ajánlat számozási modulok ProposalsPDFModules=Üzleti ajánlat dokumentumok modellek ClassifiedInvoiced=Minősített számlázott -ClassifiedInvoicedWithOrder=Osztályozza számlázott javaslat időben, mint a megrendelés HideTreadedPropal=Elrejtése a kezelt üzleti ajánlatot a listán AddShippingDateAbility=Add szállítási határidő képessége AddDeliveryAddressAbility=Add szállítási határidő képessége diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 240cddea555..11a02026bce 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -839,7 +839,6 @@ PathDirectory=Listinn ProposalsNumberingModules=Auglýsing tillögu tala mát ProposalsPDFModules=Auglýsing tillögu skjöl módel ClassifiedInvoiced=Flokkast innheimt -ClassifiedInvoicedWithOrder=Flokka innheimt tillögu á sama tíma og röð HideTreadedPropal=Fela fengu auglýsing tillögur í skránni AddShippingDateAbility=Bæta við skipum dagsetningu getu AddDeliveryAddressAbility=Bæta við fæðingardag getu diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index b9d23af4965..5156be2975f 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -89,7 +89,6 @@ CashDeskSetup =Impostazioni modulo punto vendita CashDeskThirdPartyForSell =Terzo generico da utilizzare per le vendite ChooseABarCode =Nessun generatore definito ClassifiedInvoiced =Classifica fatturate -ClassifiedInvoicedWithOrder =Classifica proposte fatturate all'ordine ##### ClickToDial ##### ClickToDialDesc =Questo modulo aggiunge una icona accanto ai numeri telefonici dei contatti in Dolibarr.
Cliccando sull'icona si attiva il collegamento al server che effettuerà le chiamate telefoniche. ClickToDialSetup =Impostazioni modulo ClickToDial (telefonate con un clic) diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index c212696f1eb..18d642dbbc5 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -939,7 +939,6 @@ NumberOfProductLines=製品ラインの数 ProposalsNumberingModules=商業的な提案番号モジュール ProposalsPDFModules=商業的な提案文書のモデル ClassifiedInvoiced=請求分類 -ClassifiedInvoicedWithOrder=オーダーと同時に請求書の提案を分類する HideTreadedPropal=リスト内で処理された商用の提案を隠す AddShippingDateAbility=発送日の能力を追加します。 AddDeliveryAddressAbility=配達日の能力を追加します。 diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index f34388acd55..24389a0c05c 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -682,7 +682,6 @@ PathDirectory=Mappe ProposalsNumberingModules=Nummereringsmodul for tilbud ProposalsPDFModules=Tilbudsmaler ClassifiedInvoiced=Klassifiser fakturert -ClassifiedInvoicedWithOrder=Klassifsiser tilbudet fakturert samtidig som ordren HideTreadedPropal=Skjul behandlede tilbud i listen AddShippingDateAbility=Legg til felt for forsendelsesdato AddDeliveryAddressAbility=Legg til felt for leveringsdato diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index 88b9397c80e..a11cccc6a5f 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -673,7 +673,6 @@ PathDirectory=Bedrijvengids ProposalsNumberingModules=Nummering van commerciële voorstellen ProposalsPDFModules=Model commerciële voorstellen ClassifiedInvoiced=Gerubriceerde gefactureerd -ClassifiedInvoicedWithOrder=Classifiseer het gefactureerd voorstel op hetzelfde tijdstip als de bestelling HideTreadedPropal=Verberg de behandelde commerciële voorstellen in de lijst AddShippingDateAbility=Toevoegen verzendkosten datum vermogen AddDeliveryAddressAbility=Toevoegen leveringsdatum vermogen diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index d157a0e1387..df16b9aef0d 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -894,7 +894,6 @@ PathDirectory = Map ProposalsNumberingModules = Offertenummeringmodules ProposalsPDFModules = Offertedocumentsjablonen ClassifiedInvoiced = Geclassificeerde factuur -ClassifiedInvoicedWithOrder = Classificeer gefactureerde offerte tegelijk met de opdracht HideTreadedPropal = Verberg de behandelde offertes in de lijst AddShippingDateAbility = Voeg mogelijke verzenddatum toe AddDeliveryAddressAbility = Voeg mogelijke leverdatum toe diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 41ef260cf4e..c51a5e9d3b5 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -680,7 +680,6 @@ PathDirectory=Katalog ProposalsNumberingModules=Commercial wniosku numeracji modules ProposalsPDFModules=Commercial wniosku dokumenty modeli ClassifiedInvoiced=Sklasyfikowany zafakturowana -ClassifiedInvoicedWithOrder=Klasyfikacja zafakturowana wniosku w tym samym czasie, zamówienia HideTreadedPropal=Ukryj leczonych propozycji w wykazie AddShippingDateAbility=Dodaj datę wysyłki zdolność AddDeliveryAddressAbility=Dodaj datę dostawy zdolność diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 1cfd2654a38..a1041584113 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -756,7 +756,6 @@ PathDirectory=Catálogo ProposalsNumberingModules=Módulos de numeração de Orçamentos ProposalsPDFModules=Modelos de documentos de Orçamentos ClassifiedInvoiced=Classificar faturado -ClassifiedInvoicedWithOrder=Classificar como faturado o orçamento ao mesmo tempo que o pedido HideTreadedPropal=Ocultar os Orçamentos processados do listado AddShippingDateAbility=possibilidade de determinar uma data de entregas AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 822adbcc869..d1111b594d1 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -734,7 +734,6 @@ PathDirectory=Catálogo ProposalsNumberingModules=Módulos de numeração de Orçamentos ProposalsPDFModules=Modelos de documentos de Orçamentos ClassifiedInvoiced=Clasificar facturado -ClassifiedInvoicedWithOrder=Clasificar como facturado o orçamento à mismo tiempo que o pedido HideTreadedPropal=Ocultar os Orçamentos procesados do listado AddShippingDateAbility=possibilidade de determinar uma data de entregas AddDeliveryAddressAbility=possibilidade de seleccionar uma direcção de envío diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 7b0708f5edb..ada2dba8cf7 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -679,7 +679,6 @@ PathDirectory=Directory ProposalsNumberingModules=Comerciale propunerea de numerotare module ProposalsPDFModules=Comerciale propunerea modele de documente ClassifiedInvoiced=Clasificate facturate -ClassifiedInvoicedWithOrder=Clasifica facturate propunerea, în acelaşi timp, pentru ca HideTreadedPropal=Ascunde tratate comerciale propuneri în lista AddShippingDateAbility=Adauga data de capacitatea de transport maritim AddDeliveryAddressAbility=Adauga data de capacitatea de livrare diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index bc274b6eb20..7d45498bf78 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -678,7 +678,6 @@ PathDirectory=Каталог ProposalsNumberingModules=Коммерческие предложения нумерации модулей ProposalsPDFModules=Коммерческие предложения документы моделей ClassifiedInvoiced=Доска счета -ClassifiedInvoicedWithOrder=Классификация счетов предложения и в то же время порядка HideTreadedPropal=Скрыть рассматриваются коммерческие предложения в списке AddShippingDateAbility=Добавить судоходства дата способность AddDeliveryAddressAbility=Добавить дату доставки способность diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 376339e0857..ffe0f3de113 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -920,7 +920,6 @@ PathDirectory = Mapa ProposalsNumberingModules = Moduli za številčenje komercialnih ponudb ProposalsPDFModules = Modeli obrazcev komercialnih ponudb ClassifiedInvoiced = Označi kot zaračunano -ClassifiedInvoicedWithOrder = Označi zaračunano ponudbo obenem kot naročilo HideTreadedPropal = Skrij obravnavano komercialno ponudbo na seznamu AddShippingDateAbility = Dodaj možen datum pošiljanja AddDeliveryAddressAbility = Dodaj možen datum dobave diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 8ac490864cb..f19aa78c358 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -845,7 +845,6 @@ PathDirectory=Directory ProposalsNumberingModules=Kommersiella förslag numrering moduler ProposalsPDFModules=Kommersiella förslag dokument modeller ClassifiedInvoiced=Sekretessbelagda fakturerade -ClassifiedInvoicedWithOrder=Klassificera faktureras förslag samtidigt som beslutet HideTreadedPropal=Dölj de behandlade kommersiella förslagen i listan AddShippingDateAbility=Lägg leveransdatum förmåga AddDeliveryAddressAbility=Lägg förmåga leveranstid diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index d723cbe7fa6..d728504f781 100755 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -821,7 +821,6 @@ PathDirectory=Dizin ProposalsNumberingModules=Ticari teklif numaralandırma modülü ProposalsPDFModules=Ticari teklif belge modelleri ClassifiedInvoiced=Sınıflandırılmış faturalar -ClassifiedInvoicedWithOrder=Faturalanmış teklif aynı anda sıraya göre HideTreadedPropal=İşlenmiş ticari teklifleri Listede gizle AddShippingDateAbility=Nakliye tarih yeteneği ekle AddDeliveryAddressAbility=Teslim tarihi yeteneği ekle diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index e9fa29bf681..860e994b222 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -836,7 +836,6 @@ PathDirectory=目录 ProposalsNumberingModules=商业建议编号模块 ProposalsPDFModules=商业模式的建议文件 ClassifiedInvoiced=发票分类 -ClassifiedInvoicedWithOrder=发票分类在同一时间为顺序的建议 HideTreadedPropal=隐藏在对待商业的建议名单 AddShippingDateAbility=添加出货日期的能力 AddDeliveryAddressAbility=添加交付日期的能力