diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 2989df6d446..3a3a17a5bcd 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -536,6 +536,7 @@ if ($_GET['propalid'] > 0) print ''; + // Ref print ''; $rowspan=9; @@ -561,7 +562,7 @@ if ($_GET['propalid'] > 0) if ($conf->projet->enabled) $rowspan++; // Notes - print ''; + print ''; print ''; // Date fin propal @@ -729,7 +730,7 @@ if ($_GET['propalid'] > 0) } // Remise globale -/* +/* TODO Remise a mettre sur meme principe que factures print '
'.$langs->trans('Ref').''.$propal->ref_url.'
'.$langs->trans('Note').' :
'. nl2br($propal->note).'		'.$langs->trans('NotePublic').' :
'. nl2br($propal->note_public).'
'; print '
'; print $langs->trans('GlobalDiscount'); diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index dd760dc1eec..a86b2d28a19 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -104,8 +104,12 @@ if ($propalid > 0) if ($propal->fetch($propalid)) { $propref = sanitize_string($propal->ref); + $upload_dir = $conf->propal->dir_output.'/'.$propref; + $societe = new Societe($db); + $societe->fetch($propal->socidp); + $h=0; $head[$h][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id; @@ -169,9 +173,26 @@ if ($propalid > 0) print ''; + + // Ref print ''; + + // Société + print ''; + print ''; + print ''; print ''; + print '
'.$langs->trans('Ref').''.$propal->ref_url.'
'.$langs->trans('Company').''; + if ($societe->client == 1) + { + $url ='fiche.php?socid='.$societe->id; + } + else + { + $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; + } + print ''.$societe->nom.'
'.$langs->trans("NbOfAttachedFiles").''.sizeof($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; print ''; diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index c9c39cfda97..2f613e6e0cd 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -143,26 +143,29 @@ if ($_GET['propalid']) print ''; - print ''; + print ''; - print ''; - print ''; - print ''; print ''; - + + // Date print ''; - + print ''; + + // Date fin propal + print ''; print '
'.$langs->trans('Ref').''.$propal->ref_url.'
'.$langs->trans('Ref').''.$propal->ref_url.'
'.$langs->trans('Company').''; + // Société + print '
'.$langs->trans('Company').''; if ($societe->client == 1) { - $url = DOL_URL_ROOT.'/comm/fiche.php?socid='.$societe->id; + $url ='fiche.php?socid='.$societe->id; } else { $url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$societe->id; } print ''.$societe->nom.'Conditions de réglement'.' '.'
'.$langs->trans('Date').''; print dolibarr_print_date($propal->date,'%a %d %B %Y'); print '
'.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 6d4689c7737..fd1ccb7771f 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -175,9 +175,10 @@ if ($_GET["propalid"] > 0) print ''; + // Ref print ''; - $rowspan=6; + $rowspan=9; // Société print ''; - print ''; + print ''; + + // Date fin propal + print ''; + print ''; + + // Mode de paiement + print ''; print ''; print ''; - $dests=$societe->contact_array($societe->id); - $numdest = count($dests); - if ($numdest==0) + if ($propal->statut == 0 && $user->rights->propale->creer) { print ''; } else { - if ($propal->statut == 0 && $user->rights->propale->creer) + if (!empty($propal->contactid)) { print ''; } - else - { - if (!empty($propal->contactid)) - { - print ''; - } - else { - print ''; - } + else { + print ''; } } - if ($conf->projet->enabled) $rowspan++; - - print ''; - // Projet if ($conf->projet->enabled) { @@ -312,12 +298,7 @@ if ($_GET["propalid"] > 0) if ($propal->statut == 0 && $user->rights->propale->creer) { print ''; } else @@ -341,24 +322,19 @@ if ($_GET["propalid"] > 0) } // Remise globale +/* TODO Remise a mettre sur meme principe que factures print ''; if ($propal->brouillon == 1 && $user->rights->propale->creer) { -// print ''; -// print ''; print ''; -// print ''; } else { print ''; } print ''; - +*/ print ''; print ''; print ''; @@ -367,7 +343,8 @@ if ($_GET["propalid"] > 0) print ''; print ''; print ''; - + + // Statut print ''; print '
'.$langs->trans('Ref').''.$propal->ref_url.'
'.$langs->trans('Company').''; @@ -197,7 +198,15 @@ if ($_GET["propalid"] > 0) print dolibarr_print_date($propal->date,'%a %d %B %Y'); print ''.$langs->trans('DateEndPropal').''; + if ($conf->projet->enabled) $rowspan++; + + // Note + print ''.$langs->trans('NotePublic').' :
'. nl2br($propal->note_public).'
'.$langs->trans('DateEndPropal').''; if ($propal->fin_validite) { print dolibarr_print_date($propal->fin_validite,'%a %d %B %Y'); @@ -227,13 +236,16 @@ if ($_GET["propalid"] > 0) $html->form_conditions_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->cond_reglement_id,'none'); } print '
'; print ''; if ($_GET['action'] != 'editmode' && $propal->brouillon) print ''; print '
'; print $langs->trans('PaymentMode'); print 'id.'">'.img_edit($langs->trans('SetMode'),1).'
'; - print '		'; + print ''; if ($_GET['action'] == 'editmode') { $html->form_modes_reglement($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$propal->mode_reglement_id,'mode_reglement_id'); @@ -249,51 +261,25 @@ if ($_GET["propalid"] > 0) print '
'.$langs->trans('MailTo').''; - print 'Cette societe n\'a pas de contact, veuillez en créer un avant de faire votre proposition commerciale
'; - print ''.$langs->trans('AddContact').''; + $html->select_contacts($societe->id, $propal->contactid, 'none'); print '		'; -// print '
'; -// print ''; - $html->select_contacts($societe->id, $propal->contactid, 'none'); -// print '
'; -// print ''; -// print ''; + $html->form_contacts($_SERVER['PHP_SELF'].'?propalid='.$propal->id,$societe,$propal->contactid,'none'); print ''; - require_once(DOL_DOCUMENT_ROOT.'/contact.class.php'); - $contact=new Contact($db); - $contact->fetch($propal->contactid); - print ''; - print $contact->firstname.' '.$contact->name; - print ''; - print '  '.$langs->trans('Note').' :
'. nl2br($propal->note).'
'; -// print '
'; -// print ''; $html->select_projects($societe->id, $propal->projetidp, 'projetidp'); -// print '
'; -// print ''; -// print ''; print '
'.$langs->trans('GlobalDiscount').'
'.$propal->remise_percent.'%'; -// print ''; -// print ''; -// print ' ?'; print ''.$propal->remise_percent.'%
'.$langs->trans('AmountHT').''.price($propal->price).''.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans('AmountTTC').''.price($propal->total_ttc).''.$langs->trans("Currency".$conf->monnaie).'
'.$langs->trans('Status').''.$propal->getLibStatut(4).'

'; diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 48aaab35d55..16f13da8ca4 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -54,14 +54,15 @@ class Propal var $remise; var $products; var $products_qty; - var $note; - var $price; + var $price; var $status; var $fin_validite; var $cond_reglement_id; - var $cond_reglement_code; - var $mode_reglement_id; - var $mode_reglement_code; + var $cond_reglement_code; + var $mode_reglement_id; + var $mode_reglement_code; + var $note; + var $note_public; var $labelstatut=array(); var $labelstatut_short=array();