lang->line('config_custom1').':', 'config_custom1',array('class'=>'wide')); ?>
@@ -493,7 +519,17 @@ $(document).ready(function()
number:true
},
email:"email",
- return_policy: "required"
+ return_policy: "required",
+ lines_per_page:
+ {
+ required: true,
+ number: true
+ },
+ default_sales_discount:
+ {
+ required: true,
+ number: true
+ }
},
messages:
{
@@ -506,8 +542,17 @@ $(document).ready(function()
number:"lang->line('config_default_tax_rate_number'); ?>"
},
email: "lang->line('common_email_invalid_format'); ?>",
- return_policy:"lang->line('config_return_policy_required'); ?>"
-
+ return_policy:"lang->line('config_return_policy_required'); ?>",
+ default_sales_discount:
+ {
+ required: "lang->line('config_default_sales_discount_required'); ?>",
+ number :"lang->line('config_default_sales_discount_number'); ?>"
+ },
+ lines_per_page:
+ {
+ required: "lang->line('config_lines_per_page_required'); ?>",
+ number: "lang->line('config_lines_per_page_number'); ?>"
+ }
}
});
});
diff --git a/database/2.3.1_to_2.3.2.sql b/database/2.3.1_to_2.3.2.sql
index b2af88413..35ffd582e 100644
--- a/database/2.3.1_to_2.3.2.sql
+++ b/database/2.3.1_to_2.3.2.sql
@@ -17,7 +17,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('print_top_margin', '0'),
('print_left_margin', '0'),
('print_bottom_margin', '0'),
-('print_right_margin', '0');
+('print_right_margin', '0'),
+('default_sales_discount', '0'),
+('lines_per_page', '25');
INSERT INTO `ospos_permissions` (permission_id, module_id, location_id)
(SELECT CONCAT('sales_', location_name), 'sales', location_id FROM ospos_stock_locations);
diff --git a/database/database.sql b/database/database.sql
index 54de41969..e7b53d994 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -64,7 +64,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
('print_top_margin', '0'),
('print_left_margin', '0'),
('print_bottom_margin', '0'),
-('print_right_margin', '0');
+('print_right_margin', '0'),
+('default_sales_discount', '0'),
+('lines_per_page', '25');
-- --------------------------------------------------------
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index 040e9daf2..ec086a3eb 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -113,3 +113,9 @@ config_jsprintsetup_required,Opgelet! De uitgeschakelde functionaliteit werkt en
config_use_invoice_template,Gebruik template voor facturen,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template,Use invoice template
config_invoice_email_message,Invoice Email Template,Invoice Email Template,Invoice Email Template,Invoice Email Template,Invoice Email Template,Invoice Email Template,Invoice Email Template,Invoice Email Template,Invoice Email Template
config_invoice_default_comments,Factuur Mededeling,Default Invoice Comments,Default Invoice Comments,Default Invoice Comments,Default Invoice Comments,Default Invoice Comments,Default Invoice Comments,Default Invoice Comments,Default Invoice Comments
+config_lines_per_page,Lijnen Per Pagina,Lines Per Page,Lines Per Page,Lines Per Page,Lines Per Page,Lines Per Page,Lines Per Page,Lines Per Page,Lines Per Page
+config_lines_per_page_required,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field,The lines per page is a required field
+config_lines_per_page_number,The lines per page must be a number,The lines per page must be a number,,The lines per page must be a number,The lines per page must be a number,The lines per page must be a number,The lines per page must be a number,The lines per page must be a number,The lines per page must be a number
+config_default_sales_discount,Standaard Korting %,Default Sales Discount %,Default Sales Discount %,Default Sales Discount %,Default Sales Discount %,Default Sales Discount %,Default Sales Discount %,Default Sales Discount %,Default Sales Discount %
+config_default_sales_discount_required,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field,The default sales discount is a required field
+config_default_sales_discount_number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number,The default sales discount must be a number