lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop

Browse Source
This commit is contained in:
Grand Philippe 2013-03-17 10:03:29 +01:00
commit bda1c7656b
31 changed files with 69 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/admin/expedition.php
View File

@ -65,9 +65,9 @@ if ($action == 'updateMask')
if (isset($res)) if (isset($res))
{ {
if ($res < 0) if ($res < 0)
setEventMessage($langs->trans("SetupSaved"));
else
setEventMessage($langs->trans("Error"), 'errors'); 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); $res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
if ($res < 0) if ($res < 0)
setEventMessage($langs->trans("SetupSaved"));
else
setEventMessage($langs->trans("Error"), 'errors'); setEventMessage($langs->trans("Error"), 'errors');
else
setEventMessage($langs->trans("SetupSaved"));
} }
else if ($action == 'set_SHIPPING_DRAFT_WATERMARK') 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); $res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
if ($res < 0) if ($res < 0)
setEventMessage($langs->trans("SetupSaved"));
else
setEventMessage($langs->trans("Error"), 'errors'); setEventMessage($langs->trans("Error"), 'errors');
else
setEventMessage($langs->trans("SetupSaved"));
} }
else if ($action == 'specimen') else if ($action == 'specimen')
@ -173,7 +173,12 @@ else if ($action == 'setdoc')
else if ($action == 'setmodel') 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"));
} }

2
htdocs/cashdesk/index_verif.php
View File

@ -77,7 +77,7 @@ if ( $retour >= 0 )
{ {
$return=array(); $return=array();
$sql = "SELECT rowid, name, firstname"; $sql = "SELECT rowid, lastname, firstname";
$sql.= " FROM ".MAIN_DB_PREFIX."user"; $sql.= " FROM ".MAIN_DB_PREFIX."user";
$sql.= " WHERE login = '".$username."'"; $sql.= " WHERE login = '".$username."'";
$sql.= " AND entity IN (0,".$conf->entity.")"; $sql.= " AND entity IN (0,".$conf->entity.")";

5
htdocs/commande/liste.php
View File

@ -130,7 +130,8 @@ if ($viewstatut <> '')
{ {
if ($viewstatut < 4 && $viewstatut > -3) 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) if ($viewstatut == 3)
{ {
$sql.= ' AND c.facture = 0'; // need to create invoice $sql.= ' AND c.facture = 0'; // need to create invoice
@ -223,7 +224,7 @@ if ($resql)
if ($viewstatut == -2) if ($viewstatut == -2)
$title.=' - '.$langs->trans('StatusOrderToProcessShort'); $title.=' - '.$langs->trans('StatusOrderToProcessShort');
if ($viewstatut == -3) 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; $param='&socid='.$socid.'&viewstatut='.$viewstatut;
if ($ordermonth) $param.='&ordermonth='.$ordermonth; if ($ordermonth) $param.='&ordermonth='.$ordermonth;

4
htdocs/core/menus/standard/eldy.lib.php
View File

@ -643,12 +643,12 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
{ {
$langs->load("orders"); $langs->load("orders");
$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, '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&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer); $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); $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=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") $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" && ! 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=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=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); 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); $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);

2
htdocs/exports/class/export.class.php
View File

@ -247,7 +247,7 @@ class Export
* *
* @param string $TypeField Type of Field to filter * @param string $TypeField Type of Field to filter
* @param string $NameField Name of the 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'>" * @return string sql string of then field ex : "field='xxx'>"
*/ */
function build_filterQuery($TypeField, $NameField, $ValueField) function build_filterQuery($TypeField, $NameField, $ValueField)

2
htdocs/index.php
View File

@ -290,7 +290,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
$board->load_board($user); $board->load_board($user);
$board->warning_delay=$conf->commande->client->warning_delay/60/60/24; $board->warning_delay=$conf->commande->client->warning_delay/60/60/24;
$board->label=$langs->trans("OrdersToProcess"); $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"); $board->img=img_object($langs->trans("Orders"),"order");
$rowspan++; $rowspan++;
$dashboardlines[]=$board; $dashboardlines[]=$board;

2
htdocs/langs/ar_SA/bills.lang
View File

@ -433,6 +433,6 @@ EditGlobalDiscounts=تعديل الخصومات مطلق
AddCreditNote=علما خلق الائتمان AddCreditNote=علما خلق الائتمان
InvoiceNotChecked=لا فاتورة مختارة InvoiceNotChecked=لا فاتورة مختارة
ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
ClosePaidInvoicesAutomatically=تصنيف &quot;سيولي&quot; كل معيار أو الفواتير استبدال سيولي entierely. ClosePaidInvoicesAutomatically=تصنيف &quot;سيولي&quot; كل معيار أو الفواتير استبدال سيولي entirely.
AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى &quot;فياض&quot; الوضع. AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى &quot;فياض&quot; الوضع.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:56:17). // STOP - Lines generated via autotranslator.php tool (2012-02-29 15:56:17).

2
htdocs/langs/bg_BG/bills.lang
View File

@ -384,7 +384,7 @@ DisabledBecausePayments=Не е възможно, тъй като има няк
CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирани плаща CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирани плаща
ExpectedToPay=Очаквано плащане ExpectedToPay=Очаквано плащане
PayedByThisPayment=Плаща от това плащане PayedByThisPayment=Плаща от това плащане
ClosePaidInvoicesAutomatically=Класифицира &quot;ЗАПЛАЩАТ&quot; стандартно или заместващи фактури entierely ЗАПЛАЩАТ. ClosePaidInvoicesAutomatically=Класифицира &quot;ЗАПЛАЩАТ&quot; стандартно или заместващи фактури entirely ЗАПЛАЩАТ.
AllCompletelyPayedInvoiceWillBeClosed=Всички фактура не остават да плати, ще бъде затворено автоматично статус &quot;Платени&quot;. AllCompletelyPayedInvoiceWillBeClosed=Всички фактура не остават да плати, ще бъде затворено автоматично статус &quot;Платени&quot;.
TypeContact_facture_internal_SALESREPFOLL=Представител проследяване клиент фактура TypeContact_facture_internal_SALESREPFOLL=Представител проследяване клиент фактура
TypeContact_facture_external_BILLING=Контакта с клиентите фактура TypeContact_facture_external_BILLING=Контакта с клиентите фактура

8
htdocs/langs/ca_ES/orders.lang
View File

@ -28,11 +28,12 @@ SuppliersOrdersToProcess=Comandes a proveïdors a processar
StatusOrderCanceledShort=Anul·lada StatusOrderCanceledShort=Anul·lada
StatusOrderDraftShort=Esborrany StatusOrderDraftShort=Esborrany
StatusOrderValidatedShort=Validada StatusOrderValidatedShort=Validada
StatusOrderOnProcessShort=Per rebre StatusOrderOnProcessShort=En procés
StatusOrderSentShort=Expedició en curs StatusOrderSentShort=Expedició en curs
StatusOrderSent=Enviament en curs StatusOrderSent=Enviament en curs
StatusOrderProcessedShort=Processada StatusOrderProcessedShort=Processada
StatusOrderToBillShort=A facturar StatusOrderToBillShort=Emès
StatusOrderToBillShort2=A facturar
StatusOrderApprovedShort=Aprovada StatusOrderApprovedShort=Aprovada
StatusOrderRefusedShort=Rebutjada StatusOrderRefusedShort=Rebutjada
StatusOrderToProcessShort=A processar StatusOrderToProcessShort=A processar
@ -43,7 +44,8 @@ StatusOrderDraft=Esborrany (a validar)
StatusOrderValidated=Validada StatusOrderValidated=Validada
StatusOrderOnProcess=Pendent de rebre StatusOrderOnProcess=Pendent de rebre
StatusOrderProcessed=Processada StatusOrderProcessed=Processada
StatusOrderToBill=A facturar StatusOrderToBill=Emès
StatusOrderToBill2=A facturar
StatusOrderApproved=Aprovada StatusOrderApproved=Aprovada
StatusOrderRefused=Rebutjada StatusOrderRefused=Rebutjada
StatusOrderReceivedPartially=Rebuda parcialment StatusOrderReceivedPartially=Rebuda parcialment

2
htdocs/langs/da_DK/bills.lang
View File

@ -433,6 +433,6 @@ EditGlobalDiscounts=Rediger absolutte rabatter
AddCreditNote=Opret kreditnota AddCreditNote=Opret kreditnota
InvoiceNotChecked=Ingen valgt faktura InvoiceNotChecked=Ingen valgt faktura
ShowUnpaidAll=Vis alle ubetalte fakturaer ShowUnpaidAll=Vis alle ubetalte fakturaer
ClosePaidInvoicesAutomatically=Klassificere &quot;betales&quot; hele standarden eller udskiftning af fakturaer entierely betales. ClosePaidInvoicesAutomatically=Klassificere &quot;betales&quot; hele standarden eller udskiftning af fakturaer entirely betales.
AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status &quot;betales&quot;. AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status &quot;betales&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:00:06). // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:00:06).

2
htdocs/langs/el_GR/bills.lang
View File

@ -419,7 +419,7 @@ AddGlobalDiscount=Προσθήκη έκπτωσης
AddCreditNote=Δημιουργία πιστωτικό σημείωμα AddCreditNote=Δημιουργία πιστωτικό σημείωμα
InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
ClosePaidInvoicesAutomatically=Ταξινομήστε &quot;Πληρωμένες» όλα τα τιμολόγια entierely payed. ClosePaidInvoicesAutomatically=Ταξινομήστε &quot;Πληρωμένες» όλα τα τιμολόγια entirely payed.
AllCompletelyPayedInvoiceWillBeClosed=Όλα τιμολόγιο χωρίς παραμένουν να πληρώσουν θα κλείσει αυτόματα σε κατάσταση &quot;Πληρωμένες». AllCompletelyPayedInvoiceWillBeClosed=Όλα τιμολόγιο χωρίς παραμένουν να πληρώσουν θα κλείσει αυτόματα σε κατάσταση &quot;Πληρωμένες».
// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:36:46). // STOP - Lines generated via autotranslator.php tool (2011-06-26 15:36:46).

2
htdocs/langs/en_US/admin.lang
View File

@ -1007,7 +1007,7 @@ WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct.
##### Invoices ##### ##### Invoices #####
BillsSetup=Invoices module setup BillsSetup=Invoices module setup
BillsDate=Invoices date BillsDate=Invoices date
BillsNumberingModule=Invoices and credit notes numbering module BillsNumberingModule=Invoices and credit notes numbering model
BillsPDFModules=Invoice documents models BillsPDFModules=Invoice documents models
CreditNoteSetup=Credit note module setup CreditNoteSetup=Credit note module setup
CreditNotePDFModules=Credit note document models CreditNotePDFModules=Credit note document models

4
htdocs/langs/en_US/bills.lang
View File

@ -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 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed
ExpectedToPay=Expected payment ExpectedToPay=Expected payment
PayedByThisPayment=Payed by this payment PayedByThisPayment=Payed by this payment
ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entierely payed. ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entirely payed.
ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entierely paid back. ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entirely paid back.
AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed". AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed".
ToMakePayment=Pay ToMakePayment=Pay
ToMakePaymentBack=Pay back ToMakePaymentBack=Pay back

2
htdocs/langs/en_US/orders.lang
View File

@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Number of orders by month
AmountOfOrdersByMonthHT=amount of orders by month (net of tax) AmountOfOrdersByMonthHT=amount of orders by month (net of tax)
ListOfOrders=List of orders ListOfOrders=List of orders
CloseOrder=Close order 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. 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 ? 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> ? ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?

8
htdocs/langs/es_ES/orders.lang
View File

@ -28,11 +28,12 @@ SuppliersOrdersToProcess=Pedidos a proveedores a procesar
StatusOrderCanceledShort=Anulado StatusOrderCanceledShort=Anulado
StatusOrderDraftShort=Borrador StatusOrderDraftShort=Borrador
StatusOrderValidatedShort=Validado StatusOrderValidatedShort=Validado
StatusOrderOnProcessShort=Pdte. Recibir StatusOrderOnProcessShort=En proceso
StatusOrderSentShort=Expedición en curso StatusOrderSentShort=Expedición en curso
StatusOrderSent=Envío en curso StatusOrderSent=Envío en curso
StatusOrderProcessedShort=Procesado StatusOrderProcessedShort=Procesado
StatusOrderToBillShort=A facturar StatusOrderToBillShort=Emitido
StatusOrderToBillShort2=A facturar
StatusOrderApprovedShort=Aprobado StatusOrderApprovedShort=Aprobado
StatusOrderRefusedShort=Rechazado StatusOrderRefusedShort=Rechazado
StatusOrderToProcessShort=A procesar StatusOrderToProcessShort=A procesar
@ -43,7 +44,8 @@ StatusOrderDraft=Borrador (a validar)
StatusOrderValidated=Validado StatusOrderValidated=Validado
StatusOrderOnProcess=Pendiente de recibir StatusOrderOnProcess=Pendiente de recibir
StatusOrderProcessed=Procesado StatusOrderProcessed=Procesado
StatusOrderToBill=A facturar StatusOrderToBill=Emitido
StatusOrderToBill2=A facturar
StatusOrderApproved=Aprobado StatusOrderApproved=Aprobado
StatusOrderRefused=Rechazado StatusOrderRefused=Rechazado
StatusOrderReceivedPartially=Recibido parcialmente StatusOrderReceivedPartially=Recibido parcialmente

2
htdocs/langs/et_EE/bills.lang
View File

@ -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 CantRemovePaymentWithOneInvoicePaid=Ei saa eemaldada makse sest seal on vähemalt üks arve klassifitseeritud payed
ExpectedToPay=Oodatud makse ExpectedToPay=Oodatud makse
PayedByThisPayment=Payed selle makse PayedByThisPayment=Payed selle makse
ClosePaidInvoicesAutomatically=Liigitada &quot;payed&quot; kõik standard või asendamine arved entierely payed. ClosePaidInvoicesAutomatically=Liigitada &quot;payed&quot; kõik standard või asendamine arved entirely payed.
AllCompletelyPayedInvoiceWillBeClosed=Kõik arve, millel ei ole veel maksma automaatselt suletud olek &quot;payed&quot;. AllCompletelyPayedInvoiceWillBeClosed=Kõik arve, millel ei ole veel maksma automaatselt suletud olek &quot;payed&quot;.
TypeContact_facture_internal_SALESREPFOLL=Esindaja järelmeetmeid kliendi arve TypeContact_facture_internal_SALESREPFOLL=Esindaja järelmeetmeid kliendi arve
TypeContact_facture_external_BILLING=Kliendi arve kontaktandmed TypeContact_facture_external_BILLING=Kliendi arve kontaktandmed

2
htdocs/langs/fi_FI/bills.lang
View File

@ -431,6 +431,6 @@ EditGlobalDiscounts=Muokkaa absoluuttinen alennukset
AddCreditNote=Luo hyvityslasku AddCreditNote=Luo hyvityslasku
InvoiceNotChecked=Ei laskun valittu InvoiceNotChecked=Ei laskun valittu
ShowUnpaidAll=Näytä kaikki maksamattomat laskut ShowUnpaidAll=Näytä kaikki maksamattomat laskut
ClosePaidInvoicesAutomatically=Luokittele &quot;maksanut&quot; kaikki vakio-tai korvaavan laskuja entierely maksanut. ClosePaidInvoicesAutomatically=Luokittele &quot;maksanut&quot; kaikki vakio-tai korvaavan laskuja entirely maksanut.
AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;. AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:11:08). // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:11:08).

2
htdocs/langs/fr_FR/orders.lang
View File

@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Nombre de commandes par mois
AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT) AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT)
ListOfOrders=Liste des commandes ListOfOrders=Liste des commandes
CloseOrder=Clôturer commande 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. 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 ? 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> ? ConfirmValidateOrder=Êtes-vous sûr de vouloir valider cette commande sous la référence <b>%s</b> ?

2
htdocs/langs/he_IL/bills.lang
View File

@ -374,7 +374,7 @@ DisabledBecausePayments=לא ניתן שכן אין תשלומים מסוימי
CantRemovePaymentWithOneInvoicePaid=לא ניתן להסיר תשלום מאז יש לפחות חשבונית אחת מסווגים שילם CantRemovePaymentWithOneInvoicePaid=לא ניתן להסיר תשלום מאז יש לפחות חשבונית אחת מסווגים שילם
ExpectedToPay=צפוי התשלום ExpectedToPay=צפוי התשלום
PayedByThisPayment=שילם על ידי תשלום זה PayedByThisPayment=שילם על ידי תשלום זה
ClosePaidInvoicesAutomatically=לסווג &quot;שילם&quot; את כל תקן או חשבוניות החלפת שילם entierely. ClosePaidInvoicesAutomatically=לסווג &quot;שילם&quot; את כל תקן או חשבוניות החלפת שילם entirely.
AllCompletelyPayedInvoiceWillBeClosed=כל חשבונית ללא להישאר לשלם ייסגר באופן אוטומטי למצב &quot;שילם&quot;. AllCompletelyPayedInvoiceWillBeClosed=כל חשבונית ללא להישאר לשלם ייסגר באופן אוטומטי למצב &quot;שילם&quot;.
TypeContact_facture_internal_SALESREPFOLL=לקוחות נציג הבאה למעלה החשבונית TypeContact_facture_internal_SALESREPFOLL=לקוחות נציג הבאה למעלה החשבונית
TypeContact_facture_external_BILLING=חשבונית הלקוח קשר TypeContact_facture_external_BILLING=חשבונית הלקוח קשר

2
htdocs/langs/hu_HU/bills.lang
View File

@ -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 CantRemovePaymentWithOneInvoicePaid=Nem lehet eltávolítani a fizetési hiszen legalább egy számlát fizetni osztályozott
ExpectedToPay=Várható fizetés ExpectedToPay=Várható fizetés
PayedByThisPayment=Megfizetni ezt a fizetési PayedByThisPayment=Megfizetni ezt a fizetési
ClosePaidInvoicesAutomatically=Classify &quot;fizetni&quot; minden szabványos vagy csere számlák entierely fizetni. ClosePaidInvoicesAutomatically=Classify &quot;fizetni&quot; 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 &quot;fizetni&quot;. AllCompletelyPayedInvoiceWillBeClosed=Minden számla nélkül is fizetni fogják automatikusan bezárja az állapota &quot;fizetni&quot;.
TypeContact_facture_internal_SALESREPFOLL=Reprezentatív nyomon követése vevőszámla TypeContact_facture_internal_SALESREPFOLL=Reprezentatív nyomon követése vevőszámla
TypeContact_facture_external_BILLING=Ügyfél számla Kapcsolat TypeContact_facture_external_BILLING=Ügyfél számla Kapcsolat

2
htdocs/langs/is_IS/bills.lang
View File

@ -410,6 +410,6 @@ EditGlobalDiscounts=Breyta hreinum afslætti
AddCreditNote=Búa inneignarnótuna AddCreditNote=Búa inneignarnótuna
InvoiceNotChecked=Engin reikningur valinn InvoiceNotChecked=Engin reikningur valinn
ShowUnpaidAll=Sýna alla ógreiddra reikninga ShowUnpaidAll=Sýna alla ógreiddra reikninga
ClosePaidInvoicesAutomatically=Flokka &quot;borgað&quot; allt staðall eða skipti reikningar entierely borgað. ClosePaidInvoicesAutomatically=Flokka &quot;borgað&quot; 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 &quot;borgað&quot;. AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu &quot;borgað&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:27:05). // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:27:05).

2
htdocs/langs/ja_JP/bills.lang
View File

@ -374,7 +374,7 @@ DisabledBecausePayments=いくつかの支払いがあるのでできませ​
CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません
ExpectedToPay=予想される支払い ExpectedToPay=予想される支払い
PayedByThisPayment=この支払によって支払った PayedByThisPayment=この支払によって支払った
ClosePaidInvoicesAutomatically=&quot;支払った&quot;すべての標準またはentierely支払った交換用の請求書を分類します。 ClosePaidInvoicesAutomatically=&quot;支払った&quot;すべての標準またはentirely支払った交換用の請求書を分類します。
AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが &quot;支払った&quot;に閉鎖され支払うことに残っています。 AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが &quot;支払った&quot;に閉鎖され支払うことに残っています。
TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客の請求書 TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客の請求書
TypeContact_facture_external_BILLING=顧客の請求書の連絡先 TypeContact_facture_external_BILLING=顧客の請求書の連絡先

2
htdocs/langs/nb_NO/bills.lang
View File

@ -438,6 +438,6 @@ EditGlobalDiscounts=Rediger absolutte rabatter
AddCreditNote=Lag kreditt notat AddCreditNote=Lag kreditt notat
InvoiceNotChecked=Ingen faktura er valgt InvoiceNotChecked=Ingen faktura er valgt
ShowUnpaidAll=Vis alle ubetalte fakturaer ShowUnpaidAll=Vis alle ubetalte fakturaer
ClosePaidInvoicesAutomatically=Klassifisere &quot;betalt&quot; alle standard eller utskifting fakturaer entierely utbetales. ClosePaidInvoicesAutomatically=Klassifisere &quot;betalt&quot; alle standard eller utskifting fakturaer entirely utbetales.
AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status &quot;betales&quot;. AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status &quot;betales&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:07:28). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:07:28).

2
htdocs/langs/nl_NL/bills.lang
View File

@ -400,7 +400,7 @@ EditGlobalDiscounts=Edit absolute kortingen
AddCreditNote=Maak een credit nota AddCreditNote=Maak een credit nota
AllCompletelyPayedInvoiceWillBeClosed=Alle factuur zonder te blijven om te betalen zal automatisch worden gesloten om status &quot;Betaald&quot;. AllCompletelyPayedInvoiceWillBeClosed=Alle factuur zonder te blijven om te betalen zal automatisch worden gesloten om status &quot;Betaald&quot;.
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. 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 &quot;Betaalde&quot; alle standaard of vervanging facturen entierely betaald. ClosePaidInvoicesAutomatically=Classificeren &quot;Betaalde&quot; alle standaard of vervanging facturen entirely betaald.
// STOP - Lines generated via autotranslator.php tool (2011-10-10 02:25:52). // STOP - Lines generated via autotranslator.php tool (2011-10-10 02:25:52).

2
htdocs/langs/pl_PL/bills.lang
View File

@ -432,6 +432,6 @@ EditGlobalDiscounts=Edytuj bezwzględne zniżki
AddCreditNote=Tworzenie noty kredytowej AddCreditNote=Tworzenie noty kredytowej
InvoiceNotChecked=Nie wybrano faktura InvoiceNotChecked=Nie wybrano faktura
ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
ClosePaidInvoicesAutomatically=Klasyfikowanie &quot;Opłacone&quot; wszystkie standardy lub fakturach zastępczych entierely zapłaci. ClosePaidInvoicesAutomatically=Klasyfikowanie &quot;Opłacone&quot; wszystkie standardy lub fakturach zastępczych entirely zapłaci.
AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu &quot;płatny&quot;. AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu &quot;płatny&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:19:17). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:19:17).

2
htdocs/langs/ro_RO/bills.lang
View File

@ -432,6 +432,6 @@ EditGlobalDiscounts=Editare reduceri absolute
AddCreditNote=Creaţi note de credit AddCreditNote=Creaţi note de credit
InvoiceNotChecked=Nu factură selectat InvoiceNotChecked=Nu factură selectat
ShowUnpaidAll=Arata toate facturile neachitate ShowUnpaidAll=Arata toate facturile neachitate
ClosePaidInvoicesAutomatically=Clasifica &quot;platiti&quot;, toate facturile standard sau de înlocuire entierely platite. ClosePaidInvoicesAutomatically=Clasifica &quot;platiti&quot;, 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 &quot;platite&quot;. AllCompletelyPayedInvoiceWillBeClosed=Toate cu factura nu rămân la plata vor fi închise automat la statutul de &quot;platite&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:24:55). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:24:55).

2
htdocs/langs/sv_SE/bills.lang
View File

@ -409,6 +409,6 @@ EditGlobalDiscounts=Redigera absoluta rabatter
AddCreditNote=Skapa kreditnota AddCreditNote=Skapa kreditnota
InvoiceNotChecked=Faktura vald InvoiceNotChecked=Faktura vald
ShowUnpaidAll=Visa alla obetalda fakturor ShowUnpaidAll=Visa alla obetalda fakturor
ClosePaidInvoicesAutomatically=Klassificera &quot;betalade&quot; alla standard eller fakturor ersättning entierely betalt. ClosePaidInvoicesAutomatically=Klassificera &quot;betalade&quot; alla standard eller fakturor ersättning entirely betalt.
AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status &quot;betald&quot;. AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status &quot;betald&quot;.
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:32:49). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:32:49).

2
htdocs/langs/zh_CN/bills.lang
View File

@ -414,6 +414,6 @@ EditGlobalDiscounts=编辑绝对折扣
AddCreditNote=创建信用票据 AddCreditNote=创建信用票据
InvoiceNotChecked=选择无发票 InvoiceNotChecked=选择无发票
ShowUnpaidAll=显示所有未付发票 ShowUnpaidAll=显示所有未付发票
ClosePaidInvoicesAutomatically=分类“支付最高”的所有entierely支付最高标准或更换发票。 ClosePaidInvoicesAutomatically=分类“支付最高”的所有entirely支付最高标准或更换发票。
AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。 AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07).

2
htdocs/langs/zh_TW/bills.lang
View File

@ -414,6 +414,6 @@ EditGlobalDiscounts=編輯絕對折扣
AddCreditNote=創建信用票據 AddCreditNote=創建信用票據
InvoiceNotChecked=選擇無發票 InvoiceNotChecked=選擇無發票
ShowUnpaidAll=顯示所有未付款的發票 ShowUnpaidAll=顯示所有未付款的發票
ClosePaidInvoicesAutomatically=分類“支付最高”的所有entierely支付最高標準或更換發票。 ClosePaidInvoicesAutomatically=分類“支付最高”的所有entirely支付最高標準或更換發票。
AllCompletelyPayedInvoiceWillBeClosed=所有發票仍然沒有支付將被自動關閉狀態“支付最高”。 AllCompletelyPayedInvoiceWillBeClosed=所有發票仍然沒有支付將被自動關閉狀態“支付最高”。
// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07). // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07).