Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-14 19:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Orange-Management/oms-ItemManagement into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-03-08 18:26:41 +01:00
commit 5d92530dcf
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/BackendController.php
View File

@ -16,8 +16,8 @@ namespace Modules\ItemManagement\Controller;
use Model\SettingsEnum; use Model\SettingsEnum;
use Modules\Admin\Models\LocalizationMapper; use Modules\Admin\Models\LocalizationMapper;
use Modules\Billing\Models\SalesBillMapper;
use Modules\Billing\Models\BillTypeL11n; use Modules\Billing\Models\BillTypeL11n;
use Modules\Billing\Models\SalesBillMapper;
use Modules\ItemManagement\Models\ItemAttributeMapper; use Modules\ItemManagement\Models\ItemAttributeMapper;
use Modules\ItemManagement\Models\ItemL11nMapper; use Modules\ItemManagement\Models\ItemL11nMapper;
use Modules\ItemManagement\Models\ItemMapper; use Modules\ItemManagement\Models\ItemMapper;
@ -269,7 +269,6 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-profile'); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-profile');
$view->setData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response)); $view->setData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response));
return $view; return $view;
} }
@ -291,7 +290,6 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-profile'); $view->setTemplate('/Modules/ItemManagement/Theme/Backend/sales-item-profile');
$view->setData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response)); $view->setData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1004806001, $request, $response));
return $view; return $view;
} }
} }

2
Models/ItemMapper.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\ItemManagement\Models; namespace Modules\ItemManagement\Models;
use Modules\Media\Models\MediaMapper;
use Modules\Editor\Models\EditorDocMapper; use Modules\Editor\Models\EditorDocMapper;
use Modules\Media\Models\MediaMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;
/** /**

4
Theme/Backend/Lang/fr.lang.php
View File

@ -97,7 +97,7 @@ return ['ItemManagement' => [
'Properties' => 'Propriétés', 'Properties' => 'Propriétés',
'Property' => 'Biens', 'Property' => 'Biens',
'Purchase' => 'Acheter', 'Purchase' => 'Acheter',
'PurchasePrice' => 'Prix ​​d\'achat', 'PurchasePrice' => 'Prix d\'achat',
'Purchasing' => 'Achat', 'Purchasing' => 'Achat',
'QA' => 'QA', 'QA' => 'QA',
'QM' => 'QM', 'QM' => 'QM',
@ -107,7 +107,7 @@ return ['ItemManagement' => [
'Reserved' => 'Réservé', 'Reserved' => 'Réservé',
'SN' => 'SN', 'SN' => 'SN',
'Sales' => 'Ventes', 'Sales' => 'Ventes',
'SalesPrice' => 'Prix ​​de vente', 'SalesPrice' => 'Prix de vente',
'Segment' => 'Segment', 'Segment' => 'Segment',
'ShelfLife' => 'Durée de conservation', 'ShelfLife' => 'Durée de conservation',
'Source' => 'La source', 'Source' => 'La source',