Browse Source

Fixed string argument pasded to Fl_Input.default_number_formatnum

mingodad 13 years ago
parent
commit
be081fd725

+ 2 - 0
SquiLu-ourbiz/ourbiz-fltk.nut

@@ -2304,6 +2304,7 @@ class ProductsListSearch extends MyListSearchWindow {
 					_fetching_image = false;
 				}
 				catch(e){
+					//foreach(k,v in get_last_stackinfo()) print(k,v);
 					_fetching_image = false;
 					throw(e);
 				}
@@ -2507,6 +2508,7 @@ class MyEditOrderWindow extends EditOrderWindow {
 	}
 	
 	function fill_edit_form_totals(myrec, asBlank=false){
+		//foreach(k,v in myrec) print(k,v);
 	}
 	
 	function fill_edit_lines_form(asBlank=false, doFocus=true, doCalc=true){

+ 6 - 5
SquiLu-ourbiz/ourbiz-gui.fl

@@ -1723,7 +1723,7 @@ widget_class DynamicQueryWindow {
 } 
 
 widget_class ImagesListEditWindow {
-  label {Images List / Edit} selected
+  label {Images List / Edit}
   xywh {81 129 800 560} type Double labelsize 16 hide resizable
   class List_Edit_Base_Window
 } {
@@ -3204,9 +3204,9 @@ db_products_tags->wrap_mode(o->value(), 0);}
 } 
 
 widget_class EditOrderWindow {
-  label {Edit Order}
-  xywh {255 97 800 560} type Double labelsize 16 hide resizable
-  class Edit_Base_Window
+  label {Edit Order} open selected
+  xywh {255 97 800 560} type Double labelsize 16 resizable
+  class Edit_Base_Window visible
 } {
   Fl_Group {} {open
     xywh {5 1 792 62}
@@ -3327,7 +3327,7 @@ widget_class EditOrderWindow {
         xywh {10 135 780 150} labelsize 16 textsize 16 resizable
         class Fl_Data_Table
       }
-      Fl_Group {} {
+      Fl_Group {} {open
         xywh {10 290 781 260}
       } {
         Fl_Group group_totals {open
@@ -3392,6 +3392,7 @@ widget_class EditOrderWindow {
             dirty_name db_orders_cash
             xywh {685 490 100 25} type Float labelfont 1 labelsize 16 textfont 1 textsize 16
             code0 {=add_input_field_to_map("$(1)", "$(2)", $(name));}
+            code1 {o->use_numeric_format(1);}
             class Fl_Float_Input_Fmt
           }
           Fl_Output cash_return {

+ 1 - 0
SquiLu-ourbiz/ourbiz-gui.nut

@@ -5423,6 +5423,7 @@ class EditOrderWindow extends Edit_Base_Window {
                       o.textfont(1);
                       o.labelsize(16);
                       add_input_field_to_map("orders", "cash", db_orders_cash);
+                      o->use_numeric_format(1);
                     }
                     {
                       local o = Fl_Output(685, 520, 100, 25, _tr("Return"));

+ 4 - 3
SquiLu-ourbiz/utils-fltk.nut

@@ -95,9 +95,10 @@ function delayed_method_call (obj, mcb, udata)
 }
 
 
-math.number_format_set_dec_point(",");
-math.number_format_set_thousand_sep(".");
-Fl_Input.default_number_format("\0x02,.");
+math.number_format_set_dec_point(".");
+math.number_format_set_thousand_sep(",");
+Fl_Input.default_number_format("\x02.,");
+
 //Fl:scheme("plastic");
 Fl.scheme("gtk+");
 //use partial match to find verdana font