From acb12dd517a193428f292c04c19caf6dafbd7f73 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Sun, 25 Feb 2018 15:03:05 +0000 Subject: [PATCH] Bump migrate file name with newer date --- ...grade_to_3_2_0.php => 20180225100000_upgrade_to_3_2_0.php} | 0 application/migrations/sqlscripts/3.1.1_to_3.2.0.sql | 4 ++-- database/database.sql | 1 + database/migrate_phppos_dist.sql | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) rename application/migrations/{20180217100000_upgrade_to_3_2_0.php => 20180225100000_upgrade_to_3_2_0.php} (100%) diff --git a/application/migrations/20180217100000_upgrade_to_3_2_0.php b/application/migrations/20180225100000_upgrade_to_3_2_0.php similarity index 100% rename from application/migrations/20180217100000_upgrade_to_3_2_0.php rename to application/migrations/20180225100000_upgrade_to_3_2_0.php diff --git a/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql b/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql index b7f85fcd0..de433753f 100644 --- a/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql +++ b/application/migrations/sqlscripts/3.1.1_to_3.2.0.sql @@ -29,7 +29,7 @@ AND person_id = 1; INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('work_order_enable', '0'), ('work_order_format', 'W%y{WSEQ:6}'), -('last_used_work_order_number', '0'),; +('last_used_work_order_number', '0'); ALTER TABLE `ospos_sales` ADD COLUMN `work_order_number` varchar(32) DEFAULT NULL, @@ -226,7 +226,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('print_receipt_check_behaviour', 'last'); --- This is provide distinct default comments for both quotes and invoices +-- This is to provide distinct default comments for both quotes and invoices INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('quote_default_comments', 'This is a default quote comment'); diff --git a/database/database.sql b/database/database.sql index 4299c2f2c..48e6a15d4 100644 --- a/database/database.sql +++ b/database/database.sql @@ -121,6 +121,7 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('allow_duplicate_barcodes', '0'), ('quote_default_comments', 'This is a default quote comment'); + -- -------------------------------------------------------- -- diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql index f10fd01b9..045d82f66 100644 --- a/database/migrate_phppos_dist.sql +++ b/database/migrate_phppos_dist.sql @@ -118,7 +118,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES ('suggestions_first_column', 'name'), ('suggestions_second_column', ''), ('suggestions_third_column', ''), -('allow_duplicate_barcodes', '0'); +('allow_duplicate_barcodes', '0'), +('quote_default_comments', 'This is a default quote comment'); + -- --------------------------------------------------------