diff --git a/htdocs/cashdesk/class/Facturation.class.php b/htdocs/cashdesk/class/Facturation.class.php
index 782280e6d2b..e66ed20939d 100644
--- a/htdocs/cashdesk/class/Facturation.class.php
+++ b/htdocs/cashdesk/class/Facturation.class.php
@@ -114,6 +114,7 @@ class Facturation
$localtaxarray = getLocalTaxesFromRate($vatrowid, 0, $societe, $mysoc, 1);
// Clean vat code
+ $reg = array();
$vat_src_code = '';
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 7d47724ddd3..534d45abae0 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -39,6 +39,7 @@ $action=GETPOST('action', 'aZ09');
* Actions
*/
+$reg = array();
if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
{
$code=$reg[1];
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 02cc7b04b86..2cacb885fa9 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2615,7 +2615,7 @@ if ($action == 'create')
$element = $subelement = $origin;
$regs = array();
if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
- $element = $reg[1];
+ $element = $regs[1];
$subelement = $regs[2];
}
@@ -3726,21 +3726,21 @@ elseif ($id > 0 || !empty($ref))
if ($action == 'paid' && $resteapayer > 0) {
// Code
$i = 0;
- $close [$i]['code'] = 'discount_vat'; // escompte
+ $close[$i]['code'] = 'discount_vat'; // escompte
$i++;
- $close [$i]['code'] = 'badcustomer';
+ $close[$i]['code'] = 'badcustomer';
$i++;
// Help
$i = 0;
- $close [$i]['label'] = $langs->trans("HelpEscompte").'
'.$langs->trans("ConfirmClassifyPaidPartiallyReasonDiscountVatDesc");
+ $close[$i]['label'] = $langs->trans("HelpEscompte").'
'.$langs->trans("ConfirmClassifyPaidPartiallyReasonDiscountVatDesc");
$i++;
- $close [$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
+ $close[$i]['label'] = $langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");
$i++;
// Texte
$i = 0;
- $close [$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscount", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
+ $close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscount", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
$i++;
- $close [$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
+ $close[$i]['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency".$conf->currency)), $close[$i]['label'], 1);
$i++;
// arrayreasons[code]=reason
foreach ($close as $key => $val) {
@@ -3766,17 +3766,17 @@ elseif ($id > 0 || !empty($ref))
print '
| '.$langs->trans('Type').' | '; + print ' |
| '.$langs->trans('Type').' | ';
print $object->getLibType();
if ($object->module_source) {
- print ' ('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')';
+ print ' ('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')';
}
if ($object->type == Facture::TYPE_REPLACEMENT) {
$facreplaced = new Facture($db);
$facreplaced->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+ print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
}
if ($object->type == Facture::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
$facusing = new Facture($db);
$facusing->fetch($object->fk_facture_source);
- print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+ print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
}
$facidavoir = $object->getListIdAvoirFromInvoice();
if (count($facidavoir) > 0) {
- print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+ print ' ('.$langs->transnoentities("InvoiceHasAvoir");
$i = 0;
foreach ($facidavoir as $id) {
if ($i == 0)
@@ -3914,14 +3914,14 @@ elseif ($id > 0 || !empty($ref))
if ($objectidnext > 0) {
$facthatreplace = new Facture($db);
$facthatreplace->fetch($objectidnext);
- print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+ print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
}
if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
$discount = new DiscountAbsolute($db);
$result = $discount->fetch(0, $object->id);
if ($result > 0) {
- print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).' '; + print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).' '; } } @@ -3930,7 +3930,7 @@ elseif ($id > 0 || !empty($ref)) $tmptemplate = new FactureRec($db); $result = $tmptemplate->fetch($object->fk_fac_rec_source); if ($result > 0) { - print '. '.$langs->trans( + print '. '.$langs->trans( "GeneratedFromTemplate", ''.$tmptemplate->ref.'' ).''; @@ -3939,7 +3939,8 @@ elseif ($id > 0 || !empty($ref)) print ' |
| '.$langs->trans('Discounts'); + print ''."\n"; + print ' | |
| '.$langs->trans('Discounts'); print ' | ';
$thirdparty = $soc;
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index d54c2c4995d..7e3e2ad9995 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -8,10 +8,10 @@ FONTFORPDF=msungstdlight
FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
-FormatDateShort=%m / %d /%Y
-FormatDateShortInput=%m / %d /%Y
-FormatDateShortJava=MM / dd / yyyy
-FormatDateShortJavaInput=MM / dd / yyyy
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
FormatDateShortJQuery=mm/dd/yy
FormatDateShortJQueryInput=mm/dd/yy
FormatHourShortJQuery=HH:MI
diff --git a/htdocs/langs/zh_TW/multicurrency.lang b/htdocs/langs/zh_TW/multicurrency.lang
new file mode 100644
index 00000000000..fc1db29be55
--- /dev/null
+++ b/htdocs/langs/zh_TW/multicurrency.lang
@@ -0,0 +1,20 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=多國幣別
+ErrorAddRateFail=增加的利率錯誤
+ErrorAddCurrencyFail=增加的幣別錯誤
+ErrorDeleteCurrencyFail=刪除失敗的錯誤
+multicurrency_syncronize_error=同步錯誤:%s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=使用文件的日期尋找貨幣匯率,而不是使用最新的已知匯率
+multicurrency_useOriginTx=從另一個項目新增項目時,請保持原始項目的原始匯率(否則使用最新的已知匯率)
+CurrencyLayerAccount=匯率應用程式介面
+CurrencyLayerAccount_help_to_synchronize=您必須在網站%s上新增一個帳戶才能使用此功能。 獲取您的API密鑰 。 如果您使用免費帳戶,則無法更改來源貨幣 (默認情況下為USD)。 如果您的主要貨幣不是美元,則應用程序將自動對其進行重新計算。 您每月只能進行1000次同步。 +multicurrency_appId=API密鑰 +multicurrency_appCurrencySource=來源貨幣 +multicurrency_alternateCurrencySource=備用來源貨幣 +CurrenciesUsed=已使用幣別 +CurrenciesUsed_help_to_add=增加您需要在提案 , 訂單等上使用的不同貨幣和費率。 +rate=利率 +MulticurrencyReceived=已收,原來幣別 +MulticurrencyRemainderToTake=剩餘金額,原始貨幣 +MulticurrencyPaymentAmount=付款金額,原來幣別 +AmountToOthercurrency=金額(以接收帳戶的貨幣表示) diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang index 0d9dc383561..fb4b6ab4a3c 100644 --- a/htdocs/langs/zh_TW/ticket.lang +++ b/htdocs/langs/zh_TW/ticket.lang @@ -28,14 +28,14 @@ Permission56004=管理服務單 Permission56005=查看所有合作方的服務單(對外部用戶無效,始終僅限於他們所依賴的合作方) TicketDictType=服務單-類型 -TicketDictCategory=Ticket - Groupes -TicketDictSeverity=Ticket - Severities -TicketTypeShortBUGSOFT=Dysfonctionnement logiciel -TicketTypeShortBUGHARD=Dysfonctionnement matériel -TicketTypeShortCOM=Commercial question +TicketDictCategory=服務單-組別 +TicketDictSeverity=服務單-嚴重程度 +TicketTypeShortBUGSOFT=軟體故障 +TicketTypeShortBUGHARD=設備故障 +TicketTypeShortCOM=商業問題 -TicketTypeShortHELP=Request for functionnal help -TicketTypeShortISSUE=Issue, bug or problem +TicketTypeShortHELP=請求有用的幫助 +TicketTypeShortISSUE=錯誤或問題 TicketTypeShortREQUEST=Change or enhancement request TicketTypeShortPROJET=項目 TicketTypeShortOTHER=其他 diff --git a/htdocs/langs/zh_TW/zapier.lang b/htdocs/langs/zh_TW/zapier.lang new file mode 100644 index 00000000000..56342b2ccc6 --- /dev/null +++ b/htdocs/langs/zh_TW/zapier.lang @@ -0,0 +1,28 @@ +# Copyright (C) 2019 Frédéric FRANCE |