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

[+] CORE : Accounting, Add a begin of the Accounting plan detail

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13750 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vSchoener
2012-02-29 15:28:07 +00:00
parent c8e1306ac9
commit 4c2eca45d2
16 changed files with 312 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/db_structure.sql
+1
View File
@@ -542,6 +542,7 @@ CREATE TABLE `PREFIX_customer` (
`passwd` varchar(32) NOT NULL,
`last_passwd_gen` timestamp NOT NULL default CURRENT_TIMESTAMP,
`birthday` date default NULL,
`account_number` varchar(128) NOT NULL,
`newsletter` tinyint(1) unsigned NOT NULL default '0',
`ip_registration_newsletter` varchar(15) default NULL,
`newsletter_date_add` datetime default NULL,
install-dev/data/xml/tab.xml
+19 -16
View File
@@ -9,7 +9,7 @@
<tab id="Home" id_parent="-1" active="1">
<class_name>AdminHome</class_name>
</tab>
<tab id="tab_107" id_parent="-1" active="1">
<tab id="tab_2" id_parent="-1" active="1">
<class_name>AdminLogin</class_name>
</tab>
<tab id="CMS_pages" id_parent="-1" active="1">
@@ -177,6 +177,21 @@
<tab id="Positions" id_parent="Modules" active="1">
<class_name>AdminModulesPositions</class_name>
</tab>
<tab id="Profiles" id_parent="Employees" active="1">
<class_name>AdminProfiles</class_name>
</tab>
<tab id="Permissions" id_parent="Employees" active="1">
<class_name>AdminAccess</class_name>
</tab>
<tab id="Contacts" id_parent="Employees" active="1">
<class_name>AdminContacts</class_name>
</tab>
<tab id="Tabs" id_parent="Employees" active="1">
<class_name>AdminTabs</class_name>
</tab>
<tab id="Customer_Service" id_parent="Employees" active="1">
<class_name>AdminCustomerThreads</class_name>
</tab>
<tab id="Contact_Information" id_parent="Preferences" active="1">
<class_name>AdminContact</class_name>
</tab>
@@ -252,21 +267,6 @@
<tab id="SQL_Manager" id_parent="Tools" active="1">
<class_name>AdminRequestSql</class_name>
</tab>
<tab id="Profiles" id_parent="Employees" active="1">
<class_name>AdminProfiles</class_name>
</tab>
<tab id="Permissions" id_parent="Employees" active="1">
<class_name>AdminAccess</class_name>
</tab>
<tab id="Contacts" id_parent="Employees" active="1">
<class_name>AdminContacts</class_name>
</tab>
<tab id="Tabs" id_parent="Employees" active="1">
<class_name>AdminTabs</class_name>
</tab>
<tab id="Customer_Service" id_parent="Employees" active="1">
<class_name>AdminCustomerThreads</class_name>
</tab>
<tab id="Group_Shops" id_parent="Shops" active="1">
<class_name>AdminGroupShop</class_name>
</tab>
@@ -300,5 +300,8 @@
<tab id="Export" id_parent="Accounting" active="1">
<class_name>AdminAccountingExport</class_name>
</tab>
<tab id="Display_Accounting_Plan" id_parent="Accounting" active="1">
<class_name>AdminAccountingRegisteredNumber</class_name>
</tab>
</entities>
</entity_tab>
install-dev/langs/de/data/tab.xml
+7 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<entity_tab>
<tab id="Home" name="Home"/>
<tab id="tab_107" name=""/>
<tab id="tab_2" name=""/>
<tab id="CMS_pages" name="CMS pages"/>
<tab id="CMS_categories" name="CMS categories"/>
<tab id="Combinations_generator" name="Combinations generator"/>
@@ -57,6 +57,11 @@
<tab id="My_Account" name="Mein Konto"/>
<tab id="Themes" name="Themen"/>
<tab id="Positions" name="Positionen"/>
<tab id="Profiles" name="Profile"/>
<tab id="Permissions" name="Berechtigungen"/>
<tab id="Contacts" name="Kontakte"/>
<tab id="Tabs" name="Tabs"/>
<tab id="Customer_Service" name="Kundenservice"/>
<tab id="Contact_Information" name="Kontaktinformation"/>
<tab id="Themes_1" name="Themen"/>
<tab id="SEO_URLs" name="SEO &amp; URLs"/>
@@ -82,11 +87,6 @@
<tab id="Webservice" name="Webservice"/>
<tab id="Logs" name="Log"/>
<tab id="SQL_Manager" name="SQL Manager"/>
<tab id="Profiles" name="Profile"/>
<tab id="Permissions" name="Berechtigungen"/>
<tab id="Contacts" name="Kontakte"/>
<tab id="Tabs" name="Tabs"/>
<tab id="Customer_Service" name="Kundenservice"/>
<tab id="Group_Shops" name="Group Shops"/>
<tab id="Shop_Urls" name="Shop Urls"/>
<tab id="Warehouses" name="Warehouses"/>
@@ -98,4 +98,5 @@
<tab id="Configuration" name="Configuration"/>
<tab id="Account_Number_Management" name="Account Number Management"/>
<tab id="Export" name="Export"/>
<tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
</entity_tab>
install-dev/langs/en/data/tab.xml
+7 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<entity_tab>
<tab id="Home" name="Home"/>
<tab id="tab_107" name=""/>
<tab id="tab_2" name=""/>
<tab id="CMS_pages" name="CMS pages"/>
<tab id="CMS_categories" name="CMS categories"/>
<tab id="Combinations_generator" name="Combinations generator"/>
@@ -57,6 +57,11 @@
<tab id="My_Account" name="My Account"/>
<tab id="Themes" name="Themes"/>
<tab id="Positions" name="Positions"/>
<tab id="Profiles" name="Profiles"/>
<tab id="Permissions" name="Permissions"/>
<tab id="Contacts" name="Contacts"/>
<tab id="Tabs" name="Tabs"/>
<tab id="Customer_Service" name="Customer Service"/>
<tab id="Contact_Information" name="Contact Information"/>
<tab id="Themes_1" name="Themes"/>
<tab id="SEO_URLs" name="SEO &amp; URLs"/>
@@ -82,11 +87,6 @@
<tab id="Webservice" name="Webservice"/>
<tab id="Logs" name="Logs"/>
<tab id="SQL_Manager" name="SQL Manager"/>
<tab id="Profiles" name="Profiles"/>
<tab id="Permissions" name="Permissions"/>
<tab id="Contacts" name="Contacts"/>
<tab id="Tabs" name="Tabs"/>
<tab id="Customer_Service" name="Customer Service"/>
<tab id="Group_Shops" name="Group Shops"/>
<tab id="Shop_Urls" name="Shop Urls"/>
<tab id="Warehouses" name="Warehouses"/>
@@ -98,4 +98,5 @@
<tab id="Configuration" name="Configuration"/>
<tab id="Account_Number_Management" name="Account Number Management"/>
<tab id="Export" name="Export"/>
<tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
</entity_tab>
install-dev/langs/es/data/tab.xml
+7 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<entity_tab>
<tab id="Home" name="Home"/>
<tab id="tab_107" name=""/>
<tab id="tab_2" name=""/>
<tab id="CMS_pages" name="CMS pages"/>
<tab id="CMS_categories" name="CMS categories"/>
<tab id="Combinations_generator" name="Combinations generator"/>
@@ -57,6 +57,11 @@
<tab id="My_Account" name="My Account"/>
<tab id="Themes" name="Temas"/>
<tab id="Positions" name="Posiciones"/>
<tab id="Profiles" name="Perfiles"/>
<tab id="Permissions" name="Permisos"/>
<tab id="Contacts" name="Contactos"/>
<tab id="Tabs" name="Pesta&#xF1;as"/>
<tab id="Customer_Service" name="Servicio al cliente"/>
<tab id="Contact_Information" name="Datos"/>
<tab id="Themes_1" name="Temas"/>
<tab id="SEO_URLs" name="SEO &amp; URLs"/>
@@ -82,11 +87,6 @@
<tab id="Webservice" name="Web service"/>
<tab id="Logs" name="Log"/>
<tab id="SQL_Manager" name="SQL Manager"/>
<tab id="Profiles" name="Perfiles"/>
<tab id="Permissions" name="Permisos"/>
<tab id="Contacts" name="Contactos"/>
<tab id="Tabs" name="Pesta&#xF1;as"/>
<tab id="Customer_Service" name="Servicio al cliente"/>
<tab id="Group_Shops" name="Group Shops"/>
<tab id="Shop_Urls" name="Shop Urls"/>
<tab id="Warehouses" name="Warehouses"/>
@@ -98,4 +98,5 @@
<tab id="Configuration" name="Configuration"/>
<tab id="Account_Number_Management" name="Account Number Management"/>
<tab id="Export" name="Export"/>
<tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
</entity_tab>
install-dev/langs/fr/data/tab.xml
+7 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<entity_tab>
<tab id="Home" name="Accueil"/>
<tab id="tab_107" name=""/>
<tab id="tab_2" name=""/>
<tab id="CMS_pages" name="Pages CMS"/>
<tab id="CMS_categories" name="Cat&#xE9;gories CMS"/>
<tab id="Combinations_generator" name="G&#xE9;n&#xE9;rateur de d&#xE9;clinaisons"/>
@@ -57,6 +57,11 @@
<tab id="My_Account" name="Mon compte"/>
<tab id="Themes" name="Th&#xE8;mes"/>
<tab id="Positions" name="Positions"/>
<tab id="Profiles" name="Profils"/>
<tab id="Permissions" name="Permissions"/>
<tab id="Contacts" name="Contacts"/>
<tab id="Tabs" name="Onglets"/>
<tab id="Customer_Service" name="SAV"/>
<tab id="Contact_Information" name="Coordonn&#xE9;es"/>
<tab id="Themes_1" name="Th&#xE8;mes"/>
<tab id="SEO_URLs" name="SEO &amp; URLs"/>
@@ -82,11 +87,6 @@
<tab id="Webservice" name="Service web"/>
<tab id="Logs" name="Log"/>
<tab id="SQL_Manager" name="SQL Manager"/>
<tab id="Profiles" name="Profils"/>
<tab id="Permissions" name="Permissions"/>
<tab id="Contacts" name="Contacts"/>
<tab id="Tabs" name="Onglets"/>
<tab id="Customer_Service" name="SAV"/>
<tab id="Group_Shops" name="Groupes de boutique"/>
<tab id="Shop_Urls" name="URLs de boutique"/>
<tab id="Warehouses" name="Entrep&#xF4;ts"/>
@@ -98,4 +98,5 @@
<tab id="Configuration" name="Configuration"/>
<tab id="Account_Number_Management" name="Gestion des num&#xE9;ros de comptes"/>
<tab id="Export" name="Export"/>
<tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
</entity_tab>
install-dev/langs/it/data/tab.xml
+7 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<entity_tab>
<tab id="Home" name="Home"/>
<tab id="tab_107" name=""/>
<tab id="tab_2" name=""/>
<tab id="CMS_pages" name="CMS pages"/>
<tab id="CMS_categories" name="CMS categories"/>
<tab id="Combinations_generator" name="Combinations generator"/>
@@ -57,6 +57,11 @@
<tab id="My_Account" name="Il mio Account"/>
<tab id="Themes" name="Temi"/>
<tab id="Positions" name="Posizioni"/>
<tab id="Profiles" name="Profili"/>
<tab id="Permissions" name="Permessi"/>
<tab id="Contacts" name="Contatti"/>
<tab id="Tabs" name="Tab"/>
<tab id="Customer_Service" name="Servizio clienti"/>
<tab id="Contact_Information" name="Informazioni di contatto"/>
<tab id="Themes_1" name="Temi"/>
<tab id="SEO_URLs" name="SEO &amp; URLs"/>
@@ -82,11 +87,6 @@
<tab id="Webservice" name="Webservice"/>
<tab id="Logs" name="Log"/>
<tab id="SQL_Manager" name="SQL Manager"/>
<tab id="Profiles" name="Profili"/>
<tab id="Permissions" name="Permessi"/>
<tab id="Contacts" name="Contatti"/>
<tab id="Tabs" name="Tab"/>
<tab id="Customer_Service" name="Servizio clienti"/>
<tab id="Group_Shops" name="Group Shops"/>
<tab id="Shop_Urls" name="Shop Urls"/>
<tab id="Warehouses" name="Warehouses"/>
@@ -98,4 +98,5 @@
<tab id="Configuration" name="Configuration"/>
<tab id="Account_Number_Management" name="Account Number Management"/>
<tab id="Export" name="Export"/>
<tab id="Display_Accounting_Plan" name="Display Accounting Plan"/>
</entity_tab>
install-dev/upgrade/sql/1.5.0.7.sql
+4 -4
View File
@@ -8,6 +8,8 @@ UPDATE `PREFIX_product` set is_virtual = 1 WHERE id_product IN (SELECT id_produc
ALTER TABLE `PREFIX_employee` ADD `bo_width` int(10) unsigned NOT NULL DEFAULT 0 AFTER `bo_theme`;
CREATE TABLE `PREFIX_product_tax_rules_group_shop` (
`id_product` INT(11) UNSIGNED NOT NULL,
`id_tax_rules_group` INT(11) UNSIGNED NOT NULL,
@@ -30,8 +32,6 @@ INSERT INTO `PREFIX_carrier_tax_rules_group_shop` (`id_carrier`, `id_tax_rules_g
(SELECT `id_carrier`, `id_tax_rules_group`, `id_shop` FROM `PREFIX_carrier`, `PREFIX_shop`);
ALTER TABLE `PREFIX_carrier` DROP `id_tax_rules_group`;
ALTER TABLE `PREFIX_specific_price` DROP INDEX `id_product`;
KEY (`id_product`, `id_shop`, `id_currency`, `id_country`, `id_group`, `id_customer`, `from_quantity`, `from`, `to`),
ALTER TABLE `PREFIX_customer` ADD `account_number` VARCHAR(128) NOT NULL AFTER `birthday`
ALTER TABLE `PREFIX_specific_price` ADD UNIQUE (`id_product`,`id_shop`,`id_group_shop`,`id_currency`,`id_country`,`id_group`,`id_customer`,`id_product_attribute`,`from_quantity`,`from`,`to`);
ALTER TABLE `PREFIX_specific_price` ADD INDEX (`id_cart`);
ALTER TABLE `PREFIX_product_shop` ADD `id_category_default` INT( 11 ) UNSIGNED DEFAULT NULL;