Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
9c5e98aad7
@ -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 = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*if ($action == 'setusecustomercontactasrecipient')
|
/*if ($action == 'setusecustomercontactasrecipient')
|
||||||
{
|
{
|
||||||
dolibarr_set_const($db, "PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["value"],'chaine',0,'',$conf->entity);
|
dolibarr_set_const($db, "PROPALE_USE_CUSTOMER_CONTACT_AS_RECIPIENT",$_POST["value"],'chaine',0,'',$conf->entity);
|
||||||
@ -545,22 +530,6 @@ print "</td></tr>\n";
|
|||||||
print '</form>';
|
print '</form>';
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ($conf->commande->enabled)
|
|
||||||
{
|
|
||||||
$var=!$var;
|
|
||||||
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
|
|
||||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
|
||||||
print "<input type=\"hidden\" name=\"action\" value=\"setclassifiedinvoiced\">";
|
|
||||||
print "<tr ".$bc[$var].">";
|
|
||||||
print '<td>'.$langs->trans("ClassifiedInvoicedWithOrder").'</td>';
|
|
||||||
print '<td width="60" align="center">';
|
|
||||||
print $form->selectyesno('value',$conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER,1);
|
|
||||||
print "</td>";
|
|
||||||
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
|
|
||||||
print '</tr>';
|
|
||||||
print '</form>';
|
|
||||||
}
|
|
||||||
|
|
||||||
$var=! $var;
|
$var=! $var;
|
||||||
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
|
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
|
||||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||||
|
|||||||
@ -78,6 +78,9 @@ clearstatcache();
|
|||||||
|
|
||||||
$workflowcodes=array();
|
$workflowcodes=array();
|
||||||
$workflow=array(
|
$workflow=array(
|
||||||
|
'propal' => array(
|
||||||
|
'order' => array('WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL')
|
||||||
|
),
|
||||||
'order' => array(
|
'order' => array(
|
||||||
'propal' => array('WORKFLOW_PROPAL_AUTOCREATE_ORDER')
|
'propal' => array('WORKFLOW_PROPAL_AUTOCREATE_ORDER')
|
||||||
),
|
),
|
||||||
|
|||||||
@ -2067,32 +2067,46 @@ class Commande extends CommonObject
|
|||||||
*/
|
*/
|
||||||
function classifyBilled()
|
function classifyBilled()
|
||||||
{
|
{
|
||||||
global $conf;
|
global $conf, $user, $langs;
|
||||||
|
|
||||||
|
$this->db->begin();
|
||||||
|
|
||||||
$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1';
|
$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 ($this->db->query($sql))
|
||||||
{
|
{
|
||||||
if (! empty($conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER))
|
// Appel des triggers
|
||||||
{
|
include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
|
||||||
$this->fetchObjectLinked('','propal',$this->id,$this->element);
|
$interface=new Interfaces($this->db);
|
||||||
if (! empty($this->linkedObjects))
|
$result=$interface->run_triggers('ORDER_CLASSIFY_BILLED',$this,$user,$langs,$conf);
|
||||||
{
|
if ($result < 0) {
|
||||||
foreach($this->linkedObjects['propal'] as $element)
|
$error++; $this->errors=$interface->errors;
|
||||||
{
|
|
||||||
$element->classifyBilled();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// Fin appel triggers
|
||||||
|
|
||||||
$this->facturee=1; // deprecated
|
if (! $error)
|
||||||
$this->billed=1;
|
{
|
||||||
|
$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
|
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;
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -236,6 +236,10 @@ class InterfaceDemo
|
|||||||
{
|
{
|
||||||
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
|
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')
|
elseif ($action == 'LINEORDER_INSERT')
|
||||||
{
|
{
|
||||||
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
|
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
|
||||||
|
|||||||
@ -757,7 +757,6 @@ PathDirectory=دليل
|
|||||||
ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
|
ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
|
||||||
ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
|
ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
|
||||||
ClassifiedInvoiced=صنف في الفاتورة
|
ClassifiedInvoiced=صنف في الفاتورة
|
||||||
ClassifiedInvoicedWithOrder=تصنيف فواتير الاقتراح في الوقت الذي أمر
|
|
||||||
HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة
|
HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة
|
||||||
AddShippingDateAbility=إضافة قدرة الشحن والتاريخ
|
AddShippingDateAbility=إضافة قدرة الشحن والتاريخ
|
||||||
AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
|
AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
|
||||||
|
|||||||
@ -961,7 +961,6 @@ PathDirectory=Catàleg
|
|||||||
ProposalsNumberingModules=Mòduls de numeració de pressupostos
|
ProposalsNumberingModules=Mòduls de numeració de pressupostos
|
||||||
ProposalsPDFModules=Models de documents de pressupostos
|
ProposalsPDFModules=Models de documents de pressupostos
|
||||||
ClassifiedInvoiced=Classificar facturat
|
ClassifiedInvoiced=Classificar facturat
|
||||||
ClassifiedInvoicedWithOrder=Classificar com facturat el pressupost al mateix temps que la comanda
|
|
||||||
HideTreadedPropal=Amaga els pressupostos processats del llistat
|
HideTreadedPropal=Amaga els pressupostos processats del llistat
|
||||||
AddShippingDateAbility=Possibilitat de determinar una data de lliurament
|
AddShippingDateAbility=Possibilitat de determinar una data de lliurament
|
||||||
AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament
|
AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament
|
||||||
|
|||||||
@ -680,7 +680,6 @@ PathDirectory=Directory
|
|||||||
ProposalsNumberingModules=Kommercielle forslag nummerressourcer moduler
|
ProposalsNumberingModules=Kommercielle forslag nummerressourcer moduler
|
||||||
ProposalsPDFModules=Kommercielle forslag dokumenter modeller
|
ProposalsPDFModules=Kommercielle forslag dokumenter modeller
|
||||||
ClassifiedInvoiced=Klassificerede faktureret
|
ClassifiedInvoiced=Klassificerede faktureret
|
||||||
ClassifiedInvoicedWithOrder=Klassificere faktureret forslag på samme tid som den rækkefølge
|
|
||||||
HideTreadedPropal=Skjul det behandlede kommercielle forslag på listen
|
HideTreadedPropal=Skjul det behandlede kommercielle forslag på listen
|
||||||
AddShippingDateAbility=Tilføj shipping dato evne
|
AddShippingDateAbility=Tilføj shipping dato evne
|
||||||
AddDeliveryAddressAbility=Tilføj leveringsdato evne
|
AddDeliveryAddressAbility=Tilføj leveringsdato evne
|
||||||
|
|||||||
@ -673,7 +673,6 @@ PathDirectory=Verzeichnispfad
|
|||||||
ProposalsNumberingModules=Angebotsnumerierungs-Module
|
ProposalsNumberingModules=Angebotsnumerierungs-Module
|
||||||
ProposalsPDFModules=PDF-Anbebotsmodule
|
ProposalsPDFModules=PDF-Anbebotsmodule
|
||||||
ClassifiedInvoiced=Als verrechnet markieren
|
ClassifiedInvoiced=Als verrechnet markieren
|
||||||
ClassifiedInvoicedWithOrder=Als zum Zeitpunkt der Bestellung verrechnet markieren
|
|
||||||
HideTreadedPropal=Ausblenden der behandelten Angebote in der Liste
|
HideTreadedPropal=Ausblenden der behandelten Angebote in der Liste
|
||||||
AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen
|
AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen
|
||||||
AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen
|
AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen
|
||||||
|
|||||||
@ -952,7 +952,6 @@ NumberOfProductLines=Anzahl der Produktlinien
|
|||||||
ProposalsNumberingModules=Angebotsnumerierungs-Module
|
ProposalsNumberingModules=Angebotsnumerierungs-Module
|
||||||
ProposalsPDFModules=PDF-Anbebotsmodule
|
ProposalsPDFModules=PDF-Anbebotsmodule
|
||||||
ClassifiedInvoiced=Als verrechnet markieren
|
ClassifiedInvoiced=Als verrechnet markieren
|
||||||
ClassifiedInvoicedWithOrder=Als zum Zeitpunkt der Bestellung verrechnet markieren
|
|
||||||
HideTreadedPropal=Ausblenden der behandelten Angebote in der Liste
|
HideTreadedPropal=Ausblenden der behandelten Angebote in der Liste
|
||||||
AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen
|
AddShippingDateAbility=Versandfähigkeitsdatum hinzufügen
|
||||||
AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen
|
AddDeliveryAddressAbility=Lieferfähigkeitsdatum hinzufügen
|
||||||
|
|||||||
@ -750,7 +750,6 @@ PathDirectory=Directory
|
|||||||
ProposalsNumberingModules=Commercial proposal numbering modules
|
ProposalsNumberingModules=Commercial proposal numbering modules
|
||||||
ProposalsPDFModules=Commercial proposal documents models
|
ProposalsPDFModules=Commercial proposal documents models
|
||||||
ClassifiedInvoiced=Classified invoiced
|
ClassifiedInvoiced=Classified invoiced
|
||||||
ClassifiedInvoicedWithOrder=Classify invoiced proposal at the same time as the order
|
|
||||||
HideTreadedPropal=Hide the treated commercial proposals in the list
|
HideTreadedPropal=Hide the treated commercial proposals in the list
|
||||||
AddShippingDateAbility=Add shipping date ability
|
AddShippingDateAbility=Add shipping date ability
|
||||||
AddDeliveryAddressAbility=Add delivery date ability
|
AddDeliveryAddressAbility=Add delivery date ability
|
||||||
|
|||||||
@ -14,7 +14,6 @@ WebCalAddEventOnStatusPropal=Add calendar event on quotations status change
|
|||||||
PropalSetup=Quotations module setup
|
PropalSetup=Quotations module setup
|
||||||
ProposalsNumberingModules=Quotations numbering modules
|
ProposalsNumberingModules=Quotations numbering modules
|
||||||
ProposalsPDFModules=Quotations documents models
|
ProposalsPDFModules=Quotations documents models
|
||||||
ClassifiedInvoicedWithOrder=Classify invoiced quotations at the same time as the order
|
|
||||||
HideTreadedPropal=Hide the treated quotations in the list
|
HideTreadedPropal=Hide the treated quotations in the list
|
||||||
FreeLegalTextOnProposal=Free text on quotations
|
FreeLegalTextOnProposal=Free text on quotations
|
||||||
WatermarkOnDraftProposal=Watermark on draft quotations (any if empty)
|
WatermarkOnDraftProposal=Watermark on draft quotations (any if empty)
|
||||||
@ -952,7 +952,6 @@ NumberOfProductLines=Number of product lines
|
|||||||
ProposalsNumberingModules=Commercial proposal numbering modules
|
ProposalsNumberingModules=Commercial proposal numbering modules
|
||||||
ProposalsPDFModules=Commercial proposal documents models
|
ProposalsPDFModules=Commercial proposal documents models
|
||||||
ClassifiedInvoiced=Classified invoiced
|
ClassifiedInvoiced=Classified invoiced
|
||||||
ClassifiedInvoicedWithOrder=Classify invoiced proposal at the same time as the order
|
|
||||||
HideTreadedPropal=Hide the treated commercial proposals in the list
|
HideTreadedPropal=Hide the treated commercial proposals in the list
|
||||||
AddShippingDateAbility=Add shipping date ability
|
AddShippingDateAbility=Add shipping date ability
|
||||||
AddDeliveryAddressAbility=Add delivery date ability
|
AddDeliveryAddressAbility=Add delivery date ability
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
# Dolibarr language file - fr_FR - admin
|
# Dolibarr language file - en_US - admin
|
||||||
CHARSET= UTF-8
|
CHARSET= UTF-8
|
||||||
WorkflowSetup=Workflow module setup
|
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.
|
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_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_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_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
|
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
|
||||||
@ -959,7 +959,6 @@ NumberOfProductLines=Numero de líneas de productos
|
|||||||
ProposalsNumberingModules=Módulos de numeración de presupuestos
|
ProposalsNumberingModules=Módulos de numeración de presupuestos
|
||||||
ProposalsPDFModules=Modelos de documentos de presupuestos
|
ProposalsPDFModules=Modelos de documentos de presupuestos
|
||||||
ClassifiedInvoiced=Clasificar facturado
|
ClassifiedInvoiced=Clasificar facturado
|
||||||
ClassifiedInvoicedWithOrder=Clasificar como facturado el presupuesto al mismo tiempo que el pedido
|
|
||||||
HideTreadedPropal=Ocultar los presupuestos procesados del listado
|
HideTreadedPropal=Ocultar los presupuestos procesados del listado
|
||||||
AddShippingDateAbility=Posibilidad de determinar una fecha de entrega
|
AddShippingDateAbility=Posibilidad de determinar una fecha de entrega
|
||||||
AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío
|
AddDeliveryAddressAbility=Posibilidad de seleccionar una dirección de envío
|
||||||
|
|||||||
@ -939,7 +939,6 @@ NumberOfProductLines=Number tootesarjade
|
|||||||
ProposalsNumberingModules=Commercial ettepaneku numeratsiooni moodulid
|
ProposalsNumberingModules=Commercial ettepaneku numeratsiooni moodulid
|
||||||
ProposalsPDFModules=Commercial ettepaneku dokumentide mudelid
|
ProposalsPDFModules=Commercial ettepaneku dokumentide mudelid
|
||||||
ClassifiedInvoiced=Klassifitseeritud arve
|
ClassifiedInvoiced=Klassifitseeritud arve
|
||||||
ClassifiedInvoicedWithOrder=Liigitada arve ettepaneku samal ajal, et
|
|
||||||
HideTreadedPropal=Peida saanud kaubanduslik ettepanekute nimekirja
|
HideTreadedPropal=Peida saanud kaubanduslik ettepanekute nimekirja
|
||||||
AddShippingDateAbility=Lisa tarneaeg võime
|
AddShippingDateAbility=Lisa tarneaeg võime
|
||||||
AddDeliveryAddressAbility=Lisa tarnekuupäev võime
|
AddDeliveryAddressAbility=Lisa tarnekuupäev võime
|
||||||
|
|||||||
@ -768,7 +768,6 @@ PathDirectory=دليل
|
|||||||
ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
|
ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
|
||||||
ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
|
ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
|
||||||
ClassifiedInvoiced=صنف في الفاتورة
|
ClassifiedInvoiced=صنف في الفاتورة
|
||||||
ClassifiedInvoicedWithOrder=تصنيف فواتير الاقتراح في الوقت الذي أمر
|
|
||||||
HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة
|
HideTreadedPropal=إخفاء تعامل تجاري المقترحات الواردة في قائمة
|
||||||
AddShippingDateAbility=إضافة قدرة الشحن والتاريخ
|
AddShippingDateAbility=إضافة قدرة الشحن والتاريخ
|
||||||
AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
|
AddDeliveryAddressAbility=إضافة قدرة تاريخ التسليم
|
||||||
|
|||||||
@ -676,7 +676,6 @@ PathDirectory=Directory
|
|||||||
ProposalsNumberingModules=Kaupalliset ehdotus numerointiin modules
|
ProposalsNumberingModules=Kaupalliset ehdotus numerointiin modules
|
||||||
ProposalsPDFModules=Kaupalliset ehdotus asiakirjojen malleja
|
ProposalsPDFModules=Kaupalliset ehdotus asiakirjojen malleja
|
||||||
ClassifiedInvoiced=Turvaluokitellut laskutetaan
|
ClassifiedInvoiced=Turvaluokitellut laskutetaan
|
||||||
ClassifiedInvoicedWithOrder=Luokittele laskutetaan ehdotuksen yhtä aikaa, jotta
|
|
||||||
HideTreadedPropal=Piilota käsitelty kaupallisten ehdotuksia luetteloon
|
HideTreadedPropal=Piilota käsitelty kaupallisten ehdotuksia luetteloon
|
||||||
AddShippingDateAbility=Lisää meriliikenneyhtiön päivämäärä kyky
|
AddShippingDateAbility=Lisää meriliikenneyhtiön päivämäärä kyky
|
||||||
AddDeliveryAddressAbility=Lisää toimituspäivää kyky
|
AddDeliveryAddressAbility=Lisää toimituspäivää kyky
|
||||||
|
|||||||
@ -959,7 +959,6 @@ NumberOfProductLines= Nombre de lignes produits
|
|||||||
ProposalsNumberingModules= Modèles de numérotation des propositions commerciales
|
ProposalsNumberingModules= Modèles de numérotation des propositions commerciales
|
||||||
ProposalsPDFModules= Modèles de documents de propositions commerciales
|
ProposalsPDFModules= Modèles de documents de propositions commerciales
|
||||||
ClassifiedInvoiced= Classer facturée
|
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
|
HideTreadedPropal= Cacher les propositions commerciales traitées de la liste
|
||||||
AddShippingDateAbility= Possibilité de déterminer une date de livraison
|
AddShippingDateAbility= Possibilité de déterminer une date de livraison
|
||||||
AddDeliveryAddressAbility= Possibilité de sélectionner une adresse de livraison
|
AddDeliveryAddressAbility= Possibilité de sélectionner une adresse de livraison
|
||||||
|
|||||||
@ -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_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_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_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
|
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
|
||||||
@ -941,7 +941,6 @@ NumberOfProductLines=מספר קווי מוצרים
|
|||||||
ProposalsNumberingModules=הצעה מסחרית המונה מודולים
|
ProposalsNumberingModules=הצעה מסחרית המונה מודולים
|
||||||
ProposalsPDFModules=מסמכי ההצעה מודלים מסחריים
|
ProposalsPDFModules=מסמכי ההצעה מודלים מסחריים
|
||||||
ClassifiedInvoiced=סיווג החשבונית
|
ClassifiedInvoiced=סיווג החשבונית
|
||||||
ClassifiedInvoicedWithOrder=לסווג את ההצעה החשבונית באותו זמן שהצו
|
|
||||||
HideTreadedPropal=הסתר את ההצעות המסחריות שטופלו ברשימה
|
HideTreadedPropal=הסתר את ההצעות המסחריות שטופלו ברשימה
|
||||||
AddShippingDateAbility=הוסף תאריך היכולת משלוח
|
AddShippingDateAbility=הוסף תאריך היכולת משלוח
|
||||||
AddDeliveryAddressAbility=הוסף תאריך יכולת המסירה
|
AddDeliveryAddressAbility=הוסף תאריך יכולת המסירה
|
||||||
|
|||||||
@ -939,7 +939,6 @@ NumberOfProductLines=A termék vonalak száma
|
|||||||
ProposalsNumberingModules=Üzleti ajánlat számozási modulok
|
ProposalsNumberingModules=Üzleti ajánlat számozási modulok
|
||||||
ProposalsPDFModules=Üzleti ajánlat dokumentumok modellek
|
ProposalsPDFModules=Üzleti ajánlat dokumentumok modellek
|
||||||
ClassifiedInvoiced=Minősített számlázott
|
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
|
HideTreadedPropal=Elrejtése a kezelt üzleti ajánlatot a listán
|
||||||
AddShippingDateAbility=Add szállítási határidő képessége
|
AddShippingDateAbility=Add szállítási határidő képessége
|
||||||
AddDeliveryAddressAbility=Add szállítási határidő képessége
|
AddDeliveryAddressAbility=Add szállítási határidő képessége
|
||||||
|
|||||||
@ -839,7 +839,6 @@ PathDirectory=Listinn
|
|||||||
ProposalsNumberingModules=Auglýsing tillögu tala mát
|
ProposalsNumberingModules=Auglýsing tillögu tala mát
|
||||||
ProposalsPDFModules=Auglýsing tillögu skjöl módel
|
ProposalsPDFModules=Auglýsing tillögu skjöl módel
|
||||||
ClassifiedInvoiced=Flokkast innheimt
|
ClassifiedInvoiced=Flokkast innheimt
|
||||||
ClassifiedInvoicedWithOrder=Flokka innheimt tillögu á sama tíma og röð
|
|
||||||
HideTreadedPropal=Fela fengu auglýsing tillögur í skránni
|
HideTreadedPropal=Fela fengu auglýsing tillögur í skránni
|
||||||
AddShippingDateAbility=Bæta við skipum dagsetningu getu
|
AddShippingDateAbility=Bæta við skipum dagsetningu getu
|
||||||
AddDeliveryAddressAbility=Bæta við fæðingardag getu
|
AddDeliveryAddressAbility=Bæta við fæðingardag getu
|
||||||
|
|||||||
@ -89,7 +89,6 @@ CashDeskSetup =Impostazioni modulo punto vendita
|
|||||||
CashDeskThirdPartyForSell =Terzo generico da utilizzare per le vendite
|
CashDeskThirdPartyForSell =Terzo generico da utilizzare per le vendite
|
||||||
ChooseABarCode =Nessun generatore definito
|
ChooseABarCode =Nessun generatore definito
|
||||||
ClassifiedInvoiced =Classifica fatturate
|
ClassifiedInvoiced =Classifica fatturate
|
||||||
ClassifiedInvoicedWithOrder =Classifica proposte fatturate all'ordine
|
|
||||||
##### ClickToDial #####
|
##### ClickToDial #####
|
||||||
ClickToDialDesc =Questo modulo aggiunge una icona accanto ai numeri telefonici dei contatti in Dolibarr.<br/> Cliccando sull'icona si attiva il collegamento al server che effettuerà le chiamate telefoniche.
|
ClickToDialDesc =Questo modulo aggiunge una icona accanto ai numeri telefonici dei contatti in Dolibarr.<br/> Cliccando sull'icona si attiva il collegamento al server che effettuerà le chiamate telefoniche.
|
||||||
ClickToDialSetup =Impostazioni modulo ClickToDial (telefonate con un clic)
|
ClickToDialSetup =Impostazioni modulo ClickToDial (telefonate con un clic)
|
||||||
|
|||||||
@ -939,7 +939,6 @@ NumberOfProductLines=製品ラインの数
|
|||||||
ProposalsNumberingModules=商業的な提案番号モジュール
|
ProposalsNumberingModules=商業的な提案番号モジュール
|
||||||
ProposalsPDFModules=商業的な提案文書のモデル
|
ProposalsPDFModules=商業的な提案文書のモデル
|
||||||
ClassifiedInvoiced=請求分類
|
ClassifiedInvoiced=請求分類
|
||||||
ClassifiedInvoicedWithOrder=オーダーと同時に請求書の提案を分類する
|
|
||||||
HideTreadedPropal=リスト内で処理された商用の提案を隠す
|
HideTreadedPropal=リスト内で処理された商用の提案を隠す
|
||||||
AddShippingDateAbility=発送日の能力を追加します。
|
AddShippingDateAbility=発送日の能力を追加します。
|
||||||
AddDeliveryAddressAbility=配達日の能力を追加します。
|
AddDeliveryAddressAbility=配達日の能力を追加します。
|
||||||
|
|||||||
@ -682,7 +682,6 @@ PathDirectory=Mappe
|
|||||||
ProposalsNumberingModules=Nummereringsmodul for tilbud
|
ProposalsNumberingModules=Nummereringsmodul for tilbud
|
||||||
ProposalsPDFModules=Tilbudsmaler
|
ProposalsPDFModules=Tilbudsmaler
|
||||||
ClassifiedInvoiced=Klassifiser fakturert
|
ClassifiedInvoiced=Klassifiser fakturert
|
||||||
ClassifiedInvoicedWithOrder=Klassifsiser tilbudet fakturert samtidig som ordren
|
|
||||||
HideTreadedPropal=Skjul behandlede tilbud i listen
|
HideTreadedPropal=Skjul behandlede tilbud i listen
|
||||||
AddShippingDateAbility=Legg til felt for forsendelsesdato
|
AddShippingDateAbility=Legg til felt for forsendelsesdato
|
||||||
AddDeliveryAddressAbility=Legg til felt for leveringsdato
|
AddDeliveryAddressAbility=Legg til felt for leveringsdato
|
||||||
|
|||||||
@ -673,7 +673,6 @@ PathDirectory=Bedrijvengids
|
|||||||
ProposalsNumberingModules=Nummering van commerciële voorstellen
|
ProposalsNumberingModules=Nummering van commerciële voorstellen
|
||||||
ProposalsPDFModules=Model commerciële voorstellen
|
ProposalsPDFModules=Model commerciële voorstellen
|
||||||
ClassifiedInvoiced=Gerubriceerde gefactureerd
|
ClassifiedInvoiced=Gerubriceerde gefactureerd
|
||||||
ClassifiedInvoicedWithOrder=Classifiseer het gefactureerd voorstel op hetzelfde tijdstip als de bestelling
|
|
||||||
HideTreadedPropal=Verberg de behandelde commerciële voorstellen in de lijst
|
HideTreadedPropal=Verberg de behandelde commerciële voorstellen in de lijst
|
||||||
AddShippingDateAbility=Toevoegen verzendkosten datum vermogen
|
AddShippingDateAbility=Toevoegen verzendkosten datum vermogen
|
||||||
AddDeliveryAddressAbility=Toevoegen leveringsdatum vermogen
|
AddDeliveryAddressAbility=Toevoegen leveringsdatum vermogen
|
||||||
|
|||||||
@ -894,7 +894,6 @@ PathDirectory = Map
|
|||||||
ProposalsNumberingModules = Offertenummeringmodules
|
ProposalsNumberingModules = Offertenummeringmodules
|
||||||
ProposalsPDFModules = Offertedocumentsjablonen
|
ProposalsPDFModules = Offertedocumentsjablonen
|
||||||
ClassifiedInvoiced = Geclassificeerde factuur
|
ClassifiedInvoiced = Geclassificeerde factuur
|
||||||
ClassifiedInvoicedWithOrder = Classificeer gefactureerde offerte tegelijk met de opdracht
|
|
||||||
HideTreadedPropal = Verberg de behandelde offertes in de lijst
|
HideTreadedPropal = Verberg de behandelde offertes in de lijst
|
||||||
AddShippingDateAbility = Voeg mogelijke verzenddatum toe
|
AddShippingDateAbility = Voeg mogelijke verzenddatum toe
|
||||||
AddDeliveryAddressAbility = Voeg mogelijke leverdatum toe
|
AddDeliveryAddressAbility = Voeg mogelijke leverdatum toe
|
||||||
|
|||||||
@ -680,7 +680,6 @@ PathDirectory=Katalog
|
|||||||
ProposalsNumberingModules=Commercial wniosku numeracji modules
|
ProposalsNumberingModules=Commercial wniosku numeracji modules
|
||||||
ProposalsPDFModules=Commercial wniosku dokumenty modeli
|
ProposalsPDFModules=Commercial wniosku dokumenty modeli
|
||||||
ClassifiedInvoiced=Sklasyfikowany zafakturowana
|
ClassifiedInvoiced=Sklasyfikowany zafakturowana
|
||||||
ClassifiedInvoicedWithOrder=Klasyfikacja zafakturowana wniosku w tym samym czasie, zamówienia
|
|
||||||
HideTreadedPropal=Ukryj leczonych propozycji w wykazie
|
HideTreadedPropal=Ukryj leczonych propozycji w wykazie
|
||||||
AddShippingDateAbility=Dodaj datę wysyłki zdolność
|
AddShippingDateAbility=Dodaj datę wysyłki zdolność
|
||||||
AddDeliveryAddressAbility=Dodaj datę dostawy zdolność
|
AddDeliveryAddressAbility=Dodaj datę dostawy zdolność
|
||||||
|
|||||||
@ -756,7 +756,6 @@ PathDirectory=Catálogo
|
|||||||
ProposalsNumberingModules=Módulos de numeração de Orçamentos
|
ProposalsNumberingModules=Módulos de numeração de Orçamentos
|
||||||
ProposalsPDFModules=Modelos de documentos de Orçamentos
|
ProposalsPDFModules=Modelos de documentos de Orçamentos
|
||||||
ClassifiedInvoiced=Classificar faturado
|
ClassifiedInvoiced=Classificar faturado
|
||||||
ClassifiedInvoicedWithOrder=Classificar como faturado o orçamento ao mesmo tempo que o pedido
|
|
||||||
HideTreadedPropal=Ocultar os Orçamentos processados do listado
|
HideTreadedPropal=Ocultar os Orçamentos processados do listado
|
||||||
AddShippingDateAbility=possibilidade de determinar uma data de entregas
|
AddShippingDateAbility=possibilidade de determinar uma data de entregas
|
||||||
AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio
|
AddDeliveryAddressAbility=possibilidade de selecionar uma endereço de envio
|
||||||
|
|||||||
@ -734,7 +734,6 @@ PathDirectory=Catálogo
|
|||||||
ProposalsNumberingModules=Módulos de numeração de Orçamentos
|
ProposalsNumberingModules=Módulos de numeração de Orçamentos
|
||||||
ProposalsPDFModules=Modelos de documentos de Orçamentos
|
ProposalsPDFModules=Modelos de documentos de Orçamentos
|
||||||
ClassifiedInvoiced=Clasificar facturado
|
ClassifiedInvoiced=Clasificar facturado
|
||||||
ClassifiedInvoicedWithOrder=Clasificar como facturado o orçamento à mismo tiempo que o pedido
|
|
||||||
HideTreadedPropal=Ocultar os Orçamentos procesados do listado
|
HideTreadedPropal=Ocultar os Orçamentos procesados do listado
|
||||||
AddShippingDateAbility=possibilidade de determinar uma data de entregas
|
AddShippingDateAbility=possibilidade de determinar uma data de entregas
|
||||||
AddDeliveryAddressAbility=possibilidade de seleccionar uma direcção de envío
|
AddDeliveryAddressAbility=possibilidade de seleccionar uma direcção de envío
|
||||||
|
|||||||
@ -679,7 +679,6 @@ PathDirectory=Directory
|
|||||||
ProposalsNumberingModules=Comerciale propunerea de numerotare module
|
ProposalsNumberingModules=Comerciale propunerea de numerotare module
|
||||||
ProposalsPDFModules=Comerciale propunerea modele de documente
|
ProposalsPDFModules=Comerciale propunerea modele de documente
|
||||||
ClassifiedInvoiced=Clasificate facturate
|
ClassifiedInvoiced=Clasificate facturate
|
||||||
ClassifiedInvoicedWithOrder=Clasifica facturate propunerea, în acelaşi timp, pentru ca
|
|
||||||
HideTreadedPropal=Ascunde tratate comerciale propuneri în lista
|
HideTreadedPropal=Ascunde tratate comerciale propuneri în lista
|
||||||
AddShippingDateAbility=Adauga data de capacitatea de transport maritim
|
AddShippingDateAbility=Adauga data de capacitatea de transport maritim
|
||||||
AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
|
AddDeliveryAddressAbility=Adauga data de capacitatea de livrare
|
||||||
|
|||||||
@ -678,7 +678,6 @@ PathDirectory=Каталог
|
|||||||
ProposalsNumberingModules=Коммерческие предложения нумерации модулей
|
ProposalsNumberingModules=Коммерческие предложения нумерации модулей
|
||||||
ProposalsPDFModules=Коммерческие предложения документы моделей
|
ProposalsPDFModules=Коммерческие предложения документы моделей
|
||||||
ClassifiedInvoiced=Доска счета
|
ClassifiedInvoiced=Доска счета
|
||||||
ClassifiedInvoicedWithOrder=Классификация счетов предложения и в то же время порядка
|
|
||||||
HideTreadedPropal=Скрыть рассматриваются коммерческие предложения в списке
|
HideTreadedPropal=Скрыть рассматриваются коммерческие предложения в списке
|
||||||
AddShippingDateAbility=Добавить судоходства дата способность
|
AddShippingDateAbility=Добавить судоходства дата способность
|
||||||
AddDeliveryAddressAbility=Добавить дату доставки способность
|
AddDeliveryAddressAbility=Добавить дату доставки способность
|
||||||
|
|||||||
@ -920,7 +920,6 @@ PathDirectory = Mapa
|
|||||||
ProposalsNumberingModules = Moduli za številčenje komercialnih ponudb
|
ProposalsNumberingModules = Moduli za številčenje komercialnih ponudb
|
||||||
ProposalsPDFModules = Modeli obrazcev komercialnih ponudb
|
ProposalsPDFModules = Modeli obrazcev komercialnih ponudb
|
||||||
ClassifiedInvoiced = Označi kot zaračunano
|
ClassifiedInvoiced = Označi kot zaračunano
|
||||||
ClassifiedInvoicedWithOrder = Označi zaračunano ponudbo obenem kot naročilo
|
|
||||||
HideTreadedPropal = Skrij obravnavano komercialno ponudbo na seznamu
|
HideTreadedPropal = Skrij obravnavano komercialno ponudbo na seznamu
|
||||||
AddShippingDateAbility = Dodaj možen datum pošiljanja
|
AddShippingDateAbility = Dodaj možen datum pošiljanja
|
||||||
AddDeliveryAddressAbility = Dodaj možen datum dobave
|
AddDeliveryAddressAbility = Dodaj možen datum dobave
|
||||||
|
|||||||
@ -845,7 +845,6 @@ PathDirectory=Directory
|
|||||||
ProposalsNumberingModules=Kommersiella förslag numrering moduler
|
ProposalsNumberingModules=Kommersiella förslag numrering moduler
|
||||||
ProposalsPDFModules=Kommersiella förslag dokument modeller
|
ProposalsPDFModules=Kommersiella förslag dokument modeller
|
||||||
ClassifiedInvoiced=Sekretessbelagda fakturerade
|
ClassifiedInvoiced=Sekretessbelagda fakturerade
|
||||||
ClassifiedInvoicedWithOrder=Klassificera faktureras förslag samtidigt som beslutet
|
|
||||||
HideTreadedPropal=Dölj de behandlade kommersiella förslagen i listan
|
HideTreadedPropal=Dölj de behandlade kommersiella förslagen i listan
|
||||||
AddShippingDateAbility=Lägg leveransdatum förmåga
|
AddShippingDateAbility=Lägg leveransdatum förmåga
|
||||||
AddDeliveryAddressAbility=Lägg förmåga leveranstid
|
AddDeliveryAddressAbility=Lägg förmåga leveranstid
|
||||||
|
|||||||
@ -821,7 +821,6 @@ PathDirectory=Dizin
|
|||||||
ProposalsNumberingModules=Ticari teklif numaralandırma modülü
|
ProposalsNumberingModules=Ticari teklif numaralandırma modülü
|
||||||
ProposalsPDFModules=Ticari teklif belge modelleri
|
ProposalsPDFModules=Ticari teklif belge modelleri
|
||||||
ClassifiedInvoiced=Sınıflandırılmış faturalar
|
ClassifiedInvoiced=Sınıflandırılmış faturalar
|
||||||
ClassifiedInvoicedWithOrder=Faturalanmış teklif aynı anda sıraya göre
|
|
||||||
HideTreadedPropal=İşlenmiş ticari teklifleri Listede gizle
|
HideTreadedPropal=İşlenmiş ticari teklifleri Listede gizle
|
||||||
AddShippingDateAbility=Nakliye tarih yeteneği ekle
|
AddShippingDateAbility=Nakliye tarih yeteneği ekle
|
||||||
AddDeliveryAddressAbility=Teslim tarihi yeteneği ekle
|
AddDeliveryAddressAbility=Teslim tarihi yeteneği ekle
|
||||||
|
|||||||
@ -836,7 +836,6 @@ PathDirectory=目录
|
|||||||
ProposalsNumberingModules=商业建议编号模块
|
ProposalsNumberingModules=商业建议编号模块
|
||||||
ProposalsPDFModules=商业模式的建议文件
|
ProposalsPDFModules=商业模式的建议文件
|
||||||
ClassifiedInvoiced=发票分类
|
ClassifiedInvoiced=发票分类
|
||||||
ClassifiedInvoicedWithOrder=发票分类在同一时间为顺序的建议
|
|
||||||
HideTreadedPropal=隐藏在对待商业的建议名单
|
HideTreadedPropal=隐藏在对待商业的建议名单
|
||||||
AddShippingDateAbility=添加出货日期的能力
|
AddShippingDateAbility=添加出货日期的能力
|
||||||
AddDeliveryAddressAbility=添加交付日期的能力
|
AddDeliveryAddressAbility=添加交付日期的能力
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user