Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

New: A customer can also be a prospect.

Browse Source
This commit is contained in:
Laurent Destailleur
2010-01-05 20:03:37 +00:00
parent 818394b154
commit c20be36714
26 changed files with 124 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/livraison/livraison.class.php
View File

@@ -67,7 +67,7 @@ class Livraison extends CommonObject
$this->db = $DB;
$this->lignes = array();
$this->products = array();
// List of short language codes for status
$this->statuts[-1] = 'StatusSendingCanceled';
$this->statuts[0] = 'StatusSendingDraft';
@@ -160,7 +160,7 @@ class Livraison extends CommonObject
{
$error++;
}
if (! $conf->expedition_bon->enabled)
{
if ($conf->commande->enabled)
@@ -720,7 +720,7 @@ class Livraison extends CommonObject
$sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe";
$sql.= " WHERE client = 1";
$sql.= " WHERE client IN (1, 3)";
$sql.= " AND entity = ".$conf->entity;
$sql.= " LIMIT 10";