';
print 'attribute_required [$key])) print ' class="fieldrequired"';
+ //var_dump($action);exit;
+ if ((! empty($action) && $action != 'view') && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
print '>' . $label . '';
//TODO Improve element and rights detection
@@ -67,8 +68,8 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
print '| ';
// Convert date into timestamp format
- if (in_array($extrafields->attribute_type [$key], array('date','datetime'))) {
- $value = isset($_POST ["options_" . $key]) ? dol_mktime($_POST ["options_" . $key . "hour"], $_POST ["options_" . $key . "min"], 0, $_POST ["options_" . $key . "month"], $_POST ["options_" . $key . "day"], $_POST ["options_" . $key . "year"]) : $db->jdate($object->array_options ['options_' . $key]);
+ if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
+ $value = isset($_POST["options_" . $key]) ? dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]) : $db->jdate($object->array_options['options_' . $key]);
}
//TODO Improve element and rights detection
@@ -77,7 +78,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
print ' | \n";
@@ -207,7 +213,7 @@ if ($result)
print ''.convertSecondToTime($total).' | | | ';
print '';
}
-
+
print '
';
print "\n";
$db->free($result);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 357df92a4eb..2a01602eadc 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -150,7 +150,7 @@ if ($filter && $filter != -1) // GETPOST('filtre') may be a string
if ($search_ref)
{
- if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility
+ if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref);
else $sql .= natural_search('fac.ref', $search_ref);
}
if (search_ref_supplier)
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 58a1bf3e931..b846d158227 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -22,8 +22,7 @@
*/
/**
- * \class Import
- * \brief Class to manage imports
+ * Class to manage imports
*/
class Import
{
@@ -313,10 +312,12 @@ class Import
{
if (! $notrigger)
{
+ /* Not used. This is not a business object. To convert it we must herit from CommonObject
// Call trigger
$result=$this->call_trigger('IMPORT_DELETE',$user);
- if ($result < 0) $error++;
+ if ($result < 0) $error++;
// End call triggers
+ */
}
}
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index e2c586de47f..2281793929f 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1136,6 +1136,8 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);
+UPDATE llx_facture_fourn SET ref = rowid WHERE ref IS NULL or ref = '';
+
ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index d4ecf42b997..e08c88a9170 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - admin
WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can enabled automatic actions that you are interesting in.
+WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated.
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed
|