dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Stock: Update Supplier order management and database in consequence

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9729 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-10-28 16:04:21 +00:00
parent d9f8dfcce8
commit 4e04df6d98
5 changed files with 337 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/sql/db.sql
+16 -13
View File
@@ -2013,7 +2013,7 @@ CREATE TABLE `PREFIX_warehouse_carrier` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_stock_available` (
`id_stock_available` INT(11) UNSIGNED NOT NULL,
`id_stock_available` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`id_product` INT(11) UNSIGNED NOT NULL,
`id_product_attribute` INT(11) UNSIGNED NOT NULL,
`id_shop` INT(11) UNSIGNED NOT NULL,
@@ -2027,19 +2027,20 @@ CREATE TABLE `PREFIX_stock_available` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_order` (
`id_supplier_order` INT(11) UNSIGNED NOT NULL,
`id_supplier_order` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`id_supplier` INT(11) UNSIGNED NOT NULL,
`id_employee` INT(11) UNSIGNED NOT NULL,
`id_warehouse` INT(11) UNSIGNED NOT NULL,
`id_state` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_state` INT(11) UNSIGNED NOT NULL,
`id_currency` INT(11) UNSIGNED NOT NULL,
`id_ref_currency` INT(11) UNSIGNED NOT NULL,
`reference` VARCHAR(32) DEFAULT NULL,
`date_add` DATETIME NOT NULL,
`date_upd` DATETIME NOT NULL,
`date_delivery_expected` DATETIME NOT NULL,
`date_delivery_expected` DATETIME DEFAULT NULL,
`total_te` DECIMAL(20,6) DEFAULT '0.000000',
`total_with_discount_te` DECIMAL(20,6) DEFAULT '0.000000',
`total_tax` DECIMAL(20,6) DEFAULT '0.000000',
`total_ti` DECIMAL(20,6) DEFAULT '0.000000',
`discount_rate` DECIMAL(20,6) DEFAULT '0.000000',
`discount_value_te` DECIMAL(20,6) DEFAULT '0.000000',
@@ -2050,7 +2051,7 @@ CREATE TABLE `PREFIX_supplier_order` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_order_detail` (
`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`id_supplier_order` INT(11) UNSIGNED NOT NULL,
`id_product` INT(11) UNSIGNED NOT NULL,
`id_product_attribute` INT(11) UNSIGNED NOT NULL,
@@ -2075,7 +2076,7 @@ CREATE TABLE `PREFIX_supplier_order_detail` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_order_history` (
`id_supplier_order_history` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`id_supplier_order` INT(11) UNSIGNED NOT NULL,
`id_employee` INT(11) UNSIGNED NOT NULL,
`id_state` INT(11) UNSIGNED NOT NULL,
@@ -2087,30 +2088,32 @@ CREATE TABLE `PREFIX_supplier_order_history` (
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_order_state` (
`id_state` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_state` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`delivery_note` tinyint(1) NOT NULL DEFAULT 0,
`editable` tinyint(1) NOT NULL DEFAULT 0,
`receipt_state` tinyint(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id_state`)
`pending_receipt` tinyint(1) NOT NULL DEFAULT 0,
`color` VARCHAR(32) DEFAULT NULL,
PRIMARY KEY (`id_supplier_order_state`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_order_state_lang` (
`id_state` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_state` INT(11) UNSIGNED NOT NULL,
`id_lang` INT(11) UNSIGNED NOT NULL,
`name` VARCHAR(128) DEFAULT NULL,
PRIMARY KEY (`id_state`, `id_lang`)
PRIMARY KEY (`id_supplier_order_state`, `id_lang`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_order_receipt_history` (
`id_supplier_order_receipt_history` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_receipt_history` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`id_supplier_order_detail` INT(11) UNSIGNED NOT NULL,
`id_employee` INT(11) UNSIGNED NOT NULL,
`id_state` INT(11) UNSIGNED NOT NULL,
`id_supplier_order_state` INT(11) UNSIGNED NOT NULL,
`quantity` INT(11) UNSIGNED NOT NULL,
`date_add` DATETIME NOT NULL,
PRIMARY KEY (`id_supplier_order_receipt_history`),
KEY `id_supplier_order_detail` (`id_supplier_order_detail`),
KEY `id_state` (`id_state`)
KEY `id_supplier_order_state` (`id_supplier_order_state`)
) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
CREATE TABLE `PREFIX_supplier_rates` (
install-dev/sql/db_settings_lite.sql
+52 -6
View File
@@ -866,7 +866,8 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE
(96, 'AdminWarehouses', 95, 1),
(97, 'AdminStockManagement', 95, 2),
(98, 'AdminStockInstantState', 95, 4),
(99, 'AdminStockCover', 95, 5);
(99, 'AdminStockCover', 95, 5),
(100, 'AdminSupplierOrders', 95, 6);
INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM `PREFIX_tab`);
@@ -890,7 +891,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(1, 96, 'Warehouses'),
(1, 97, 'Stock Management'),
(1, 98, 'Stock instant state'),
(1, 99, 'Stock cover');
(1, 99, 'Stock cover'),
(1, 100, 'Supplier orders');
INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(2, 1, 'Catalogue'),(2, 2, 'Clients'),(2, 3, 'Commandes'),(2, 4, 'Paiement'),(2, 5, 'Transport'),
@@ -912,7 +914,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(2, 96, 'Entrepôts'),
(2, 97, 'Gestion du stock'),
(2, 98, 'Etat instantané du stock'),
(2, 99, 'Couverture de stock');
(2, 99, 'Couverture de stock'),
(2, 100, 'Commandes fournisseurs');
INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(3, 1, 'Catálogo'),(3, 2, 'Clientes'),(3, 3, 'Pedidos'),(3, 4, 'Pago'),(3, 5, 'Transporte'),
@@ -933,7 +936,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(3, 96, 'Warehouses'),
(3, 97, 'Stock Management'),
(3, 98, 'Stock instant state'),
(3, 99, 'Stock cover');
(3, 99, 'Stock cover'),
(3, 100, 'Supplier orders');
INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
@@ -955,7 +959,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(4, 96, 'Warehouses'),
(4, 97, 'Stock Management'),
(4, 98, 'Stock instant state'),
(4, 99, 'Stock cover');
(4, 99, 'Stock cover'),
(4, 100, 'Supplier orders');
INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(5, 1, 'Catalogo'),(5, 2, 'Clienti'),(5, 3, 'Ordini'),(5, 4, 'Pagamento'),
@@ -977,7 +982,8 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
(5, 96, 'Warehouses'),
(5, 97, 'Stock Management'),
(5, 98, 'Stock instant state'),
(5, 99, 'Stock cover');
(5, 99, 'Stock cover'),
(5, 100, 'Supplier orders');
INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
(SELECT `id_tab`, id_lang, (SELECT tl.`name`
@@ -1412,3 +1418,43 @@ address2
city State:name postcode
Country:name
phone' WHERE `PREFIX_address_format`.`id_country` = 4;
INSERT INTO `ps_supplier_order_state` (`id_supplier_order_state`, `delivery_note`, `editable`, `receipt_state`, `pending_receipt`, `color`) VALUES
(1, 0, 1, 0, 0, '#ffe1af'),
(2, 1, 0, 0, 0, '#e7fbff'),
(3, 0, 0, 0, 1, '#ffdbfd'),
(4, 0, 0, 1, 1, '#ffd3d3'),
(5, 0, 0, 1, 0, '#d8ffd7'),
(6, 0, 0, 0, 0, '#cccccc');
INSERT INTO `ps_supplier_order_state_lang` (`id_supplier_order_state`, `id_lang`, `name`) VALUES
(1, 1, 'creation in progress'),
(1, 2, 'Création en cours'),
(1, 3, 'Création in progress'),
(1, 4, 'Création in progress'),
(1, 5, 'Création in progress'),
(2, 1, 'Order validated'),
(2, 2, 'Commande validée'),
(2, 3, 'Order validated'),
(2, 4, 'Order validated'),
(2, 5, 'Order validated'),
(3, 1, 'Pending receipt'),
(3, 2, 'Attente de réception'),
(3, 3, 'Pending receipt'),
(3, 4, 'Pending receipt'),
(3, 5, 'Pending receipt'),
(4, 1, 'Order received in part'),
(4, 2, 'Commande réceptionnée partiellement'),
(4, 3, 'Order received in part'),
(4, 4, 'Order received in part'),
(4, 5, 'Order received in part'),
(5, 1, 'Order received completely'),
(5, 2, 'Commande réceptionnée totalement'),
(5, 3, 'Order received completely'),
(5, 4, 'Order received completely'),
(5, 5, 'Order received completely'),
(6, 1, 'order fenced'),
(6, 2, 'Commande cloturée'),
(6, 3, 'order fenced'),
(6, 4, 'order fenced'),
(6, 5, 'order fenced');