Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3
This commit is contained in:
Laurent Destailleur
commit
ed85869394
@ -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"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -384,7 +384,7 @@ DisabledBecausePayments=Не е възможно, тъй като има няк
|
||||
CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирани плаща
|
||||
ExpectedToPay=Очаквано плащане
|
||||
PayedByThisPayment=Плаща от това плащане
|
||||
ClosePaidInvoicesAutomatically=Класифицира "ЗАПЛАЩАТ" стандартно или заместващи фактури entierely ЗАПЛАЩАТ.
|
||||
ClosePaidInvoicesAutomatically=Класифицира "ЗАПЛАЩАТ" стандартно или заместващи фактури entirely ЗАПЛАЩАТ.
|
||||
AllCompletelyPayedInvoiceWillBeClosed=Всички фактура не остават да плати, ще бъде затворено автоматично статус "Платени".
|
||||
TypeContact_facture_internal_SALESREPFOLL=Представител проследяване клиент фактура
|
||||
TypeContact_facture_external_BILLING=Контакта с клиентите фактура
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -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).
|
||||
|
||||
|
||||
@ -998,7 +998,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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -374,7 +374,7 @@ DisabledBecausePayments=לא ניתן שכן אין תשלומים מסוימי
|
||||
CantRemovePaymentWithOneInvoicePaid=לא ניתן להסיר תשלום מאז יש לפחות חשבונית אחת מסווגים שילם
|
||||
ExpectedToPay=צפוי התשלום
|
||||
PayedByThisPayment=שילם על ידי תשלום זה
|
||||
ClosePaidInvoicesAutomatically=לסווג "שילם" את כל תקן או חשבוניות החלפת שילם entierely.
|
||||
ClosePaidInvoicesAutomatically=לסווג "שילם" את כל תקן או חשבוניות החלפת שילם entirely.
|
||||
AllCompletelyPayedInvoiceWillBeClosed=כל חשבונית ללא להישאר לשלם ייסגר באופן אוטומטי למצב "שילם".
|
||||
TypeContact_facture_internal_SALESREPFOLL=לקוחות נציג הבאה למעלה החשבונית
|
||||
TypeContact_facture_external_BILLING=חשבונית הלקוח קשר
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -374,7 +374,7 @@ DisabledBecausePayments=いくつかの支払いがあるのでできませ
|
||||
CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません
|
||||
ExpectedToPay=予想される支払い
|
||||
PayedByThisPayment=この支払によって支払った
|
||||
ClosePaidInvoicesAutomatically="支払った"すべての標準またはentierely支払った交換用の請求書を分類します。
|
||||
ClosePaidInvoicesAutomatically="支払った"すべての標準またはentirely支払った交換用の請求書を分類します。
|
||||
AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが "支払った"に閉鎖され支払うことに残っています。
|
||||
TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客の請求書
|
||||
TypeContact_facture_external_BILLING=顧客の請求書の連絡先
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -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).
|
||||
|
||||
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -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).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user