From e147259e955edd3d7c1ae29d118b086a7c928b30 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 21 Sep 2014 20:30:55 +0200 Subject: [PATCH] Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6 --- htdocs/accountancy/admin/index.php | 20 +++++++-------- htdocs/accountancy/admin/productaccount.php | 8 +++--- htdocs/accountancy/customer/list.php | 8 +++--- htdocs/accountancy/journal/bankjournal.php | 16 ++++++------ htdocs/accountancy/journal/cashjournal.php | 16 ++++++------ .../accountancy/journal/purchasesjournal.php | 15 +++++------ htdocs/accountancy/journal/sellsjournal.php | 15 +++++------ htdocs/admin/compta.php | 24 +++++++++--------- htdocs/admin/salaries.php | 2 +- htdocs/compta/journal/purchasesjournal.php | 9 +++---- htdocs/compta/journal/sellsjournal.php | 9 +++---- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/resultat/index.php | 2 +- htdocs/compta/stats/cabyprodserv.php | 2 +- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/compta/stats/index.php | 2 +- htdocs/compta/tva/quadri.php | 6 ++--- htdocs/core/class/conf.class.php | 4 +-- .../install/mysql/migration/3.6.0-3.7.0.sql | 25 +++++++++++++++++++ htdocs/langs/ar_SA/compta.lang | 16 ++++++------ htdocs/langs/bg_BG/compta.lang | 16 ++++++------ htdocs/langs/bs_BA/compta.lang | 16 ++++++------ htdocs/langs/ca_ES/compta.lang | 16 ++++++------ htdocs/langs/cs_CZ/compta.lang | 16 ++++++------ htdocs/langs/da_DK/compta.lang | 16 ++++++------ htdocs/langs/de_DE/compta.lang | 16 ++++++------ htdocs/langs/el_GR/compta.lang | 16 ++++++------ htdocs/langs/en_US/accountancy.lang | 8 +++--- htdocs/langs/en_US/compta.lang | 16 ++++++------ htdocs/langs/es_DO/compta.lang | 4 +-- htdocs/langs/es_ES/accountancy.lang | 8 +++--- htdocs/langs/es_ES/compta.lang | 16 ++++++------ htdocs/langs/es_HN/compta.lang | 2 +- htdocs/langs/es_PE/compta.lang | 2 +- htdocs/langs/es_PR/compta.lang | 2 +- htdocs/langs/et_EE/compta.lang | 16 ++++++------ htdocs/langs/eu_ES/compta.lang | 16 ++++++------ htdocs/langs/fa_IR/compta.lang | 16 ++++++------ htdocs/langs/fi_FI/compta.lang | 16 ++++++------ htdocs/langs/fr_FR/accountancy.lang | 8 +++--- htdocs/langs/fr_FR/compta.lang | 16 ++++++------ htdocs/langs/he_IL/compta.lang | 16 ++++++------ htdocs/langs/hr_HR/compta.lang | 16 ++++++------ htdocs/langs/hu_HU/compta.lang | 16 ++++++------ htdocs/langs/id_ID/compta.lang | 16 ++++++------ htdocs/langs/is_IS/compta.lang | 16 ++++++------ htdocs/langs/it_IT/compta.lang | 16 ++++++------ htdocs/langs/ja_JP/compta.lang | 16 ++++++------ htdocs/langs/ko_KR/compta.lang | 16 ++++++------ htdocs/langs/lt_LT/compta.lang | 16 ++++++------ htdocs/langs/lv_LV/compta.lang | 16 ++++++------ htdocs/langs/mk_MK/compta.lang | 16 ++++++------ htdocs/langs/nb_NO/compta.lang | 16 ++++++------ htdocs/langs/nl_NL/compta.lang | 16 ++++++------ htdocs/langs/pl_PL/compta.lang | 16 ++++++------ htdocs/langs/pt_BR/compta.lang | 16 ++++++------ htdocs/langs/pt_PT/compta.lang | 16 ++++++------ htdocs/langs/ro_RO/compta.lang | 16 ++++++------ htdocs/langs/ru_RU/compta.lang | 16 ++++++------ htdocs/langs/sk_SK/compta.lang | 16 ++++++------ htdocs/langs/sl_SI/compta.lang | 16 ++++++------ htdocs/langs/sq_AL/compta.lang | 16 ++++++------ htdocs/langs/sv_SE/compta.lang | 16 ++++++------ htdocs/langs/th_TH/compta.lang | 16 ++++++------ htdocs/langs/tr_TR/compta.lang | 16 ++++++------ htdocs/langs/uk_UA/compta.lang | 16 ++++++------ htdocs/langs/uz_UZ/compta.lang | 16 ++++++------ htdocs/langs/vi_VN/compta.lang | 16 ++++++------ htdocs/langs/zh_CN/compta.lang | 16 ++++++------ htdocs/langs/zh_TW/compta.lang | 16 ++++++------ 71 files changed, 472 insertions(+), 455 deletions(-) diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php index 02cb262b209..a61eb4852bd 100644 --- a/htdocs/accountancy/admin/index.php +++ b/htdocs/accountancy/admin/index.php @@ -44,17 +44,17 @@ if (!$user->admin) $action = GETPOST('action', 'alpha'); -// Other parameters COMPTA_* & ACCOUNTING_* +// Other parameters ACCOUNTING_* $list = array ( 'ACCOUNTING_LIMIT_LIST_VENTILATION', 'ACCOUNTING_LENGTH_GACCOUNT', 'ACCOUNTING_LENGTH_AACCOUNT', - 'COMPTA_ACCOUNT_CUSTOMER', - 'COMPTA_ACCOUNT_SUPPLIER', - 'COMPTA_PRODUCT_BUY_ACCOUNT', - 'COMPTA_PRODUCT_SOLD_ACCOUNT', - 'COMPTA_SERVICE_BUY_ACCOUNT', - 'COMPTA_SERVICE_SOLD_ACCOUNT', + 'ACCOUNTING_ACCOUNT_CUSTOMER', + 'ACCOUNTING_ACCOUNT_SUPPLIER', + 'ACCOUNTING_PRODUCT_BUY_ACCOUNT', + 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT', + 'ACCOUNTING_SERVICE_BUY_ACCOUNT', + 'ACCOUNTING_SERVICE_SOLD_ACCOUNT', 'ACCOUNTING_ACCOUNT_SUSPENSE', 'ACCOUNTING_ACCOUNT_TRANSFER_CASH' ); @@ -63,7 +63,7 @@ $list = array ( * Actions */ -$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES'; +$compta_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; if ($action == 'update') { @@ -78,7 +78,7 @@ if ($action == 'update') if (in_array($compta_mode,$compta_modes)) { - if (!dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { + if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { $error++; } } else { @@ -160,7 +160,7 @@ print ''; print ''; -// Cas du parametre COMPTA_MODE +// Cas du parametre ACCOUNTING_MODE print ''; print ''; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index 0b06a3d0daa..5c1cba946ee 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -98,17 +98,17 @@ if ($resql) { $compta_prodsell = $obj->accountancy_code_sell; if (empty($compta_prodsell)) { if ($obj->product_type == 0) - $compta_prodsell = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodsell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); else - $compta_prodsell = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodsell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } $compta_prodbuy = $obj->accountancy_code_buy; if (empty($compta_prodbuy)) { if ($obj->product_type == 0) - $compta_prodbuy = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodbuy = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef")); else - $compta_prodbuy = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT) ? $conf->global->COMPTA_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef")); + $compta_prodbuy = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef")); } $product_static = new Product($db); diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index fefed420621..225bffdfcb8 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -168,17 +168,17 @@ if ($result) { if (! empty($objp->type)) { if ($objp->type == 1) { - $objp->code_sell = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } else { - $objp->code_sell = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } } else { $code_sell_notset = 'color:blue'; if ($objp->type == 1) { - $objp->code_sell = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } else { - $objp->code_sell = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); + $objp->code_sell = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef")); } } } diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 82c3a09e20a..537dc3476fd 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -129,8 +129,8 @@ if ($result) { $num = $db->num_rows($result); // Variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER) ? $conf->global->COMPTA_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER) ? $conf->global->COMPTA_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); $cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef")); $accountancy_account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : $langs->trans("CodeNotDef")); @@ -349,7 +349,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else if ($tabtype[$key] == 'payment_supplier') { $sqlmid = 'SELECT facf.facnumber'; @@ -364,7 +364,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_SUPPLIER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; } else if ($tabtype[$key] == 'company') { $sqlmid = 'SELECT fac.facnumber'; @@ -379,11 +379,11 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else { $bookkeeping->doc_ref = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } $result = $bookkeeping->create(); @@ -434,9 +434,9 @@ if ($action == 'export_csv') { print $date . $sep; print $conf->global->ACCOUNTING_BANK_JOURNAL . $sep; if ($val["lib"] == '(SupplierInvoicePayment)') { - print length_accountg($conf->global->COMPTA_ACCOUNT_SUPPLIER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep; } else { - print length_accountg($conf->global->COMPTA_ACCOUNT_CUSTOMER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep; } print length_accounta(html_entity_decode($k)) . $sep; print ($mt < 0 ? 'D' : 'C') . $sep; diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php index 33b1e4359c1..52cdbb4f616 100644 --- a/htdocs/accountancy/journal/cashjournal.php +++ b/htdocs/accountancy/journal/cashjournal.php @@ -121,8 +121,8 @@ if ($result) { $num = $db->num_rows($result); // les variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER) ? $conf->global->COMPTA_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER) ? $conf->global->COMPTA_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef")); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef")); $cpttva = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef")); $cptsociale = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) ? $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE : $langs->trans("CodeNotDef")); @@ -318,7 +318,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else if ($tabtype[$key] == 'payment_supplier') { $sqlmid = 'SELECT facf.facnumber'; @@ -333,7 +333,7 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_SUPPLIER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; } else if ($tabtype[$key] == 'company') { $sqlmid = 'SELECT fac.facnumber'; @@ -348,11 +348,11 @@ if ($action == 'writeBookKeeping') { $bookkeeping->doc_ref = $objmid->facnumber; } $bookkeeping->code_tiers = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } else { $bookkeeping->doc_ref = $k; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; } $result = $bookkeeping->create(); @@ -399,9 +399,9 @@ if ($action == 'export_csv') { print $date . $sep; print $conf->global->ACCOUNTING_CASH_JOURNAL . $sep; if ($obj->label == '(SupplierInvoicePayment)') { - print length_accountg($conf->global->COMPTA_ACCOUNT_SUPPLIER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep; } else { - print length_accountg($conf->global->COMPTA_ACCOUNT_CUSTOMER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep; } print length_accounta(html_entity_decode($k)) . $sep; print ($mt < 0 ? 'D' : 'C') . $sep; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index c9d21f5d9be..789aa1111af 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -111,8 +111,8 @@ $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); // les variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER)) ? $conf->global->COMPTA_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"); - $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)) ? $conf->global->COMPTA_VAT_ACCOUNT : $langs->trans("CodeNotDef"); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef"); $tabfac = array (); $tabht = array (); @@ -128,9 +128,9 @@ if ($result) { $compta_prod = $obj->compte; if (empty($compta_prod)) { if ($obj->product_type == 0) - $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT)) ? $conf->global->COMPTA_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"); else - $compta_prod = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT)) ? $conf->global->COMPTA_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"); } $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva); @@ -174,7 +174,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->fk_docdet = $val["fk_facturefourndet"]; $bookkeeping->code_tiers = $tabcompany[$key]['code_fournisseur']; $bookkeeping->label_compte = $tabcompany[$key]['name']; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_SUPPLIER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt >= 0) ? 'C' : 'D'; $bookkeeping->debit = ($mt <= 0) ? $mt : 0; @@ -288,7 +288,7 @@ if ($action == 'export_csv') { } print $date . $sep; print $conf->global->ACCOUNTING_PURCHASE_JOURNAL . $sep; - print length_accountg($conf->global->COMPTA_ACCOUNT_SUPPLIER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) . $sep; foreach ( $tabttc[$key] as $k => $mt ) { print length_accounta(html_entity_decode($k)) . $sep; @@ -416,7 +416,6 @@ if ($action == 'export_csv') { foreach ( $tabht[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; @@ -431,7 +430,6 @@ if ($action == 'export_csv') { foreach ( $tabtva[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; @@ -443,7 +441,6 @@ if ($action == 'export_csv') { print ""; // Third party - // print ""; print ""; print ""; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 79444fbca60..a7c0266998f 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -125,17 +125,17 @@ if ($result) { while ( $i < $num ) { $obj = $db->fetch_object($result); // les variables - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER)) ? $conf->global->COMPTA_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"); $compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli; $compta_prod = $obj->compte; if (empty($compta_prod)) { if ($obj->product_type == 0) - $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); else - $compta_prod = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT)) ? $conf->global->COMPTA_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); + $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"); } - $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)) ? $conf->global->COMPTA_VAT_ACCOUNT : $langs->trans("CodeNotDef"); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_ACCOUNT : $langs->trans("CodeNotDef"); $compta_tva = (! empty($obj->account_tva) ? $obj->account_tva : $cpttva); // Invoice lines @@ -183,7 +183,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->fk_doc = $key; $bookkeeping->fk_docdet = $val["fk_facturedet"]; $bookkeeping->code_tiers = $tabcompany[$key]['code_client']; - $bookkeeping->numero_compte = $conf->global->COMPTA_ACCOUNT_CUSTOMER; + $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER; $bookkeeping->label_compte = $tabcompany[$key]['name']; $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C'; @@ -267,7 +267,7 @@ if ($action == 'export_csv') { print $date . $sep; print $conf->global->ACCOUNTING_SELL_JOURNAL . $sep; - print length_accountg($conf->global->COMPTA_ACCOUNT_CUSTOMER) . $sep; + print length_accountg($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) . $sep; foreach ( $tabttc[$key] as $k => $mt ) { print length_accounta(html_entity_decode($k)) . $sep; print ($mt < 0 ? 'C' : 'D') . $sep; @@ -422,7 +422,6 @@ if ($action == 'export_csv') { print ""; // Third party - // print ""; print ""; print ""; foreach ( $tabttc[$key] as $k => $mt ) { @@ -441,7 +440,6 @@ if ($action == 'export_csv') { foreach ( $tabht[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; @@ -457,7 +455,6 @@ if ($action == 'export_csv') { foreach ( $tabtva[$key] as $k => $mt ) { if ($mt) { print ""; - // print ""; print ""; print ""; print ""; diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 5c77149c0f0..0bb83eae3c4 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -37,23 +37,23 @@ accessforbidden(); $action = GETPOST('action','alpha'); -// Other parameters COMPTA_* +// Other parameters ACCOUNTING_* $list = array( - 'COMPTA_PRODUCT_BUY_ACCOUNT', - 'COMPTA_PRODUCT_SOLD_ACCOUNT', - 'COMPTA_SERVICE_BUY_ACCOUNT', - 'COMPTA_SERVICE_SOLD_ACCOUNT', - 'COMPTA_VAT_ACCOUNT', - 'COMPTA_VAT_BUY_ACCOUNT', - 'COMPTA_ACCOUNT_CUSTOMER', - 'COMPTA_ACCOUNT_SUPPLIER' + 'ACCOUNTING_PRODUCT_BUY_ACCOUNT', + 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT', + 'ACCOUNTING_SERVICE_BUY_ACCOUNT', + 'ACCOUNTING_SERVICE_SOLD_ACCOUNT', + 'ACCOUNTING_VAT_ACCOUNT', + 'ACCOUNTING_VAT_BUY_ACCOUNT', + 'ACCOUNTING_ACCOUNT_CUSTOMER', + 'ACCOUNTING_ACCOUNT_SUPPLIER' ); /* * Actions */ -$compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES'; +$compta_mode = defined('ACCOUNTING_MODE')?ACCOUNTING_MODE:'RECETTES-DEPENSES'; if ($action == 'update') { @@ -69,7 +69,7 @@ if ($action == 'update') if (in_array($compta_mode,$compta_modes)) { - if (!dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { + if (!dolibarr_set_const($db, 'ACCOUNTING_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) { $error++; } } else { @@ -113,7 +113,7 @@ print ''; print '
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "" . $langs->trans("VAT") . "
".$conf->global->COMPTA_JOURNAL_BUY."" . $date . "" . $invoicestatic->getNomUrl(1) . "
".$conf->global->COMPTA_JOURNAL_SELL."" . $date . "" . $invoicestatic->getNomUrl(1) . "
".$conf->global->COMPTA_JOURNAL_SELL."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "
".$conf->global->COMPTA_JOURNAL_SELL."" . $date . "" . $invoicestatic->getNomUrl(1) . "" . length_accountg($k) . "
'; -// Cas du parametre COMPTA_MODE +// Cas du parametre ACCOUNTING_MODE print ''; print ''; diff --git a/htdocs/admin/salaries.php b/htdocs/admin/salaries.php index 453db8e4203..d7027d8a1dd 100644 --- a/htdocs/admin/salaries.php +++ b/htdocs/admin/salaries.php @@ -36,7 +36,7 @@ if (!$user->admin) $action = GETPOST('action', 'alpha'); -// Other parameters COMPTA_* & ACCOUNTING_* +// Other parameters SALARIES_* $list = array ( 'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT', 'SALARIES_ACCOUNTING_ACCOUNT_CHARGE' diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php index 169fb32010a..34cf525104a 100644 --- a/htdocs/compta/journal/purchasesjournal.php +++ b/htdocs/compta/journal/purchasesjournal.php @@ -122,8 +122,8 @@ if ($result) { $num = $db->num_rows($result); // les variables - $cptfour = (! empty($conf->global->COMPTA_ACCOUNT_SUPPLIER)?$conf->global->COMPTA_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef")); - $cpttva = (! empty($conf->global->COMPTA_VAT_BUY_ACCOUNT)?$conf->global->COMPTA_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); + $cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)?$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER:$langs->trans("CodeNotDef")); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_VAT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); $tabfac = array(); $tabht = array(); @@ -142,8 +142,8 @@ if ($result) $compta_prod = $obj->accountancy_code_buy; if (empty($compta_prod)) { - if($obj->product_type == 0) $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_BUY_ACCOUNT)?$conf->global->COMPTA_PRODUCT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); - else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_BUY_ACCOUNT)?$conf->global->COMPTA_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef")); + if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT:$langs->trans("CodeNotDef")); + else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT:$langs->trans("CodeNotDef")); } $compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva); $compta_localtax1 = (! empty($obj->account_localtax1)?$obj->account_localtax1:$langs->trans("CodeNotDef")); @@ -230,7 +230,6 @@ foreach ($tabfac as $key => $val) if (isset($line['nomtcheck']) || $mt) { print ""; - //print ""; print ""; print ""; print ""; diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php index f90add66b54..e249d3fe554 100644 --- a/htdocs/compta/journal/sellsjournal.php +++ b/htdocs/compta/journal/sellsjournal.php @@ -141,15 +141,15 @@ if ($result) { $obj = $db->fetch_object($result); // les variables - $cptcli = (! empty($conf->global->COMPTA_ACCOUNT_CUSTOMER)?$conf->global->COMPTA_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef")); + $cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)?$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER:$langs->trans("CodeNotDef")); $compta_soc = (! empty($obj->code_compta)?$obj->code_compta:$cptcli); $compta_prod = $obj->accountancy_code_sell; if (empty($compta_prod)) { - if($obj->product_type == 0) $compta_prod = (! empty($conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT)?$conf->global->COMPTA_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); - else $compta_prod = (! empty($conf->global->COMPTA_SERVICE_SOLD_ACCOUNT)?$conf->global->COMPTA_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); + if($obj->product_type == 0) $compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); + else $compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)?$conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT:$langs->trans("CodeNotDef")); } - $cpttva = (! empty($conf->global->COMPTA_VAT_ACCOUNT)?$conf->global->COMPTA_VAT_ACCOUNT:$langs->trans("CodeNotDef")); + $cpttva = (! empty($conf->global->ACCOUNTING_VAT_ACCOUNT)?$conf->global->ACCOUNTING_VAT_ACCOUNT:$langs->trans("CodeNotDef")); $compta_tva = (! empty($obj->account_tva)?$obj->account_tva:$cpttva); $account_localtax1=getLocalTaxesFromRate($obj->tva_tx, 1, $obj->thirdparty, $mysoc); @@ -240,7 +240,6 @@ foreach ($tabfac as $key => $val) if (isset($line['nomtcheck']) || $mt) { print ""; - //print ""; print ""; print ""; print ""; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 08ae52a3d51..abad47cf443 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -99,7 +99,7 @@ else } // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->COMPTA_MODE); +$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->ACCOUNTING_MODE); /* diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 05c3a93e011..1fecc0e1c28 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -48,7 +48,7 @@ if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accountin // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->COMPTA_MODE); +$modecompta=(GETPOST("modecompta")?GETPOST("modecompta"):$conf->global->ACCOUNTING_MODE); /* diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index aa1047934f5..e995ee45d54 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -39,7 +39,7 @@ if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta' if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport'); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 04cf00b4388..e88d370a0c6 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -36,7 +36,7 @@ if (! empty($conf->comptabilite->enabled)) $result=restrictedArea($user,'compta' if (! empty($conf->accounting->enabled)) $result=restrictedArea($user,'accounting','','','comptarapport'); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index cea623a144b..1d34f78a181 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -34,7 +34,7 @@ $langs->load("companies"); $langs->load("categories"); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if (GETPOST("modecompta")) $modecompta=GETPOST("modecompta"); $sortorder=isset($_GET["sortorder"])?$_GET["sortorder"]:$_POST["sortorder"]; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 59a7e478f9b..69fdeff849c 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -38,7 +38,7 @@ else { $userid=GETPOST('userid','int'); $socid = GETPOST('socid','int'); // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES') -$modecompta = $conf->global->COMPTA_MODE; +$modecompta = $conf->global->ACCOUNTING_MODE; if ($_GET["modecompta"]) $modecompta=$_GET["modecompta"]; // Security check diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index d991ac8ac88..f5d0065e7f3 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -60,7 +60,7 @@ function tva_coll($db,$y,$q) { global $conf; - if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") + if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES") { // if vat paid on due invoices $sql = "SELECT d.fk_facture as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.total_tva as amount"; @@ -128,7 +128,7 @@ function tva_paye($db, $y,$q) { global $conf; - if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") + if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES") { // Si on paye la tva sur les factures dues (non brouillon) $sql = "SELECT d.fk_facture_fourn as facid, f.facnumber as facnum, d.tva_tx as rate, d.total_ht as totalht, d.tva as amount"; @@ -212,7 +212,7 @@ print ""; print ""; print "\n"; -if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") +if ($conf->global->ACCOUNTING_MODE == "CREANCES-DETTES") { $y = $year_current; diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index b6225de2913..8a17273435e 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -370,8 +370,8 @@ class Conf if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR'; $this->currency=$this->global->MAIN_MONNAIE; - // conf->global->COMPTA_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...) - if (empty($this->global->COMPTA_MODE)) $this->global->COMPTA_MODE='RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES' + // conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...) + if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE='RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES' // conf->liste_limit = constante de taille maximale des listes if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25; diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 24cb1a6203d..d444b003541 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -77,6 +77,31 @@ ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec; ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label; ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author; +-- Qual +UPDATE llx_const SET name = 'ACCOUNTING_MODE' WHERE name = 'COMPTA_MODE'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_CUSTOMER' WHERE name = 'COMPTA_ACCOUNT_CUSTOMER'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUPPLIER' WHERE name = 'COMPTA_ACCOUNT_SUPPLIER'; +UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_BUY_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_BUY_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT' WHERE name = 'COMPTA_PRODUCT_SOLD_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_BUY_ACCOUNT' WHERE name = 'COMPTA_SERVICE_BUY_ACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT' WHERE name = 'COMPTA_SERVICE_SOLD_ACCOUNT'; + +-- Compatibility with module Accounting Expert +UPDATE llx_const SET name = 'ACCOUNTING_SEPARATORCSV' WHERE name = 'ACCOUNTINGEX_SEPARATORCSV'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUSPENSE' WHERE name = 'ACCOUNTINGEX_ACCOUNT_SUSPENSE'; +UPDATE llx_const SET name = 'ACCOUNTING_SELL_JOURNAL' WHERE name = 'ACCOUNTINGEX_SELL_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_PURCHASE_JOURNAL' WHERE name = 'ACCOUNTINGEX_PURCHASE_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_SOCIAL_JOURNAL' WHERE name = 'ACCOUNTINGEX_SOCIAL_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_CASH_JOURNAL' WHERE name = 'ACCOUNTINGEX_CASH_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_MISCELLANEOUS_JOURNAL' WHERE name = 'ACCOUNTINGEX_MISCELLANEOUS_JOURNAL'; +UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH' WHERE name = 'ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH'; +UPDATE llx_const SET name = 'ACCOUNTING_MODELCSV' WHERE name = 'ACCOUNTINGEX_MODELCSV'; +UPDATE llx_const SET name = 'ACCOUNTING_LENGTH_GACCOUNT' WHERE name = 'ACCOUNTINGEX_LENGTH_GACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_LENGTH_AACCOUNT' WHERE name = 'ACCOUNTINGEX_LENGTH_AACCOUNT'; +UPDATE llx_const SET name = 'ACCOUNTING_LIMIT_LIST_VENTILATION' WHERE name = 'ACCOUNTINGEX_LIMIT_LIST_VENTILATION'; +UPDATE llx_const SET name = 'ACCOUNTING_LIST_SORT_VENTILATION_TODO' WHERE name = 'ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO'; +UPDATE llx_const SET name = 'ACCOUNTING_LIST_SORT_VENTILATION_DONE' WHERE name = 'ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE'; + -- Drop old table DROP TABLE llx_compta; DROP TABLE llx_compta_account; diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang index 2d307a8aefc..f0f62dc224f 100644 --- a/htdocs/langs/ar_SA/compta.lang +++ b/htdocs/langs/ar_SA/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang index 92759e243bb..03427b5e2ae 100644 --- a/htdocs/langs/bg_BG/compta.lang +++ b/htdocs/langs/bg_BG/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang index f63bcd65b3c..2ea31a467d3 100644 --- a/htdocs/langs/bs_BA/compta.lang +++ b/htdocs/langs/bs_BA/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index aee43830170..c70bfcf75da 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang index 83ce6e5305d..2a350c29f16 100644 --- a/htdocs/langs/cs_CZ/compta.lang +++ b/htdocs/langs/cs_CZ/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=podle dodavatele zvolit vhodnou metodu použít stej TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat zpráva za zboží, při použití hotovosti evidence režim není relevantní. Tato zpráva je k dispozici pouze při použití zásnubní evidence režimu (viz nastavení účetního modulu). CalculationMode=Výpočet režim AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Účetnictví standardní kód pro zákaznické thirdparties -COMPTA_ACCOUNT_SUPPLIER=Účetnictví standardní kód pro dodavatele thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Účetnictví standardní kód pro zákaznické thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Účetnictví standardní kód pro dodavatele thirdparties diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang index cd807bc9c4c..7664bec456d 100644 --- a/htdocs/langs/da_DK/compta.lang +++ b/htdocs/langs/da_DK/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Kalkulations mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 8e9aa735602..53d8dba6d00 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Berechnungsmodus AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen -COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen -COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen -COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen -COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen -COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen +ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen +ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen +ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang index 89dac1035d2..35c9a2a060b 100644 --- a/htdocs/langs/el_GR/compta.lang +++ b/htdocs/langs/el_GR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=σύμφωνα με τον προμηθευτή, ε TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε ταμειακής λογιστικής mode is not relevant. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε λογιστικής δέσμευσης τρόπος (ανατρέξτε στην ενότητα Ρύθμιση της μονάδας λογιστικής). CalculationMode=Τρόπο υπολογισμού AccountancyJournal=Λογιστικος Κωδικός περιοδικό -COMPTA_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για να αγοράσουν τα προϊόντα -COMPTA_PRODUCT_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση των προϊόντων -COMPTA_SERVICE_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την αγορά των υπηρεσιών -COMPTA_SERVICE_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση υπηρεσιών -COMPTA_VAT_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ -COMPTA_VAT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ -COMPTA_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη -COMPTA_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για να αγοράσουν τα προϊόντα +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση των προϊόντων +ACCOUNTING_SERVICE_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την αγορά των υπηρεσιών +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την πώληση υπηρεσιών +ACCOUNTING_VAT_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την είσπραξη του ΦΠΑ +ACCOUNTING_VAT_BUY_ACCOUNT=Προ επιλεγμένος κωδικός λογιστικής για την καταβολή του ΦΠΑ +ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προεπιλογή για πελάτη +ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για προμηθευτή diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 3d9681774d8..cfcdec83c2f 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -87,10 +87,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait -COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) -COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) -COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) -COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) Doctype=Type of document Docdate=Date diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 363f1f17395..5ec9bd62a54 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang index 0d837cbe9f6..4474b523ba5 100644 --- a/htdocs/langs/es_DO/compta.lang +++ b/htdocs/langs/es_DO/compta.lang @@ -24,5 +24,5 @@ RulesVATInServices=- Para los servicios, el informe incluye el ITBIS de los pago RulesVATInProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura. RulesVATDueServices=- Para los servicios, el informe incluye el ITBIS de las facturas debidas, pagadas o no basándose en la fecha de estas facturas. RulesVATDueProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido -COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado \ No newline at end of file +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido +ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado \ No newline at end of file diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index 4298ceddbc6..c715587994f 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -87,10 +87,10 @@ ACCOUNTINGEX_SOCIAL_JOURNAL=Diario social ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Cuenta de caja ACCOUNTINGEX_ACCOUNT_SUSPENSE=Cuenta operaciones pendientes de asignar -COMPTA_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto) -COMPTA_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto) -COMPTA_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio) -COMPTA_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (si no se define en el producto) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cuenta contable predeterminada para los productos vendidos (si no se define en el producto) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Cuenta contable predeterminada para los servicios comprados (si no se define en el servicio) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cuenta contable predeterminada para los servicios vendidos (si no se define en el servico) Doctype=Tipo de documento Docdate=Fecha diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index 9fc192ecbb1..da1da3eb951 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=de acuerdo con el proveedor, seleccione el método a TurnoverPerProductInCommitmentAccountingNotRelevant=El informe de ventas por producto, cuando se utiliza en modo contabilidad de caja no es relevante. Este informe sólo está disponible cuando se utiliza en modo contabilidad de compromiso (consulte la configuración del módulo de contabilidad). CalculationMode=Modo de cálculo AccountancyJournal=Código contable diario -COMPTA_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos -COMPTA_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos -COMPTA_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios -COMPTA_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios -COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido -COMPTA_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado -COMPTA_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes -COMPTA_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código contable por defecto para la compra de productos +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código contable por defecto para la venta de productos +ACCOUNTING_SERVICE_BUY_ACCOUNT=Código contable por defecto para la compra de servicios +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código contable por defecto para la venta de servicios +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVA repercutido +ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el IVA soportado +ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta contable por defecto para clientes +ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta contable por defecto para proveedores diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang index 29196f1372e..396d234b2df 100644 --- a/htdocs/langs/es_HN/compta.lang +++ b/htdocs/langs/es_HN/compta.lang @@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe %sISV pagado%s para un modo SeeVATReportInDueDebtMode=Ver el informe %sISV debido%s para un modo de cálculo con la opción sobre lo debido RulesVATIn=- Para los servicios, el informe incluye el ISV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura. RulesVATDue=- Para los servicios, el informe incluye el ISV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV") +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV") diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang index 782dfe6ec94..2dbc3cc49b9 100644 --- a/htdocs/langs/es_PE/compta.lang +++ b/htdocs/langs/es_PE/compta.lang @@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe %sIGV pagado%s para un modo SeeVATReportInDueDebtMode=Ver el informe %sIGV debido%s para un modo de cálculo con la opción sobre lo debido RulesVATIn=- Para los servicios, el informe incluye el IGV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura. RulesVATDue=- Para los servicios, el informe incluye el IGV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV") +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV") diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang index 0ba46f2c682..c9226abe8f1 100644 --- a/htdocs/langs/es_PR/compta.lang +++ b/htdocs/langs/es_PR/compta.lang @@ -22,4 +22,4 @@ SeeVATReportInInputOutputMode=Ver el informe %sIVU pagado%s para un modo SeeVATReportInDueDebtMode=Ver el informe %sIVU debido%s para un modo de cálculo con la opción sobre lo debido RulesVATIn=- Para los servicios, el informe incluye el IVU de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura. RulesVATDue=- Para los servicios, el informe incluye el IVU de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura. -COMPTA_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU") +ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU") diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang index 2dac123a3fe..8c7afa0e642 100644 --- a/htdocs/langs/et_EE/compta.lang +++ b/htdocs/langs/et_EE/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=vastavalt hankijale, vali sobiv meetod sama reegli r TurnoverPerProductInCommitmentAccountingNotRelevant=Käibearuanne toote kaupa, kassapõhist raamatupidamist kasutades pole režiim oluline. See aruanne on saadaval vaid tekkepõhist raamatupidamist kasutades (vaata raamatupidamise mooduli seadistust). CalculationMode=Arvutusrežiim AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Vaikimisi kasutatav raamatupidamise kood klientide loomisel -COMPTA_ACCOUNT_SUPPLIER=Vaikimisi kasutatav raamatupidamise kood hankijate loomisel +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Vaikimisi kasutatav raamatupidamise kood klientide loomisel +ACCOUNTING_ACCOUNT_SUPPLIER=Vaikimisi kasutatav raamatupidamise kood hankijate loomisel diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/eu_ES/compta.lang +++ b/htdocs/langs/eu_ES/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index f6bdd7dca9a..252a2597b7c 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=با توجه به منبع، انتخاب روش م TurnoverPerProductInCommitmentAccountingNotRelevant=گزارش گردش مالی در هر محصول، در هنگام استفاده از حالت حسابداری نقدی مربوط نیست. این گزارش که با استفاده از تعامل حالت حسابداری (راه اندازی ماژول حسابداری را مشاهده کنید) فقط در دسترس است. CalculationMode=حالت محاسبه AccountancyJournal=کد حسابداری مجله -COMPTA_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات -COMPTA_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات -COMPTA_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات -COMPTA_SERVICE_SOLD_ACCOUNT=کد پیش فرض حسابداری به فروش خدمات -COMPTA_VAT_ACCOUNT=پیش فرض کد حسابداری برای جمع آوری مالیات بر ارزش افزوده -COMPTA_VAT_BUY_ACCOUNT=پیش فرض کد حسابداری برای پرداخت مالیات بر ارزش افزوده -COMPTA_ACCOUNT_CUSTOMER=کد حسابداری به طور پیش فرض برای thirdparties مشتری -COMPTA_ACCOUNT_SUPPLIER=کد حسابداری به طور پیش فرض برای thirdparties منبع +ACCOUNTING_PRODUCT_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید محصولات +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=کد پیش فرض حسابداری برای فروش محصولات +ACCOUNTING_SERVICE_BUY_ACCOUNT=کد پیش فرض حسابداری برای خرید خدمات +ACCOUNTING_SERVICE_SOLD_ACCOUNT=کد پیش فرض حسابداری به فروش خدمات +ACCOUNTING_VAT_ACCOUNT=پیش فرض کد حسابداری برای جمع آوری مالیات بر ارزش افزوده +ACCOUNTING_VAT_BUY_ACCOUNT=پیش فرض کد حسابداری برای پرداخت مالیات بر ارزش افزوده +ACCOUNTING_ACCOUNT_CUSTOMER=کد حسابداری به طور پیش فرض برای thirdparties مشتری +ACCOUNTING_ACCOUNT_SUPPLIER=کد حسابداری به طور پیش فرض برای thirdparties منبع diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang index 585b9bac3f8..e1d9de0c869 100644 --- a/htdocs/langs/fi_FI/compta.lang +++ b/htdocs/langs/fi_FI/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 8f66eb5319f..352b3902096 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -87,10 +87,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Journal Social ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de transfert espèce ACCOUNTING_ACCOUNT_SUSPENSE=Compte d'attente -COMPTA_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) -COMPTA_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) -COMPTA_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) -COMPTA_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service) Doctype=Type de document Docdate=Date diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index daf273cee3d..7e82771eec1 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaire par produit, dans une comptabilité en mode comptabilité de caisse n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit comptabilité d'engagement (voir la configuration du module de comptabilité). CalculationMode=Mode de calcul AccountancyJournal=Code journal comptabilité -COMPTA_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits -COMPTA_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits -COMPTA_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services -COMPTA_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services -COMPTA_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA -COMPTA_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA -COMPTA_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients -COMPTA_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Code comptable par défaut pour l'achat de produits +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Code comptable par défaut pour la vente de produits +ACCOUNTING_SERVICE_BUY_ACCOUNT=Code comptable par défaut pour l'achat de services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Code comptable par défaut pour la vente de services +ACCOUNTING_VAT_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA +ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour le versement de la TVA +ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients +ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang index 22edf9746b3..bac153c241e 100644 --- a/htdocs/langs/he_IL/compta.lang +++ b/htdocs/langs/he_IL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/hr_HR/compta.lang +++ b/htdocs/langs/hr_HR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang index 357d0092b75..1acf7e994fe 100644 --- a/htdocs/langs/hu_HU/compta.lang +++ b/htdocs/langs/hu_HU/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/id_ID/compta.lang +++ b/htdocs/langs/id_ID/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang index f31764f0036..d9148be61f3 100644 --- a/htdocs/langs/is_IS/compta.lang +++ b/htdocs/langs/is_IS/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang index 8c60b656a72..ec2601ed1b2 100644 --- a/htdocs/langs/it_IT/compta.lang +++ b/htdocs/langs/it_IT/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=in accordo con il fornitore, scegliere il metodo app TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Metodo di calcolo AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Codice contabile predefinito per acquistare prodotti -COMPTA_PRODUCT_SOLD_ACCOUNT=Codice contabile predefinito per vendere prodotti -COMPTA_SERVICE_BUY_ACCOUNT=Codice contabile predefinito per comprare servizi -COMPTA_SERVICE_SOLD_ACCOUNT=Codice contabile predefinito per vendere servizi -COMPTA_VAT_ACCOUNT=Codice contabile predefinito per IVA a credito -COMPTA_VAT_BUY_ACCOUNT=Codice contabile predefinito per IVA a debito -COMPTA_ACCOUNT_CUSTOMER=Codice contabile predefinito per clienti -COMPTA_ACCOUNT_SUPPLIER=Codice contabile predefinito per fornitori +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codice contabile predefinito per acquistare prodotti +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codice contabile predefinito per vendere prodotti +ACCOUNTING_SERVICE_BUY_ACCOUNT=Codice contabile predefinito per comprare servizi +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codice contabile predefinito per vendere servizi +ACCOUNTING_VAT_ACCOUNT=Codice contabile predefinito per IVA a credito +ACCOUNTING_VAT_BUY_ACCOUNT=Codice contabile predefinito per IVA a debito +ACCOUNTING_ACCOUNT_CUSTOMER=Codice contabile predefinito per clienti +ACCOUNTING_ACCOUNT_SUPPLIER=Codice contabile predefinito per fornitori diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang index 4520b58c2d3..a1d67ea4a1f 100644 --- a/htdocs/langs/ja_JP/compta.lang +++ b/htdocs/langs/ja_JP/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/ko_KR/compta.lang +++ b/htdocs/langs/ko_KR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang index 3ddf4470a93..74afe6bd1e8 100644 --- a/htdocs/langs/lt_LT/compta.lang +++ b/htdocs/langs/lt_LT/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Priklausomai nuo tiekėjo, pasirinkti tinkamą metod TurnoverPerProductInCommitmentAccountingNotRelevant=Apyvartos ataskaita pagal produktą, kai naudojamas Pinigų apskaita būdas nėra tinkamas. Ši ataskaita yra prieinama tik tada, kai naudojama Įsipareigojimų apskaita režimas (žr. Apskaitos modulio nustatymus). CalculationMode=Skaičiavimo metodas AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pirkimui -COMPTA_PRODUCT_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pardavimui -COMPTA_SERVICE_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pirkimui -COMPTA_SERVICE_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pardavimui -COMPTA_VAT_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą gaunama PVM -COMPTA_VAT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą sumokamam PVM -COMPTA_ACCOUNT_CUSTOMER=Apskaitos taisyklės pagal nutylėjimą klientui trečiajai šaliai -COMPTA_ACCOUNT_SUPPLIER=Apskaitos taisyklės pagal nutylėjimą tiekėjams trečiosioms šalims +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pirkimui +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą produktų pardavimui +ACCOUNTING_SERVICE_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pirkimui +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą paslaugų pardavimui +ACCOUNTING_VAT_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą gaunama PVM +ACCOUNTING_VAT_BUY_ACCOUNT=Apskaitos taisyklės pagal nutylėjimą sumokamam PVM +ACCOUNTING_ACCOUNT_CUSTOMER=Apskaitos taisyklės pagal nutylėjimą klientui trečiajai šaliai +ACCOUNTING_ACCOUNT_SUPPLIER=Apskaitos taisyklės pagal nutylėjimą tiekėjams trečiosioms šalims diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang index fcb2cd6b575..86edd4a2e0e 100644 --- a/htdocs/langs/lv_LV/compta.lang +++ b/htdocs/langs/lv_LV/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=no piegādātāja, izvēlēties piemērotu metodi pi TurnoverPerProductInCommitmentAccountingNotRelevant=Apgrozījums ziņojums par produktu, izmantojot skaidras naudas uzskaites režīmu nav nozīmes. Šis ziņojums ir pieejams tikai tad, ja izmanto saderināšanās grāmatvedības režīmu (skat. iestatīšanu grāmatvedības moduli). CalculationMode=Aprēķinu režīms AccountancyJournal=Kontu žurnāls -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Grāmatvedība kods pēc noklusējuma klientu thirdparties -COMPTA_ACCOUNT_SUPPLIER=Grāmatvedība kods pēc noklusējuma piegādātāja thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Grāmatvedība kods pēc noklusējuma klientu thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Grāmatvedība kods pēc noklusējuma piegādātāja thirdparties diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/mk_MK/compta.lang +++ b/htdocs/langs/mk_MK/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang index 53d0c060922..3c9ec2a9d79 100644 --- a/htdocs/langs/nb_NO/compta.lang +++ b/htdocs/langs/nb_NO/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index 0d6f8ac174c..88556ef051e 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een kas boukhoudings-modus is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van betrokkenheid accountancy-modus (zie setup van boukhoud module). CalculationMode=Berekeningswijze AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Standaard boekhoud code om producten te kopen -COMPTA_PRODUCT_SOLD_ACCOUNT=Standaard boekhoud code om producten te verkopen -COMPTA_SERVICE_BUY_ACCOUNT=Standaard boekhoud code om diensten te kopen -COMPTA_SERVICE_SOLD_ACCOUNT=Standaard boekhoud code om diensten te verkopen -COMPTA_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW -COMPTA_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw -COMPTA_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties -COMPTA_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standaard boekhoud code om producten te kopen +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standaard boekhoud code om producten te verkopen +ACCOUNTING_SERVICE_BUY_ACCOUNT=Standaard boekhoud code om diensten te kopen +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standaard boekhoud code om diensten te verkopen +ACCOUNTING_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW +ACCOUNTING_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw +ACCOUNTING_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties +ACCOUNTING_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang index 6525bb0d511..e4853c56231 100644 --- a/htdocs/langs/pl_PL/compta.lang +++ b/htdocs/langs/pl_PL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang index 8da28ed9638..807892c8955 100644 --- a/htdocs/langs/pt_BR/compta.lang +++ b/htdocs/langs/pt_BR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequ TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de contabilidade de caixa não é relevante. Este relatório está disponível somente quando utilizar o modo de contabilidade engajamento (ver configuração do módulo de contabilidade). CalculationMode=Modo de cálculo AccountancyJournal=Codigo do jornal fiscal -COMPTA_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos -COMPTA_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos -COMPTA_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços -COMPTA_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços -COMPTA_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT -COMPTA_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT -COMPTA_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes -COMPTA_ACCOUNT_SUPPLIER=Código da contabilidade por padrão para fornecedor +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Código de contabilidade padrão para comprar produtos +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Código de contabilidade padrão para vender produtos +ACCOUNTING_SERVICE_BUY_ACCOUNT=Código de contabilidade padrão para comprar serviços +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Código de contabilidade padrão para vender serviços +ACCOUNTING_VAT_ACCOUNT=Código de contabilidade padrão para cobrança do VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Código de contabilidade padrão para pagar o VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Código Contabilidade por padrão para fornecedores de clientes +ACCOUNTING_ACCOUNT_SUPPLIER=Código da contabilidade por padrão para fornecedor diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index f05ffdf57c7..fc482644769 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Modo de cálculo AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index d77a0d6abf8..333fabb0205 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=în funcție de furnizor, alege metoda potrivită pe TurnoverPerProductInCommitmentAccountingNotRelevant=Raportul cifra de afaceri pe produs, atunci când se utilizează modul contabilitate de casă nu este relevant. Acest raport este disponibil numai atunci când se utilizează modul contabilitate de angajament (a se vedea configurarea modulului de contabilitate). CalculationMode=Mod calcul AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Contul contabil implicit pentru terţii clienţi -COMPTA_ACCOUNT_SUPPLIER=Contul contabil implicit pentru terţii furnizori +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Contul contabil implicit pentru terţii clienţi +ACCOUNTING_ACCOUNT_SUPPLIER=Contul contabil implicit pentru terţii furnizori diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang index 25fc3fdd5dd..4dc595627ee 100644 --- a/htdocs/langs/ru_RU/compta.lang +++ b/htdocs/langs/ru_RU/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Режим вычислений AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang index 361ca593eef..a5164dc8c0f 100644 --- a/htdocs/langs/sk_SK/compta.lang +++ b/htdocs/langs/sk_SK/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=podľa dodávateľa zvoliť vhodnú metódu použiť TurnoverPerProductInCommitmentAccountingNotRelevant=Obrat správa za tovar, pri použití hotovosti evidencia režim nie je relevantná. Táto správa je k dispozícii len pri použití zásnubný evidencia režimu (pozri nastavenie účtovného modulu). CalculationMode=Výpočet režim AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Účtovníctvo štandardný kód pre zákaznícke thirdparties -COMPTA_ACCOUNT_SUPPLIER=Účtovníctvo štandardný kód pre dodávateľov thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Účtovníctvo štandardný kód pre zákaznícke thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Účtovníctvo štandardný kód pre dodávateľov thirdparties diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang index 88bb0773392..d744d2d588c 100644 --- a/htdocs/langs/sl_SI/compta.lang +++ b/htdocs/langs/sl_SI/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/sq_AL/compta.lang +++ b/htdocs/langs/sq_AL/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index 21e59c35abb..f224a0b49a7 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/th_TH/compta.lang +++ b/htdocs/langs/th_TH/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index 86bdd1945d3..2cdba02cd1b 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kulla TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, nakit muhasebesimodu için uygun değildir. Bu rapor yalnızca, tahakkuk muhasebesi modu için uygundur (muhasebe modülü ayarlarına bakın). CalculationMode=Hesaplama modu AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu -COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu -COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu -COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu -COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu -COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu -COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu -COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu +ACCOUNTING_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu +ACCOUNTING_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu +ACCOUNTING_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu +ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu +ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/uk_UA/compta.lang +++ b/htdocs/langs/uk_UA/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang index 30b41b5316e..b44f52ee2fa 100644 --- a/htdocs/langs/uz_UZ/compta.lang +++ b/htdocs/langs/uz_UZ/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang index 73c0eb59742..996a4df1d34 100644 --- a/htdocs/langs/vi_VN/compta.lang +++ b/htdocs/langs/vi_VN/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang index 2813b899471..31c7f734728 100644 --- a/htdocs/langs/zh_CN/compta.lang +++ b/htdocs/langs/zh_CN/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=根据供应商，选择适当的方法来套用相 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=计算模式 AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=买产品的缺省会计模式 -COMPTA_PRODUCT_SOLD_ACCOUNT=卖产品的缺省会计模式 -COMPTA_SERVICE_BUY_ACCOUNT=买服务的缺省会计模式 -COMPTA_SERVICE_SOLD_ACCOUNT=卖服务的缺省会计模式 -COMPTA_VAT_ACCOUNT=征收增值税的缺省会计模式 -COMPTA_VAT_BUY_ACCOUNT=支付增值税的缺省会计模式 -COMPTA_ACCOUNT_CUSTOMER=默认情况下，第三方客户的会计代码 -COMPTA_ACCOUNT_SUPPLIER=默认情况下，第三方供应商的会计代码 +ACCOUNTING_PRODUCT_BUY_ACCOUNT=买产品的缺省会计模式 +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=卖产品的缺省会计模式 +ACCOUNTING_SERVICE_BUY_ACCOUNT=买服务的缺省会计模式 +ACCOUNTING_SERVICE_SOLD_ACCOUNT=卖服务的缺省会计模式 +ACCOUNTING_VAT_ACCOUNT=征收增值税的缺省会计模式 +ACCOUNTING_VAT_BUY_ACCOUNT=支付增值税的缺省会计模式 +ACCOUNTING_ACCOUNT_CUSTOMER=默认情况下，第三方客户的会计代码 +ACCOUNTING_ACCOUNT_SUPPLIER=默认情况下，第三方供应商的会计代码 diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang index 0277516591f..8d5b6d6e4f2 100644 --- a/htdocs/langs/zh_TW/compta.lang +++ b/htdocs/langs/zh_TW/compta.lang @@ -196,11 +196,11 @@ CalculationRuleDescSupplier=according to supplier, choose appropriate method to TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). CalculationMode=Calculation mode AccountancyJournal=Accountancy code journal -COMPTA_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products -COMPTA_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products -COMPTA_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services -COMPTA_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services -COMPTA_VAT_ACCOUNT=Default accountancy code for collecting VAT -COMPTA_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT -COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Default accountancy code to buy products +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Default accountancy code to sell products +ACCOUNTING_SERVICE_BUY_ACCOUNT=Default accountancy code to buy services +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Default accountancy code to sell services +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
'.$langs->trans('OptionMode').''.$langs->trans('Description').'
".$conf->global->COMPTA_JOURNAL_BUY."".dol_print_date($val["date"])."".$invoicestatic->getNomUrl(1)."".$k."".$line['label']."
".$conf->global->COMPTA_JOURNAL_SELL."".dol_print_date($val["date"])."".$invoicestatic->getNomUrl(1)."".$k."".$line['label']."".$langs->trans("Invoices")."".$langs->trans("TotalToPay")."