? cvs_787822_current.patch
Index: storminvoice/storminvoice.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/storminvoice/storminvoice.module,v
retrieving revision 1.4.4.72
diff -u -p -r1.4.4.72 storminvoice.module
--- storminvoice/storminvoice.module	18 Jan 2010 22:01:41 -0000	1.4.4.72
+++ storminvoice/storminvoice.module	9 May 2010 16:13:38 -0000
@@ -433,6 +433,20 @@ function storminvoice_form(&$node) {
     '#default_value' => _storm_gmtimestamp_to_date($node->requestdate),
   );
 
+  if (module_exists('date_api') && module_exists('date_popup')) {
+    $form['group3']['requestdate'] = array(
+      '#type' => 'date_popup',
+      '#title' => t('Request date'),
+      '#date_format' =>  'Y-m-d',
+    );
+
+    if ($node->requestdate == 0 || $node->requestdate == NULL) {
+      $form['group3']['requestdate']['#default_value'] = NULL;
+    } else {
+      $form['group3']['requestdate']['#default_value'] = date('Y-m-d',$node->requestdate);
+    }
+  }
+
   $form['group3']['duedate'] = array(
     '#type' => 'dateext',
     '#withnull' => 'true',
@@ -440,13 +454,41 @@ function storminvoice_form(&$node) {
     '#default_value' => _storm_gmtimestamp_to_date($node->duedate),
   );
 
+  if (module_exists('date_api') && module_exists('date_popup')) {
+    $form['group3']['duedate'] = array(
+      '#type' => 'date_popup',
+      '#title' => t('Due date'),
+      '#date_format' =>  'Y-m-d',
+    );
+
+    if ($node->duedate == 0 || $node->duedate == NULL) {
+      $form['group3']['duedate']['#default_value'] = NULL;
+    } else {
+      $form['group3']['duedate']['#default_value'] = date('Y-m-d',$node->duedate);
+    }
+  }
+
   $form['group3']['paymentdate'] = array(
     '#type' => 'dateext',
     '#withnull' => 'true',
     '#title' => t('Payment date'),
     '#default_value' => _storm_gmtimestamp_to_date($node->paymentdate),
   );
-  
+
+  if (module_exists('date_api') && module_exists('date_popup')) {
+    $form['group3']['paymentdate'] = array(
+      '#type' => 'date_popup',
+      '#title' => t('Payment date'),
+      '#date_format' =>  'Y-m-d',
+    );
+
+    if ($node->paymentdate == 0 || $node->paymentdate == NULL) {
+      $form['group3']['paymentdate']['#default_value'] = NULL;
+    } else {
+      $form['group3']['paymentdate']['#default_value'] = date('Y-m-d',$node->paymentdate);
+    }
+  }
+
   $form['group4'] = array(
     '#type' => 'markup',
     '#weight' => module_exists('content') ? content_extra_field_weight($node->type, 'group4') : -16,
@@ -674,9 +716,26 @@ function _storminvoice_beforesave(&$node
   $node->total = str_replace(',', '.', $node->total);
   $node->totalcustomercurr = str_replace(',', '.', $node->totalcustomercurr);
   
-  if (is_array($node->requestdate)) $node->requestdate = _storm_date_to_gmtimestamp($node->requestdate);
-  if (is_array($node->duedate)) $node->duedate = _storm_date_to_gmtimestamp($node->duedate);
-  if (is_array($node->paymentdate)) $node->paymentdate = _storm_date_to_gmtimestamp($node->paymentdate);
+  if (is_array($node->requestdate)) {
+    $node->requestdate = _storm_date_to_gmtimestamp($node->requestdate);
+  }
+  else {
+    $node->requestdate = strtotime($node->requestdate);
+  }
+  
+  if (is_array($node->duedate)) {
+    $node->duedate = _storm_date_to_gmtimestamp($node->duedate);
+  }
+  else {
+    $node->duedate = strtotime($node->duedate);
+  }
+  
+  if (is_array($node->paymentdate)) {
+    $node->paymentdate = _storm_date_to_gmtimestamp($node->paymentdate);
+  }
+  else {
+    $node->paymentdate = strtotime($node->paymentdate);
+  }
 
   $s = "SELECT n.title FROM {node} AS n 
     INNER JOIN {stormorganization} AS o ON n.vid=o.vid
Index: stormticket/stormticket.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormticket/stormticket.module,v
retrieving revision 1.5.4.43
diff -u -p -r1.5.4.43 stormticket.module
--- stormticket/stormticket.module	2 Jan 2010 15:19:17 -0000	1.5.4.43
+++ stormticket/stormticket.module	9 May 2010 16:13:38 -0000
@@ -475,6 +475,20 @@ function stormticket_form(&$node) {
     '#default_value' => _storm_gmtimestamp_to_date($node->datebegin),
   );
 
+  if (module_exists('date_api') && module_exists('date_popup')) {
+    $form['group3']['datebegin'] = array(
+      '#type' => 'date_popup',
+      '#title' => t('Date begin'),
+      '#date_format' =>  'Y-m-d',
+    );
+
+    if ($node->datebegin == 0 || $node->datebegin == NULL) {
+      $form['group3']['datebegin']['#default_value'] = NULL;
+    } else {
+      $form['group3']['datebegin']['#default_value'] = date('Y-m-d',$node->datebegin);
+    }
+  }
+
   $form['group3']['dateend'] = array(
     '#type' => 'dateext',
     '#title' => t('Date end'),
@@ -482,6 +496,20 @@ function stormticket_form(&$node) {
     '#default_value' => _storm_gmtimestamp_to_date($node->dateend),
   );
 
+  if (module_exists('date_api') && module_exists('date_popup')) {
+    $form['group3']['dateend'] = array(
+      '#type' => 'date_popup',
+      '#title' => t('Date end'),
+      '#date_format' =>  'Y-m-d',
+    );
+
+    if ($node->dateend == 0 || $node->dateend == NULL) {
+      $form['group3']['dateend']['#default_value'] = NULL;
+    } else {
+      $form['group3']['dateend']['#default_value'] = date('Y-m-d',$node->dateend);
+    }
+  }
+
   $durationunits = stormattribute_attributes_bydomain('Duration unit');
   $form['group3']['durationunit'] = array(
     '#type' => 'select',
@@ -646,8 +674,20 @@ function _stormticket_beforesave(&$node)
   $node->duration = str_replace(',', '.', $node->duration);
   $node->price = str_replace(',', '.', $node->price);
   
-  if (is_array($node->datebegin)) $node->datebegin = _storm_date_to_gmtimestamp($node->datebegin);
-  if (is_array($node->dateend)) $node->dateend = _storm_date_to_gmtimestamp($node->dateend);
+  if (is_array($node->datebegin)) {
+    $node->datebegin = _storm_date_to_gmtimestamp($node->datebegin);
+  }
+  else  {
+    $node->datebegin = strtotime($node->datebegin);
+  }
+  
+  if (is_array($node->dateend)) {
+    $node->dateend = _storm_date_to_gmtimestamp($node->dateend);
+  }
+  else {
+    $node->dateend = strtotime($node->dateend);
+  }
+
 }
 
 function stormticket_nodeapi(&$node, $op, $teaser, $page) {