Skip to content

Commit

Permalink
Add dol_syslog
Browse files Browse the repository at this point in the history
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
  • Loading branch information
FHenry committed Sep 5, 2013
1 parent 95ff16f commit 2740cc7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions ChangeLog
Expand Up @@ -79,6 +79,7 @@ For users:
- Fix: [Bug #958] LocalTax2 for Spain fails on Suppliers
- Fix: [ bug #972 ] Auto completion contact field do not take account the min caract number before search
- Fix: [ bug #971 ] html.form.class.php select_contact with autocomplete do not exclude id from exclude array
- Fix: Expedition creation, can retreive product from other expedition

For translators:
- Update language files.
Expand Down
2 changes: 2 additions & 0 deletions htdocs/expedition/class/expedition.class.php
Expand Up @@ -224,6 +224,7 @@ function create($user)
$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
$sql.= ")";

dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
{
Expand Down Expand Up @@ -323,6 +324,7 @@ function create_line($entrepot_id, $origin_line_id, $qty)
$sql.= ", ".$qty;
$sql.= ")";

dol_syslog(get_class($this)."::create_line sql=".$sql, LOG_DEBUG);
if (! $this->db->query($sql))
{
$error++;
Expand Down
2 changes: 2 additions & 0 deletions htdocs/expedition/fiche.php
Expand Up @@ -87,6 +87,8 @@
if ($action == 'add')
{
$error=0;

$object = new Expedition($db);

$db->begin();

Expand Down
2 changes: 1 addition & 1 deletion htdocs/fourn/facture/index.php
Expand Up @@ -195,7 +195,7 @@
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"fac.rowid,fac.ref","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"fac.ref,fac.rowid","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("RefSupplier"),$_SERVER["PHP_SELF"],"ref_supplier","",$param,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"fac.datef,fac.rowid","",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"fac.date_lim_reglement","",$param,'align="center"',$sortfield,$sortorder);
Expand Down

0 comments on commit 2740cc7

Please sign in to comment.