diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index efed0298f52..a9ec591cf5f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -473,7 +473,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G $result = $interface->run_triggers('PROPAL_SENTBYMAIL', $object, $user, $langs, $conf); if ($result < 0) { $error ++; - $this->errors = $interface->errors; + $object->errors = $interface->errors; } // Fin appel triggers diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 27690ae7093..0e16f6744fd 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -784,8 +784,8 @@ if ($id > 0 || ! empty($ref)) print ''; if ($sep > 0) print ' '; // If we had at least one line in future else print $langs->trans("CurrentBalance"); - print ''; - print ''.price($total).''; + print ' '.$object->currency_code.''; + print ''.price($total, 0, $langs, 0, 0, -1, $object->currency_code).''; print ' '; print ''; } diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index cf43fc578fb..e98d8978440 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -90,7 +90,7 @@ print ''.$langs->trans("Status").''; print ''.$langs->trans("BankBalance").''; print "\n"; -$total = 0; $found = 0; +$total = array(); $found = 0; $var=true; foreach ($accounts as $key=>$type) { @@ -119,17 +119,19 @@ foreach ($accounts as $key=>$type) print ''; print ''.$acc->getLibStatut(2).''; print ''; - print ''.price($solde).''; + print ''.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).''; print ''; print ''; - $total += $solde; + $total[$acc->currency_code] += $solde; } } if (! $found) print ''.$langs->trans("None").''; // Total -print ''.$langs->trans("Total").''.price($total).''; - +foreach ($total as $key=>$solde) +{ + print ''.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; +} //print ' '; @@ -144,7 +146,7 @@ print ''.$langs->trans("Status").''; print ''.$langs->trans("BankBalance").''; print "\n"; -$total = 0; $found = 0; +$total = array(); $found = 0; $var=true; foreach ($accounts as $key=>$type) { @@ -165,16 +167,19 @@ foreach ($accounts as $key=>$type) print ' '; print ''.$acc->getLibStatut(2).''; print ''; - print ''.price($solde).''; + print ''.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).''; print ''; print ''; - $total += $solde; + $total[$acc->currency_code] += $solde; } } if (! $found) print ''.$langs->trans("None").''; // Total -print ''.$langs->trans("Total").''.price($total).''; +foreach ($total as $key=>$solde) +{ + print ''.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; +} @@ -193,7 +198,7 @@ print ''.$langs->trans("Status").''; print ''.$langs->trans("BankBalance").''; print "\n"; -$total = 0; $found = 0; +$total = array(); $found = 0; $var=true; foreach ($accounts as $key=>$type) { @@ -222,16 +227,19 @@ foreach ($accounts as $key=>$type) print ''; print ''.$acc->getLibStatut(2).''; print ''; - print ''.price($solde).''; + print ''.price($solde, 0, $langs, 0, 0, -1, $acc->currency_code).''; print ''; print ''; - $total += $solde; + $total[$acc->currency_code] += $solde; } } if (! $found) print ''.$langs->trans("None").''; // Total -print ''.$langs->trans("Total").''.price($total).''; +foreach ($total as $key=>$solde) +{ + print ''.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; +} print ""; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index da275ca37c1..b6837d68a98 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1607,7 +1607,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $result = $interface->run_triggers('BILL_SENTBYMAIL', $object, $user, $langs, $conf); if ($result < 0) { $error ++; - $this->errors = $interface->errors; + $object->errors = $interface->errors; } // Fin appel triggers diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 5cf09642c68..b7a94bc28c4 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -1128,6 +1128,10 @@ class Expedition extends CommonObject // Eat-by date if (! empty($conf->productbatch->enabled)) { + /* test on conf at begining of file sometimes doesn't include expeditionbatch + * May be conf is not well initialized for dark reason + */ + require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php'; $line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id); } $this->lines[$i] = $line; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 1fd33b29c53..45208e77dbe 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -500,7 +500,7 @@ if ($action == 'send' && ! GETPOST('addfile','alpha') && ! GETPOST('removedfile' $interface=new Interfaces($db); $result=$interface->run_triggers('SHIPPING_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { - $error++; $this->errors=$interface->errors; + $error++; $object->errors=$interface->errors; } // Fin appel triggers @@ -863,7 +863,7 @@ if ($action == 'create') if (($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) || $defaultqty < 0) $defaultqty=0; } - if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() and is_array($product->stock_warehouse[GETPOST('entrepot_id','int')]))) + if (empty($conf->productbatch->enabled) || ! ($product->hasbatch() and is_object($product->stock_warehouse[GETPOST('entrepot_id','int')]))) { // Quantity to send print ''; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 182fd0d1a36..7dae4a359ee 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -730,7 +730,7 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $interface=new Interfaces($db); $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { - $error++; $this->errors=$interface->errors; + $error++; $object->errors=$interface->errors; } // Fin appel triggers diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index e70d78d1ea6..92c8be3469c 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -911,7 +911,7 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P $interface=new Interfaces($db); $result=$interface->run_triggers('BILL_SUPPLIER_SENTBYMAIL',$object,$user,$langs,$conf); if ($result < 0) { - $error++; $this->errors=$interface->errors; + $error++; $object->errors=$interface->errors; } // Fin appel triggers diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 8b58e7a4455..9a38e16f7f4 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -103,7 +103,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->fournisse } } -if ($action == 'setnum' && ! empty($_POST['num_paiement'])) +if ($action == 'setnum_paiement' && ! empty($_POST['num_paiement'])) { $object->fetch($id); $res = $object->update_num($_POST['num_paiement']); diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 1186de5e4ad..77591686983 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -83,6 +83,8 @@ class Project extends CommonObject $error = 0; $ret = 0; + $now=dol_now(); + // Check parameters if (!trim($this->ref)) { @@ -113,9 +115,9 @@ class Project extends CommonObject $sql.= ", " . $user->id; $sql.= ", 0"; $sql.= ", " . ($this->public ? 1 : 0); - $sql.= ", " . $this->db->idate(dol_now()); - $sql.= ", " . ($this->date_start != '' ? $this->db->idate($this->date_start) : 'null'); - $sql.= ", " . ($this->date_end != '' ? $this->db->idate($this->date_end) : 'null'); + $sql.= ", '".$this->db->idate($now)."'"; + $sql.= ", " . ($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : 'null'); + $sql.= ", " . ($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : 'null'); $sql.= ", ".$conf->entity; $sql.= ")"; diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 97b489cc3e4..c6880547c60 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -192,6 +192,16 @@ if ($id > 0 || ! empty($ref)) // Statut print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($object->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($object->date_end,'day'); + print ''; + print ""; print ''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 04164a38579..322820b361d 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -128,6 +128,16 @@ print ''; // Statut print ''.$langs->trans("Status").''.$project->getLibStatut(4).''; +// Date start +print ''.$langs->trans("DateStart").''; +print dol_print_date($object->date_start,'day'); +print ''; + +// Date end +print ''.$langs->trans("DateEnd").''; +print dol_print_date($object->date_end,'day'); +print ''; + print ''; print ''; diff --git a/htdocs/projet/ganttchart.php b/htdocs/projet/ganttchart.inc.php similarity index 99% rename from htdocs/projet/ganttchart.php rename to htdocs/projet/ganttchart.inc.php index b3701191142..7b4249a0128 100644 --- a/htdocs/projet/ganttchart.php +++ b/htdocs/projet/ganttchart.inc.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/projet/ganttchart.php + * \file htdocs/projet/ganttchart.inc.php * \ingroup projet * \brief Gantt diagram of a project */ diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 77767fd446f..79d302addd3 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -137,6 +137,17 @@ if ($id > 0 || ! empty($ref)) // Statut print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($object->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($object->date_end,'day'); + print ''; + + print ''; print ''; @@ -184,8 +195,8 @@ if (count($tasksarray)>0) // Show Gant diagram from $taskarray using JSGantt - $dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.php later - $dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.php later + $dateformat=$langs->trans("FormatDateShort"); // Used by include ganttchart.inc.php later + $dateformat=$langs->trans("FormatDateShortJQuery"); // Used by include ganttchart.inc.php later $array_contacts=array(); $tasks=array(); $project_dependencies=array(); @@ -244,7 +255,7 @@ if (count($tasksarray)>0) { //var_dump($_SESSION); print '
'."\n"; - include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.php'; + include_once DOL_DOCUMENT_ROOT.'/projet/ganttchart.inc.php'; print '
'."\n"; } else diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 710d4b9f50d..493141cbe95 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -118,6 +118,16 @@ if ($id > 0 || ! empty($ref)) // Statut print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($object->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($object->date_end,'day'); + print ''; + print ""; print '
'; diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index fc02da1c821..356eed55e6d 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -232,12 +232,12 @@ if ($id > 0 || ! empty($ref)) // Date start print ''.$langs->trans("DateStart").''; - print dol_print_date($object->date_start,'dayhour'); + print dol_print_date($object->date_start,'day'); print ''; // Date end print ''.$langs->trans("DateEnd").''; - print dol_print_date($object->date_end,'dayhour'); + print dol_print_date($object->date_end,'day'); print ''; // Other options diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index a86dd329e4c..f0bdce25fca 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -202,6 +202,16 @@ if ($id > 0 || ! empty($ref)) // Statut print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($projectstatic->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($projectstatic->date_end,'day'); + print ''; + print ''; dol_fiche_end(); diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php index 29aca5f23f7..50763f839f7 100644 --- a/htdocs/projet/tasks/document.php +++ b/htdocs/projet/tasks/document.php @@ -166,6 +166,16 @@ if ($object->id > 0) // Statut print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($projectstatic->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($projectstatic->date_end,'day'); + print ''; + print ''; dol_fiche_end(); diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php index f0f72810e8a..a6f8846ce0e 100644 --- a/htdocs/projet/tasks/note.php +++ b/htdocs/projet/tasks/note.php @@ -148,6 +148,16 @@ if ($object->id > 0) // Statut print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($projectstatic->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($projectstatic->date_end,'day'); + print ''; + print ''; dol_fiche_end(); diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index 62dfb3cbe68..dd83cf57d8f 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -243,6 +243,16 @@ if ($id > 0 || ! empty($ref)) // Statut print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($projectstatic->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($projectstatic->date_end,'day'); + print ''; + print ''; dol_fiche_end(); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 4d70ddae36b..2ef635dbe53 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -234,6 +234,16 @@ if ($id > 0 || ! empty($ref)) // Statut print ''.$langs->trans("Status").''.$projectstatic->getLibStatut(4).''; + // Date start + print ''.$langs->trans("DateStart").''; + print dol_print_date($projectstatic->date_start,'day'); + print ''; + + // Date end + print ''.$langs->trans("DateEnd").''; + print dol_print_date($projectstatic->date_end,'day'); + print ''; + print ''; dol_fiche_end(); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f2d2e64791d..b88642cd83d 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -432,12 +432,12 @@ if (empty($reshook)) $sql = "UPDATE ".MAIN_DB_PREFIX."adherent"; $sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id; - dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG); - if (! $this->db->query($sql)) + dol_syslog(get_class($object)."::delete sql=".$sql, LOG_DEBUG); + if (! $object->db->query($sql)) { $error++; - $this->error .= $this->db->lasterror(); - dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR); + $object->error .= $object->db->lasterror(); + dol_syslog(get_class($object)."::delete erreur -1 ".$object->error, LOG_ERR); } } diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index a8ab0dc5ebb..bc8e14aafd1 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -385,7 +385,7 @@ class UserGroup extends CommonObject // Pour compatibilite, si lowid = 0, on est en mode suppression de tout // TODO A virer quand sera gere par l'appelant - if (substr($rid,-1,1) == 0) $wherefordel="module='$module'"; + //if (substr($rid,-1,1) == 0) $wherefordel="module='$module'"; } else { // Where pour la liste des droits a supprimer