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

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

Browse Source 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
This commit is contained in:
Laurent Destailleur 2013-04-28 01:24:58 +02:00
commit 80e470a4ce
19 changed files with 68 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -110,6 +110,7 @@ WARNING: If you used external modules, some of them may need to be upgraded due
- Fix: [ bug #810 ] Cannot update ODT template path
- Fix: [ bug #824 ] MAIN_DB_PREFIX not use into dictionnary
- Fix: [ bug #828 ] Error when code_region is not a number in llx_c_regions (with postgres)
- Fix: [ bug #857 ] Invoice created from shipment does not have the order discount
***** ChangeLog for 3.3.1 compared to 3.3 *****

17
htdocs/comm/propal/class/propal.class.php
View File

@ -313,7 +313,7 @@ class Propal extends CommonObject
*
* @see add_product
*/
function addline($propalid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$date_start='', $date_end='')
function addline($propalid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='')
{
global $conf;
@ -474,7 +474,7 @@ class Propal extends CommonObject
* @param timestamp $date_end End date of the line
* @return int 0 if OK, <0 if KO
*/
function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='')
function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='')
{
global $conf,$user,$langs;
@ -2783,6 +2783,7 @@ class PropaleLigne
if (empty($this->info_bits)) $this->info_bits=0;
if (empty($this->special_code)) $this->special_code=0;
if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
if (empty($this->fk_fournprice)) $this->fk_fournprice=0;
if (empty($this->pa_ht)) $this->pa_ht=0;
@ -2799,7 +2800,8 @@ class PropaleLigne
// Insert line into database
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'propaldet';
$sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type, fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx,';
$sql.= ' (fk_propal, fk_parent_line, label, description, fk_product, product_type,';
$sql.= ' fk_remise_except, qty, tva_tx, localtax1_tx, localtax2_tx,';
$sql.= ' subprice, remise_percent, ';
$sql.= ' info_bits, ';
$sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,';
@ -2817,13 +2819,13 @@ class PropaleLigne
$sql.= " ".price2num($this->localtax2_tx).",";
$sql.= " ".($this->subprice?price2num($this->subprice):'null').",";
$sql.= " ".price2num($this->remise_percent).",";
$sql.= " '".$this->info_bits."',";
$sql.= " ".(isset($this->info_bits)?"'".$this->info_bits."'":"null").",";
$sql.= " ".price2num($this->total_ht).",";
$sql.= " ".price2num($this->total_tva).",";
$sql.= " ".price2num($this->total_localtax1).",";
$sql.= " ".price2num($this->total_localtax2).",";
$sql.= " ".price2num($this->total_ttc).",";
$sql.= " ".(isset($this->fk_fournprice)?"'".$this->fk_fournprice."'":"null").",";
$sql.= " ".(!empty($this->fk_fournprice)?"'".$this->fk_fournprice."'":"null").",";
$sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").",";
$sql.= ' '.$this->special_code.',';
$sql.= ' '.$this->rang.',';
@ -2923,6 +2925,7 @@ class PropaleLigne
if (empty($this->info_bits)) $this->info_bits=0;
if (empty($this->special_code)) $this->special_code=0;
if (empty($this->fk_parent_line)) $this->fk_parent_line=0;
if (empty($this->fk_parent_line)) $this->fk_fournprice=0;
if (empty($this->pa_ht)) $this->pa_ht=0;
@ -2955,8 +2958,8 @@ class PropaleLigne
$sql.= " , total_localtax1=".price2num($this->total_localtax1)."";
$sql.= " , total_localtax2=".price2num($this->total_localtax2)."";
}
$sql.= " , fk_product_fournisseur_price='".$this->fk_fournprice."'";
$sql.= " , buy_price_ht='".price2num($this->pa_ht)."'";
$sql.= " , fk_product_fournisseur_price=".(! empty($this->fk_fournprice)?"'".$this->fk_fournprice."'":"null");
$sql.= " , buy_price_ht=".price2num($this->pa_ht);
if (strlen($this->special_code)) $sql.= " , special_code=".$this->special_code;
$sql.= " , fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null");
if (! empty($this->rang)) $sql.= ", rang=".$this->rang;

11
htdocs/compta/facture.php
View File

@ -655,11 +655,11 @@ else if ($action == 'add' && $user->rights->facture->creer)
$db->begin();
$error=0;
// Fill array 'array_options' with data from add form
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
// Replacement invoice
if ($_POST['type'] == 1)
@ -2289,8 +2289,9 @@ if ($action == 'create')
print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';
$newclassname=$classname;
if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
elseif ($newclassname == 'Commande') $newclassname = 'Order';
if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
elseif ($newclassname == 'Commande') $newclassname = 'Order';
elseif ($newclassname == 'Expedition') $newclassname = 'Sending';
print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
print '<tr><td>'.$langs->trans('TotalHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
@ -3620,7 +3621,7 @@ else if ($id > 0 || ! empty($ref))
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$object->id;
$genallowed=$user->rights->facture->creer;
$delallowed=$user->rights->facture->supprimer;
print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
$somethingshown=$formfile->numoffiles;

4
htdocs/compta/facture/impayees.php
View File

@ -227,7 +227,7 @@ if ($search_societe) $sql .= " AND s.nom LIKE '%".$search_societe."%'";
if ($search_montant_ht) $sql .= " AND f.total = '".$search_montant_ht."'";
if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$search_montant_ttc."'";
if (GETPOST('sf_ref')) $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'";
$sql.= " GROUP BY f.facnumber,f.increment,f.total,f.total_ttc,f.datef, f.date_lim_reglement,f.paye, f.rowid, f.fk_statut, f.type,s.nom, s.rowid";
$sql.= " GROUP BY s.nom, s.rowid, f.facnumber, f.increment, f.total, f.tva, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.rowid, f.fk_statut, f.type ";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " ORDER BY ";
$listfield=explode(',',$sortfield);
@ -380,7 +380,7 @@ if ($resql)
if (! empty($objp->am) && ! empty($cn)) print '+';
if (! empty($cn)) print price($cn);
print '</td>';
// Remain to receive
//print '<td align="right">'.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):'&nbsp;').'</td>';

2
htdocs/compta/facture/list.php
View File

@ -209,7 +209,7 @@ if ($search_user > 0)
}
if (! $sall)
{
$sql.= ' GROUP BY f.rowid, f.facnumber, f.type, f.increment, f.total, f.total_ttc,';
$sql.= ' GROUP BY f.rowid, f.facnumber, f.type, f.increment, f.total,f.tva, f.total_ttc,';
$sql.= ' f.datef, f.date_lim_reglement,';
$sql.= ' f.paye, f.fk_statut,';
$sql.= ' s.nom, s.rowid';

3
htdocs/compta/index.php
View File

@ -943,7 +943,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$sql.= " AND ff.fk_statut = 1";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
if ($socid) $sql.= " AND ff.fk_soc = ".$socid;
$sql.= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, s.nom, s.rowid";
$sql.= " GROUP BY ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.paye,";
$sql.= " s.nom, s.rowid";
$resql=$db->query($sql);
if ($resql)

10
htdocs/core/class/html.form.class.php
View File

@ -692,6 +692,7 @@ class Form
//$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
$out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
/*
<<<<<<< HEAD
if ($selected && empty($selected_input_value))
{
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@ -699,6 +700,15 @@ class Form
$product->fetch($selected);
$selected_input_value=$product->ref;
}
=======
if ($selected && empty($selected_input_value))
{
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$product = new Product($this->db);
$product->fetch($selected);
$selected_input_value=$product->ref;
}
>>>>>>> refs/remotes/origin/3.3
// mode=1 means customers products
$ajaxoptions=array();
$urloption='htmlname='.$htmlname.'&outjson=1&filter='.urlencode($filter).'&showtype='.$showtype;

1
htdocs/core/modules/syslog/mod_syslog_file.php
View File

@ -98,7 +98,6 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
*
* @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string
* @return string
*/
private function getFilename($suffixinfilename='')
{

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

@ -875,7 +875,7 @@ class Expedition extends CommonObject
$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked";
$sql.= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
$sql.= ", cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.price, cd.subprice";
$sql.= ", cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.price, cd.subprice, cd.remise_percent";
$sql.= ", ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
$sql.= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
$sql.= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units";

2
htdocs/expedition/tpl/linkedobjectblock.tpl.php
View File

@ -33,7 +33,7 @@ print_titre($langs->trans('RelatedShippings'));
<tr class="liste_titre">
<td><?php echo $langs->trans("Ref"); ?></td>
<td align="center"><?php echo $langs->trans("Date"); ?></td>
<td align="center"><?php echo $langs->trans("DateSendingShort"); ?></td>
<td align="center"><?php echo $langs->trans("DateDeliveryPlanned"); ?></td>
<td align="right"><?php echo $langs->trans("AmountHTShort"); ?></td>
<td align="right"><?php echo $langs->trans("Status"); ?></td>
</tr>

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

@ -143,8 +143,9 @@ if ($user->rights->fournisseur->facture->lire)
{
$sql .= " AND f.ref_supplier LIKE '%".GETPOST('sf_re')."%'";
}
$sql.= " GROUP BY f.ref_supplier, f.rowid, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, s.rowid, s.nom";
$sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, s.rowid, s.nom";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " ORDER BY ";
$listfield=explode(',',$sortfield);
foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.",";

19
htdocs/holiday/class/holiday.class.php
View File

@ -269,7 +269,7 @@ class Holiday extends CommonObject
$sql.= " cp.date_cancel,";
$sql.= " cp.fk_user_cancel,";
$sql.= " cp.detail_refuse,";
$sql.= " uu.lastname as user_lastname,";
$sql.= " uu.firstname as user_firstname,";
@ -665,7 +665,6 @@ class Holiday extends CommonObject
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
return $result;
}
@ -695,8 +694,8 @@ class Holiday extends CommonObject
if ($mode == 0)
{
if ($statut == 1) return $langs->trans('DraftCP');
if ($statut == 2) return $langs->trans('ToValidateCP');
if ($statut == 3) return $langs->trans('ValidateCP');
if ($statut == 2) return $langs->trans('ToReviewCP');
if ($statut == 3) return $langs->trans('ApprovedCP');
if ($statut == 4) return $langs->trans('CancelCP');
if ($statut == 5) return $langs->trans('RefuseCP');
}
@ -705,8 +704,8 @@ class Holiday extends CommonObject
$pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP'); // Draft
if ($statut == 2) return img_picto($langs->trans('ToValidateCP'),'statut1').' '.$langs->trans('ToValidateCP'); // Waiting approval
if ($statut == 3) return img_picto($langs->trans('ValidateCP'),$pictoapproved).' '.$langs->trans('ValidateCP');
if ($statut == 2) return img_picto($langs->trans('ToReviewCP'),'statut1').' '.$langs->trans('ToReviewCP'); // Waiting approval
if ($statut == 3) return img_picto($langs->trans('ApprovedCP'),$pictoapproved).' '.$langs->trans('ApprovedCP');
if ($statut == 4) return img_picto($langs->trans('CancelCP'),'statut5').' '.$langs->trans('CancelCP');
if ($statut == 5) return img_picto($langs->trans('RefuseCP'),'statut5').' '.$langs->trans('RefuseCP');
}
@ -715,8 +714,8 @@ class Holiday extends CommonObject
$pictoapproved='statut6';
if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0'); // Draft
if ($statut == 2) return $langs->trans('ToValidateCP').' '.img_picto($langs->trans('ToValidateCP'),'statut1'); // Waiting approval
if ($statut == 3) return $langs->trans('ValidateCP').' '.img_picto($langs->trans('ValidateCP'),$pictoapproved);
if ($statut == 2) return $langs->trans('ToReviewCP').' '.img_picto($langs->trans('ToReviewCP'),'statut1'); // Waiting approval
if ($statut == 3) return $langs->trans('ApprovedCP').' '.img_picto($langs->trans('ApprovedCP'),$pictoapproved);
if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
}
@ -736,7 +735,7 @@ class Holiday extends CommonObject
global $langs;
// Liste des statuts
$name = array('DraftCP','ToValidateCP','ValidateCP','CancelCP','RefuseCP');
$name = array('DraftCP','ToReviewCP','ApprovedCP','CancelCP','RefuseCP');
$nb = count($name)+1;
// Select HTML
@ -914,7 +913,7 @@ class Holiday extends CommonObject
$new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
// On ajoute la modification dans le LOG
$this->addLogCP($user->id,$users[$i]['rowid'], $langs->trans('Event').': '.$langs->trans('HolidaysMonthlyAssignment'),$new_solde);
$this->addLogCP($user->id,$users[$i]['rowid'], $langs->trans('Event').': '.$langs->trans('HolidaysMonthlyUpdate'),$new_solde);
$i++;
}

8
htdocs/holiday/fiche.php
View File

@ -397,7 +397,7 @@ if($action == 'confirm_valid')
// Content
$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
$message.= "\n";
$message.= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($cp->date_debut,'day'),dol_print_date($cp->date_fin,'day'))."\n";
$message.= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($cp->date_debut,'day'),dol_print_date($cp->date_fin,'day'))."\n";
$message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
$message.= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/fiche.php?id=".$cp->rowid."\n\n";
$message.= "\n";
@ -699,7 +699,7 @@ if (empty($id) || $action == 'add' || $action == 'request')
// Approved by
print '<tr>';
print '<td class="fieldrequired">'.$langs->trans("ValidateByCP").'</td>';
print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
// Liste des utiliseurs du groupe choisi dans la config
$validator = new UserGroup($db);
$excludefilter=$user->admin?'':'u.rowid <> '.$user->id;
@ -952,12 +952,12 @@ else
if(!$edit) {
print '<tr>';
print '<td width="50%">'.$langs->trans('ValidateByCP').'</td>';
print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
print '<td>'.$valideur->getNomUrl(1).'</td>';
print '</tr>';
} else {
print '<tr>';
print '<td width="50%">'.$langs->trans('ValidateByCP').'</td>';
print '<td width="50%">'.$langs->trans('ReviewedByCP').'</td>';
// Liste des utiliseurs du groupes choisi dans la config
$idGroupValid = $cp->getConfCP('userGroup');

6
htdocs/langs/bg_BG/holiday.lang
View File

@ -21,13 +21,13 @@ DateDebCP=Начална дата
DateFinCP=Крайна дата
DateCreateCP=Дата на създаване
DraftCP=Проект
ToValidateCP=Очаква одобрение
ValidateCP=Утвърден
ToApproveCP=Очаква одобрение
ApprovedCP=Утвърден
CancelCP=Отменен
RefuseCP=Отказ
ValidatorCP=Validator
ListeCP=Списък на празници
ValidateByCP=Ще бъдат утвърдени от
ReviewedByCP=Ще бъдат утвърдени от
DescCP=Описание
SendRequestCP=Създаване търсенето за празниците
DelayToRequestCP=Заявленията за почивка трябва да бъдат направени най-малко <b>дни %s (а),</b> преди да ги.

6
htdocs/langs/en_US/holiday.lang
View File

@ -15,13 +15,13 @@ DateDebCP=Start date
DateFinCP=End date
DateCreateCP=Creation date
DraftCP=Draft
ToValidateCP=Awaiting approval
ValidateCP=Approved
ToApproveCP=Awaiting approval
ApprovedCP=Approved
CancelCP=Canceled
RefuseCP=Refused
ValidatorCP=Approbator
ListeCP=List of holidays
ValidateByCP=Will be approved by
ReviewedByCP=Will be reviewed by
DescCP=Description
SendRequestCP=Creating demand for holidays
DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.

6
htdocs/langs/es_ES/holiday.lang
View File

@ -15,13 +15,13 @@ DateDebCP=Fecha inicio
DateFinCP=Fecha fin
DateCreateCP=Fecha de creación
DraftCP=Borrador
ToValidateCP=En espera de validación
ValidateCP=Validada
ToApproveCP=En espera de aprobación
ApprovedCP=Aprobada
CancelCP=Anulada
RefuseCP=Rechazada
ValidatorCP=Validador
ListeCP=Lista de vacaciones
ValidateByCP=Será validada por
ReviewedByCP=Será revisada por
DescCP=Descripción
SendRequestCP=Enviar la petición de vacaciones
DelayToRequestCP=Las peticiones de vacaciones deben realizarse al menos <b>%s días</b> antes.

6
htdocs/langs/fr_FR/holiday.lang
View File

@ -15,13 +15,13 @@ DateDebCP=Date Début
DateFinCP=Date Fin
DateCreateCP=Date de création
DraftCP=Brouillon
ToValidateCP=En attente d'approbation
ValidateCP=Approuvé
ToApproveCP=En attente d'approbation
ApprovedCP=Approuvé
CancelCP=Annulée
RefuseCP=Refusée
ValidatorCP=Approbateur
ListeCP=Liste des congés
ValidateByCP=Sera approuvé par
ReviewedByCP=Sera approuvé par
DescCP=Description
SendRequestCP=Envoyer la demande de congés
DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jours</b> avant la date</b> de ceux-ci.

10
htdocs/langs/nl_NL/admin.lang
View File

@ -296,7 +296,7 @@ TestSubmitForm = Invoer testformulier
Module0Name = Gebruikers & groepen
Module0Desc = Beheer gebruikers en groepen
Module1Name = Beheer derde partijen
Module1Desc = Beheer van derde partijen (afnemers, leveranciers en contactpersonen). Ook kunt u hier sjabloondocumenten uploaden.
Module1Desc = Beheer van derde partijen (klanten, leveranciers en contactpersonen). Ook kunt u hier sjabloondocumenten uploaden.
Module2Name = Commercieel
Module2Desc = Commercieel beheer
Module10Name = Boekhouding
@ -307,10 +307,10 @@ Module22Name = EMailings
Module22Desc = Administratie en verzending van bulk-e-mails
Module23Name = Energie
Module23Desc = Monitoring van het verbruik van energie
Module25Name = Afnemersopdrachten
Module25Desc = Verkoopopdrachten
Module25Name = Bestellingen klanten
Module25Desc = Beheer van de bestellingen door klanten
Module30Name = Facturen
Module30Desc = Factuur- en creditnotabeheer voor afnemers. Factuurbeheer voor leveranciers
Module30Desc = Factuur- en creditnotabeheer voor klanten. Factuurbeheer voor leveranciers
Module40Name = Leveranciers
Module40Desc = Leveranciersbeheer (inkoopopdrachten en -facturen)
Module42Name = Syslog
@ -341,7 +341,7 @@ Module70Name = Interventies
Module70Desc = Interventiesbeheer
Module75Name = Reisnotities en -kosten
Module75Desc = Beheer van reisnotities en -kosten
Module80Name = Expedities
Module80Name = Verzendingen
Module80Desc = Beheer afnemersverzending en -ontvangst
Module85Name = Bank en Contant
Module85Desc = Beheer van bank- en / of kasrekeningen

4
htdocs/langs/nl_NL/commercial.lang
View File

@ -4,8 +4,8 @@ Commercial = Commercieel
CommercialArea = Commerciële gedeelte
CommercialCard = Commerciele details
CustomerArea = Afnemersdetails
Customer = Afnemer
Customers = Afnemers
Customer = Klant
Customers = Klanten
Prospect = Prospect
Prospects = Prospecten
DeleteAction = Verwijder een actie