diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index c012d52efb1f3e49301832b54b1b9f3c20312d8f..2c69b643884effd5f40c0a0582914ec4241de914 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -65,9 +65,9 @@ if ($action == 'updateMask')
if (isset($res))
{
if ($res < 0)
- setEventMessage($langs->trans("SetupSaved"));
- else
setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
}
@@ -77,9 +77,9 @@ else if ($action == 'set_SHIPPING_FREE_TEXT')
$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
if ($res < 0)
- setEventMessage($langs->trans("SetupSaved"));
- else
setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
else if ($action == 'set_SHIPPING_DRAFT_WATERMARK')
@@ -88,9 +88,9 @@ else if ($action == 'set_SHIPPING_DRAFT_WATERMARK')
$res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
if ($res < 0)
- setEventMessage($langs->trans("SetupSaved"));
- else
setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
else if ($action == 'specimen')
@@ -173,7 +173,12 @@ else if ($action == 'setdoc')
else if ($action == 'setmodel')
{
- dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity);
+
+ if ($res < 0)
+ setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
@@ -490,4 +495,4 @@ print '</table>';
llxFooter();
$db->close();
-?>
\ No newline at end of file
+?>
diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php
index c61f660b732d8b66b6d134dd39b5001978bfea3a..b628dc2d5dbcb889be1d124500e9f03849a5b879 100644
--- a/htdocs/commande/liste.php
+++ b/htdocs/commande/liste.php
@@ -130,7 +130,8 @@ if ($viewstatut <> '')
{
if ($viewstatut < 4 && $viewstatut > -3)
{
- $sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee
+ if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
+ else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee
if ($viewstatut == 3)
{
$sql.= ' AND c.facture = 0'; // need to create invoice
@@ -223,7 +224,7 @@ if ($resql)
if ($viewstatut == -2)
$title.=' - '.$langs->trans('StatusOrderToProcessShort');
if ($viewstatut == -3)
- $title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill');
+ $title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
$param='&socid='.$socid.'&viewstatut='.$viewstatut;
if ($ordermonth) $param.='&ordermonth='.$ordermonth;
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d0b2fa3be1a3e977e516ede7383b88c548d9fe40..7e459f07f207697defcbaf5569d35c47ce6f18e2 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -57,7 +57,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu)
print_text_menu_entry($langs->trans("Home"), 1, DOL_URL_ROOT.'/index.php?mainmenu=home&leftmenu=', $id, $idsel, $classname, $atarget);
print_end_menu_entry();
$menu->add(DOL_URL_ROOT.'/index.php?mainmenu=home&leftmenu=', $langs->trans("Home"), 0, $showmode, $atarget, $mainmenu, $leftmenu);
-
+
// Third parties
$tmpentry=array('enabled'=>(! empty($conf->societe->enabled) || ! empty($conf->fournisseur->enabled)), 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->fournisseur->lire)), 'module'=>'societe|fournisseur');
$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
@@ -638,21 +638,21 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);
}
- // Customers orders
- if (! empty($conf->commande->enabled))
- {
- $langs->load("orders");
- $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
- $newmenu->add("/commande/fiche.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
- $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
- if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
- if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
- if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire);
- if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-2"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire);
- if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
- if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
- $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
- }
+ // Customers orders
+ if (! empty($conf->commande->enabled))
+ {
+ $langs->load("orders");
+ $newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+ $newmenu->add("/societe/societe.php?leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
+ $newmenu->add("/commande/liste.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
+ if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
+ if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
+ if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire);
+ if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later
+ if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
+ if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
+ $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
+ }
// Suppliers orders
if (! empty($conf->fournisseur->enabled))
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index a5ee3d3d04590e479b523499b7ec80289375bd4a..ef7698d0564061c2f36eaa2c133db91e2c825bac 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -381,7 +381,7 @@ class pdf_crabe extends ModelePDFFactures
if ((! isset($localtax1_type)) || $localtax1_type=='') $localtax1_type = $localtaxtmp_array[0];
if ((! isset($localtax2_type)) || $localtax2_type=='') $localtax2_type = $localtaxtmp_array[2];
//end TODO
-
+
// retrieve global local tax
if ($localtax1_type == '7') $localtax1_rate = $localtaxtmp_array[1];
if ($localtax2_type == '7') $localtax2_rate = $localtaxtmp_array[3];
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 0424409ef22e45b8dbdfe22a7f845ed75198f31d..6018456fce78fd49037919737ee97926b4918742 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -371,7 +371,7 @@ class pdf_azur extends ModelePDFPropales
if ($object->remise_percent) $localtax2ligne-=($localtax2ligne*$object->remise_percent)/100;
$vatrate=(string) $object->lines[$i]->tva_tx;
-
+
// TODO : store local taxes types into object lines and remove this
$localtaxtmp_array=getLocalTaxesFromRate($vatrate,0,$mysoc);
if ((! isset($localtax1_type)) || $localtax1_type=='') $localtax1_type = $localtaxtmp_array[0];
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index e4debd24e80001bd746ef2f1021f2062f4d705b2..9def962c8ec4073d8d881351ea0fa0f0764c276b 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -247,7 +247,7 @@ class Export
*
* @param string $TypeField Type of Field to filter
* @param string $NameField Name of the field to filter
- * @param string $ValueField Initial value of the field to filter
+ * @param string $ValueField Value of the field for filter. Must not be ''
* @return string sql string of then field ex : "field='xxx'>"
*/
function build_filterQuery($TypeField, $NameField, $ValueField)
diff --git a/htdocs/index.php b/htdocs/index.php
index a1e0dff5e4702e6b1e6423dd5ad545c647f9c467..adb3c8e6f49653170f39df22a943d12018abf89e 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -290,7 +290,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$board->load_board($user);
$board->warning_delay=$conf->commande->client->warning_delay/60/60/24;
$board->label=$langs->trans("OrdersToProcess");
- $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2';
+ $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-3';
$board->img=img_object($langs->trans("Orders"),"order");
$rowspan++;
$dashboardlines[]=$board;
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 6fad3e67919a6aa57867d7b1aad8b50d16d80c71..3987e77682fa2e8125e2ed9611def573422c8984 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -433,6 +433,6 @@ EditGlobalDiscounts=تعديل الخصومات مطلق
AddCreditNote=علما خلق الائتمان
InvoiceNotChecked=لا فاتورة مختارة
ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
-ClosePaidInvoicesAutomatically=تصنيف "سيولي" كل معيار أو الفواتير استبدال سيولي entierely.
+ClosePaidInvoicesAutomatically=تصنيف "سيولي" كل معيار أو الفواتير استبدال سيولي entirely.
AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى "فياض" الوضع.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:56:17).
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 86920ad6d7d7f8a0334c22d340644a3158c8b54c..9d295d4edc5ae9493bcea4867e0f1ffbced5667d 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -384,7 +384,7 @@ DisabledBecausePayments=Не е възможно, тъй като има няк
CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирани плаща
ExpectedToPay=Очаквано плащане
PayedByThisPayment=Плаща от това плащане
-ClosePaidInvoicesAutomatically=Класифицира "ЗАПЛАЩАТ" стандартно или заместващи фактури entierely ЗАПЛАЩАТ.
+ClosePaidInvoicesAutomatically=Класифицира "ЗАПЛАЩАТ" стандартно или заместващи фактури entirely ЗАПЛАЩАТ.
AllCompletelyPayedInvoiceWillBeClosed=Всички фактура не остават да плати, ще бъде затворено автоматично статус "Платени".
TypeContact_facture_internal_SALESREPFOLL=Представител проследяване клиент фактура
TypeContact_facture_external_BILLING=Контакта с клиентите фактура
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 15fd9b6c9a16705ca19bbb1395e55d5064b35025..39ee41a4ca94f1971f5dd214914964298d463b93 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -28,11 +28,12 @@ SuppliersOrdersToProcess=Comandes a proveïdors a processar
StatusOrderCanceledShort=Anul·lada
StatusOrderDraftShort=Esborrany
StatusOrderValidatedShort=Validada
-StatusOrderOnProcessShort=Per rebre
+StatusOrderOnProcessShort=En procés
StatusOrderSentShort=Expedició en curs
StatusOrderSent=Enviament en curs
StatusOrderProcessedShort=Processada
-StatusOrderToBillShort=A facturar
+StatusOrderToBillShort=Emès
+StatusOrderToBillShort2=A facturar
StatusOrderApprovedShort=Aprovada
StatusOrderRefusedShort=Rebutjada
StatusOrderToProcessShort=A processar
@@ -43,7 +44,8 @@ StatusOrderDraft=Esborrany (a validar)
StatusOrderValidated=Validada
StatusOrderOnProcess=Pendent de rebre
StatusOrderProcessed=Processada
-StatusOrderToBill=A facturar
+StatusOrderToBill=Emès
+StatusOrderToBill2=A facturar
StatusOrderApproved=Aprovada
StatusOrderRefused=Rebutjada
StatusOrderReceivedPartially=Rebuda parcialment
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index f915134e890840c93545429a5e32b458de187256..f357cb6bec21b92559d7e5f50296134b57a3147f 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -433,6 +433,6 @@ EditGlobalDiscounts=Rediger absolutte rabatter
AddCreditNote=Opret kreditnota
InvoiceNotChecked=Ingen valgt faktura
ShowUnpaidAll=Vis alle ubetalte fakturaer
-ClosePaidInvoicesAutomatically=Klassificere "betales" hele standarden eller udskiftning af fakturaer entierely betales.
+ClosePaidInvoicesAutomatically=Klassificere "betales" hele standarden eller udskiftning af fakturaer entirely betales.
AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status "betales".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:00:06).
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index e38fd849716a0cebbbdf3520bbf4a6abd420861e..30bd566989849835c1bd8b88d22c98896edd0fbc 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -419,7 +419,7 @@ AddGlobalDiscount=Προσθήκη έκπτωσης
AddCreditNote=Δημιουργία πιστωτικό σημείωμα
InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
-ClosePaidInvoicesAutomatically=Ταξινομήστε "Πληρωμένες» όλα τα τιμολόγια entierely payed.
+ClosePaidInvoicesAutomatically=Ταξινομήστε "Πληρωμένες» όλα τα τιμολόγια entirely payed.
AllCompletelyPayedInvoiceWillBeClosed=Όλα τιμολόγιο χωρίς παραμένουν να πληρώσουν θα κλείσει αυτόματα σε κατάσταση "Πληρωμένες».
// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:36:46).
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 3b13ef6e83484f550e22689818af8343b6027ab7..246abf27f89b778a7d3a90904529894869b3b52a 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1007,7 +1007,7 @@ WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct.
##### Invoices #####
BillsSetup=Invoices module setup
BillsDate=Invoices date
-BillsNumberingModule=Invoices and credit notes numbering module
+BillsNumberingModule=Invoices and credit notes numbering model
BillsPDFModules=Invoice documents models
CreditNoteSetup=Credit note module setup
CreditNotePDFModules=Credit note document models
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 49a6090fbee88e1ad1a516dfc853a6f750aab409..785f131b61bf0225c3cc5951bc1782ae4e5ca1a5 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -384,8 +384,8 @@ DisabledBecausePayments=Not possible since there is some payments
CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed
ExpectedToPay=Expected payment
PayedByThisPayment=Payed by this payment
-ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entierely payed.
-ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entierely paid back.
+ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entirely payed.
+ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entirely paid back.
AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed".
ToMakePayment=Pay
ToMakePaymentBack=Pay back
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 2796759a8f01a0df6163e5e0b355b07b536b4d1f..172f6fb13c61d6631909c235f85c151cc1a245e4 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Number of orders by month
AmountOfOrdersByMonthHT=amount of orders by month (net of tax)
ListOfOrders=List of orders
CloseOrder=Close order
-ConfirmCloseOrder=Are you sure you want to close this order ? Once an order is closed, it can only be billed.
+ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done.
ConfirmDeleteOrder=Are you sure you want to delete this order ?
ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 13710c240b7d41f6aefe9713ba3a878964527a4e..65044ab09a72707bba735f2fb6383bab98b4edfc 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -28,11 +28,12 @@ SuppliersOrdersToProcess=Pedidos a proveedores a procesar
StatusOrderCanceledShort=Anulado
StatusOrderDraftShort=Borrador
StatusOrderValidatedShort=Validado
-StatusOrderOnProcessShort=Pdte. Recibir
+StatusOrderOnProcessShort=En proceso
StatusOrderSentShort=Expedición en curso
StatusOrderSent=Envío en curso
StatusOrderProcessedShort=Procesado
-StatusOrderToBillShort=A facturar
+StatusOrderToBillShort=Emitido
+StatusOrderToBillShort2=A facturar
StatusOrderApprovedShort=Aprobado
StatusOrderRefusedShort=Rechazado
StatusOrderToProcessShort=A procesar
@@ -43,7 +44,8 @@ StatusOrderDraft=Borrador (a validar)
StatusOrderValidated=Validado
StatusOrderOnProcess=Pendiente de recibir
StatusOrderProcessed=Procesado
-StatusOrderToBill=A facturar
+StatusOrderToBill=Emitido
+StatusOrderToBill2=A facturar
StatusOrderApproved=Aprobado
StatusOrderRefused=Rechazado
StatusOrderReceivedPartially=Recibido parcialmente
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 6b7f9cfc53e2eb86ebb3489b6a978a64c6cc3872..b2b9a21de616362ab42cfa57d72d4a5c0c09e156 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -374,7 +374,7 @@ DisabledBecausePayments=Ole võimalik, sest seal on mõned maksed
CantRemovePaymentWithOneInvoicePaid=Ei saa eemaldada makse sest seal on vähemalt üks arve klassifitseeritud payed
ExpectedToPay=Oodatud makse
PayedByThisPayment=Payed selle makse
-ClosePaidInvoicesAutomatically=Liigitada "payed" kõik standard või asendamine arved entierely payed.
+ClosePaidInvoicesAutomatically=Liigitada "payed" kõik standard või asendamine arved entirely payed.
AllCompletelyPayedInvoiceWillBeClosed=Kõik arve, millel ei ole veel maksma automaatselt suletud olek "payed".
TypeContact_facture_internal_SALESREPFOLL=Esindaja järelmeetmeid kliendi arve
TypeContact_facture_external_BILLING=Kliendi arve kontaktandmed
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 9c383ea1fde08be77cb0e789fd8c7181ea7226a6..c56954a7b96beff6457f6e19079519d4a4af31a7 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -431,6 +431,6 @@ EditGlobalDiscounts=Muokkaa absoluuttinen alennukset
AddCreditNote=Luo hyvityslasku
InvoiceNotChecked=Ei laskun valittu
ShowUnpaidAll=Näytä kaikki maksamattomat laskut
-ClosePaidInvoicesAutomatically=Luokittele "maksanut" kaikki vakio-tai korvaavan laskuja entierely maksanut.
+ClosePaidInvoicesAutomatically=Luokittele "maksanut" kaikki vakio-tai korvaavan laskuja entirely maksanut.
AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila "maksanut".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:11:08).
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 1866ecbdcfbdd04546d325b72179090f851397e3..045b62230384956c5013fe4c1215dc8b6b07de51 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Nombre de commandes par mois
AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT)
ListOfOrders=Liste des commandes
CloseOrder=Clôturer commande
-ConfirmCloseOrder=Êtes-vous sûr de vouloir clôturer cette commande ? Une fois une commande clôturée, elle peut être facturée.
+ConfirmCloseOrder=Êtes-vous sûr de vouloir classer cette commande à Délivrée ? Une fois une commande délivrée, elle peut aussi être passée à facturée.
ConfirmCloseOrderIfSending=Êtes-vous sûr de vouloir clôturer cette commande ? Vous ne devez clôturer une commande qu'une fois les produits expédiés.
ConfirmDeleteOrder=Êtes-vous sûr de vouloir effacer cette commande ?
ConfirmValidateOrder=Êtes-vous sûr de vouloir valider cette commande sous la référence <b>%s</b> ?
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index d0c5cb1044c87a2e7dbb673dad06562fddc266ec..a16a4c455471d26074035161be486c4cd7e6ac71 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -374,7 +374,7 @@ DisabledBecausePayments=לא ניתן שכן אין תשלומים מסוימי
CantRemovePaymentWithOneInvoicePaid=לא ניתן להסיר תשלום מאז יש לפחות חשבונית אחת מסווגים שילם
ExpectedToPay=צפוי התשלום
PayedByThisPayment=שילם על ידי תשלום זה
-ClosePaidInvoicesAutomatically=לסווג "שילם" את כל תקן או חשבוניות החלפת שילם entierely.
+ClosePaidInvoicesAutomatically=לסווג "שילם" את כל תקן או חשבוניות החלפת שילם entirely.
AllCompletelyPayedInvoiceWillBeClosed=כל חשבונית ללא להישאר לשלם ייסגר באופן אוטומטי למצב "שילם".
TypeContact_facture_internal_SALESREPFOLL=לקוחות נציג הבאה למעלה החשבונית
TypeContact_facture_external_BILLING=חשבונית הלקוח קשר
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 8546d155e7b297c1c59ab500b83f1e658a1dcb5c..4439698118d1d135fbe25dda8823de3e2f3928b5 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -374,7 +374,7 @@ DisabledBecausePayments=Nem lehetséges, mert van némi kifizetések
CantRemovePaymentWithOneInvoicePaid=Nem lehet eltávolítani a fizetési hiszen legalább egy számlát fizetni osztályozott
ExpectedToPay=Várható fizetés
PayedByThisPayment=Megfizetni ezt a fizetési
-ClosePaidInvoicesAutomatically=Classify "fizetni" minden szabványos vagy csere számlák entierely fizetni.
+ClosePaidInvoicesAutomatically=Classify "fizetni" minden szabványos vagy csere számlák entirely fizetni.
AllCompletelyPayedInvoiceWillBeClosed=Minden számla nélkül is fizetni fogják automatikusan bezárja az állapota "fizetni".
TypeContact_facture_internal_SALESREPFOLL=Reprezentatív nyomon követése vevőszámla
TypeContact_facture_external_BILLING=Ügyfél számla Kapcsolat
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 21209b0158f622e867a9e96b206f0dc30136d454..a342ad46e7865e47684dbb9e8bde7dbfa2bf290d 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -410,6 +410,6 @@ EditGlobalDiscounts=Breyta hreinum afslætti
AddCreditNote=Búa inneignarnótuna
InvoiceNotChecked=Engin reikningur valinn
ShowUnpaidAll=Sýna alla ógreiddra reikninga
-ClosePaidInvoicesAutomatically=Flokka "borgað" allt staðall eða skipti reikningar entierely borgað.
+ClosePaidInvoicesAutomatically=Flokka "borgað" allt staðall eða skipti reikningar entirely borgað.
AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu "borgað".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:27:05).
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index f2172127b5f65c39eded263c9c107fb0fe3a8c65..e8088302025e3a0a26522b0551796deda5f60298 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -374,7 +374,7 @@ DisabledBecausePayments=いくつかの支払いがあるのでできませ
CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません
ExpectedToPay=予想される支払い
PayedByThisPayment=この支払によって支払った
-ClosePaidInvoicesAutomatically="支払った"すべての標準またはentierely支払った交換用の請求書を分類します。
+ClosePaidInvoicesAutomatically="支払った"すべての標準またはentirely支払った交換用の請求書を分類します。
AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが "支払った"に閉鎖され支払うことに残っています。
TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客の請求書
TypeContact_facture_external_BILLING=顧客の請求書の連絡先
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index faf0e2b69b476820cecdd356982ea720844400c6..1a3618b132c6d11b6300e29f205f7fc0cab87957 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -438,6 +438,6 @@ EditGlobalDiscounts=Rediger absolutte rabatter
AddCreditNote=Lag kreditt notat
InvoiceNotChecked=Ingen faktura er valgt
ShowUnpaidAll=Vis alle ubetalte fakturaer
-ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entierely utbetales.
+ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entirely utbetales.
AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status "betales".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:07:28).
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index d8d7bae1abef3ba6775559579fdbd05cf4127311..bc238882ecc68a3515bf381d5815792ff5056d5e 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -400,7 +400,7 @@ EditGlobalDiscounts=Edit absolute kortingen
AddCreditNote=Maak een credit nota
AllCompletelyPayedInvoiceWillBeClosed=Alle factuur zonder te blijven om te betalen zal automatisch worden gesloten om status "Betaald".
TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren.
-ClosePaidInvoicesAutomatically=Classificeren "Betaalde" alle standaard of vervanging facturen entierely betaald.
+ClosePaidInvoicesAutomatically=Classificeren "Betaalde" alle standaard of vervanging facturen entirely betaald.
// STOP - Lines generated via autotranslator.php tool (2011-10-10 02:25:52).
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 422892976c94557b38d10ab5d20b23171bda223e..549154c32e2c07f9594142fc378420d4ed0aa2cb 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -432,6 +432,6 @@ EditGlobalDiscounts=Edytuj bezwzględne zniżki
AddCreditNote=Tworzenie noty kredytowej
InvoiceNotChecked=Nie wybrano faktura
ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
-ClosePaidInvoicesAutomatically=Klasyfikowanie "Opłacone" wszystkie standardy lub fakturach zastępczych entierely zapłaci.
+ClosePaidInvoicesAutomatically=Klasyfikowanie "Opłacone" wszystkie standardy lub fakturach zastępczych entirely zapłaci.
AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu "płatny".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:19:17).
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index e0042ad162bbcc490135ca16e4e037d19fecec6c..aa7e69936e39bec2c68c2cdb2c0c2e4d060e6f50 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -432,6 +432,6 @@ EditGlobalDiscounts=Editare reduceri absolute
AddCreditNote=Creaţi note de credit
InvoiceNotChecked=Nu factură selectat
ShowUnpaidAll=Arata toate facturile neachitate
-ClosePaidInvoicesAutomatically=Clasifica "platiti", toate facturile standard sau de înlocuire entierely platite.
+ClosePaidInvoicesAutomatically=Clasifica "platiti", toate facturile standard sau de înlocuire entirely platite.
AllCompletelyPayedInvoiceWillBeClosed=Toate cu factura nu rămân la plata vor fi închise automat la statutul de "platite".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:24:55).
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 2b477bb3084cb1d63d6cb4082af055d3e42b0f5d..7d60a3065547db741528a052bde35449b6d675ad 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -409,6 +409,6 @@ EditGlobalDiscounts=Redigera absoluta rabatter
AddCreditNote=Skapa kreditnota
InvoiceNotChecked=Faktura vald
ShowUnpaidAll=Visa alla obetalda fakturor
-ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entierely betalt.
+ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entirely betalt.
AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status "betald".
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:32:49).
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index d3330a6a4310a6c9b7abb7c929a1e6cbdc1fa83f..ad61aa5068e94165ca45b8bc1e792e052f6b69da 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -414,6 +414,6 @@ EditGlobalDiscounts=编辑绝对折扣
AddCreditNote=创建信用票据
InvoiceNotChecked=选择无发票
ShowUnpaidAll=显示所有未付发票
-ClosePaidInvoicesAutomatically=分类“支付最高”的所有entierely支付最高标准或更换发票。
+ClosePaidInvoicesAutomatically=分类“支付最高”的所有entirely支付最高标准或更换发票。
AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07).
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 399aa502b29e5ab4eb3e75566534887e05941e99..ae3bfa163ad42a907bfe021c123e630d5c83f0e0 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -414,6 +414,6 @@ EditGlobalDiscounts=編輯絕對折扣
AddCreditNote=創建信用票據
InvoiceNotChecked=選擇無發票
ShowUnpaidAll=顯示所有未付款的發票
-ClosePaidInvoicesAutomatically=分類“支付最高”的所有entierely支付最高標準或更換發票。
+ClosePaidInvoicesAutomatically=分類“支付最高”的所有entirely支付最高標準或更換發票。
AllCompletelyPayedInvoiceWillBeClosed=所有發票仍然沒有支付將被自動關閉狀態“支付最高”。
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07).