diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst index 506c03fab85..d963b229fa2 100644 --- a/dev/translation/ignore_translation_keys.lst +++ b/dev/translation/ignore_translation_keys.lst @@ -804,7 +804,6 @@ Success Supervisor SupplierDepositsAreNotIncluded SupplierMissingRef -Synchronize Syslog TLS/STARTTLS TYPE_ @@ -919,7 +918,6 @@ period_interval period_recurrences period_start_date point -productlot refunded save seconds diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php index d0cbd4655d6..c6c148fb599 100644 --- a/htdocs/core/modules/modMultiCurrency.class.php +++ b/htdocs/core/modules/modMultiCurrency.class.php @@ -1,8 +1,9 @@ - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2005-2016 Regis Houssin - * Copyright (C) 2016 Pierre-Henry Favre +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2005-2016 Regis Houssin + * Copyright (C) 2016 Pierre-Henry Favre + * Copyright (C) 2025 Frédéric France * * 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 @@ -40,7 +41,7 @@ class modMultiCurrency extends DolibarrModules */ public function __construct($db) { - global $conf; + global $conf, $langs; $this->db = $db; @@ -88,8 +89,6 @@ class modMultiCurrency extends DolibarrModules $this->depends = array(); // List of modules id that must be enabled if this module is enabled $this->requiredby = array(); // List of modules id to disable if this one is disabled $this->conflictwith = array(); // List of modules id this module is in conflict with - $this->phpmin = array(7, 0); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module $this->langfiles = array("multicurrency"); // Constants @@ -136,23 +135,18 @@ class modMultiCurrency extends DolibarrModules // Boxes // Add here list of php file(s) stored in core/boxes that contains class to show a box. $this->boxes = array(); // List of boxes - // Example: - //$this->boxes=array( - // 0=>array('file'=>'myboxa.php@multicurrency','note'=>'','enabledbydefaulton'=>'Home'), - // 1=>array('file'=>'myboxb.php@multicurrency','note'=>''), - // 2=>array('file'=>'myboxc.php@multicurrency','note'=>'') - //); // Cronjobs (List of cron jobs entries to add when module is enabled) // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week $statusatinstall=1; $arraydate=dol_getdate(dol_now()); $datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']); + $langs->load('multicurrency'); $this->cronjobs = array( 0 => array( 'priority'=>61, - 'label'=>'MutltiCurrencyAutoUpdateCurrencies', + 'label'=>$langs->trans('MutltiCurrencyAutoUpdateCurrencies'), 'jobtype'=>'method', 'class'=>'multicurrency/class/multicurrency.class.php', 'objectname'=>'MultiCurrency', @@ -208,39 +202,6 @@ class modMultiCurrency extends DolibarrModules $this->menu = array(); // List of menus to add $r = 0; - // Add here entries to declare new menus - // - // Example to declare a new Top Menu entry and its Left menu entry: - // $this->menu[$r]=array( 'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - // 'type'=>'top', // This is a Top menu entry - // 'titre'=>'MyModule top menu', - // 'mainmenu'=>'multicurrency', - // 'leftmenu'=>'multicurrency', - // 'url'=>'/multicurrency/pagetop.php', - // 'langs'=>'mylangfile@multicurrency', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - // 'position'=>100, - // 'enabled'=>'$conf->multicurrency->enabled', // Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled. - // 'perms'=>'1', // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules - // 'target'=>'', - // 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both - // $r++; - // - // Example to declare a Left Menu entry into an existing Top menu entry: - // $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=xxx', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - // 'type'=>'left', // This is a Left menu entry - // 'titre'=>'MyModule left menu', - // 'mainmenu'=>'xxx', - // 'leftmenu'=>'multicurrency', - // 'url'=>'/multicurrency/pagelevel2.php', - // 'langs'=>'mylangfile@multicurrency', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - // 'position'=>100, - // 'enabled'=>'$conf->multicurrency->enabled', // Define condition to show or hide menu entry. Use '$conf->multicurrency->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - // 'perms'=>'1', // Use 'perms'=>'$user->rights->multicurrency->level1->level2' if you want your menu with a permission rules - // 'target'=>'', - // 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both - // $r++; - - // Exports $r = 1; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 9ceea384545..b5d18487602 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2673,3 +2673,4 @@ MAIN_SECURITY_MAXFILESIZE_DOWNLOADED=Max size of downloaded files ShowTopMenuURLIntoAFrame=Include content of URL into a frame under the top menu SameWindow=Same window NewWindow=New window / New tab +Synchronize=Synchronize diff --git a/htdocs/product/stock/productlot_note.php b/htdocs/product/stock/productlot_note.php index 58baeea4107..e90fa8ccfa2 100644 --- a/htdocs/product/stock/productlot_note.php +++ b/htdocs/product/stock/productlot_note.php @@ -1,7 +1,6 @@ - * Copyright (C) ---Put here your own copyright and developer email--- - * Copyright (C) 2024 Frédéric France +/* Copyright (C) 2007-2017 Laurent Destailleur + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -23,8 +22,6 @@ * \brief Tab for notes on productlot */ - - require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; @@ -42,7 +39,7 @@ $langs->loadLangs(array('other', 'products')); // Get parameters $id = GETPOSTINT('id'); -$ref = GETPOST('ref', 'alpha'); +$ref = GETPOST('ref', 'alpha'); $action = GETPOST('action', 'aZ09'); // Initialize a technical objects @@ -90,7 +87,7 @@ if (empty($reshook)) { $form = new Form($db); $help_url = ''; -llxHeader('', $langs->trans('productlot'), $help_url, '', 0, 0, '', '', '', 'mod-product page-stock_productlot_note'); +llxHeader('', $langs->trans('ProductLot'), $help_url, '', 0, 0, '', '', '', 'mod-product page-stock_productlot_note'); if ($id > 0 || !empty($ref)) { $object->fetch_thirdparty();