From 1343b35576b1beaeb59bbb3d7e4c94c840af78e3 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 27 Oct 2008 19:07:56 +0000 Subject: [PATCH] Added ability to assign a category of product to a customer --- htdocs/categories/index.php | 9 +++++---- htdocs/categories/viewcat.php | 4 ++-- mysql/tables/llx_categorie.sql | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index c63063db833..155e2139d36 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -1,8 +1,9 @@ - * Copyright (C) 2005 Éric Seigne - * Copyright (C) 2006 Laurent Destailleur - * Copyright (C) 2007 Patrick Raguin +/* Copyright (C) 2005 Matthieu Valleton + * Copyright (C) 2005 Éric Seigne + * Copyright (C) 2006-2008 Laurent Destailleur + * Copyright (C) 2007 Patrick Raguin + * Copyright (C) 2005-2008 Regis Houssin * * 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 diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index f85390b41bb..ab185a2810d 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -150,7 +150,7 @@ if ($type == 0 && $conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER) else { print ''; - print $langs->trans("InternalCategory").''; + print $langs->trans("CategoryContents").''; print ($c->visible ? $langs->trans("Visible") : $langs->trans("Invisible")); print ''; } @@ -158,7 +158,7 @@ if ($type == 0 && $conf->global->CATEGORY_ASSIGNED_TO_A_CUSTOMER) else { print ''; - print $langs->trans("Status").''; + print $langs->trans("CategoryContents").''; print ($c->visible ? $langs->trans("Visible") : $langs->trans("Invisible")); print ''; } diff --git a/mysql/tables/llx_categorie.sql b/mysql/tables/llx_categorie.sql index 93fac289eb6..5f723a571b2 100644 --- a/mysql/tables/llx_categorie.sql +++ b/mysql/tables/llx_categorie.sql @@ -25,7 +25,7 @@ create table llx_categorie rowid integer AUTO_INCREMENT PRIMARY KEY, label VARCHAR(255), -- category name description text, -- description of the category - fk_soc integer DEFAULT NULL, -- attribution of the category has a company (for product only) + fk_soc integer DEFAULT NULL, -- attribution of the category has a company (for product only) visible tinyint DEFAULT 1 NOT NULL, -- determine if the products are visible or not type tinyint DEFAULT 1 NOT NULL -- category type (product, supplier, customer) )type=innodb;