Merge lp:~georgeyk/stoq/start_production into lp:~stoq-dev/stoq/master-old

[George Kussumoto]

[George Kussumoto (georgeyk)]

bug: http://bugs.async.com.br/show_bug.cgi?id=4057

[Ronaldo Maia (romaia)]

review: Approve

=== modified file 'data/glade/production.glade'
--- data/glade/production.glade	2009-07-31 14:02:18 +0000
+++ data/glade/production.glade	2009-09-02 19:59:03 +0000
@@ -13,6 +13,14 @@
                     </widget>
                 </child>
                 <child>
+                    <widget class="GtkAction" id="MenuStartProduction">
+                        <property name="name">MenuStartProduction</property>
+                        <property name="stock_id">stoq-transfer</property>
+                        <property name="accelerator">&lt;Control&gt;t</property>
+                        <property name="label" translatable="yes">Start Production...</property>
+                    </widget>
+                </child>
+                <child>
                     <widget class="GtkAction" id="FinishOrder">
                         <property name="name">FinishOrder</property>
                         <property name="label" translatable="yes">Finish Order...</property>
@@ -74,6 +82,13 @@
                     </widget>
                 </child>
                 <child>
+                    <widget class="GtkAction" id="ToolbarStartProduction">
+                        <property name="name">ToolbarStartProduction</property>
+                        <property name="label" translatable="yes">Start Production</property>
+                        <property name="stock_id">stoq-transfer</property>
+                    </widget>
+                </child>
+                <child>
                     <widget class="GtkAction" id="ProductionMenu">
                         <property name="name">ProductionMenu</property>
                         <property name="label" translatable="yes">_Production</property>
@@ -123,7 +138,7 @@
                         <property name="label" translatable="yes">Services...</property>
                         <property name="accelerator">&lt;Control&gt;s</property>
                     </widget>
-                </child> 
+                </child>
                 <child>
                     <widget class="GtkAction" id="about_menu">
                         <property name="name">about_menu</property>
@@ -159,6 +174,7 @@
 	<menubar action="menubar">
         <menu action="ProductionMenu">
 	    <menuitem action="MenuNewProduction"/>
+	    <menuitem action="MenuStartProduction"/>
 	    <separator name="sep"/>
 	    <menuitem action="ExportCSV"/>
 	    <menuitem action="Quit"/>
@@ -173,6 +189,7 @@
 	  </menubar>
 	  <toolbar action="toolbar1">
 	    <toolitem action="ToolbarNewProduction"/>
+	    <toolitem action="ToolbarStartProduction"/>
 	  </toolbar>
 	</ui>]]></ui>
     </widget>

=== modified file 'stoq/gui/production/production.py'
--- stoq/gui/production/production.py	2009-07-31 14:02:18 +0000
+++ stoq/gui/production/production.py	2009-09-03 18:48:23 +0000
@@ -33,6 +33,7 @@
 
 from stoqlib.database.runtime import new_transaction, finish_transaction
 from stoqlib.domain.production import ProductionOrder
+from stoqlib.gui.dialogs.startproduction import StartProductionDialog
 from stoqlib.gui.search.productionsearch import ProductionProductSearch
 from stoqlib.gui.search.servicesearch import ServiceSearch
 from stoqlib.gui.wizards.productionwizard import ProductionWizard
@@ -57,11 +58,15 @@
     def _update_widgets(self):
         selection = self.results.get_selected_rows()
         can_edit = False
+        can_start = False
         if len(selection) == 1:
             selected = selection[0]
             can_edit = (selected.status == ProductionOrder.ORDER_OPENED or
                         selected.status == ProductionOrder.ORDER_WAITING)
+            can_start = can_edit
         self.edit_button.set_sensitive(can_edit)
+        self.MenuStartProduction.set_sensitive(can_start)
+        self.ToolbarStartProduction.set_sensitive(can_start)
 
     def _get_status_values(self):
         items = [(text, value)
@@ -75,6 +80,17 @@
         retval = self.run_dialog(ProductionWizard, trans, order)
         finish_transaction(trans, retval)
         trans.close()
+        self.refresh()
+
+    def _start_production_order(self):
+        trans = new_transaction()
+        order = trans.get(self.results.get_selected_rows()[0])
+        assert order is not None
+
+        retval = self.run_dialog(StartProductionDialog, trans, order)
+        finish_transaction(trans, retval)
+        trans.close()
+        self.refresh()
 
     #
     # SearchableAppWindow
@@ -95,7 +111,7 @@
                        data_type=str, expand=True),
                 SearchColumn('open_date', title=_(u'Opened'),
                              data_type=datetime.date),
-                SearchColumn('closed_date', title=_(u'Closed'),
+                SearchColumn('close_date', title=_(u'Closed'),
                              data_type=datetime.date),]
 
     #
@@ -111,9 +127,15 @@
     def on_MenuNewProduction__activate(self, action):
         self._open_production_order()
 
+    def on_MenuStartProduction__activate(self, action):
+        self._start_production_order()
+
     def on_ToolbarNewProduction__activate(self, action):
         self._open_production_order()
 
+    def on_ToolbarStartProduction__activate(self, action):
+        self._start_production_order()
+
     def on_edit_button__clicked(self, widget):
         order = self.results.get_selected_rows()[0]
         assert order is not None