mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
This commit is contained in:
Regis Houssin
commit
93d760e0fc
|
|
@ -1127,7 +1127,7 @@ if ($step == 5 && $datatoimport)
|
|||
|
||||
$nboflines=dol_count_nb_of_line($conf->import->dir_temp.'/'.$filetoimport);
|
||||
|
||||
$param='&leftmenu=import&step=5&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines.'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);
|
||||
$param='&leftmenu=import&format='.$format.'&datatoimport='.$datatoimport.'&filetoimport='.urlencode($filetoimport).'&nboflines='.$nboflines.'&separator='.urlencode($separator).'&enclosure='.urlencode($enclosure);
|
||||
$param2 = $param;
|
||||
if ($excludefirstline) {
|
||||
$param.='&excludefirstline=1';
|
||||
|
|
@ -1191,7 +1191,7 @@ if ($step == 5 && $datatoimport)
|
|||
print '</td><td>';
|
||||
print '<input type="checkbox" name="excludefirstline" value="1"';
|
||||
print ($excludefirstline?' checked="checked"':'');
|
||||
print ' onClick="javascript: window.location=\''.$_SERVER["PHP_SELF"].'?excludefirstline='.($excludefirstline?'0':'1').$param2.'\';">';
|
||||
print ' onClick="javascript: window.location=\''.$_SERVER["PHP_SELF"].'?step=5&excludefirstline='.($excludefirstline?'0':'1').$param2.'\';">';
|
||||
print ' '.$langs->trans("DoNotImportFirstLine");
|
||||
print '</td></tr>';
|
||||
|
||||
|
|
|
|||
|
|
@ -169,73 +169,42 @@ MigrationContract=Data migration for contracts
|
|||
MigrationSuccessfullUpdate=Upgrade successful
|
||||
MigrationUpdateFailed=Failed upgrade process
|
||||
MigrationRelationshipTables=Data migration for relationship tables (%s)
|
||||
|
||||
# Payments Update
|
||||
MigrationPaymentsUpdate=Payment data correction
|
||||
MigrationPaymentsNumberToUpdate=%s payment(s) to update
|
||||
MigrationProcessPaymentUpdate=Update payment(s) %s
|
||||
MigrationPaymentsNothingToUpdate=No more things to do
|
||||
MigrationPaymentsNothingUpdatable=No more payments that can be corrected
|
||||
|
||||
# Contracts Update
|
||||
MigrationContractsUpdate=Contract data correction
|
||||
MigrationContractsNumberToUpdate=%s contract(s) to update
|
||||
MigrationContractsLineCreation=Create contract line for contract ref %s
|
||||
MigrationContractsNothingToUpdate=No more things to do
|
||||
MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
|
||||
|
||||
# Contracts Empty Dates Update
|
||||
MigrationContractsEmptyDatesUpdate=Contract empty date correction
|
||||
MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly
|
||||
MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
|
||||
MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
|
||||
|
||||
# Contracts Invalid Dates Update
|
||||
MigrationContractsInvalidDatesUpdate=Bad value date contract correction
|
||||
MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s)
|
||||
MigrationContractsInvalidDatesNumber=%s contracts modified
|
||||
MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
|
||||
|
||||
# Contracts Incoherent Dates Update
|
||||
MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
|
||||
MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly
|
||||
MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
|
||||
|
||||
# Reopening Contracts
|
||||
MigrationReopeningContracts=Open contract closed by error
|
||||
MigrationReopenThisContract=Reopen contract %s
|
||||
MigrationReopenedContractsNumber=%s contracts modified
|
||||
MigrationReopeningContractsNothingToUpdate=No closed contract to open
|
||||
|
||||
# Migration transfer
|
||||
MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer
|
||||
MigrationBankTransfertsNothingToUpdate=All links are up to date
|
||||
|
||||
# Migration delivery
|
||||
MigrationShipmentOrderMatching=Sendings receipt update
|
||||
MigrationDeliveryOrderMatching=Delivery receipt update
|
||||
MigrationDeliveryDetail=Delivery update
|
||||
|
||||
# Migration stock
|
||||
MigrationStockDetail=Update stock value of products
|
||||
|
||||
# Migration menus
|
||||
MigrationMenusDetail=Update dynamic menus tables
|
||||
|
||||
# Migration delivery address
|
||||
MigrationDeliveryAddress=Update delivery address in shipments
|
||||
|
||||
# Migration project task actors
|
||||
MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
|
||||
|
||||
# Migration project user resp
|
||||
MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
|
||||
|
||||
# Migration project task time
|
||||
MigrationProjectTaskTime=Update time spent in seconds
|
||||
|
||||
# Migration Acctioncom
|
||||
MigrationActioncommElement=Update data on actions
|
||||
|
||||
# Migration payment mode
|
||||
MigrationPaymentMode=Data migration for payment mode
|
||||
MigrationPaymentMode=Data migration for payment mode
|
||||
MigrationCategorieAssociation=Migration of categories
|
||||
|
|
|
|||
|
|
@ -174,74 +174,43 @@ MigrationContract=Migration de données sur les contrats
|
|||
MigrationSuccessfullUpdate=Mise à jour réussie
|
||||
MigrationUpdateFailed=La mise à jour a échoué
|
||||
MigrationRelationshipTables=Migration des tables de liaison (%s)
|
||||
|
||||
# Payments Update
|
||||
MigrationPaymentsUpdate=Mise à jour des paiements (lien n-n paiements-factures)
|
||||
MigrationPaymentsNumberToUpdate=%s paiement(s) a mettre à jour
|
||||
MigrationProcessPaymentUpdate=Mise à jour paiement(s) %s
|
||||
MigrationPaymentsNothingToUpdate=Pas ou plus de paiement orphelin à corriger.
|
||||
MigrationPaymentsNothingUpdatable=Pas ou plus de paiement orphelin corrigible.
|
||||
|
||||
# Contracts Update
|
||||
MigrationContractsUpdate=Mise à jour des contrats sans détail (gestion du contrat + détail de contrat)
|
||||
MigrationContractsNumberToUpdate=%s contrat(s) a mettre à jour
|
||||
MigrationContractsLineCreation=Création ligne contrat pour contrat ref %s
|
||||
MigrationContractsNothingToUpdate=Pas ou plus de contrats (liés à un produit) sans ligne de détail à corriger.
|
||||
MigrationContractsFieldDontExist=Le champs fk_facture n'existe plus. Pas d'opération à faire.
|
||||
|
||||
# Contracts Empty Dates Update
|
||||
MigrationContractsEmptyDatesUpdate=Mise à jour des dates de contrats non renseignées
|
||||
MigrationContractsEmptyDatesUpdateSuccess=Ok pour date de contrat
|
||||
MigrationContractsEmptyDatesNothingToUpdate=Pas ou plus de date de contrats à renseigner.
|
||||
MigrationContractsEmptyCreationDatesUpdateSuccess=Ok pour date création
|
||||
MigrationContractsEmptyCreationDatesNothingToUpdate=Pas ou plus de date de création à renseigner.
|
||||
|
||||
# Contracts Invalid Dates Update
|
||||
MigrationContractsInvalidDatesUpdate=Mise à jour dates contrat incorrectes (pour contrats avec détail en service)
|
||||
MigrationContractsInvalidDateFix=Correction contrat %s (Date contrat=%s, Date mise service min=%s)
|
||||
MigrationContractsInvalidDatesNumber=%s contrats modifiés
|
||||
MigrationContractsInvalidDatesNothingToUpdate=Pas ou plus de contrats à corriger.
|
||||
|
||||
# Contracts Incoherent Dates Update
|
||||
MigrationContractsIncoherentCreationDateUpdate=Mise à jour des dates de création de contrat qui ont une valeur incohérente
|
||||
MigrationContractsIncoherentCreationDateUpdateSuccess=Ok
|
||||
MigrationContractsIncoherentCreationDateNothingToUpdate=Pas ou plus de date de contrats à corriger.
|
||||
|
||||
# Reopening Contracts
|
||||
MigrationReopeningContracts=Réouverture des contrats qui ont au moins un service actif non fermé
|
||||
MigrationReopenThisContract=Réouverture contrat %s
|
||||
MigrationReopenedContractsNumber=%s contrats modifiés
|
||||
MigrationReopeningContractsNothingToUpdate=Pas ou plus de contrats à ré-ouvrir.
|
||||
|
||||
# Migration transfert
|
||||
MigrationBankTransfertsUpdate=Mise à jour des liens entre écriture bancaire et un transfert entre compte
|
||||
MigrationBankTransfertsNothingToUpdate=Aucun lien non à jour
|
||||
|
||||
# Migration delivery
|
||||
MigrationShipmentOrderMatching=Mise à jour bon expédition
|
||||
MigrationDeliveryOrderMatching=Mise à jour bon réception
|
||||
MigrationDeliveryDetail=Mise à jour bon réception
|
||||
|
||||
# Migration stock
|
||||
MigrationStockDetail=Mise à jour valeur en stock des produits
|
||||
|
||||
# Migration menus
|
||||
MigrationMenusDetail=Mise à jour table des menus dynamiques
|
||||
|
||||
# Migration delivery address
|
||||
MigrationDeliveryAddress=Mise à jour des adresses de livraison dans les bons d'expédition
|
||||
|
||||
# Migration project task actors
|
||||
MigrationProjectTaskActors=Migration de la table llx_projet_task_actors
|
||||
|
||||
# Migration project user resp
|
||||
MigrationProjectUserResp=Migration du champ fk_user_resp de llx_projet vers llx_element_contact
|
||||
|
||||
# Migration project task time
|
||||
MigrationProjectTaskTime=Mise à jour du temps consommé en secondes
|
||||
|
||||
# Migration Acctioncom
|
||||
MigrationActioncommElement=Mise à jour des données des actions des éléments
|
||||
|
||||
# Migration payment mode
|
||||
MigrationPaymentMode=Migration des modes de paiement
|
||||
MigrationCategorieAssociation=Migration des categories
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user