lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: table name differs.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-14 01:47:31 +02:00
parent 536b579b35
commit 2cf21f856c
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.formmail.class.php
View File

@ -680,7 +680,7 @@ class FormMail
/** /**
* Return template of email * Return template of email
* Search into table c_email_template * Search into table c_email_templates
* *
* @param DoliDB $db Database handler * @param DoliDB $db Database handler
* @param string $type_template Get message for key module * @param string $type_template Get message for key module

2
htdocs/core/lib/functions.lib.php
View File

@ -3843,6 +3843,7 @@ function dol_string_is_good_iso($s)
* @param string $s String to check * @param string $s String to check
* @param int $maxchar Not yet used * @param int $maxchar Not yet used
* @return int Number of lines * @return int Number of lines
* @see dol_nboflines_bis
*/ */
function dol_nboflines($s,$maxchar=0) function dol_nboflines($s,$maxchar=0)
{ {
@ -3861,6 +3862,7 @@ function dol_nboflines($s,$maxchar=0)
* @param int $maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut) * @param int $maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
* @param string $charset Give the charset used to encode the $text variable in memory. * @param string $charset Give the charset used to encode the $text variable in memory.
* @return int Number of lines * @return int Number of lines
* @see dol_nboflines
*/ */
function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8') function dol_nboflines_bis($text,$maxlinesize=0,$charset='UTF-8')
{ {

4
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@ -1088,8 +1088,8 @@ ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_ob
ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public; ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public;
ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang); ALTER TABLE llx_c_email_templates ADD UNIQUE INDEX uk_c_email_templates(label, lang);
ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template); ALTER TABLE llx_c_email_templates ADD INDEX idx_type(type_template);
-- Remove OSC module -- Remove OSC module
DELETE FROM llx_const WHERE name = 'MAIN_MODULE_BOUTIQUE'; DELETE FROM llx_const WHERE name = 'MAIN_MODULE_BOUTIQUE';

4
htdocs/install/mysql/tables/llx_c_email_template.key.sql → htdocs/install/mysql/tables/llx_c_email_templates.key.sql
View File

@ -17,6 +17,6 @@
-- Table with templates of emails -- Table with templates of emails
-- =================================================================== -- ===================================================================
ALTER TABLE llx_c_email_template ADD UNIQUE INDEX uk_c_email_template(label, lang); ALTER TABLE llx_c_email_templates ADD UNIQUE INDEX uk_c_email_templates(label, lang);
ALTER TABLE llx_c_email_template ADD INDEX idx_type(type_template); ALTER TABLE llx_c_email_templates ADD INDEX idx_type(type_template);

2
htdocs/install/mysql/tables/llx_c_email_template.sql → htdocs/install/mysql/tables/llx_c_email_templates.sql
View File

@ -17,7 +17,7 @@
-- Table with templates of emails -- Table with templates of emails
-- =================================================================== -- ===================================================================
create table llx_c_email_template create table llx_c_email_templates
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id

2
htdocs/install/pgsql/functions/functions.sql
View File

@ -62,7 +62,7 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_adherent_type FOR EA
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_bank_account FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_boxes_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_boxes_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_template FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_email_templates FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_field_list FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_field_list FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_shipment_mode FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_c_shipment_mode FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_chargesociales FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms(); CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_chargesociales FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();