lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-12 20:23:24 +01:00
commit 5f65b2a97f
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/facture/fiche.php
View File

@ -50,9 +50,11 @@ if (!empty($conf->projet->enabled)) {
$langs->load('bills'); $langs->load('bills');
$langs->load('compta');
$langs->load('suppliers'); $langs->load('suppliers');
$langs->load('companies'); $langs->load('companies');
$langs->load('products'); $langs->load('products');
$langs->load('banks');
$mesg=''; $mesg='';
$errors=array(); $errors=array();

2
htdocs/fourn/facture/impayees.php
View File

@ -217,7 +217,7 @@ if ($user->rights->fournisseur->facture->lire)
print '</td><td class="liste_titre" align="right">'; print '</td><td class="liste_titre" align="right">';
print '<input class="flat" type="text" size="8" name="search_montant_ttc" value="'.$search_montant_ttc.'">'; print '<input class="flat" type="text" size="8" name="search_montant_ttc" value="'.$search_montant_ttc.'">';
print '</td><td class="liste_titre" colspan="2" align="right">'; print '</td><td class="liste_titre" colspan="2" align="right">';
print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'; print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
print '</td>'; print '</td>';
print "</tr>\n"; print "</tr>\n";

4
htdocs/main.inc.php
View File

@ -680,8 +680,8 @@ if (! defined('NOLOGIN'))
if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0 if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) $conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
if (isset($user->conf->PRODUIT_LIMIT_SIZE)) $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0 if (isset($user->conf->PRODUIT_LIMIT_SIZE)) $conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
// Replace conf->css by personalized value // Replace conf->css by personalized value if theme not forced
if (isset($user->conf->MAIN_THEME) && $user->conf->MAIN_THEME) if (empty($conf->global->MAIN_FORCETHEME) && ! empty($user->conf->MAIN_THEME))
{ {
$conf->theme=$user->conf->MAIN_THEME; $conf->theme=$user->conf->MAIN_THEME;
$conf->css = "/theme/".$conf->theme."/style.css.php"; $conf->css = "/theme/".$conf->theme."/style.css.php";

2
htdocs/product/class/product.class.php
View File

@ -2973,7 +2973,7 @@ class Product extends CommonObject
// Objet // Objet
$obj=array(); $obj=array();
$obj['photo']=$photo; $obj['photo']=$photo;
if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']=$dirthumb . $photo_vignette; if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) $obj['photo_vignette']='thumbs/' . $photo_vignette;
else $obj['photo_vignette']=""; else $obj['photo_vignette']="";
$tabobj[$nbphoto-1]=$obj; $tabobj[$nbphoto-1]=$obj;

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

@ -306,6 +306,12 @@ class Societe extends CommonObject
$contact->socid = $this->id; // fk_soc $contact->socid = $this->id; // fk_soc
$contact->statut = 1; $contact->statut = 1;
$contact->priv = 0; $contact->priv = 0;
$contact->country_id = $this->country_id;
$contact->address = $this->address;
$contact->email = $this->email;
$contact->zip = $this->zip;
$contact->town = $this->town;
$contact->phone_pro = $this->phone;
$result = $contact->create($user); $result = $contact->create($user);
if ($result < 0) { if ($result < 0) {
$this->error = $contact->error; $this->error = $contact->error;