/[dolibarr]/dolibarr/htdocs/comm/remx.php
ViewVC logotype

Diff of /dolibarr/htdocs/comm/remx.php

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.5 by eldy, Mon Sep 5 19:03:02 2005 UTC revision 1.6 by eldy, Wed Sep 7 21:27:33 2005 UTC
# Line 161  if ($_socid > 0) Line 161  if ($_socid > 0)
161          if ($obj->fk_user == $user->id) $remise_user+=$obj->amount_ht;          if ($obj->fk_user == $user->id) $remise_user+=$obj->amount_ht;
162      }      }
163    
164      print '<tr><td width="25%">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';      print '<tr><td width="33%">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
165      print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';      print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
166    
167      print '<tr><td width="25%">'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';      print '<tr><td width="33%">'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
168      print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';      print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
169      print '<tr><td>'.$langs->trans("NewValue").'</td>';      print '<tr><td>'.$langs->trans("NewValue").'</td>';
170      print '<td><input type="text" size="5" name="remise" value="'.$remise_user.'">&nbsp;'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';      print '<td><input type="text" size="5" name="remise" value="'.$remise_user.'">&nbsp;'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
171            
172      print '<tr><td align="center" colspan="2">&nbsp;<input type="submit" value="'.$langs->trans("Save").'"></td></tr>';      print '<tr><td align="center" colspan="2">&nbsp;<input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';
173                    
174      print "</table></form>";      print "</table></form>";
175    
# Line 181  if ($_socid > 0) Line 181  if ($_socid > 0)
181      /*      /*
182       * Liste       * Liste
183       */       */
184      $sql  = "SELECT rc.amount_ht,".$db->pdate("rc.datec")." as dc, u.code";      $sql  = "SELECT rc.amount_ht,".$db->pdate("rc.datec")." as dc, u.code, u.rowid as user_id";
185      $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";      $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
186      $sql .= " , ".MAIN_DB_PREFIX."user as u";      $sql .= " , ".MAIN_DB_PREFIX."user as u";
187      $sql .= " WHERE rc.fk_soc =". $objsoc->id;      $sql .= " WHERE rc.fk_soc =". $objsoc->id;
# Line 194  if ($_socid > 0) Line 194  if ($_socid > 0)
194          print_titre($langs->trans("Ristournes restant dues"));          print_titre($langs->trans("Ristournes restant dues"));
195          print '<table width="100%" class="noborder">';          print '<table width="100%" class="noborder">';
196          print '<tr class="liste_titre"><td width="80">'.$langs->trans("Date").'</td>';          print '<tr class="liste_titre"><td width="80">'.$langs->trans("Date").'</td>';
197          print '<td>'.$langs->trans("AmountHT").'</td><td width="100">'.$langs->trans("Accordée par").'</td></tr>';          print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td><td>&nbsp;</td><td width="100">'.$langs->trans("Accordée par").'</td></tr>';
198    
199          $var = true;          $var = true;
200          $i = 0 ;          $i = 0 ;
# Line 205  if ($_socid > 0) Line 205  if ($_socid > 0)
205              $var = !$var;              $var = !$var;
206              print "<tr $bc[$var]>";              print "<tr $bc[$var]>";
207              print '<td>'.dolibarr_print_date($obj->dc).'</td>';              print '<td>'.dolibarr_print_date($obj->dc).'</td>';
208              print '<td>'.price($obj->amount_ht).'</td>';              print '<td align="right">'.price($obj->amount_ht).'</td>';
209              print '<td>'.$obj->code.'</td></tr>';              print '<td>&nbsp;</td>';
210                print '<td><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"),'user').' '.$obj->code.'</td></tr>';
211            
212              $i++;              $i++;
213          }          }
# Line 221  if ($_socid > 0) Line 222  if ($_socid > 0)
222      print '<br />';      print '<br />';
223    
224      /*      /*
225       * Liste Archives       * Liste ristournes appliquées
226       */       */
227      $sql  = "SELECT rc.amount_ht,".$db->pdate("rc.datec")." as dc, u.code, rc.fk_facture, f.facnumber";      $sql  = "SELECT rc.amount_ht,".$db->pdate("rc.datec")." as dc, u.code, u.rowid as user_id,";
228      $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";      $sql.= " rc.fk_facture, f.facnumber";
229      $sql .= " , ".MAIN_DB_PREFIX."user as u";      $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
230      $sql .= " , ".MAIN_DB_PREFIX."facture as f";      $sql.= " , ".MAIN_DB_PREFIX."user as u";
231      $sql .= " WHERE rc.fk_soc =". $objsoc->id;      $sql.= " , ".MAIN_DB_PREFIX."facture as f";
232      $sql .= " AND fk_facture = f.rowid";      $sql.= " WHERE rc.fk_soc =". $objsoc->id;
233      $sql .= " AND u.rowid = rc.fk_user AND fk_facture IS NOT NULL";      $sql.= " AND fk_facture = f.rowid";
234      $sql .= " ORDER BY rc.datec DESC";      $sql.= " AND u.rowid = rc.fk_user AND fk_facture IS NOT NULL";
235        $sql.= " ORDER BY rc.datec DESC";
236    
237      $resql=$db->query($sql);      $resql=$db->query($sql);
238      if ($resql)      if ($resql)
# Line 238  if ($_socid > 0) Line 240  if ($_socid > 0)
240          print_titre($langs->trans("Ristournes appliquées"));          print_titre($langs->trans("Ristournes appliquées"));
241          print '<table class="noborder" width="100%">';          print '<table class="noborder" width="100%">';
242          print '<tr class="liste_titre"><td width="80">'.$langs->trans("Date").'</td>';          print '<tr class="liste_titre"><td width="80">'.$langs->trans("Date").'</td>';
243          print '<td>'.$langs->trans("AmountHT").'</td><td align="center">'.$langs->trans("Bill").'</td><td width="100">'.$langs->trans("Author").'</td></tr>';          print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td><td align="center">'.$langs->trans("Bill").'</td><td width="100">'.$langs->trans("Author").'</td></tr>';
244    
245          $var = true;          $var = true;
246          $i = 0 ;          $i = 0 ;
# Line 249  if ($_socid > 0) Line 251  if ($_socid > 0)
251              $var = !$var;              $var = !$var;
252              print "<tr $bc[$var]>";              print "<tr $bc[$var]>";
253              print '<td>'.dolibarr_print_date($obj->dc).'</td>';              print '<td>'.dolibarr_print_date($obj->dc).'</td>';
254              print '<td>'.price($obj->amount_ht).'</td>';              print '<td align="right">'.price($obj->amount_ht).'</td>';
255              print '<td align="center"><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->fk_facture.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';              print '<td align="center"><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->fk_facture.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>';
256              print '<td>'.$obj->code.'</td></tr>';              print '<td>'.$obj->code.'</td></tr>';
257            

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26