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

Normalisation mode modif remise globale

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-21 21:27:03 +00:00
parent 88056912c6
commit 573134d970
6 changed files with 120 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
htdocs/commande/fiche.php
View File

@ -272,33 +272,35 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans('Ref').' :</td><td>Provisoire</td>'; print '<tr><td>'.$langs->trans('Ref').'</td><td>Provisoire</td>';
print '<td>'.$langs->trans('Comments').' :</td></tr>'; print '<td>'.$langs->trans('Comments').'</td></tr>';
$nbrow=4; $nbrow=4;
if ($conf->projet->enabled) $nbrow++; if ($conf->projet->enabled) $nbrow++;
print '<tr><td>'.$langs->trans('Customer').' :</td><td>'.$soc->nom_url.'</td><td rowspan="'.$nbrow.'">';
print '<textarea name="note" wrap="soft" cols="50" rows="4"></textarea></td></tr>';
print '<tr><td>'.$langs->trans('Date').' :</td><td>'; print '<tr><td>'.$langs->trans('Customer').'</td><td>'.$soc->nom_url.'</td>';
print '<td rowspan="'.$nbrow.'" valign="top"><textarea name="note" wrap="soft" cols="50" rows="4"></textarea></td>';
print '</tr>';
print '<tr><td>'.$langs->trans('RefCdeClient').'</td><td>';
print '<input type="text" name="ref_client" value=""></td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Date').'</td><td>';
$html->select_date(); $html->select_date();
print '</td></tr>'; print '</td></tr>';
if ($conf->projet->enabled) if ($conf->projet->enabled)
{ {
print '<tr><td>'.$langs->trans('Project').' :</td><td>'; print '<tr><td>'.$langs->trans('Project').'</td><td>';
$html->select_projects($soc->id,'','projetid'); $html->select_projects($soc->id,'','projetid');
print '</td></tr>'; print '</td></tr>';
} }
print '<tr><td>'.$langs->trans('Source').' :</td><td>'; print '<tr><td>'.$langs->trans('Source').'</td><td>';
$html->select_array('source_id',$new_commande->sources,2); $html->select_array('source_id',$new_commande->sources,2);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans('RefCdeClient').' :</td><td>';
print '<input type="text" name="ref_client" value="">';
print '</td></tr>';
if ($propalid > 0) if ($propalid > 0)
{ {
$amount = ($obj->price); $amount = ($obj->price);
@ -321,10 +323,8 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
*/ */
$NBLINES=8; $NBLINES=8;
print '<tr><td colspan="3">'.$langs->trans('Services').'/'.$langs->trans('Products').'</td></tr>';
print '<tr><td colspan="3">'; print '<tr><td colspan="3">';
print '<table class="noborder">'; print '<table class="noborder">';
print '<tr><td>'.$langs->trans('ProductsAndServices').'</td><td>'.$langs->trans('Qty').'</td><td>'.$langs->trans('Discount').'</td></tr>'; print '<tr><td>'.$langs->trans('ProductsAndServices').'</td><td>'.$langs->trans('Qty').'</td><td>'.$langs->trans('Discount').'</td></tr>';
for ($i = 1 ; $i <= $NBLINES ; $i++) for ($i = 1 ; $i <= $NBLINES ; $i++)
@ -504,33 +504,56 @@ else
* Commande * Commande
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Ref
print '<tr><td width="15%">'.$langs->trans('Ref').'</td>'; print '<tr><td width="15%">'.$langs->trans('Ref').'</td>';
print '<td colspan="2">'.$commande->ref.'</td>'; print '<td colspan="2">'.$commande->ref.'</td>';
print '<td>'.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ; print '<td width="50%">'.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ;
if ($commande->source == 0) if ($commande->source == 0)
{ {
/* Propale */ // Si source = propal
$propal = new Propal($db); $propal = new Propal($db);
$propal->fetch($commande->propale_id); $propal->fetch($commande->propale_id);
print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>'; print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
} }
print '</td></tr>'; print '</td></tr>';
// Société
print '<tr><td>'.$langs->trans('Customer').'</td>'; print '<tr><td>'.$langs->trans('Customer').'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>'; print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
print '</tr>'; print '</tr>';
print '<tr><td>'.$langs->trans('Status').'</td>'; $nbrow=7;
print '<td colspan="2">'.$commande->statuts[$commande->statut].'</td>';
$nbrow=6;
if ($conf->projet->enabled) $nbrow++; if ($conf->projet->enabled) $nbrow++;
// Ref commande client
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
print $langs->trans('RefCdeClient').'</td><td align="left">';
print '</td>';
if ($_GET['action'] != 'refcdeclient') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refcdeclient&amp;id='.$commande->id.'">'.img_edit($langs->trans('Edit')).'</a></td>';
print '</tr></table>';
print '</td><td colspan="2">';
if ($user->rights->commande->creer && $_GET['action'] == 'refcdeclient')
{
print '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="set_ref_client">';
print '<input type="text" class="flat" size="20" name="ref_client" value="'.$commande->ref_client.'">';
print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
else
{
print $commande->ref_client;
}
print '</td>';
print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('Note').' :<br>'; print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('Note').' :<br>';
if ($commande->brouillon == 1 && $user->rights->commande->creer) if ($commande->brouillon == 1 && $user->rights->commande->creer)
{ {
print '<form action="fiche.php?id='.$id.'" method="post">'; print '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="setnote">'; print '<input type="hidden" name="action" value="setnote">';
print '<textarea name="note" style="width:95%;height:80%">'.$commande->note.'</textarea><br>'; print '<textarea name="note" rows="5" style="width:95%;">'.$commande->note.'</textarea><br>';
print '<center><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>'; print '<center><input type="submit" class="button" value="'.$langs->trans('Save').'"></center>';
print '</form>'; print '</form>';
} }
@ -538,7 +561,12 @@ else
{ {
print nl2br($commande->note); print nl2br($commande->note);
} }
print '</td></tr>'; print '</td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Status').'</td>';
print '<td colspan="2">'.$commande->statuts[$commande->statut].'</td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Date').'</td>'; print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'%A %d %B %Y').'</td>'; print '<td colspan="2">'.dolibarr_print_date($commande->date,'%A %d %B %Y').'</td>';
@ -570,45 +598,41 @@ else
print '<tr><td height="10">&nbsp;</td><td colspan="2">&nbsp;</td></tr>'; print '<tr><td height="10">&nbsp;</td><td colspan="2">&nbsp;</td></tr>';
} }
// Lignes de 3 colonnes // Lignes de 3 colonnes
print '<tr><td>'.$langs->trans('RefCdeClient').' :</td><td align="left">';
if ($commande->brouillon == 1 && $user->rights->commande->creer)
{
print '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="set_ref_client">';
print '<input type="text" class="flat" size="25" name="ref_client" value="'.$commande->ref_client.'">';
print '</td><td><input type="submit" class="button" value="'.$langs->trans('Save').'">';
print '</form>';
}
else
{
print $commande->ref_client.'</td><td>&nbsp;';
}
print '</td></tr>';
print '<tr><td>'.$langs->trans('AmountHT').'</td>'; print '<tr><td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; print '<table class="nobordernopadding" width="100%"><tr><td>';
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print $langs->trans('GlobalDiscount').'</td><td align="right">';
print '</td>';
print '<tr><td>'.$langs->trans('GlobalDiscount').'</td><td align="right">'; if ($_GET['action'] != 'setdiscount') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=setdiscount&amp;id='.$commande->id.'">'.img_edit($langs->trans('Edit')).'</a></td>';
if ($commande->brouillon == 1 && $user->rights->commande->creer) print '</tr></table>';
print '</td>';
if ($user->rights->commande->creer && $_GET['action'] == 'setdiscount')
{ {
print '<td align="right">';
print '<form action="fiche.php?id='.$id.'" method="post">'; print '<form action="fiche.php?id='.$id.'" method="post">';
print '<input type="hidden" name="action" value="setremise">'; print '<input type="hidden" name="action" value="setremise">';
print '<input type="text" class="flat" name="remise" size="3" value="'.$commande->remise_percent.'">%'; print '<input type="text" class="flat" name="remise" size="3" value="'.$commande->remise_percent.'">%';
print '</td><td><input type="submit" class="button" value="'.$langs->trans('Save').'">'; print '</td><td><input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>'; print '</form>';
print '</td>';
} }
else else
{ {
print $commande->remise_percent.'%</td><td>&nbsp;'; print '<td align="right">'.$commande->remise_percent.'</td><td>%</td>';
} }
print '</td></tr>'; print '</tr>';
print '<tr><td>'.$langs->trans('VAT').'</td><td align="right">'.price($commande->total_tva).'</td>'; // Total HT
print '<tr><td>'.$langs->trans('TotalHT').'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Total TVA
print '<tr><td>'.$langs->trans('TotalVAT').'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
// Total TTC
print '<tr><td>'.$langs->trans('TotalTTC').'</td><td align="right">'.price($commande->total_ttc).'</td>'; print '<tr><td>'.$langs->trans('TotalTTC').'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>';
@ -803,6 +827,7 @@ else
if ($user->societe_id == 0 && $commande->statut < 3 && $_GET['action'] == '') if ($user->societe_id == 0 && $commande->statut < 3 && $_GET['action'] == '')
{ {
print '<div class="tabsAction">'; print '<div class="tabsAction">';
if ($conf->expedition->enabled && $commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer) if ($conf->expedition->enabled && $commande->statut > 0 && $commande->statut < 3 && $user->rights->expedition->creer)
{ {
print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$_GET['id'].'">'.$langs->trans('Send').'</a>'; print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/commande.php?id='.$_GET['id'].'">'.$langs->trans('Send').'</a>';

61
htdocs/expedition/commande.php
View File

@ -126,32 +126,49 @@ if ($_GET["id"] > 0)
// Onglet expedition // Onglet expedition
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
print '<td width="30%">';
print '<b><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
print '<td width="50%">'; // Ref
print $commande->statuts[$commande->statut]; print '<tr><td width="15%">'.$langs->trans('Ref').'</td>';
print "</td></tr>"; print '<td colspan="2">'.$commande->ref.'</td>';
print '<td width="50%">'.$langs->trans('Source').' : ' . $commande->sources[$commande->source] ;
if ($commande->source == 0)
{
// Si source = propal
$propal = new Propal($db);
$propal->fetch($commande->propale_id);
print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
}
print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Date").'</td>'; // Société
print '<td width="30%">'.strftime("%A %d %B %Y",$commande->date)."</td>\n"; print '<tr><td>'.$langs->trans('Customer').'</td>';
print '<td colspan="3">';
print '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
print '</tr>';
print '<td width="50%">Source : ' . $commande->sources[$commande->source] ; $nbrow=3;
if ($commande->source == 0)
{
/* Propale */
$propal = new Propal($db);
$propal->fetch($commande->propale_id);
print ' -> <a href="'.DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id.'">'.$propal->ref.'</a>';
}
print "</td></tr>";
if ($commande->note) // Ref commande client
{ print '<tr><td>';
print '<tr><td>'.$langs->trans("Note").'</td></tr>'; print '<table class="nobordernopadding" width="100%"><tr><td nowrap>';
print '<tr><td colspan="3">'.nl2br($commande->note)."</td></tr>"; print $langs->trans('RefCdeClient').'</td><td align="left">';
} print '</td>';
print '</tr></table>';
print '</td><td colspan="2">';
print $commande->ref_client;
print '</td>';
print '<td rowspan="'.$nbrow.'" valign="top">'.$langs->trans('Note').' :<br>';
print nl2br($commande->note);
print '</td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Status').'</td>';
print '<td colspan="2">'.$commande->statuts[$commande->statut].'</td>';
print '</tr>';
print '<tr><td>'.$langs->trans('Date').'</td>';
print '<td colspan="2">'.dolibarr_print_date($commande->date,'%A %d %B %Y').'</td>';
print '</tr>';
print '</table>'; print '</table>';

8
htdocs/langs/en_US/admin.lang
View File

@ -137,10 +137,10 @@ Permission74=Delete members
Permission75=Setup types and attributes for members Permission75=Setup types and attributes for members
Permission78=Read subscriptions Permission78=Read subscriptions
Permission79=Create/modify subscriptions Permission79=Create/modify subscriptions
Permission81=Read orders Permission81=Read customers orders
Permission82=Create/modify orders Permission82=Create/modify customers orders
Permission84=Activate orders Permission84=Validate customers orders
Permission89=Disable orders Permission89=Cancel customers orders
Permission91=Read charges and vat Permission91=Read charges and vat
Permission92=Create/modify charges and vat Permission92=Create/modify charges and vat
Permission93=Delete charges and vat Permission93=Delete charges and vat

1
htdocs/langs/en_US/orders.lang
View File

@ -49,6 +49,7 @@ ComptaCard=Accountancy card
DraftOrders=Draft orders DraftOrders=Draft orders
RelatedOrders=Related orders RelatedOrders=Related orders
OnProcessOrders=On process orders OnProcessOrders=On process orders
RefCdeClient=Ref. customer order
# Sources # Sources
OrderSource0=Commercial proposal OrderSource0=Commercial proposal
OrderSource1=Internet OrderSource1=Internet

8
htdocs/langs/fr_FR/admin.lang
View File

@ -137,10 +137,10 @@ Permission74=Supprimer les adh
Permission75=Configurer les types et caractéristiques des adhérents Permission75=Configurer les types et caractéristiques des adhérents
Permission78=Consulter les cotisations Permission78=Consulter les cotisations
Permission79=Créer/modifier les cotisations Permission79=Créer/modifier les cotisations
Permission81=Consulter les commandes Permission81=Consulter les commandes clients
Permission82=Créer/modifier les commandes Permission82=Créer/modifier les commandes clients
Permission84=Activer les commandes Permission84=Valider les commandes clients
Permission89=Désactiver les commandes Permission89=Annuler les commandes clients
Permission91=Consulter les charges et la TVA Permission91=Consulter les charges et la TVA
Permission92=Créer/modifier les charges et la TVA Permission92=Créer/modifier les charges et la TVA
Permission93=Supprimer les charges et la TVA Permission93=Supprimer les charges et la TVA

1
htdocs/langs/fr_FR/orders.lang
View File

@ -49,6 +49,7 @@ ComptaCard=Fiche compta
DraftOrders=Commandes brouillons DraftOrders=Commandes brouillons
RelatedOrders=Commandes rattachées RelatedOrders=Commandes rattachées
OnProcessOrders=Commandes en cours de traitement OnProcessOrders=Commandes en cours de traitement
RefCdeClient=Ref. commande client
# Sources # Sources
OrderSource0=Proposition commerciale OrderSource0=Proposition commerciale
OrderSource1=Internet OrderSource1=Internet