Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 09:08:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "New dictionaries"

Browse Source
This commit is contained in:
Laurent Destailleur
2025-01-05 19:09:51 +01:00
committed by GitHub
parent 6834c9405c
commit 8993fece48
4 changed files with 3 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
htdocs/admin/dict.php
View File

@@ -15,8 +15,7 @@
* Copyright (C) 2020-2022 Open-Dsi <support@open-dsi.fr>
* Copyright (C) 2024 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Sylvain Legrand <contact@infras.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
@@ -93,8 +92,6 @@ const DICT_TRANSPORT_MODE = 41;
const DICT_PRODUCT_NATURE = 42;
const DICT_PRODUCTBATCH_QCSTATUS = 43;
const DICT_ASSET_DISPOSAL_TYPE = 44;
const DICT_SEPA_CATEGORY_PURPOSE = 45;
const DICT_SEPA_COMMUNITY_INSTRUMENT = 46;
/**
* @var Conf $conf
@@ -106,7 +103,7 @@ const DICT_SEPA_COMMUNITY_INSTRUMENT = 46;
*/
// Load translation files required by the page
$langs->loadLangs(array("errors", "admin", "main", "companies", "resource", "holiday", "accountancy", "hrm", "orders", "contracts", "projects", "propal", "bills", "interventions", "ticket", "banks"));
$langs->loadLangs(array("errors", "admin", "main", "companies", "resource", "holiday", "accountancy", "hrm", "orders", "contracts", "projects", "propal", "bills", "interventions", "ticket"));
$action = GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view';
$confirm = GETPOST('confirm', 'alpha');
@@ -171,7 +168,7 @@ $permissiontoadd = $allowed;
// Put here declaration of dictionaries properties
// Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
$taborder = array(DICT_CURRENCIES, DICT_PAPER_FORMAT, DICT_FORMAT_CARDS, 0, DICT_COUNTRY, DICT_REGIONS, DICT_DEPARTEMENTS, 0, DICT_FORME_JURIDIQUE, DICT_TYPENT, DICT_EFFECTIF, DICT_PROSPECTLEVEL, DICT_PROSPECTCONTACTLEVEL, DICT_STCOMM, DICT_STCOMMCONTACT, DICT_SOCIALNETWORKS, 0, DICT_CIVILITY, DICT_TYPE_CONTACT, 0, DICT_ACTIONCOMM, DICT_TYPE_RESOURCE, 0, DICT_LEAD_STATUS, 0, DICT_HRM_DEPARTMENT, DICT_HRM_FUNCTION, DICT_HRM_PUBLIC_HOLIDAY, DICT_HOLIDAY_TYPES, DICT_TYPE_FEES, DICT_EXP_TAX_CAT, DICT_EXP_TAX_RANGE, 0, DICT_TVA, DICT_INVOICE_SUBTYPE, DICT_REVENUESTAMP, DICT_PAYMENT_TERM, DICT_PAIEMENT, DICT_CHARGESOCIALES, 0, DICT_ECOTAXE, 0, DICT_INPUT_REASON, DICT_INPUT_METHOD, DICT_SHIPMENT_MODE, DICT_AVAILABILITY, DICT_TRANSPORT_MODE, 0, DICT_UNITS, DICT_PRODUCT_NATURE, 0, DICT_PRODUCTBATCH_QCSTATUS, 0, DICT_TYPE_CONTAINER, 0, DICT_ASSET_DISPOSAL_TYPE, 0, DICT_SEPA_CATEGORY_PURPOSE, DICT_SEPA_COMMUNITY_INSTRUMENT);
$taborder = array(DICT_CURRENCIES, DICT_PAPER_FORMAT, DICT_FORMAT_CARDS, 0, DICT_COUNTRY, DICT_REGIONS, DICT_DEPARTEMENTS, 0, DICT_FORME_JURIDIQUE, DICT_TYPENT, DICT_EFFECTIF, DICT_PROSPECTLEVEL, DICT_PROSPECTCONTACTLEVEL, DICT_STCOMM, DICT_STCOMMCONTACT, DICT_SOCIALNETWORKS, 0, DICT_CIVILITY, DICT_TYPE_CONTACT, 0, DICT_ACTIONCOMM, DICT_TYPE_RESOURCE, 0, DICT_LEAD_STATUS, 0, DICT_HRM_DEPARTMENT, DICT_HRM_FUNCTION, DICT_HRM_PUBLIC_HOLIDAY, DICT_HOLIDAY_TYPES, DICT_TYPE_FEES, DICT_EXP_TAX_CAT, DICT_EXP_TAX_RANGE, 0, DICT_TVA, DICT_INVOICE_SUBTYPE, DICT_REVENUESTAMP, DICT_PAYMENT_TERM, DICT_PAIEMENT, DICT_CHARGESOCIALES, 0, DICT_ECOTAXE, 0, DICT_INPUT_REASON, DICT_INPUT_METHOD, DICT_SHIPMENT_MODE, DICT_AVAILABILITY, DICT_TRANSPORT_MODE, 0, DICT_UNITS, DICT_PRODUCT_NATURE, 0, DICT_PRODUCTBATCH_QCSTATUS, 0, DICT_TYPE_CONTAINER, 0, DICT_ASSET_DISPOSAL_TYPE, 0);
// Name of SQL tables of dictionaries
$tabname = array();
@@ -219,8 +216,6 @@ $tabname[DICT_TRANSPORT_MODE] = "c_transport_mode";
$tabname[DICT_PRODUCT_NATURE] = "c_product_nature";
$tabname[DICT_PRODUCTBATCH_QCSTATUS] = "c_productbatch_qcstatus";
$tabname[DICT_ASSET_DISPOSAL_TYPE] = "c_asset_disposal_type";
$tabname[DICT_SEPA_CATEGORY_PURPOSE] = "c_sepa_category_purpose";
$tabname[DICT_SEPA_COMMUNITY_INSTRUMENT] = "c_sepa_community_instrument";
// Dictionary labels
$tablib = array();
@@ -268,8 +263,6 @@ $tablib[DICT_TRANSPORT_MODE] = "DictionaryTransportMode";
$tablib[DICT_PRODUCT_NATURE] = "DictionaryProductNature";
$tablib[DICT_PRODUCTBATCH_QCSTATUS] = "DictionaryBatchStatus";
$tablib[DICT_ASSET_DISPOSAL_TYPE] = "DictionaryAssetDisposalType";
$tablib[DICT_SEPA_CATEGORY_PURPOSE] = "DictionarySepaCategoryPurpose";
$tablib[DICT_SEPA_COMMUNITY_INSTRUMENT] = "DictionarySepaCommunityInstrument";
// Requests to extract data
$tabsql = array();
@@ -317,8 +310,6 @@ $tabsql[DICT_TRANSPORT_MODE] = "SELECT t.rowid as rowid, t.code, t.label, t.acti
$tabsql[DICT_PRODUCT_NATURE] = "SELECT t.rowid as rowid, t.code, t.label, t.active FROM ".MAIN_DB_PREFIX."c_product_nature as t";
$tabsql[DICT_PRODUCTBATCH_QCSTATUS] = "SELECT t.rowid, t.code, t.label, t.active FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus as t";
$tabsql[DICT_ASSET_DISPOSAL_TYPE] = "SELECT t.rowid, t.code, t.label, t.active FROM ".MAIN_DB_PREFIX."c_asset_disposal_type as t";
$tabsql[DICT_SEPA_CATEGORY_PURPOSE] = "SELECT t.rowid, t.code, t.label, t.position, t.active FROM ".MAIN_DB_PREFIX."c_sepa_category_purpose as t";
$tabsql[DICT_SEPA_COMMUNITY_INSTRUMENT] = "SELECT t.rowid, t.code, t.label, t.position, t.active FROM ".MAIN_DB_PREFIX."c_sepa_community_instrument as t";
// Criteria to sort dictionaries
$tabsqlsort = array();
@@ -366,8 +357,6 @@ $tabsqlsort[DICT_TRANSPORT_MODE] = "code ASC";
$tabsqlsort[DICT_PRODUCT_NATURE] = "code ASC";
$tabsqlsort[DICT_PRODUCTBATCH_QCSTATUS] = "code ASC";
$tabsqlsort[DICT_ASSET_DISPOSAL_TYPE] = "code ASC";
$tabsqlsort[DICT_SEPA_CATEGORY_PURPOSE] = "position ASC";
$tabsqlsort[DICT_SEPA_COMMUNITY_INSTRUMENT] = "position ASC";
// Field names in select result for dictionary display
$tabfield = array();
@@ -415,8 +404,6 @@ $tabfield[DICT_TRANSPORT_MODE] = "code,label";
$tabfield[DICT_PRODUCT_NATURE] = "code,label";
$tabfield[DICT_PRODUCTBATCH_QCSTATUS] = "code,label";
$tabfield[DICT_ASSET_DISPOSAL_TYPE] = "code,label";
$tabfield[DICT_SEPA_CATEGORY_PURPOSE] = "code,label,position";
$tabfield[DICT_SEPA_COMMUNITY_INSTRUMENT] = "code,label,position";
// Edit field names for editing a record
$tabfieldvalue = array();
@@ -464,8 +451,6 @@ $tabfieldvalue[DICT_TRANSPORT_MODE] = "code,label";
$tabfieldvalue[DICT_PRODUCT_NATURE] = "code,label";
$tabfieldvalue[DICT_PRODUCTBATCH_QCSTATUS] = "code,label";
$tabfieldvalue[DICT_ASSET_DISPOSAL_TYPE] = "code,label";
$tabfieldvalue[DICT_SEPA_CATEGORY_PURPOSE] = "code,label,position";
$tabfieldvalue[DICT_SEPA_COMMUNITY_INSTRUMENT] = "code,label,position";
// Field names in the table for inserting a record (add field "entity" only here when dictionary is ready to personalized by entity)
$tabfieldinsert = array();
@@ -513,8 +498,6 @@ $tabfieldinsert[DICT_TRANSPORT_MODE] = "code,label";
$tabfieldinsert[DICT_PRODUCT_NATURE] = "code,label";
$tabfieldinsert[DICT_PRODUCTBATCH_QCSTATUS] = "code,label";
$tabfieldinsert[DICT_ASSET_DISPOSAL_TYPE] = "code,label";
$tabfieldinsert[DICT_SEPA_CATEGORY_PURPOSE] = "code,label,position";
$tabfieldinsert[DICT_SEPA_COMMUNITY_INSTRUMENT] = "code,label,position";
// Rowid name of field depending if field is autoincrement on or off..
// Use "" if id field is "rowid" and has autoincrement on
@@ -564,8 +547,6 @@ $tabrowid[DICT_TRANSPORT_MODE] = "";
$tabrowid[DICT_PRODUCT_NATURE] = "rowid";
$tabrowid[DICT_PRODUCTBATCH_QCSTATUS] = "rowid";
$tabrowid[DICT_ASSET_DISPOSAL_TYPE] = "rowid";
$tabrowid[DICT_SEPA_CATEGORY_PURPOSE] = "";
$tabrowid[DICT_SEPA_COMMUNITY_INSTRUMENT] = "";
// Condition to show dictionary in setup page
$tabcond = array();
@@ -613,8 +594,6 @@ $tabcond[DICT_TRANSPORT_MODE] = isModEnabled('intracommreport');
$tabcond[DICT_PRODUCT_NATURE] = isModEnabled("product");
$tabcond[DICT_PRODUCTBATCH_QCSTATUS] = isModEnabled("product") && isModEnabled('productbatch') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2;
$tabcond[DICT_ASSET_DISPOSAL_TYPE] = isModEnabled('asset');
$tabcond[DICT_SEPA_CATEGORY_PURPOSE] = isModEnabled('paymentbybanktransfer');
$tabcond[DICT_SEPA_COMMUNITY_INSTRUMENT] = isModEnabled('paymentbybanktransfer');
// List of help for fields (no more used, help is defined into tabcomplete)
$tabhelp = array();
@@ -673,8 +652,6 @@ $tabcomplete = array(
'c_productbatch_qcstatus' => array('picto' => 'lot', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
'c_asset_disposal_type' => array('picto' => 'asset', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
'c_invoice_subtype' => array('picto' => 'bill', 'help' => array('code' => $langs->trans("EnterAnyCode"))),
'c_sepa_category_purpose' => array('picto' => 'payment', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))),
'c_sepa_community_instrument' => array('picto' => 'payment', 'help' => array('code' => $langs->trans("EnterAnyCode"), 'position' => $langs->trans("PositionIntoComboList"))),
);
@@ -2556,9 +2533,6 @@ if ($id > 0) {
} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == 'c_productbatch_qcstatus') {
$langs->load("productbatch");
$valuetoshow = $langs->trans($obj->{$value});
} elseif ($fieldlist[$field] == 'label' && ($tabname[$id] == 'c_sepa_category_purpose' || $tabname[$id] == 'c_sepa_community_instrument')) {
$langs->load("banks");
$valuetoshow = $langs->trans($obj->{$value});
} elseif ($value == 'block_if_negative') {
$valuetoshow = yn($obj->{$value});
} elseif ($value == 'icon') {

8
htdocs/langs/en_US/banks.lang
View File

@@ -195,11 +195,3 @@ SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA fi
SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Yes = Store 'Payment Type' in 'Credit Transfer' section of SEPA file<br><br>When generating a SEPA XML file for Credit transfers, the section "PaymentTypeInformation" can now be placed inside the "CreditTransferTransactionInformation" section (instead of "Payment" section). We strongly recommend to keep this unchecked to place PaymentTypeInformation at Payment level, as all banks will not necessarily accept it at CreditTransferTransactionInformation level. Contact your bank before placing PaymentTypeInformation at CreditTransferTransactionInformation level.
ToCreateRelatedRecordIntoBank=To create missing related bank record
XNewLinesConciliated=%s new line(s) conciliated
c_sepa_category_purposeCORE=CORE - Transaction is related to SEPA direct debit (default)
c_sepa_category_purposeCORT=CORT - Transaction is related to settlement of a trade, eg a foreign exchange deal or a securities transaction
c_sepa_category_purposeCASH=CASH - Transaction is a general cash management instruction
c_sepa_category_purposeINST=INST - Transaction is related to an Instant Credit Transfer
c_sepa_category_purposeSUPP=SUPP - Transaction is related to a payment to a supplier
c_sepa_category_purposeTREA=TREA - Transaction is related to treasury operations
c_sepa_community_instrumentCORE=CORE - Transaction is related to SEPA direct debit (default)
c_sepa_community_instrumentINST=INST - Transaction is related to an Instant Credit Transfer

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

@@ -1122,8 +1122,6 @@ DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de t
DictionaryBatchStatus=État du contrôle qualité du lot/série de produits
DictionaryAssetDisposalType=Type de cession d'actifs
DictionaryInvoiceSubtype=Sous-types de factures
DictionarySepaCategoryPurpose=Catégories de l'objet du virement (construction des fichiers SEPA)
DictionarySepaCommunityInstrument=Codes d'instrument local (construction des fichiers SEPA)
TypeOfUnit=Type d'unité
SetupSaved=Configuration sauvegardée
SetupNotSaved=Configuration non enregistrée

8
htdocs/langs/fr_FR/banks.lang
View File

@@ -195,11 +195,3 @@ SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Variant
SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Oui = Stocker le « Type de paiement » dans la section « Virement de crédit » du fichier SEPA<br><br>Lors de la génération d'un fichier XML SEPA pour les virements, la section "PaymentTypeInformation" peut désormais être placée dans la section "CreditTransferTransactionInformation" (au lieu de la section "Payment"). Nous vous recommandons fortement de laisser cette case décochée pour placer PaymentTypeInformation au niveau Payment, car toutes les banques ne l'accepteront pas nécessairement au niveau CreditTransferTransactionInformation. Contactez votre banque avant de placer PaymentTypeInformation au niveau CreditTransferTransactionInformation.
ToCreateRelatedRecordIntoBank=Pour créer un enregistrement bancaire associé manquant
XNewLinesConciliated=%s nouvelle(s) ligne(s) rapprochée(s)
c_sepa_category_purposeCORE=CORE - Prélèvement SEPA (par défaut)
c_sepa_category_purposeCORT=CORT - Opération de change
c_sepa_category_purposeCASH=CASH - Instruction générale de gestion de trésorerie
c_sepa_category_purposeINST=INST - Virement instantané
c_sepa_category_purposeSUPP=SUPP - Paiement fournisseur
c_sepa_category_purposeTREA=TREA - Virement de trésorerie
c_sepa_community_instrumentCORE=CORE - Prélèvement SEPA (par défaut)
c_sepa_community_instrumentINST=INST - Virement instantané